From ac997f8f0dada1b17a7d45b8cc55abe53541397a Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 5 Oct 2023 05:25:20 +0800 Subject: [PATCH 0001/1039] [cub] update to 2.1.0 (#34111) --- ports/cub/fix-usage.patch | 20 ++++---------------- ports/cub/portfile.cmake | 4 ++-- ports/cub/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cub.json | 5 +++++ 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ports/cub/fix-usage.patch b/ports/cub/fix-usage.patch index 56801fdb9ef2d3..353818cb7ff3e7 100644 --- a/ports/cub/fix-usage.patch +++ b/ports/cub/fix-usage.patch @@ -1,24 +1,12 @@ diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake -index 3d7f64b..213a95e 100644 +index ebe40ef..884ce65 100644 --- a/cub/cmake/cub-config.cmake +++ b/cub/cmake/cub-config.cmake -@@ -8,6 +8,7 @@ if (TARGET CUB::CUB) - return() - endif() +@@ -11,6 +11,7 @@ endif() + # Minimum supported libcudacxx version: + set(cub_libcudacxx_version 1.8.0) +include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake") function(_cub_declare_interface_alias alias_name ugly_name) # 1) Only IMPORTED and ALIAS targets can be placed in a namespace. # 2) When an IMPORTED library is linked to another target, its include -diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in -index 2a46606..d2c38ef 100644 ---- a/cub/cmake/cub-header-search.cmake.in -+++ b/cub/cmake/cub-header-search.cmake.in -@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search - find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh - NO_DEFAULT_PATH # Only search explicit paths below: - PATHS -- "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree -+ "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree - ) - set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL) diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake index 69f73ad63c896f..9049648f0d3c02 100644 --- a/ports/cub/portfile.cmake +++ b/ports/cub/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub - REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0 - SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6 + REF "${VERSION}" + SHA512 f88fdf80c81b8b5d3d09797bf5e9a9e82e1365950b358e0ffc2141b465646c2054ce7e6a30ae07735fbaa69d07c9a8e9bab57c8ddb8a0db8426b27eadd045197 HEAD_REF master PATCHES fix-usage.patch ) diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json index f6988759ffe79b..2162ca5a631e5e 100644 --- a/ports/cub/vcpkg.json +++ b/ports/cub/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cub", - "version": "1.16.0", + "version": "2.1.0", "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming", "homepage": "https://github.com/NVIDIA/cub", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 22bc58b6378325..40c34ab9247a0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1965,7 +1965,7 @@ "port-version": 0 }, "cub": { - "baseline": "1.16.0", + "baseline": "2.1.0", "port-version": 0 }, "cubeb": { diff --git a/versions/c-/cub.json b/versions/c-/cub.json index 4dc47df0860c4d..6538ac26f51d0e 100644 --- a/versions/c-/cub.json +++ b/versions/c-/cub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7b6e0430fa6c7701a81090f35c8344c7889d790", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d", "version": "1.16.0", From accd79817981f1ce00c6a4164aecf2b2ac699823 Mon Sep 17 00:00:00 2001 From: SlawekNowy <38943477+SlawekNowy@users.noreply.github.com> Date: Wed, 4 Oct 2023 23:40:35 +0200 Subject: [PATCH 0002/1039] [openimageio] Point to a new repo and fix checksums (#34231) --- ports/openimageio/portfile.cmake | 4 ++-- ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index c583243183bbe7..d56f4ed2bb25e9 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO OpenImageIO/oiio + REPO AcademySoftwareFoundation/OpenImageIO REF "v${VERSION}" - SHA512 59c38667ae792f5c5cc6f7f9655159e9b0e048d99f1232766407c01ab635a319ad4ba28cd3c6a115924ea0e4ec994d4c1bdb2f6301fbb9ae11b2820768bd1ff1 + SHA512 6b87c805907a2f7c98f40e987fb6ebf769f8519f5d8a8b7393bed62a41cee1118bb32d2bc4d23fd464973e237077d08771ff85f72073caa57799d71bd098038f HEAD_REF master PATCHES fix-dependencies.patch diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index b63a14c3bcc118..a2b67d66495bdd 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.4.14.0", - "port-version": 1, + "port-version": 2, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 40c34ab9247a0d..beea648b15b3e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6126,7 +6126,7 @@ }, "openimageio": { "baseline": "2.4.14.0", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 9b0dd874dfae66..49da4aa3b11724 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fed3a9ba9a7731e30376ded1d6bdaba3e41b1ec6", + "version": "2.4.14.0", + "port-version": 2 + }, { "git-tree": "c74249169c46dbedf60590f672fb709294ffc7c6", "version": "2.4.14.0", From 5731e5bb8045ec33045b7247819cf68aef554a9f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 4 Oct 2023 16:53:01 -0700 Subject: [PATCH 0003/1039] Build Fixes for 2023-10-04 (#34267) --- ports/hypre/portfile.cmake | 1 + ports/hypre/vcpkg.json | 1 + scripts/ci.baseline.txt | 8 -------- versions/baseline.json | 2 +- versions/h-/hypre.json | 5 +++++ 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake index 720a3e97fcad0b..145f8ecc66e422 100644 --- a/ports/hypre/portfile.cmake +++ b/ports/hypre/portfile.cmake @@ -14,6 +14,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/src" + DISABLE_PARALLEL_CONFIGURE # See 'Autogenerate csr_spgemm_device_numer$ files' OPTIONS -DHYPRE_SHARED=${HYPRE_SHARED} -DHYPRE_ENABLE_HYPRE_BLAS=OFF diff --git a/ports/hypre/vcpkg.json b/ports/hypre/vcpkg.json index 42548e93a07f44..396c5c364f9852 100644 --- a/ports/hypre/vcpkg.json +++ b/ports/hypre/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hypre", "version": "2.29.0", + "port-version": 1, "description": "Parallel solvers for sparse linear systems featuring multigrid methods", "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ba69f0bb74e3f0..58df23171425a6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -255,9 +255,6 @@ cserialport:arm-neon-android=fail cserialport:arm64-android=fail cserialport:x64-android=fail ctbench:x64-osx=fail -cubeb:arm-neon-android=fail -cubeb:arm64-android=fail -cubeb:x64-android=fail czmq:arm-neon-android=fail czmq:arm64-android=fail czmq:x64-android=fail @@ -351,9 +348,6 @@ fmi4cpp:arm64-uwp=fail fmi4cpp:x64-uwp=fail folly:arm64-android=fail folly:x64-android=fail -foonathan-memory:arm64-windows=fail -foonathan-memory:arm64-uwp=fail -foonathan-memory:x64-uwp=fail freeglut:arm-neon-android=fail freeglut:arm64-android=fail freeglut:x64-android=fail @@ -742,7 +736,6 @@ microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip -# https://github.com/mlpack/mlpack/pull/2945 monkeys-audio:arm-neon-android=fail monkeys-audio:arm64-android=fail monkeys-audio:x64-android=fail @@ -1067,7 +1060,6 @@ rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip rest-rpc:arm64-osx=skip -rhash:arm64-windows=fail rpclib:arm64-windows=fail rpclib:arm64-uwp=fail rpclib:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index beea648b15b3e2..c5f91dee21a56d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3286,7 +3286,7 @@ }, "hypre": { "baseline": "2.29.0", - "port-version": 0 + "port-version": 1 }, "iceoryx": { "baseline": "2.0.3", diff --git a/versions/h-/hypre.json b/versions/h-/hypre.json index 39edafad89499d..67e936f1c0e97e 100644 --- a/versions/h-/hypre.json +++ b/versions/h-/hypre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c86dd4b42c27ebdfbfa8c276e3e1b1d8f9ca7333", + "version": "2.29.0", + "port-version": 1 + }, { "git-tree": "bb61b149787c812f654a86f6863a6e4b8cb011cb", "version": "2.29.0", From 9d031612af24cc60f0887dd4dc0c010c72281706 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 5 Oct 2023 05:53:50 +0600 Subject: [PATCH 0004/1039] [makeid] update to 1.0.3 (#34271) --- ports/makeid/portfile.cmake | 4 ++-- ports/makeid/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/makeid.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/makeid/portfile.cmake b/ports/makeid/portfile.cmake index b4328b40ccc3d8..67c75090195c5f 100644 --- a/ports/makeid/portfile.cmake +++ b/ports/makeid/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_download_distfile(ARCHIVE URLS "https://www.humus.name/3D/MakeID.h" FILENAME "MakeID.h-${VERSION}" - SHA512 9b7cb5c1b71904f37f65fcac3d18194154029fbe04d89099d879ce8eb03e796662c78653322317ed72988d3695414aaa6e6c24cfff999bea5009ec47119c57a7 + SHA512 fd4222d2cc0b0e16b0cfbac048cb64ac59d53ede10ab7f88f710e4b866cb67ffb0ec139821c181f1804a813cc9ab20cf33282c8b73e9ef0fdba414be474c2b64 ) -file(COPY "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${ARCHIVE}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "MakeID.h") set(license_text "Public Domain diff --git a/ports/makeid/vcpkg.json b/ports/makeid/vcpkg.json index fbd793888b2cef..188046ce1c92b0 100644 --- a/ports/makeid/vcpkg.json +++ b/ports/makeid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "makeid", - "version": "1.0.2", + "version": "1.0.3", "description": "MakeID is a cross platform C++ library for IDs allocation/deallocation", "homepage": "http://www.humus.name/index.php?page=3D", "license": null diff --git a/versions/baseline.json b/versions/baseline.json index c5f91dee21a56d..882b0e7802b63d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5253,7 +5253,7 @@ "port-version": 2 }, "makeid": { - "baseline": "1.0.2", + "baseline": "1.0.3", "port-version": 0 }, "manif": { diff --git a/versions/m-/makeid.json b/versions/m-/makeid.json index 4b7c72c99db533..72598a80f2046e 100644 --- a/versions/m-/makeid.json +++ b/versions/m-/makeid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1e67fd4892325f13527874899102c734da3333d", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "08114cbf3e65a21af7fa59508fc838fb4cac067c", "version": "1.0.2", From 3b7578831da081ba164be30da8d9382a64841059 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Thu, 5 Oct 2023 05:55:03 +0600 Subject: [PATCH 0005/1039] [chakracore] enable static crt (#34270) --- ports/chakracore/portfile.cmake | 2 -- ports/chakracore/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/chakracore.json | 5 +++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 7d796d09e62399..78a5f9aafe1684 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -15,7 +15,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(additional_options NO_TOOLCHAIN_PROPS) # don't know how to fix the linker error about __guard_check_icall_thunk endif() - set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") set(PLATFORM_ARG PLATFORM x86) # it's x86, not Win32 in sln file endif() @@ -25,7 +24,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) PROJECT_SUBPATH Build/Chakra.Core.sln OPTIONS "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" - "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" ${PLATFORM_ARG} ${additional_options} ) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index e6fffb3c709c94..a296ca9ff4945e 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,11 +1,11 @@ { "name": "chakracore", "version-date": "2022-11-09", - "port-version": 4, + "port-version": 5, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "license": "MIT", - "supports": "!osx & !uwp & (linux | (!static & !staticcrt))", + "supports": "!osx & !uwp & (linux | !static)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 882b0e7802b63d..95915e0539aead 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1510,7 +1510,7 @@ }, "chakracore": { "baseline": "2022-11-09", - "port-version": 4 + "port-version": 5 }, "charls": { "baseline": "2.4.2", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index aa917d32b8a4ad..10b4b0fd2ae46b 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98c62c0fbb2d410646eec57ce65ec0b91ad19fcf", + "version-date": "2022-11-09", + "port-version": 5 + }, { "git-tree": "cc06634190b18bc8003202b9490c6af7919821a3", "version-date": "2022-11-09", From 8ec31e98fb07e3f9c2e5b6aed0737a76a693fc72 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 6 Oct 2023 03:20:33 +0800 Subject: [PATCH 0006/1039] [sqlite3] update to 3.43.1 (#34178) --- ports/sqlite3/add-config-include.patch | 6 +++--- ports/sqlite3/portfile.cmake | 2 +- ports/sqlite3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sqlite3/add-config-include.patch b/ports/sqlite3/add-config-include.patch index cb0e957bbe980e..df4b8172131e1f 100644 --- a/ports/sqlite3/add-config-include.patch +++ b/ports/sqlite3/add-config-include.patch @@ -1,17 +1,17 @@ diff --git a/sqlite3.c b/sqlite3.c -index 310583f..61f7d9e 100644 +index 1884b08..0d191be 100644 --- a/sqlite3.c +++ b/sqlite3.c @@ -20,6 +20,7 @@ ** The content in this amalgamation comes from Fossil check-in - ** f80b798b3f4b81a7bb4233c58294edd0f11. + ** d3a40c05c49e1a49264912b1a05bc2143ac. */ +#include "sqlite3-vcpkg-config.h" #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 #ifndef SQLITE_PRIVATE diff --git a/sqlite3.h b/sqlite3.h -index ec451a5..9c01424 100644 +index b9d0692..698c410 100644 --- a/sqlite3.h +++ b/sqlite3.h @@ -32,6 +32,7 @@ diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index ca93d91e2a96dc..5d4a6f987ac200 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -4,7 +4,7 @@ string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," " vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 241b22899c9090d94677328335588ba964a5bc3bfb278b8dcc97d6062cdfab6460b5b03dc166124f6119f5f8ece62ef9d06298de06eb5b36ed3ea49fd6ddc394 + SHA512 f17810f3b68b7f77a174503a863385a17bac0e9c819b9813cb75597cbd229ae8ad0b545410fc320669f377e79ab8412bbff8863f197d0f804c3a05b573df57e9 ) vcpkg_extract_source_archive( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index b78b582414f95b..31540cdf3381dc 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlite3", - "version": "3.43.0", + "version": "3.43.1", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index 95915e0539aead..44afb25120d97f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7949,7 +7949,7 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.43.0", + "baseline": "3.43.1", "port-version": 0 }, "sqlitecpp": { diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index ad00ae370deab6..ef71f41ebcc86d 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6497ccc9668ca1e0b17a080b01e8585b33660336", + "version": "3.43.1", + "port-version": 0 + }, { "git-tree": "4f7a1dcf86377b6045fbf05eb0ec1baff1d2ceb6", "version": "3.43.0", From 4664eb1fb631c76b337d6ccad58b7a4ffc30ea65 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Thu, 5 Oct 2023 23:38:14 +0200 Subject: [PATCH 0007/1039] [atl] new port (#34220) --- ports/atl/portfile.cmake | 10 ++++++++++ ports/atl/vcpkg.json | 6 ++++++ ports/atlmfc/vcpkg.json | 9 ++++++--- versions/a-/atl.json | 9 +++++++++ versions/a-/atlmfc.json | 5 +++++ versions/baseline.json | 6 +++++- 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 ports/atl/portfile.cmake create mode 100644 ports/atl/vcpkg.json create mode 100644 versions/a-/atl.json diff --git a/ports/atl/portfile.cmake b/ports/atl/portfile.cmake new file mode 100644 index 00000000000000..61a207f7bfbaae --- /dev/null +++ b/ports/atl/portfile.cmake @@ -0,0 +1,10 @@ +find_path(ATLBASE_H + NAMES atlbase.h + PATHS $ENV{INCLUDE} +) + +if(NOT ATLBASE_H) + message(FATAL_ERROR "Unable to locate 'atlbase.h'. Ensure you have installed the Active Template Library (ATL) component of Visual Studio.") +endif() + +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/atl/vcpkg.json b/ports/atl/vcpkg.json new file mode 100644 index 00000000000000..cd2350eb2bcd74 --- /dev/null +++ b/ports/atl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "atl", + "version": "0", + "description": "A stub package that ensures Visual Studio has Active Template Library (ATL) installed.", + "supports": "windows" +} diff --git a/ports/atlmfc/vcpkg.json b/ports/atlmfc/vcpkg.json index 6b9eea357c7951..40f1377957854d 100644 --- a/ports/atlmfc/vcpkg.json +++ b/ports/atlmfc/vcpkg.json @@ -1,7 +1,10 @@ { "name": "atlmfc", "version": "0", - "port-version": 2, - "description": "a stub package that ensures VS has ATL/MFC installed.", - "supports": "windows" + "port-version": 3, + "description": "A stub package that ensures Visual Studio has ATL/MFC installed.", + "supports": "windows", + "dependencies": [ + "atl" + ] } diff --git a/versions/a-/atl.json b/versions/a-/atl.json new file mode 100644 index 00000000000000..458b1eed606a00 --- /dev/null +++ b/versions/a-/atl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0cf33fe03c09b26209c1162fee2bb2c5538f8b0f", + "version": "0", + "port-version": 0 + } + ] +} diff --git a/versions/a-/atlmfc.json b/versions/a-/atlmfc.json index 4de2206ee7c86a..f9be7ff97a1c17 100644 --- a/versions/a-/atlmfc.json +++ b/versions/a-/atlmfc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a6d710d7d3ffd42089aa001571c625805f59918", + "version": "0", + "port-version": 3 + }, { "git-tree": "60bac7802a9cdb32192315262495b647af36b723", "version": "0", diff --git a/versions/baseline.json b/versions/baseline.json index 44afb25120d97f..508d7835ee8cee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -296,9 +296,13 @@ "baseline": "2.36.1", "port-version": 2 }, + "atl": { + "baseline": "0", + "port-version": 0 + }, "atlmfc": { "baseline": "0", - "port-version": 2 + "port-version": 3 }, "atomic-queue": { "baseline": "2021-05-03", From 97f6e6766607c9f6d5930aefaf8c1e54fd4f2f30 Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Fri, 6 Oct 2023 05:07:02 +0200 Subject: [PATCH 0008/1039] [qt5] update to 5.15.11 (#34289) --- 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 | 3 +- ports/qt5-doc/vcpkg.json | 2 +- ports/qt5-gamepad/vcpkg.json | 2 +- ports/qt5-graphicaleffects/vcpkg.json | 2 +- ports/qt5-imageformats/vcpkg.json | 2 +- 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/vcpkg.json | 3 +- 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 | 3 +- 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 | 92 +++++++++++------------ 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 ++ 84 files changed, 333 insertions(+), 133 deletions(-) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index e43904ccdcff2f..398b30b5e59f73 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "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 cdce229a192fcc..da99d74106e4fd 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.10", + "version": "5.15.11", "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 339df96c58fa75..5c5ff65cf0a3b2 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.10", + "version": "5.15.11", "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 e61050013c4b69..a4aeef035f79c9 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 10) +set(QT_PATCH_VER 11) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-3d 6c3d94b02188493567921552e104f407fd92bf2b95acd6c933a9dd214ba7ebc0c1983ffcaefeae63d60131d02651df1da834522628711d36514dc697e7bb885f) -set(QT_HASH_qt5-activeqt 67ebe2eb0b45c128d9e57305f378900d21348d75960800e7848134452c1c01688219b36e712bceff76e942ce05e5100881194409627a7902a6d613938656550b) -set(QT_HASH_qt5-androidextras 9001f6cee644efcbfe5df1a7f97e8426364cc1a86cc7b5ae897aed05436920992325c8ff708a4de796ae02ab38af5c6cc20388f5d682bcd7fd43aa8d5775c5ae) -set(QT_HASH_qt5-base 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef) -set(QT_HASH_qt5-charts 15c76bc6b987b2d89473972df9cd4826913bb0dd2dffdb06fc6dfdbdd1a5676508584d5f0982b06ab513e46cee12871f3eb0ed00f94fccf23ef807079be96961) -set(QT_HASH_qt5-connectivity 3bc1c701f1e80794a410f0784c8955be42cb800c315d686da1a1e8429dbb72799bba2da59592f9edcd686c326df26fee4bf4e74b49feb96119e6aa29e982059f) -set(QT_HASH_qt5-datavis3d 414f4c86a55a9f2db745691f01f0d7ad6bbdddf56a04a280fd11f5b1bcd590ff34a8b35e178eaef15e1b1a1813cb148ac5bddfbb8fcb05de6ed5492666cccaf9) -set(QT_HASH_qt5-declarative 378fc41a31edb52d85fd5e37fe6c086e35b5d5d759ceacc49cf7981a8a38d25ae5f2ca27d99547bd1db381f32128e7947800e2a01a857177707cc2a9980373a8) -set(QT_HASH_qt5-doc 5c2751c1736c1c6818a7806ed14a81856115dfd8f46508dcea9b8023df638d34e96171c383cbdd3b7c307f97297e97da13503032225d8135e1a52b2fef5722e8) -set(QT_HASH_qt5-gamepad 20f06a11b8e7057e11b2f061ba088f1721cf94a20bed21e52eb0d7c6e20cd8f74ae2d0fe47748466c4a3dd63f9843afc94f74fb3076849e80ad8e71017fb3605) -set(QT_HASH_qt5-graphicaleffects a7e1326c10bd3bbce0f5b3e664dc42e5573de7add44ac852417aba9170a4e21c173679a65ea4ed403782fa954652b896266611887664488a99d42a8b3c8f7504) -set(QT_HASH_qt5-imageformats 7373884e5f01da0aae6f7d4575ca953de3be6cd41d3d19aa29bb2a2e5998486407525f23122e8b13c26143e64aa95d4756c5381643e93f930472c9890e6561de) -set(QT_HASH_qt5-location e4fb56ddd2dc50024f02de84323c3299788eb6632672e1bc52ef1399ccf9d0af34b0104548cb108fb372870057426b0cdd52052ad91ba45fc7f8098a675f29a4) -set(QT_HASH_qt5-macextras 6eea905dab769183bacba4eac04f8de9c006dfda2034bd2025361445781a5379b2cc038ca6af95206f52fe6a2a11d73b36f96b0b716e93445973b9fb20337167) -set(QT_HASH_qt5-mqtt 5ca3b7ab7865f09eb0d5d300854b9fc7cd1534090a17462fcdbecee25f831e8d3a0de2adb151ae6f810f9df0ef30146f22a902275636554f6b77660e9bf00440) -set(QT_HASH_qt5-multimedia a322dba0daced00cf0a7fcd21b7f55c281dec107b7976792406ecc7658c94ea1a40c81c7cbdc0987f1be32cafd2458993c92db87fcbfdc7ba1243d2e0047896e) -set(QT_HASH_qt5-networkauth bfdda139223d183767e50fb95309dee7cd85c42fa09a00246a38987bf1570d84a137fb3fc71119416cc45126f21f6964f430b031e5acd4447caf30d0aac3bc2a) -set(QT_HASH_qt5-purchasing 9758325cf7bbdc8428a1ec9254749c27d6397a72d4fe164dc8ce0da08d09aa9c0ec0edb67879d6aa54500a47096154b252292b200d0bc516de425bfaad4f9ca8) -set(QT_HASH_qt5-quickcontrols fe7faf770adad9820ae897b5822b5dcba095dfc267411dd92d0b46daf7f84f87b3d9f2f9f90a90c030b09dcdc30549647f3f42039ac09e9207b5c1462116ed10) -set(QT_HASH_qt5-quickcontrols2 87e1590223c36b1191f4d976cab946c7d688228032a4a32e699a87ee844d64ed60f93c3c0c148374f4ac6ca619bbf583492cb9b57823b15dd0b9811ca270f390) -set(QT_HASH_qt5-remoteobjects 980884aaa65cd3462d9359f4def9e15a1d395569a14ee6c7c70f71a3d0445031baaa5a91541df01d6b7d6ca48bade2ae2c4ceebb306a97eefdc500c2f7d3eee6) -set(QT_HASH_qt5-script 3748cc8c90c2f96a21e6b0c8ffacca11d023e37091f6f5a05608f7f787f81619a7aac5c8074360486e28033a28601c1d347e499bc387a36f50c4cec2be30e782) -set(QT_HASH_qt5-scxml 93e2df05da176802a0439ba752f52d1c84d291a2addf9492aaab2099f06efb32d896edd0660711bb2e0b67f7a9ea2c4d31b4ec3366f6230140d3de0056478923) -set(QT_HASH_qt5-sensors 9950b0f8b90727a051299c5b7e7852819c165bcdb1cbe2f8bd7386768175c387ab838918e7d6f1dcf2a7d6d32bb1559dfda225c57e8b9b5b4ffeac5f3db432ac) -set(QT_HASH_qt5-serialbus 914a6ec2d51f89f84bc3425185cc35d497595c8f5378ff475ce784bc744fe1a9054feeaeed8d4205abc5f4de256d9511e8e1be3076066eed424848724325f513) -set(QT_HASH_qt5-serialport 59face48cce750fb02c112dbef9c997a5b61d84cf8085a0f8c59c3bb5c93d7110de9c9830f26f3ed61fffb2c23eb8a42d5683211abaa6e5147cf87643469a45e) -set(QT_HASH_qt5-speech b938c8baba11aa9a40a2ec5492df32c511164686aa2649d78023beccc8b23f1e0a77193672f7bc7d7f72aeb7b59fe30972683f5a4e22e1e39da9744ecd40201d) -set(QT_HASH_qt5-svg 6de19c1dd6584f95bc3abbd391495bbdc13f15cc677a0c9e7afa2a0beffef8f8128eab5ccda741ed95af4553203b9daf1fc0327197912945e7211aeace33c6e7) -set(QT_HASH_qt5-tools 08d5182309c0f19f14af4e509871bca13b89cdd762bd4b7f98b15120b2e74308e478f826b4236f01abc299520da32b716df9e7bfaa84935fbdc0a74422ade5f1) -set(QT_HASH_qt5-translations 94f22857cf9f14f13f774ee5632bfd0fc367ca5fb745cbfb3997fee8651961d9547f0a629afc54c35b2e4493244da9b94214777e20340c2b203c538bc1c84a22) -set(QT_HASH_qt5-virtualkeyboard 6d539af5e5a336f2bf4ac1e6006268e50b426f6bb174019f742847da86f8cd5c8eb2c5f353255b5d1bba9c9c7a7b035bcb12e0063be5b31e45741ea9bd478582) -set(QT_HASH_qt5-wayland 214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899) -set(QT_HASH_qt5-webchannel ed8349820c623dd7abcd34244a2f05426667d6997a8952567c3cbe785bb2ea92f03dd931bb53f77b34faff16d04dd7d39e4165c75d7a9ebb4ae225d7582355bc) -set(QT_HASH_qt5-webengine e35d0cab5f66a148420206616b3517e62b8320572beac53650096c0db58db8b4942d52a3abf4f0d6db1450de27befeb92f8b632c1277b0939464c1407a904b1b) -set(QT_HASH_qt5-webglplugin f47dc98f94ee422bdfce70663e24af3155047cb3ee1a914cb4d5f0d269de43bdb5f68376e04d0a9701c2f95ffe19c29f5c38db6441ec2144ccb41beb45924f1e) -set(QT_HASH_qt5-websockets b9a2593169f0ff8e3e77c178de689dacfed564b2100ae67194f3636bf6d2300be3531a01b7158b06657f4a2d2a32453a98b96c6ab13fb9d8094e7ceeb5fdcbe3) -set(QT_HASH_qt5-webview 258e2146a74083b2a7e48f8875f601df8f6135cdd4bb7c35c3d8b61bec0e5937942e74c36e971565ced9c070e3f1303a3950b7f2a87b148e8abb516bd0ce7a25) -set(QT_HASH_qt5-winextras dec47ca62e83a0794dc2f096a6fdccc45a1e43912af7f8a67ffd4aaed047d1887c85e411daba8a5a71d38e4ed3fbef1e2142a314aee1416a3a91a75c61f58706) -set(QT_HASH_qt5-x11extras 460345ad1fc7812a5bc71c097eb31c37a94acaaf94a79cfbfe3317142b4c515832ce2bf46b9bfcc9c9f669587a76492fb172dd55bfc27ca1570780772438f8b7) -set(QT_HASH_qt5-xmlpatterns 308203fafdd572998563a30b3289002f848c05b6de5a18545dc06489f97aa197c32f37019880b068c152e678ff5254ebe33333b581572811111c45a5ccb4a243) +set(QT_HASH_qt5-3d 34362aafbff5352786e87d98362e8961d4e2d9ad4ddd0c76ec7771375eb3f9c6f23b681c2697752ee9dad228f04e377e0a934859f70e6020dd9613b6ee760f1c) +set(QT_HASH_qt5-activeqt 33e441e56e0d59215c2884f75fbea104c2089e2b7571025f045cd03a8f5db1cf318f7f0bd7107ff2e414ddd0de13e16fbd49ad6c75ae1cef4cc4049429d3fba0) +set(QT_HASH_qt5-androidextras 6524e13c255f8350c0ac4abe8ea6a424daed60b3dc05c2aa66ecdcceace47fe4733a386dd4faf883c1014791e11f7f34633c6189907fbf8da31e81b027ef4003) +set(QT_HASH_qt5-base 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f) +set(QT_HASH_qt5-charts fe6f32b9d42a6fb6c26d4f860489be18643b1f5b32d5be348f7529fa029cfaea79af0c8493d8d26b0a9d91ebdbdc8ac0d80a3912ee40b36bed863cc5356370bf) +set(QT_HASH_qt5-connectivity f1bddff89b45352c9f98c7f94be9c5226588219036474d3be1e35b6f0c9327dcb1e8ca4e52e342863ff2e3052014eb7abbed1f9d4381174e326e3c70eebc1306) +set(QT_HASH_qt5-datavis3d 43ca0e5aa9af59d80a05166bb6cf29ab0d1a7421474d7dc974cb960dd3100d417456a2614208ccfca900e2203fd9becea12af6c15dd93107c196ebe17ad47559) +set(QT_HASH_qt5-declarative 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae) +set(QT_HASH_qt5-doc 8c7777446ca83fc7a4f2ef33b0f7e032268f67284855fd97900e07e1f7e0b7173bfb980cba206d010c489630719a5f8f08c42b222784a426b0800c4c34f097da) +set(QT_HASH_qt5-gamepad 4aa21aa51d854edd365e21e6f8f195c70998223c2a70603518b00a0efbeddf5ed9c60c33e665c1bb2dbed73e3d9b113b7fbf47287789ea54ba2a1d5c65b72c33) +set(QT_HASH_qt5-graphicaleffects 9e46eb1d985fdde3571f0327229a973b9ba4e3da360c3a890aa9c658a4cd82c20485a46ffbdbfd10c7fe4d6e3c45476682ee561ce3345f1eddebbf97eee162b0) +set(QT_HASH_qt5-imageformats a41f2adec9470433914a634e3dc79a70e2eda5713be5884029f8ef5eae3c5b2cea4c6de795907ddc69268635aef194325b047cddf84c8be4cf59668d172a89fa) +set(QT_HASH_qt5-location d439d03ff9044fc70165d1ceb5def9ec3290beec56b3e893409a24cd355651a4317e0eadff0266d38203ff84429a5fb8659a200f094669716579b6791a1a0f6d) +set(QT_HASH_qt5-macextras 5a9427c5dc21ecaac45097c731fcb3cb5c8397f0391e3da52f8aee30a6ba919b4697e6a20008b358c0086e98cb47fec678a2ed421a44c5107425432b5bc59e9a) +set(QT_HASH_qt5-mqtt 7bc1c4f3fa0097c057ffa72fd7ac68a3f7df35b1c0b93a54d53568c4743041887f3e2739c0281fcfad49909c926e9353c0a6523fd2bac62f539e4390044151fe) +set(QT_HASH_qt5-multimedia 1d72f79fe83cc955037ec6c5348058369697889a9a40b9fbaee9f3ad0cb74fe5f97062e026254e3512f0861e67cca8a36eaa19c1b3ffbea32d6b3cde2163b484) +set(QT_HASH_qt5-networkauth a7e4fcb5d5d5f80640444ae42896920c3e713df887244fbb42ce8de920270204fde1be12664ae24c075cdeea5d98da8f13aa4114524516cd9e3e5f2c68bd016f) +set(QT_HASH_qt5-purchasing 89b2d03528c4902ce2011817246f691902314383e0401638dc06c3bef4664a3d5a37edfe6f290fd7117168fa7862217b67b9a2340353b883b6e2b3741af658a8) +set(QT_HASH_qt5-quickcontrols 0779f9eb1b7b78a9f7662f5c2f7754882c0b85efbfff6e922d044757d1bc47f4c8ba0adb14b1a1347c32abd8086b6031d77c50cf534206f1988c4ce616e4953c) +set(QT_HASH_qt5-quickcontrols2 2621ae1d0c8ebb38ec2c9a0ff28b9bdb3a7aebfd2b6477d145a9772002abdae832aa7daeb8843a8372b32ebe476262650ba23cc977257fd5932499cde796eb32) +set(QT_HASH_qt5-remoteobjects ae5910c4b4da95cb927389137c2def0e75030024f5139a7634d009f9ebcc81c3f7171e6d0b3a5f3e0201a93eb8fad4d346b70fcc0aefbb1c6c69afc13c6d4848) +set(QT_HASH_qt5-script 116dc95c804fcd78082100d67c51c68c045a17754c8591cb885925c3b3541439317ae79ba7eefc1102ce12d2f544dc502fd67c4d8724f4d7f1347099cda3f744) +set(QT_HASH_qt5-scxml 7b6b9a13e8a142cbb3d10b879877dcffdcf99a815db8149f7ff869c1b967a39620b8fd0bbb5e07832b9aeb91b6152ea5b8413b25020d73531e560041525a7842) +set(QT_HASH_qt5-sensors 94c3ae48a8423fd6af5c984ae99a51cba49d396a6d7032ba29008aa9bea461199986d52449f838278285a98aa3c0a95bb62868368bdc5879ca696273608a74d6) +set(QT_HASH_qt5-serialbus 2f51b449242a05a50cdf761f639dc9fa178eca5531cc520fdd22a1a18e3bac7244acc5a4b596f1ca11dbf7bff38181b451f6cb8de6fcee63165316a5b09956d8) +set(QT_HASH_qt5-serialport ff863b20283f36f865dbcf363faff5555234438ac29f475f98f2a351bbcac320fb1764ecc42f0cdcc729b6b6a64792ca86f35cfa2567d9ade5ef72ff2e493e2f) +set(QT_HASH_qt5-speech 658eb9d24ea2f2bf39c6f4cd6dc75677067c8058cae694b53e665e28a273d2f730ab0dd4744ca8f8db224e52bb014fd145af1abd1667e3cd37f74c51bf96ebf4) +set(QT_HASH_qt5-svg ac04197aa69342aa403f476e41a8ea7b1895187812577afe32536130d5605fb1dc7f99c0aef368ccbacb673f8b41efe44a200643b905e4674379aa951a48cf59) +set(QT_HASH_qt5-tools 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884) +set(QT_HASH_qt5-translations bb1d5c353932566b3daccc8b4d9ad957d3c4ea130e67eb933c0a7e49b99d2f9cac2860201a12e37ea51e46ae772a75a4be80d71e3a8afa59f5e14d3e02dd1ce2) +set(QT_HASH_qt5-virtualkeyboard 771088a6f847c901f59c14e32225410a4b174d2e9eb026928acba41e7dc2f658ad09d054846a06efb262fe198c1ddfbaf1014a61257856014c6ca2498747cc0e) +set(QT_HASH_qt5-wayland b47a3358bc37f52dde0839940431e8049abfaa827722e6d57362b07547c35fe9fb422d28fd28c69a13f5773c24efc3eeea1e584372737a0151ed94bf4c5b9980) +set(QT_HASH_qt5-webchannel 499e67d83d08476ee4b9da6c331a459b595ace3c6a7cbc7e1d8660b551cc0a87ef50e5d9d69a7783614c67db46df7802fdb4a2e79edb76012f6d26ceb3417eeb) +set(QT_HASH_qt5-webengine cebda17b9023348c85e9397fce5ad0f8ee16cfe821b8e79cea7ce92f7bb00e7fe59594107ac9f9411df1bb2e675eb6ecbfe3366df67a05b45fe12ead97cdc76c) +set(QT_HASH_qt5-webglplugin cbbab9ac54b38dfaa3f492ded0796ea942c24534d001980f71f5d1f35786c7c455de8a187608caa9ec4d9d1a0ed7dba19dc03de00414ac69efec48ff8c69f2ed) +set(QT_HASH_qt5-websockets 644182da57f0b3b77a434abcfe67731178cb0e62bc8743c85bda24e137f2fe686728b10a73f5030d8f357cc616c2e681de15598bedf4d01d4cb705482235bbcd) +set(QT_HASH_qt5-webview 7a741b3bb79b9aeaca05130ad8346a2dc704a203654754c73953d37a88d4c923375c3db44ddc22ea0b9856abedb7daf99e89d4f387014dfe8fbb31aaea6a7e38) +set(QT_HASH_qt5-winextras a387da6da092267545c78caff54dd95958be1840913f8ebe66320d35d8328ced2bb2b0cc85f0e2f7138f937fd828141e573d45c805e2da47c7b050bf961f2fb5) +set(QT_HASH_qt5-x11extras e1135ed8d1800d59f039e82ce33f3c84ac87df29ad61a60b2a0d25d78e4e38e2e1800406513d45abd3af79a2821698ca5d71161d6ad1f3b05deb3fad7599f654) +set(QT_HASH_qt5-xmlpatterns 73326aaa7fef65e00e3a585952d06841bba0905c1cb9a753b6c636e01fd7bf8cc66dadbe962ed962523f234c7461463ed893b045a7e3c2f0fbfb5e9aecf7a802) 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 5702c408d3f040..1945e55f389072 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.10", - "port-version": 7, + "version": "5.15.11", "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 ff1f5737a0e422..4776a533e44a1f 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.10", + "version": "5.15.11", "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 30e607a3e06af1..eab2b2e3720d90 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.10", + "version": "5.15.11", "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 ab129f728804bc..e9dae7a52427b2 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.10", + "version": "5.15.11", "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 25e4d19b2e1732..2ffb5acee7950e 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "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 0d7aafe81c893c..403099132eae3b 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 9d757785e72ad3..a5cbb927303e91 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.10", + "version": "5.15.11", "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 ef0df010942726..01b6f6d9e6f4d0 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index d9ec973cac4c94..38c70b1b609635 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.10", + "version": "5.15.11", "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 9048df7d7b5dc9..ee68e67e202042 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.10", + "version": "5.15.11", "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 16146b0b71e5ed..b2d03191a8beb5 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.10", + "version": "5.15.11", "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 9d3619a24015ad..16f7f52c6b9ba2 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index c349d61d73033a..fef4059774cfaa 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.10", + "version": "5.15.11", "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 dd059c25f891f9..24814527eb7934 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index fa3a509ed635b6..ce0126d6f184f0 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.10", + "version": "5.15.11", "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 a45d8e0987d3d2..26741f8f5dcac0 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 7ee321220f8ab6..9d7f132a918982 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index fb38de4d9780cd..675197200ee357 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.10", + "version": "5.15.11", "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 ecafd394eb9507..0d1609a26c1f30 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index feb59ba6a8fdee..522e87d415c6d1 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.10", + "version": "5.15.11", "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 9fea767a039036..1c714da77f8f46 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.10", + "version": "5.15.11", "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 36174611d70eb0..c55bf6c7aa71d2 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index a09f5ecf0a2c28..7644e67fc22ce2 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.10", + "version": "5.15.11", "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 cc493f9849ae66..15a50ac979cccb 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 989f2e177f4ad3..63f9b59fa54e93 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index edf24f1ccb7445..31a9e69653a73e 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "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 2fc8ed1482c6a8..83f1f385d31b6c 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index a8941978315fe2..3a6eb89f7d70d2 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.10", + "version": "5.15.11", "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 3c5035539d92dc..224d47f9c10fe1 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index 5cc07a85dc471b..d16e484d35006e 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.10", + "version": "5.15.11", "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 8161a985c8ed44..296aa471eb58b3 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.10", - "port-version": 1, + "version": "5.15.11", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 6476a176f2dbe2..99ab24ed5e0059 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Webglplugin Module", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 9e71b76e48ce4d..45209f405fe4fa 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.10", + "version": "5.15.11", "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 7a993eb0a80c33..2d6ad37008d217 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.10", + "version": "5.15.11", "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 724ae378c92b6b..b1b519b0dc8724 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.10", + "version": "5.15.11", "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 af3b84383b5411..76ca6eb92b5ec7 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 x11extras Module;", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 12d0f5e98f2437..c44f47a8c4db81 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.10", + "version": "5.15.11", "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 e30614eaef3b4f..4fced41162bc4f 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5", - "version": "5.15.10", + "version": "5.15.11", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 508d7835ee8cee..730d3249cf873e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6741,67 +6741,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.10", - "port-version": 7 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 2 }, "qt5-charts": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-location": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-modularscripts": { @@ -6809,107 +6809,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.10", - "port-version": 1 + "baseline": "5.15.11", + "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.10", + "baseline": "5.15.11", "port-version": 0 }, "qt5compat": { diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index ec5e76fdb9072c..856cd3966c6516 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3a019873d77d8951d137f3f5a4bd3ae8fc147a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "be8daf4a45d4f87e7867bd9110ba974c3db3aa00", "version": "5.15.10", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 2a6eb937ea93bf..6fede3be3dacbe 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45de7184a24f527bbccf33013f1c6667d5e6f668", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "7862807b3cdd0a4647ba2f9db4eb3c1338536e9e", "version": "5.15.10", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index dc85eeafc339c2..7a173015f515dd 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "382ab13532eab56c75a3a4150a8bdb2cf9464200", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "11a9fee7235b0de6c54f4b1ee65e103bc94a6075", "version": "5.15.10", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index d235d6b2c9c798..03de08dcc47938 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d26db1adfbe17c91d6c2858d38290ce2277cd8a3", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "0ee4e266c41088bae8b961529841eebc5696a749", "version": "5.15.10", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 470a52be7d7ccf..0e2d14123f0108 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "917d2b5a9ee716031be8a168076d174ec6712788", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "21cff64c27a49de9aeebf975fa890c7de64b2ede", "version": "5.15.10", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 16777143387321..48bd66c53dd9e4 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b623eee1a6ff0e483580654a60d9e6eb4787be92", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "8b9f8ae492cb7fb0ad32863279bfd1796779a043", "version": "5.15.10", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 1813793f887d50..3c8db1d4cacbd6 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80f8d82fe81bf098c225ca52b7ea49478512be67", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "734a01140c22505395e27032cdbadebbdb0d1cdc", "version": "5.15.10", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index c865fd09b97b3d..f969d3fa8533b4 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "880d2e0ae6f6042a0cb4baae85bc7bc7c950b746", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "c7cc59aec9e75dc548a741b01b94b13438904e99", "version": "5.15.10", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index b60ede1f0c308f..3c9a0a16c4dc0e 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e2640c2eff33d0d16d7a3168aeb75bccb8fbc37", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "260c42f72e3b608905415b0570f98a354264d9e0", "version": "5.15.10", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index b3870620a87e8b..122e59f0742f42 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a02c1cd4d355720fc3b2af9d0ddad446279a731", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "556adf6709fe319be9960166e72a30c03372d370", "version": "5.15.10", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 065e27e4a63c0d..1ac424030bacc8 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "209e1c20fbc69e0bd69bf50aad1a5b049f7cf5fd", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "53cf70df24a80e1b6c72b85f9d6ff8c4765b7af2", "version": "5.15.10", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 8bf01c71c0380a..913cb0cfa4015f 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea581d5a2583209a4b276fd9a20f8c04194e29c0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "39d5acff58afd279f8249487ea29263910b24220", "version": "5.15.10", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 216dd8c7bec027..2440816d684969 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55991602e3deb4103599fc04c287a4959c847016", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "fc2aca1d6bd39aba9d6e45651d8f2908e3a555c8", "version": "5.15.10", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index ab158ecdbfb269..0982c9698795b1 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50e9a0fc524758440c3715855627b8b8bd531f0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "12b1fde22a5acf67e0ac9e5066ff280363131c14", "version": "5.15.10", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 33c3cb2603445a..91adb1ac41e0d6 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0fc4bdfce63f3f7410762189b98448182f9b3ab", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "398e7c0eab3505667a21ba09a66acbaf434f2469", "version": "5.15.10", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index f9f4681f94e08d..96c727bd1cc3c0 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c3d01a70310ae2d017d0e08428b1902c45b872f", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "a6c4649e892aeb5e8c154336702ee48f0dfcfcf9", "version": "5.15.10", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 80c87368431a46..9462015627700b 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2245d4d7c2e1064fd19a893f34ee247bdb07322b", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "dae7f812fc32b8659a16029d431fe0fe0156681e", "version": "5.15.10", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 762e02785d7769..301ad95bca54d4 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "714b9adc89ab6a09174e73be5497e982e4e830fa", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "9769b05f79a109d7fcd2ace8c3500638504f586b", "version": "5.15.10", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 19a8ac2bff3cdb..5c0081dcb554c4 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e63a158c8c9551554c2986dab6d771efabd38c7", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "342b8c5a23f4f9690bedb464a32e171dbb5ef2e4", "version": "5.15.10", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index d686cac46f968f..26bc37f30d8c48 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1d335409f6c5c9af37eb6721b5d68d78a8dbdb1", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "e22bfd152605c0559014192e82b46e465e16dac6", "version": "5.15.10", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index bc69d8c1d5f48d..37efcaa9d1c41f 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83e7e782900b0f016a0f7b659e6cb235f7677cf7", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "6f93d74b2bcca02aee5e9e4e7e0126f5c445aeaa", "version": "5.15.10", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 674877136587fb..be9f8fb2e74595 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4c21b90523ce92847d4b1f675a84ba4f34a9710", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "bf51477b296f65a9b1548f1f895fb123aba0c792", "version": "5.15.10", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index dc2078c350dfc9..392a3f1371b500 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eb406a4e80cd474efe6f42e896438b7b90ee96c", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "26f667cea870335a6f46ca414baa020c8f6aba35", "version": "5.15.10", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 172bd3ec20b857..8696e62d28f103 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5883a76574d6f2b6077898a5fd3ca52d1788dd88", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "dbca7fa67ff94eee8d6e3de297d737170190ff6f", "version": "5.15.10", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index b14917d7083741..6aae9ca9212069 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1259ec9f3eea78cad8e057fbc7d765a47929154", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "66becab038e0bc1ebd91613c96f32203edfd2933", "version": "5.15.10", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index b0f268596e1202..4ed83e36d86e34 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081a6b53bdb5d7dd70f8e8315deaa8e71a160714", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "051b6d588faeba97c3ee9e53e96c5a619ac38352", "version": "5.15.10", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 192022a7a7bc56..4b12030f96351c 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf9d4d8eab1658f34274dcdf5e83c2624e7727bb", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "3530341f63252d313281374bb000e761889a0de6", "version": "5.15.10", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 3d36f2e75e7e16..f86df19be40431 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c938a0870f30cebe24c31abefa8ac8a8dc60722a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "632ca34b395881412e1694d350f605a2dd6d54f0", "version": "5.15.10", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 3092ebf0bcd4f8..66ada1a2178a5c 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b41d2e4f17b9cbcb85f1fe67b9e1adfaa70a0cb", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "c3e934f75a0e506d6c3329e0fa0b2a56d6f71324", "version": "5.15.10", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index fbb33fad50acfd..ea43d1be6d6d9f 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d49653566c4a0eae04e6b56cb9b3904b7c826af", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "7a8ae0c894141bd285fa02a23a9d4eb6f40604aa", "version": "5.15.10", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index cecdc6dd54322a..69b7314fe1ac53 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "144f57127630eec25443579a16d72fd4eb2c0378", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "eca137a635e6a4aa62a40609dc1a09029ca02733", "version": "5.15.10", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 5a384bc6772b40..46518ab9cce87e 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fe250be41e03ec6404fb5b38d8db2d52e68ef78", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "f45281462dfeef2426bd9e6cc4d15d87fdd5f888", "version": "5.15.10", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 09bf79c553a18b..676f1bcab04c00 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "834b6ab045a2739e6fa6d85f3687423e66417d7a", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "688b1af87eb544cc7828bfa75df01c0dc2efe4d8", "version": "5.15.10", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index c7359dba460963..28a436dae28074 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4609e43287d1db55e04e0553d85039adebffacd", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "cf5ac17e7409f445cbfc1cffc1d8a138a24582a0", "version": "5.15.10", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 520cabfb43f208..d1e22f69d04da2 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b2a0472f4b91117a702ed605c443c71d3393862", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "d056d88bfc82130467bf524e8c7285850b71c594", "version": "5.15.10", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 5f2317b6c4326d..8db9fd64e267b7 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8589b41f61533965537f8a6701d2f8ea015f1f2", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "13d815c2479b4a47f6b617ff2e1de3379d0a44b7", "version": "5.15.10", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index fe439a429bf2ce..7a492fc5fdb56e 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf926864a58a4777c63c25c856ea5f4c544b1fd2", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "d70201641dafec375d2ac778fce87a73c5f451b3", "version": "5.15.10", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 5011282158d114..897abe00eb9519 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "913946992a50661e33d59f4452c3d322d5341400", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "9e40a0af7bdebc43925450f1e51e2c2f8b49a067", "version": "5.15.10", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index cb55edaa388ba7..e961435bd32c4f 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08d312b3a2e6e0016aa0b6d2bdac1d3d3d864d23", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "e2042c06d5c6007ed72d9df7f8dae8d1148eb1cc", "version": "5.15.10", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 49afb77b66f6d7..1934dfffd8d805 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d366bc9e9536eb8db2be796afdd35eb0ad05c8b", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "510fff85661604ebc087feee170a857bc08d31d9", "version": "5.15.10", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index ee969ff2156edc..3c90fbf95b2427 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83c7937d7b60d45f3f9e5006fa6cbcdead8b62e0", + "version": "5.15.11", + "port-version": 0 + }, { "git-tree": "50fe0254b5caf977970fd69dfed756799a54120c", "version": "5.15.10", From 158f8d698597fd133bc2bc1d6a97e1ec04258cfe Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:09:36 -0700 Subject: [PATCH 0009/1039] [azure-core-amqp-cpp] Update to 1.0.0-beta.4 (#34293) --- ports/azure-core-amqp-cpp/portfile.cmake | 4 ++-- ports/azure-core-amqp-cpp/vcpkg.json | 3 +-- versions/a-/azure-core-amqp-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index 76e2e05910924e..da4284a422fcc7 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.3 - SHA512 93af776c164942584025fdca8493a9ac6145bba5afc061d2d9a8976c887e818baef3b8797b56fc5278c5e01875dc8813b94f3919d581a5b8e660f6ca27ecd702 + REF azure-core-amqp_1.0.0-beta.4 + SHA512 c8bc1e73e8f2a31ace636a5193e4909d1f673efb5f62c5cb27dbbe379ad77387bfecd862efb635c335044a6e7e1726a0ba39fba8713d97b0e80e239f9d92e3a7 ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 03df1ddc8b09a6..b9a6f43b391d02 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.3", - "port-version": 1, + "version-semver": "1.0.0-beta.4", "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 7d8610a784bc2f..08f1e3af2e2cf1 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50c7a85fdc78ded123beb5dd15e2b4557ace24b2", + "version-semver": "1.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "f2454e03858a910421f6fd248968fd1cb7999ba7", "version-semver": "1.0.0-beta.3", diff --git a/versions/baseline.json b/versions/baseline.json index 730d3249cf873e..7d8b984567e3e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -413,8 +413,8 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.3", - "port-version": 1 + "baseline": "1.0.0-beta.4", + "port-version": 0 }, "azure-core-cpp": { "baseline": "1.10.2", From 7827a2a05e7b290db5fd29a00644bbfd39f55582 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:09:43 -0700 Subject: [PATCH 0010/1039] [azure-core-cpp] Update to 1.10.3 (#34291) --- ports/azure-core-cpp/portfile.cmake | 5 +++-- ports/azure-core-cpp/vcpkg.json | 16 +++++++++------- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 9478984a157c6f..09167adbce06b4 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.10.2 - SHA512 ab942af0764eb1352fe65582bcf3e06a7f75853796e47ed32f5ae485e1042e55ace7fc1dc1daf80c0a53813f6daa2377b03ed09527808d52d486c5bbd71b3fa3 + REF azure-core_1.10.3 + SHA512 b3705cf757a14693f65a5ea4a43cc3c5f8377b3156ef24869bd664e9e8b25797fd21107ad543db476335bbb2389687cc1ed8fb8fe1010bb9b5a0eb406f3c0d59 ) vcpkg_check_features( @@ -28,6 +28,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF + -DNO_AUTOMATIC_TRANSPORT_BUILD=ON ) vcpkg_cmake_install() diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index fe7e5385313180..3126e9b75aa69e 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.10.2", - "port-version": 5, + "version-semver": "1.10.3", "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++." @@ -20,10 +19,6 @@ { "name": "vcpkg-cmake-config", "host": true - }, - { - "name": "wil", - "platform": "windows" } ], "default-features": [ @@ -69,7 +64,14 @@ }, "winhttp": { "description": "WinHTTP HTTP transport implementation", - "supports": "windows" + "supports": "windows", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + }, + "wil" + ] } } } diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index a55a42a6f8d4af..c88a7165ff2fd1 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6323331b6946093d5e0c3dd11e33d3e83203dc3", + "version-semver": "1.10.3", + "port-version": 0 + }, { "git-tree": "5f406f6bf6084c74a6a234f35bc6e232fae15cae", "version-semver": "1.10.2", diff --git a/versions/baseline.json b/versions/baseline.json index 7d8b984567e3e2..fd6f518ceaca90 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -417,8 +417,8 @@ "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.10.2", - "port-version": 5 + "baseline": "1.10.3", + "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", From 4d999187501e852f76457306b35627dbe63895cd Mon Sep 17 00:00:00 2001 From: Pravila Date: Fri, 6 Oct 2023 04:45:47 +0100 Subject: [PATCH 0011/1039] [make-vector] New port (#34069) --- ports/pravila00-make-vector/portfile.cmake | 11 +++++++++++ ports/pravila00-make-vector/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/p-/pravila00-make-vector.json | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 ports/pravila00-make-vector/portfile.cmake create mode 100644 ports/pravila00-make-vector/vcpkg.json create mode 100644 versions/p-/pravila00-make-vector.json diff --git a/ports/pravila00-make-vector/portfile.cmake b/ports/pravila00-make-vector/portfile.cmake new file mode 100644 index 00000000000000..285464d9b63476 --- /dev/null +++ b/ports/pravila00-make-vector/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pravila00/make-vector + REF 1518ac00adec9b13a645aee45ed1a36eb6ec1e98 + SHA512 2be4af258ceeb71e990ecc5c1c2c269456f6621b7b6b8183ba4e29f5479c4c7a618bd0c737a8d66aa00052a710930ec2f2ee5bc925f7a627427ac90918b6d4fa + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/include/make_vector.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/make-vector") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pravila00-make-vector/vcpkg.json b/ports/pravila00-make-vector/vcpkg.json new file mode 100644 index 00000000000000..04cd52a3271c05 --- /dev/null +++ b/ports/pravila00-make-vector/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pravila00-make-vector", + "version-date": "2023-04-10", + "description": "C++ helper for making vectors.", + "homepage": "https://github.com/Pravila00/make-vector", + "license": "BSL-1.0" +} diff --git a/versions/baseline.json b/versions/baseline.json index fd6f518ceaca90..c3f0b6f36745e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6592,6 +6592,10 @@ "baseline": "1.3", "port-version": 7 }, + "pravila00-make-vector": { + "baseline": "2023-04-10", + "port-version": 0 + }, "presentmon": { "baseline": "1.7.0", "port-version": 2 diff --git a/versions/p-/pravila00-make-vector.json b/versions/p-/pravila00-make-vector.json new file mode 100644 index 00000000000000..3b694dd47e2800 --- /dev/null +++ b/versions/p-/pravila00-make-vector.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b4a9f4a88cb5645d9a5f6827293bc3732a57e043", + "version-date": "2023-04-10", + "port-version": 0 + } + ] +} From 909ad555665f5084bf31b505fdd1f2970e2b9270 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:29:02 +0200 Subject: [PATCH 0012/1039] [qt5-base] fix xcode 15 build (#34285) --- .../patches/patch-qtbase-memory_resource.diff | 43 +++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + ports/qt5-base/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 ports/qt5-base/patches/patch-qtbase-memory_resource.diff diff --git a/ports/qt5-base/patches/patch-qtbase-memory_resource.diff b/ports/qt5-base/patches/patch-qtbase-memory_resource.diff new file mode 100644 index 00000000000000..18b5b4d5136dbd --- /dev/null +++ b/ports/qt5-base/patches/patch-qtbase-memory_resource.diff @@ -0,0 +1,43 @@ +--- a/src/corelib/global/qcompilerdetection.h ++++ b/src/corelib/global/qcompilerdetection.h +@@ -1050,16 +1050,22 @@ + # endif // !_HAS_CONSTEXPR + # endif // !__GLIBCXX__ && !_LIBCPP_VERSION + # endif // Q_OS_QNX +-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ +- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) ++# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN) ++# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) + // Apple has not updated libstdc++ since 2007, which means it does not have + // or std::move. Let's disable these features +-# undef Q_COMPILER_INITIALIZER_LISTS +-# undef Q_COMPILER_RVALUE_REFS +-# undef Q_COMPILER_REF_QUALIFIERS ++# undef Q_COMPILER_INITIALIZER_LISTS ++# undef Q_COMPILER_RVALUE_REFS ++# undef Q_COMPILER_REF_QUALIFIERS + // Also disable , since it's clearly not there +-# undef Q_COMPILER_ATOMICS +-# endif ++# undef Q_COMPILER_ATOMICS ++# endif ++# if defined(__cpp_lib_memory_resource) \ ++ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \ ++ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000)) ++# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17 ++# endif ++# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN) + # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500 + // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode + // (probably because libc++'s on OS X failed to compile), but they're missing some +--- a/src/corelib/tools/qduplicatetracker_p.h ++++ b/src/corelib/tools/qduplicatetracker_p.h +@@ -52,7 +52,7 @@ + + #include + +-#if QT_HAS_INCLUDE() && __cplusplus > 201402L ++#ifdef __cpp_lib_memory_resource + # include + # include + #else diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 4fb0ddf09748b0..9969b7f7bcad3e 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -67,6 +67,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/mysql-configure.patch #Fix mysql project patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 patches/xcode-15.patch #From https://codereview.qt-project.org/c/qt/qtbase/+/503172 + patches/patch-qtbase-memory_resource.diff # From https://bugreports.qt.io/browse/QTBUG-114316 #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 1945e55f389072..c01e316ea2e57f 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-base", "version": "5.15.11", + "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, diff --git a/versions/baseline.json b/versions/baseline.json index c3f0b6f36745e6..b12ec264a6d5e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6762,7 +6762,7 @@ }, "qt5-base": { "baseline": "5.15.11", - "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 03de08dcc47938..a509edccd1820e 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c09b409166a1cb3e4881ee5b0081069227a7ae45", + "version": "5.15.11", + "port-version": 1 + }, { "git-tree": "d26db1adfbe17c91d6c2858d38290ce2277cd8a3", "version": "5.15.11", From 06f9283535252a73abbb418090389560256ec44c Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:36:13 +0200 Subject: [PATCH 0013/1039] [bext-wintls] Update to 0.9.7 (#34296) --- ports/bext-wintls/portfile.cmake | 6 +++--- ports/bext-wintls/vcpkg.json | 14 +++----------- versions/b-/bext-wintls.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ports/bext-wintls/portfile.cmake b/ports/bext-wintls/portfile.cmake index 14ac5c893e4698..81b1aebb0cf9c6 100644 --- a/ports/bext-wintls/portfile.cmake +++ b/ports/bext-wintls/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO laudrup/boost-wintls - REF v0.9.5 - SHA512 5b6a88d64225c0f065d18f65319d44b90eb594431c53d9fbff72edfe2fc909613a966062b5636db7a3d0e36a389a0948dada0fbfa61b21b7b52b1af952d93071 + REF "v${VERSION}" + SHA512 b2973148f53f036108783ea6c30fca5f5055efc3676a9df2d1bf527399f757ac2f319f8637646904820e5280a8be48cf8369a3d2b6a3879afc0aa4463c77ea06 HEAD_REF master ) file(COPY "${SOURCE_PATH}/include/boost/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost/") -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/bext-wintls/vcpkg.json b/ports/bext-wintls/vcpkg.json index cb39e3137c97f7..80327ea1ab7200 100644 --- a/ports/bext-wintls/vcpkg.json +++ b/ports/bext-wintls/vcpkg.json @@ -1,18 +1,10 @@ { "name": "bext-wintls", - "version": "0.9.5", + "version": "0.9.7", "description": "Native Windows TLS stream wrapper for use with boost::asio", "homepage": "https://github.com/laudrup/boost-wintls", - "supports": "windows", + "supports": "windows | mingw", "dependencies": [ - "boost-asio", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "boost-asio" ] } diff --git a/versions/b-/bext-wintls.json b/versions/b-/bext-wintls.json index b57b166726ec7d..f5fffd6cbf0de0 100644 --- a/versions/b-/bext-wintls.json +++ b/versions/b-/bext-wintls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc8c1307f16b47fb5fd638e719f0157323be3919", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "1bed92afff8085f2d8f888b35ce0049e5986aa8a", "version": "0.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index b12ec264a6d5e1..fcc95d217f9786 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -573,7 +573,7 @@ "port-version": 2 }, "bext-wintls": { - "baseline": "0.9.5", + "baseline": "0.9.7", "port-version": 0 }, "bfgroup-lyra": { From 33e2a9f56dec00d00bc4711a82c9301df4966cbb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 6 Oct 2023 19:37:04 +0200 Subject: [PATCH 0014/1039] [libgnutls] Fix build errors (#34275) --- ports/libgnutls/portfile.cmake | 18 +++++++++++++----- ports/libgnutls/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/l-/libgnutls.json | 5 +++++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ports/libgnutls/portfile.cmake b/ports/libgnutls/portfile.cmake index 94302863e72764..58daad08804631 100644 --- a/ports/libgnutls/portfile.cmake +++ b/ports/libgnutls/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - string(REGEX REPLACE "^([0-9]*[.][0-9]*)[.].*" "\\1" GNUTLS_BRANCH "${VERSION}") vcpkg_download_distfile(tarball URLS @@ -28,8 +26,18 @@ if ("openssl" IN_LIST FEATURES) vcpkg_list(APPEND options "--enable-openssl-compatibility") endif() -if(VCPKG_TARGET_IS_OSX) - vcpkg_list(APPEND options "LDFLAGS=\$LDFLAGS -framework CoreFoundation") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND options "LIBS=\$LIBS -liconv -lcharset") # for libunistring +endif() + +if(VCPKG_CROSSCOMPILING) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + set(ccas "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + cmake_path(GET ccas PARENT_PATH ccas_dir) + vcpkg_add_to_path("${ccas_dir}") + cmake_path(GET ccas FILENAME ccas_command) + vcpkg_list(APPEND options "CCAS=${ccas_command}") endif() set(ENV{GTKDOCIZE} true) # true, the program @@ -42,7 +50,6 @@ vcpkg_configure_make( --disable-guile --disable-libdane --disable-maintainer-mode - --disable-silent-rules --disable-rpath --disable-tests --with-brotli=no @@ -57,6 +64,7 @@ vcpkg_configure_make( ) vcpkg_install_make() vcpkg_fixup_pkgconfig() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libgnutls/vcpkg.json b/ports/libgnutls/vcpkg.json index 227c79a8f41663..17f86699f3498b 100644 --- a/ports/libgnutls/vcpkg.json +++ b/ports/libgnutls/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgnutls", "version": "3.8.1", + "port-version": 1, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols.", "homepage": "https://www.gnutls.org/", "license": null, @@ -11,20 +12,25 @@ "libtasn1", "libunistring", "nettle", + { + "name": "vcpkg-cmake-get-vars", + "host": true, + "platform": "!native" + }, "zlib" ], "features": { "nls": { "description": "Enable native language support.", "dependencies": [ - "gettext", { "name": "gettext", "host": true, "features": [ "tools" ] - } + }, + "gettext-libintl" ] }, "openssl": { diff --git a/versions/baseline.json b/versions/baseline.json index fcc95d217f9786..18c8b6cd7b3f6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4206,7 +4206,7 @@ }, "libgnutls": { "baseline": "3.8.1", - "port-version": 0 + "port-version": 1 }, "libgo": { "baseline": "3.1", diff --git a/versions/l-/libgnutls.json b/versions/l-/libgnutls.json index d8aa09978a5bc6..997bb9db7b76a8 100644 --- a/versions/l-/libgnutls.json +++ b/versions/l-/libgnutls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdcde91b6757c786647f9bfafef1e0f02591a859", + "version": "3.8.1", + "port-version": 1 + }, { "git-tree": "7818d88f0b76ec5775b8bc6269ebf22d9aea466d", "version": "3.8.1", From 01b55e171b27e7617f84af34925f0f98eb169f05 Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:37:57 +0200 Subject: [PATCH 0015/1039] [tinygltf] update to version 2.8.17 (#34302) --- ports/tinygltf/portfile.cmake | 4 ++-- ports/tinygltf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tinygltf.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/tinygltf/portfile.cmake b/ports/tinygltf/portfile.cmake index 373167a255e8a5..86b654f53c49ab 100644 --- a/ports/tinygltf/portfile.cmake +++ b/ports/tinygltf/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinygltf - REF "v.${VERSION}" - SHA512 e5309e4018db1c2fde8d5fcf0fef2a0a2fc37fc69524ee3cdc89cbf1a163da42e71c5e2154befe0eaac5d33e345698ff05b1aea6952f2cd18d908787c758d2f9 + REF "v${VERSION}" + SHA512 b745fea9e7291494d3bda225b90885ee7923d8a98f515908f3c3390dc3eb76207b9f7d3464254ef68031d0a8428935064dcf40e9c0f1858bd465c4b5dd660382 HEAD_REF master ) diff --git a/ports/tinygltf/vcpkg.json b/ports/tinygltf/vcpkg.json index 6f0124dffd50c7..1084ba4e261936 100644 --- a/ports/tinygltf/vcpkg.json +++ b/ports/tinygltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinygltf", - "version": "2.8.4", + "version": "2.8.17", "description": "A header only C++11 glTF 2.0 library.", "homepage": "https://github.com/syoyo/tinygltf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 18c8b6cd7b3f6b..c9152a143a7398 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8281,7 +8281,7 @@ "port-version": 0 }, "tinygltf": { - "baseline": "2.8.4", + "baseline": "2.8.17", "port-version": 0 }, "tinynpy": { diff --git a/versions/t-/tinygltf.json b/versions/t-/tinygltf.json index 7e9d0ee46f1c94..2c795115547ea7 100644 --- a/versions/t-/tinygltf.json +++ b/versions/t-/tinygltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a828c964c3dac5b5b48545da10e8e357c3759042", + "version": "2.8.17", + "port-version": 0 + }, { "git-tree": "d642030fcb4784451290f7523460bdabfa96bd56", "version": "2.8.4", From 7e4d2ff73b643ca2c685c6cfe0783a0f62cfb15c Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Fri, 6 Oct 2023 19:38:28 +0200 Subject: [PATCH 0016/1039] [Vc] Update to 1.4.4 (#34299) --- ports/vc/Fix-internal-func-export.patch | 16 ---------------- ports/vc/portfile.cmake | 5 ++--- ports/vc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vc.json | 5 +++++ 5 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 ports/vc/Fix-internal-func-export.patch diff --git a/ports/vc/Fix-internal-func-export.patch b/ports/vc/Fix-internal-func-export.patch deleted file mode 100644 index a06321649dd594..00000000000000 --- a/ports/vc/Fix-internal-func-export.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/support_x86.cpp b/src/support_x86.cpp -index 0ab9669..d5c17ba 100644 ---- a/src/support_x86.cpp -+++ b/src/support_x86.cpp -@@ -58,8 +58,9 @@ static inline bool xgetbvCheck(unsigned int bits) - #endif - } - --Vc_TARGET_NO_SIMD --bool isImplementationSupported(Implementation impl) -+ -+Vc_TARGET_NO_SIMD -+bool Vc_VDECL isImplementationSupported(Vc::Implementation impl) - { - CpuId::init(); - diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index d185dd587fecbd..91ced9f34e326c 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.3 - SHA512 7c0c4ccf8c7c4585334482135f2daf1a5bc088114b880093893583bdcea1fbfcec02485da6059304c510c8b1bb1b768ef04fd7ac8ccb21b9ebbad5d0d5babaef + REF 1.4.4 + SHA512 b8aa0a45637dd1e0cc23f074d023b677aab570dd4a78cff94e4c2d832afb841c1b421077ae9c848a40aa4beb50ed2e31fdf075738496856ff8fe3ea1d0acba07 HEAD_REF 1.4 PATCHES correct_cmake_config_path.patch - Fix-internal-func-export.patch #remove it in next version ) vcpkg_cmake_configure( diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json index 09bb050102a37f..965a2141462ba4 100644 --- a/ports/vc/vcpkg.json +++ b/ports/vc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vc", - "version": "1.4.3", + "version": "1.4.4", "description": "SIMD Vector Classes for C++ .", "homepage": "https://github.com/VcDevel/Vc", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c9152a143a7398..38f7e4cfc20477 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8601,7 +8601,7 @@ "port-version": 0 }, "vc": { - "baseline": "1.4.3", + "baseline": "1.4.4", "port-version": 0 }, "vcglib": { diff --git a/versions/v-/vc.json b/versions/v-/vc.json index f1232fc14d8b6a..14fb131a9d48e3 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "219677dca49bb75959b61537111daca726e52a86", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "933ac99201b15104edd8037e8bcc7959d36a6d67", "version": "1.4.3", From 93ef2d8a3c644981c75f2d225cdf41380ffb3d24 Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:39:50 +0200 Subject: [PATCH 0017/1039] [rapidjson] update version to 2023-07-17 (#34317) --- ports/rapidjson/portfile.cmake | 4 ++-- ports/rapidjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index a2dc96d73db1ed..7c7c4e16ddca9e 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 949c771b03de448bdedea80c44a4a5f65284bfeb # accessed on 2023-04-27 - SHA512 dc0a16230188ccd3ef8f1abffb3213948dd34b17df68330a28bb82a4e3f636e13add3ff33f03774322697140456c704223102e6517d5122fa099260704b7c363 + REF a95e013b97ca6523f32da23f5095fcc9dd6067e5 # accessed on 2023-07-17 + SHA512 19bf9a579df70cbeaf60c7ccf25c92c327bffe95b0df14f27f2132134d5bb214e98a45e021eb287c4790e301f84bb095e0bdb3c97f65a37fbeb254970d97c005 FILE_DISAMBIGUATOR 2 HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index a343edc2bc2d87..ec17e082f51a79 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidjson", - "version-date": "2023-04-27", + "version-date": "2023-07-17", "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 38f7e4cfc20477..6dc0cfbfededda 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7181,7 +7181,7 @@ "port-version": 0 }, "rapidjson": { - "baseline": "2023-04-27", + "baseline": "2023-07-17", "port-version": 0 }, "rapidxml": { diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 7d632c02b06318..a335aac74cfdd0 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9da8fa409b1afef5674fe412237db0504cf6156e", + "version-date": "2023-07-17", + "port-version": 0 + }, { "git-tree": "ea1032a866631acc7d63b4804be4ece09baeb47f", "version-date": "2023-04-27", From 29de898220e8961e1d5ba2b9e4ca3938bb07abbe Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Sat, 7 Oct 2023 01:42:16 +0200 Subject: [PATCH 0018/1039] [tiff] update to version 4.6.0 (#34304) --- ports/tiff/portfile.cmake | 2 +- ports/tiff/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tiff.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 01af6b41b21f17..2fc3e200721420 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO libtiff/libtiff REF "v${VERSION}" - SHA512 859331284cd28df56c44644a355ecdd8eece19f0d5cd3e693e37c0fe37115091e46943ffbad784e84af1b39a6fd81cd196af2d4fefe86369258f89050dafaa84 + SHA512 ef2f1d424219d9e245069b7d23e78f5e817cf6ee516d46694915ab6c8909522166f84997513d20a702f4e52c3f18467813935b328fafa34bea5156dee00f66fa HEAD_REF master PATCHES FindCMath.patch diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 5efdd811634629..daed76e3ab689e 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tiff", - "version": "4.5.1", - "port-version": 2, + "version": "4.6.0", "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": "libtiff", diff --git a/versions/baseline.json b/versions/baseline.json index 6dc0cfbfededda..65e1996f4d212d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8221,8 +8221,8 @@ "port-version": 0 }, "tiff": { - "baseline": "4.5.1", - "port-version": 2 + "baseline": "4.6.0", + "port-version": 0 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 2548d1d90eb96e..c25ec1ff3da757 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88ab604b58a0473cf643b6f3890c2d0c8174ff62", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "68f4ecc87b5ddce6c328c0f600a4c8b81d967d4c", "version": "4.5.1", From 681e510ff1eb6c237d12dc8b662fbeb1b1dd68bf Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Sat, 7 Oct 2023 01:47:19 +0200 Subject: [PATCH 0019/1039] [vcpkg] Fix GitLab authentication token (#34151) --- scripts/cmake/vcpkg_from_gitlab.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index b739e5bef3d486..93e8e60bdf7e84 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -18,7 +18,7 @@ endfunction() function(vcpkg_from_gitlab) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" - "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR" + "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR;AUTHORIZATION_TOKEN" "PATCHES") if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -45,7 +45,7 @@ function(vcpkg_from_gitlab) set(headers_param "") if(DEFINED arg_AUTHORIZATION_TOKEN) - set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") + set(headers_param "HEADERS" "PRIVATE-TOKEN: ${arg_AUTHORIZATION_TOKEN}") endif() if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) From cc97b4536ae749ec0e4f643488b600b217540fb3 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Sat, 7 Oct 2023 02:47:54 +0300 Subject: [PATCH 0020/1039] Improve detection of the target architecture on Apple platforms. (#34054) --- scripts/buildsystems/vcpkg.cmake | 66 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 6747a2a444da1c..8ae279069d91b6 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -268,6 +268,39 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_OSX_ARCHITECTURES) + list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT) + if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0") + message(WARNING "Unable to determine target architecture. " + "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. " + "Continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() + + if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1") + message(WARNING "Detected more than one target architecture. Using the first one.") + endif() + list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH) + if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s") + set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + else() + message(WARNING "Unable to determine target architecture, continuing without vcpkg.") + set(VCPKG_TOOLCHAIN ON) + cmake_policy(POP) + return() + endif() else() find_program(Z_VCPKG_CL cl) if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$") @@ -278,39 +311,6 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(Z_VCPKG_CL MATCHES "bin/cl.exe$" OR Z_VCPKG_CL MATCHES "x86/cl.exe$") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED CMAKE_SYSTEM_NAME AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") - list(LENGTH CMAKE_OSX_ARCHITECTURES Z_VCPKG_OSX_ARCH_COUNT) - if(Z_VCPKG_OSX_ARCH_COUNT EQUAL "0") - message(WARNING "Unable to determine target architecture. " - "Consider providing a value for the CMAKE_OSX_ARCHITECTURES cache variable. " - "Continuing without vcpkg.") - set(VCPKG_TOOLCHAIN ON) - cmake_policy(POP) - return() - endif() - - if(Z_VCPKG_OSX_ARCH_COUNT GREATER "1") - message(WARNING "Detected more than one target architecture. Using the first one.") - endif() - list(GET CMAKE_OSX_ARCHITECTURES "0" Z_VCPKG_OSX_TARGET_ARCH) - if(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "arm64s") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64s) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7s") - set(Z_VCPKG_TARGET_TRIPLET_ARCH armv7s) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "armv7") - set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "x86_64") - set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) - elseif(Z_VCPKG_OSX_TARGET_ARCH STREQUAL "i386") - set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) - else() - message(WARNING "Unable to determine target architecture, continuing without vcpkg.") - set(VCPKG_TOOLCHAIN ON) - cmake_policy(POP) - return() - endif() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") From 9c2fc5d3518bb7f729754b23440695f9c595576a Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Tue, 10 Oct 2023 03:33:09 +0530 Subject: [PATCH 0021/1039] [libgig] New Port (#33255) --- ports/libgig/0001-msvc-fix-ssize_t.patch | 16 ++++++++++ ports/libgig/0002-cmake-fixes.patch | 18 +++++++++++ ports/libgig/0003-fix-usage.patch | 19 +++++++++++ ports/libgig/portfile.cmake | 40 ++++++++++++++++++++++++ ports/libgig/vcpkg.json | 31 ++++++++++++++++++ versions/baseline.json | 4 +++ versions/l-/libgig.json | 9 ++++++ 7 files changed, 137 insertions(+) create mode 100644 ports/libgig/0001-msvc-fix-ssize_t.patch create mode 100644 ports/libgig/0002-cmake-fixes.patch create mode 100644 ports/libgig/0003-fix-usage.patch create mode 100644 ports/libgig/portfile.cmake create mode 100644 ports/libgig/vcpkg.json create mode 100644 versions/l-/libgig.json diff --git a/ports/libgig/0001-msvc-fix-ssize_t.patch b/ports/libgig/0001-msvc-fix-ssize_t.patch new file mode 100644 index 00000000000000..d2edce0e7be6be --- /dev/null +++ b/ports/libgig/0001-msvc-fix-ssize_t.patch @@ -0,0 +1,16 @@ +diff --git a/src/Serialization.h b/src/Serialization.h +index cccfc54..91a8fa4 100644 +--- a/src/Serialization.h ++++ b/src/Serialization.h +@@ -40,6 +40,11 @@ + #include + #include + ++#ifdef _MSC_VER ++#include ++using ssize_t = SSIZE_T; ++#endif ++ + #ifndef __has_extension + # define __has_extension(x) 0 + #endif diff --git a/ports/libgig/0002-cmake-fixes.patch b/ports/libgig/0002-cmake-fixes.patch new file mode 100644 index 00000000000000..19982f251c6e80 --- /dev/null +++ b/ports/libgig/0002-cmake-fixes.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae66913..893e3ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.1) + project(libgig) + +-if(NOT MSVC) +- message(FATAL_ERROR "Please use configure and make, this cmake file is currently only to generate msvc solution files") +-endif() ++#To force the compiler to use C++ 11 ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + + + #configuration options diff --git a/ports/libgig/0003-fix-usage.patch b/ports/libgig/0003-fix-usage.patch new file mode 100644 index 00000000000000..0b2c040bced3de --- /dev/null +++ b/ports/libgig/0003-fix-usage.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 893e3ea..2eef641 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,12 +128,11 @@ install(TARGETS libgig EXPORT libgig-config + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + +-install(TARGETS libakai EXPORT libakai-config ++install(TARGETS libakai EXPORT libgig-config + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + PUBLIC_HEADER DESTINATION include/libgig) +-install(EXPORT libakai-config NAMESPACE libgig:: DESTINATION share/libgig) ++install(EXPORT libgig-config NAMESPACE libgig:: DESTINATION share/libgig) + diff --git a/ports/libgig/portfile.cmake b/ports/libgig/portfile.cmake new file mode 100644 index 00000000000000..57f2748f878009 --- /dev/null +++ b/ports/libgig/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://download.linuxsampler.org/packages/libgig-4.3.0.tar.bz2" + FILENAME "libgig-4.3.0.tar.bz2" + SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + 0001-msvc-fix-ssize_t.patch + 0002-cmake-fixes.patch + 0003-fix-usage.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic LIBGIG_BUILD_SHARED) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + extra-tools LIBGIG_BUILD_TOOLS + tests LIBGIG_ENABLE_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBGIG_BUILD_SHARED=${LIBGIG_BUILD_SHARED} +) + +vcpkg_cmake_install() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dlsdump gigdump gigmerge korg2gig korgdump rifftree sf2dump + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin") +endif() +vcpkg_cmake_config_fixup() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libgig/vcpkg.json b/ports/libgig/vcpkg.json new file mode 100644 index 00000000000000..917fb405e9817f --- /dev/null +++ b/ports/libgig/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "libgig", + "version": "4.3.0", + "description": "C++ library for loading Gigasampler files and DLS Level 1/2 files", + "homepage": "https://www.linuxsampler.org/libgig/", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tests": { + "description": "Build test cases", + "dependencies": [ + "cppunit" + ] + }, + "tools": { + "description": "Build extra tools", + "dependencies": [ + "libsndfile" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 65e1996f4d212d..89251ff88e13a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4196,6 +4196,10 @@ "baseline": "1.7.1", "port-version": 3 }, + "libgig": { + "baseline": "4.3.0", + "port-version": 0 + }, "libgit2": { "baseline": "1.6.4", "port-version": 1 diff --git a/versions/l-/libgig.json b/versions/l-/libgig.json new file mode 100644 index 00000000000000..b68106b2e4f233 --- /dev/null +++ b/versions/l-/libgig.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "328bc5b2b64bc33badee7d282589b14d49aadb55", + "version": "4.3.0", + "port-version": 0 + } + ] +} From 6b0924525956bd55016a99352e638e477d96772e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:05:22 -0700 Subject: [PATCH 0022/1039] [botan] Update to 3.1.1 (#33424) --- ports/botan/arm64-windows.patch | 23 ----------------- ports/botan/fix-generate-build-path.patch | 13 ---------- ports/botan/fix-objectfile-list.patch | 23 ----------------- ports/botan/pkgconfig.patch | 4 +-- ports/botan/portfile.cmake | 15 +++++------ ports/botan/vcpkg.json | 3 +-- ports/botan/verbose-install.patch | 8 +++--- ports/qca/0002-fix-build-error.patch | 31 ----------------------- ports/qca/portfile.cmake | 6 ++--- ports/qca/vcpkg.json | 3 +-- versions/b-/botan.json | 5 ++++ versions/baseline.json | 8 +++--- versions/q-/qca.json | 5 ++++ 13 files changed, 31 insertions(+), 116 deletions(-) delete mode 100644 ports/botan/arm64-windows.patch delete mode 100644 ports/botan/fix-generate-build-path.patch delete mode 100644 ports/botan/fix-objectfile-list.patch diff --git a/ports/botan/arm64-windows.patch b/ports/botan/arm64-windows.patch deleted file mode 100644 index 54f98b7a9dfb8b..00000000000000 --- a/ports/botan/arm64-windows.patch +++ /dev/null @@ -1,23 +0,0 @@ -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/fix-generate-build-path.patch b/ports/botan/fix-generate-build-path.patch deleted file mode 100644 index 455c1f1391897c..00000000000000 --- a/ports/botan/fix-generate-build-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.py b/configure.py -index 89f87d4..ba7914f 100644 ---- a/configure.py -+++ b/configure.py -@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, - 'maintainer_mode': options.maintainer_mode, - - 'out_dir': build_dir, -- 'build_dir': build_paths.build_dir, -+ 'build_dir': os.path.abspath(build_paths.build_dir), - - 'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'), - 'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'), diff --git a/ports/botan/fix-objectfile-list.patch b/ports/botan/fix-objectfile-list.patch deleted file mode 100644 index b76c5fd7985377..00000000000000 --- a/ports/botan/fix-objectfile-list.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/configure.py b/configure.py -index 2474860a5..7d320d470 100755 ---- a/configure.py -+++ b/configure.py -@@ -1821,13 +1821,12 @@ def yield_objectfile_list(sources, obj_dir, obj_suffix, options): - - for src in sources: - (directory, filename) = os.path.split(os.path.normpath(src)) -- parts = directory.split(os.sep) -+ parts_in_src = directory.split(os.sep + 'src' + os.sep) -+ parts = [] - -- if 'src' in parts: -- parts = parts[parts.index('src')+2:] -- elif options.amalgamation and filename.find(options.name_amalgamation) != -1: -- parts = [] -- else: -+ if len(parts_in_src) > 1: -+ parts = [ 'src' ] + parts_in_src[-1].split(os.sep) -+ elif not options.amalgamation or filename.find(options.name_amalgamation) == -1: - raise InternalError("Unexpected file '%s/%s'" % (directory, filename)) - - if parts != []: diff --git a/ports/botan/pkgconfig.patch b/ports/botan/pkgconfig.patch index 95f74c2805ae1b..1f4b921e6cccce 100644 --- a/ports/botan/pkgconfig.patch +++ b/ports/botan/pkgconfig.patch @@ -1,5 +1,5 @@ diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in -index 7139436..81214fe 100644 +index c18b522..a5722c9 100644 --- a/src/build-data/botan.pc.in +++ b/src/build-data/botan.pc.in @@ -1,7 +1,7 @@ @@ -11,4 +11,4 @@ index 7139436..81214fe 100644 +includedir=${prefix}/include Name: Botan - Description: Crypto and TLS for C++11 + Description: Crypto and TLS for Modern C++ diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index fe71f942239e34..7d265ba541360a 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -3,16 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan REF "${VERSION}" - SHA512 0f99ef4026e5180dd65dc0e935ba2cabaf750862c651699294b3521053463b7e65a90847fef6f0d640eb9f9eb5efce64b13e999aa9c215310998817d13bd5332 + SHA512 fb6be83b0292bb28319061721fe10ea16776a942b381780a8d4bece9b86e3525a0f533e3572e54c6498b08c4dc421a746bff8f0302f3ea0d810e266811331a65 HEAD_REF master PATCHES - fix-generate-build-path.patch embed-debug-info.patch - arm64-windows.patch pkgconfig.patch verbose-install.patch configure-zlib.patch - fix-objectfile-list.patch # https://github.com/randombit/botan/pull/3069 ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") @@ -147,13 +144,13 @@ else() vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan") if(pkgconfig_requires) list(JOIN pkgconfig_requires ", " pkgconfig_requires) - file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}") + file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}") if(NOT VCPKG_BUILD_TYPE) - file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" "Requires.private: ${pkgconfig_requires}") + file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-3.pc" "Requires.private: ${pkgconfig_requires}") endif() endif() vcpkg_fixup_pkgconfig() @@ -161,7 +158,7 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/include/botan-2" + "${CURRENT_PACKAGES_DIR}/include/botan-3" ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") @@ -169,4 +166,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BO vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") -file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index d8f0e4e72536a0..067569ba68f380 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,6 @@ { "name": "botan", - "version": "2.19.3", - "port-version": 2, + "version": "3.1.1", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/ports/botan/verbose-install.patch b/ports/botan/verbose-install.patch index 6b1e4672984049..4f6101e10b1217 100644 --- a/ports/botan/verbose-install.patch +++ b/ports/botan/verbose-install.patch @@ -1,13 +1,13 @@ diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in -index 4839112..5102933 100644 +index 1d50a31..64789a5 100644 --- a/src/build-data/makefile.in +++ b/src/build-data/makefile.in -@@ -58,7 +58,7 @@ distclean: +@@ -61,7 +61,7 @@ distclean: "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/cleanup.py" --build-dir="%{build_dir}" --distclean install: %{install_targets} -- "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}" -+ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --prefix="%{prefix}" --build-dir="%{build_dir}" --bindir="%{bindir}" --libdir="%{libdir}" --docdir="%{docdir}" --includedir="%{includedir}" --verbose +- "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" ++ "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/install.py" --build-dir="%{build_dir}" --verbose check: tests "$(PYTHON_EXE)" "$(SCRIPTS_DIR)/check.py" --build-dir="%{build_dir}" diff --git a/ports/qca/0002-fix-build-error.patch b/ports/qca/0002-fix-build-error.patch index 69993e79a11eae..5515d21f738aed 100644 --- a/ports/qca/0002-fix-build-error.patch +++ b/ports/qca/0002-fix-build-error.patch @@ -23,35 +23,4 @@ index 80af6e84..ba86310d 100644 endmacro(install_pdb) macro(normalize_path PATH) -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index b2c5d3d3..4250ec26 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -6846,6 +6846,7 @@ public: - else if (type == QLatin1String("aes256-ccm")) - return new opensslCipherContext(EVP_aes_256_ccm(), 0, this, type); - #endif -+#ifndef OPENSSL_NO_BF - else if (type == QLatin1String("blowfish-ecb")) - return new opensslCipherContext(EVP_bf_ecb(), 0, this, type); - else if (type == QLatin1String("blowfish-cfb")) -@@ -6856,6 +6857,8 @@ public: - return new opensslCipherContext(EVP_bf_cbc(), 0, this, type); - else if (type == QLatin1String("blowfish-cbc-pkcs7")) - return new opensslCipherContext(EVP_bf_cbc(), 1, this, type); -+#endif -+#ifndef OPENSSL_NO_DES - else if (type == QLatin1String("tripledes-ecb")) - return new opensslCipherContext(EVP_des_ede3(), 0, this, type); - else if (type == QLatin1String("tripledes-cbc")) -@@ -6872,6 +6875,7 @@ public: - return new opensslCipherContext(EVP_des_cfb(), 0, this, type); - else if (type == QLatin1String("des-ofb")) - return new opensslCipherContext(EVP_des_ofb(), 0, this, type); -+#endif - #ifndef OPENSSL_NO_CAST - else if (type == QLatin1String("cast5-ecb")) - return new opensslCipherContext(EVP_cast5_ecb(), 0, this, type); --- -2.31.1 diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 599801eaeaeed7..6f1246f622cb45 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/qca - REF v2.3.5 - SHA512 c83ac69597f22d915479fd4fd1557b89c56ba384321c324f93cf2f1bd32a819cb6d7b008c44e7606fa39c8184043d97c36ee1210d23a6e8ce24c41c8a83e4fb9 + REF "v${VERSION}" + SHA512 de06173aaea32aac19a24510b5dbb4bb79681217eb1e4256de36db9f7158ad485fa450ffba5e13c12a0425866923b54f9b4d6164d0eaf659fdf40e458f5ee017 PATCHES 0001-fix-path-for-vcpkg.patch 0002-fix-build-error.patch @@ -92,4 +92,4 @@ file(REMOVE_RECURSE vcpkg_fixup_pkgconfig() # Handle copyright -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/qca/vcpkg.json b/ports/qca/vcpkg.json index dde4c6dcd4a54d..cc1315838fa9b3 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qca", - "version": "2.3.5", - "port-version": 2, + "version": "2.3.7", "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://userbase.kde.org/QCA", "dependencies": [ diff --git a/versions/b-/botan.json b/versions/b-/botan.json index ab55eb09922052..7ee8c91e54d24a 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d66e60d97a7a4e77df4e559fed1926a45dac3f52", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "575322265c701c0ff15d79c65a47ad38e7958235", "version": "2.19.3", diff --git a/versions/baseline.json b/versions/baseline.json index 89251ff88e13a1..ea6d5f2562f3e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1285,8 +1285,8 @@ "port-version": 0 }, "botan": { - "baseline": "2.19.3", - "port-version": 2 + "baseline": "3.1.1", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", @@ -6701,8 +6701,8 @@ "port-version": 0 }, "qca": { - "baseline": "2.3.5", - "port-version": 2 + "baseline": "2.3.7", + "port-version": 0 }, "qcustomplot": { "baseline": "2.1.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index d032255dc1d0a8..24a56166d38006 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4a6f18e51fa29570a8e35e20668aa86e60f6ff7", + "version": "2.3.7", + "port-version": 0 + }, { "git-tree": "32321bfdc0e4563ed40687585b48038d551f6149", "version": "2.3.5", From 0e85eeb82a191e466923e01a59ca98f2679803b7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:07:23 +0200 Subject: [PATCH 0023/1039] [sdl2-net] fix uwp (#33688) --- ports/sdl2-net/fix-uwp.patch | 13 +++++++++++++ ports/sdl2-net/portfile.cmake | 2 ++ ports/sdl2-net/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/s-/sdl2-net.json | 5 +++++ 6 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 ports/sdl2-net/fix-uwp.patch diff --git a/ports/sdl2-net/fix-uwp.patch b/ports/sdl2-net/fix-uwp.patch new file mode 100644 index 00000000000000..79f4c07a290858 --- /dev/null +++ b/ports/sdl2-net/fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/SDLnetUDP.c b/SDLnetUDP.c +index ee4e46b..dc9b4b0 100644 +--- a/SDLnetUDP.c ++++ b/SDLnetUDP.c +@@ -22,7 +22,7 @@ + #include "SDLnetsys.h" + #include "SDL_net.h" + +-#if defined(__WIN32__) || defined(__OS2__) ++#if defined(_WIN32) || defined(__OS2__) + #define srandom srand + #define random rand + #endif diff --git a/ports/sdl2-net/portfile.cmake b/ports/sdl2-net/portfile.cmake index f5c4473adb655f..eac85455e0b9e2 100644 --- a/ports/sdl2-net/portfile.cmake +++ b/ports/sdl2-net/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 669e75b84632e2c6cc5c65974ec9e28052cb7a4e # release-2.2.0 SHA512 180c757d704c72dc7fcc392c13942214c87b90de22e32045ec9eb6cde5da2b762516e14120d8bee52f7f4a59ad8e30d4f71e313918432ae07ef71df8e9380e4b HEAD_REF main + PATCHES + fix-uwp.patch ) vcpkg_cmake_configure( diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json index 1b10deb52a1972..941ca075e48e58 100644 --- a/ports/sdl2-net/vcpkg.json +++ b/ports/sdl2-net/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-net", "version": "2.2.0", - "port-version": 1, + "port-version": 2, "description": "Networking library for SDL", "homepage": "https://github.com/libsdl-org/SDL_net", "license": "Zlib", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 58df23171425a6..d3f996e9997558 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1100,8 +1100,6 @@ sdformat9:x64-windows-static-md=fail sdl1:arm-neon-android=fail sdl1:arm64-android=fail sdl1:x64-android=fail -sdl2-net:arm64-uwp=fail -sdl2-net:x64-uwp=fail sentencepiece:arm-neon-android=fail sentencepiece:arm64-android=fail sentencepiece:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index ea6d5f2562f3e8..6fc4815f4dce72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7570,7 +7570,7 @@ }, "sdl2-net": { "baseline": "2.2.0", - "port-version": 1 + "port-version": 2 }, "sdl2-ttf": { "baseline": "2.20.2", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index 8a937d9af535f4..0452f1331ea656 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "755d96f16afae7c5b7cae15eb97fe5da85951a72", + "version": "2.2.0", + "port-version": 2 + }, { "git-tree": "b34dc64f26f414003d909391145491128bdcf636", "version": "2.2.0", From 9e968a32120231124686d250520f5910ce0e66fe Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:07:33 +0200 Subject: [PATCH 0024/1039] [drogon] fix cross compilation (#33713) --- ports/drogon/0005-drogon-cross-compile.patch | 25 ++++++++++++++++++++ ports/drogon/portfile.cmake | 9 ++++++- ports/drogon/vcpkg.json | 13 +++++++++- versions/baseline.json | 2 +- versions/d-/drogon.json | 5 ++++ 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 ports/drogon/0005-drogon-cross-compile.patch diff --git a/ports/drogon/0005-drogon-cross-compile.patch b/ports/drogon/0005-drogon-cross-compile.patch new file mode 100644 index 00000000000000..61f0edc4fae357 --- /dev/null +++ b/ports/drogon/0005-drogon-cross-compile.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 88026025..d6f180fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,7 @@ option(BUILD_DOC "Build Doxygen documentation" OFF) + option(BUILD_BROTLI "Build Brotli" ON) + option(BUILD_YAML_CONFIG "Build yaml config" ON) + option(USE_SUBMODULE "Use trantor as a submodule" ON) ++set(DROGON_CTL_TOOL "" CACHE STRING "drogon_ctl tool executable when doing cross builds") + + include(CMakeDependentOption) + CMAKE_DEPENDENT_OPTION(BUILD_POSTGRESQL "Build with postgresql support" ON "BUILD_ORM" OFF) +diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +index 249c453d..16b346ea 100755 +--- a/drogon_ctl/CMakeLists.txt ++++ b/drogon_ctl/CMakeLists.txt +@@ -43,7 +43,7 @@ foreach(cspFile ${SCP_LIST}) + get_filename_component(classname ${cspFile} NAME_WE) + message(STATUS "view classname:" ${classname}) + add_custom_command(OUTPUT ${classname}.h ${classname}.cc +- COMMAND $ ++ COMMAND $,${DROGON_CTL_TOOL},$> + ARGS + create + view diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 3aa87b8cf7373c..54d7508872743f 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -9,8 +9,14 @@ vcpkg_from_github( 0002-drogon-config.patch 0003-deps-redis.patch 0004-drogon-ctl.patch + 0005-drogon-cross-compile.patch ) +set(DROGON_CTL_TOOL "") +if(VCPKG_CROSSCOMPILING) + set(DROGON_CTL_TOOL "${CURRENT_HOST_INSTALLED_DIR}/tools/drogon/drogon_ctl${VCPKG_HOST_EXECUTABLE_SUFFIX}") +endif() + vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,7 +39,8 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON -DUSE_SUBMODULE=OFF - ${FEATURE_OPTIONS} + "-DDROGON_CTL_TOOL=${DROGON_CTL_TOOL}" + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Boost ) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index f6ef00d672315a..a23057c4dc9508 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drogon", "version": "1.8.7", + "port-version": 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/", @@ -26,7 +27,17 @@ ], "features": { "ctl": { - "description": "Build drogon_ctl tool." + "description": "Build drogon_ctl tool.", + "dependencies": [ + { + "name": "drogon", + "host": true, + "default-features": false, + "features": [ + "ctl" + ] + } + ] }, "mysql": { "description": "Support reading and writing from/to MySQL databases.", diff --git a/versions/baseline.json b/versions/baseline.json index 6fc4815f4dce72..ac181c9666931f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2230,7 +2230,7 @@ }, "drogon": { "baseline": "1.8.7", - "port-version": 0 + "port-version": 1 }, "dstorage": { "baseline": "1.2.0", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 65b8a2fa4f1aa3..69d1c4f29de96d 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc8fd6d40ad624513353e295fbd39a0dd237c91", + "version": "1.8.7", + "port-version": 1 + }, { "git-tree": "01b8dcf586886018269bc888cc651751d074d4c6", "version": "1.8.7", From 1038c0d5bfc704bd46e87da755ac79eae63adca7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:08:15 +0200 Subject: [PATCH 0025/1039] [itk] fix python build (#33826) --- ports/itk/cxx17.patch | 12 ++++++++++++ ports/itk/portfile.cmake | 3 ++- ports/itk/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/i-/itk.json | 5 +++++ 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 ports/itk/cxx17.patch diff --git a/ports/itk/cxx17.patch b/ports/itk/cxx17.patch new file mode 100644 index 00000000000000..65df5d6f8d6b4a --- /dev/null +++ b/ports/itk/cxx17.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/ITKInitializeCXXStandard.cmake b/CMake/ITKInitializeCXXStandard.cmake +index 5345230b..a9ca48c3 100644 +--- a/CMake/ITKInitializeCXXStandard.cmake ++++ b/CMake/ITKInitializeCXXStandard.cmake +@@ -1,6 +1,6 @@ + ## Set the default target properties for ITK + if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 14) # Supported values are 14, 17, 20, and 23. ++ set(CMAKE_CXX_STANDARD 17) # Supported values are 14, 17, 20, and 23. + endif() + if(NOT CMAKE_CXX_STANDARD_REQUIRED) + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 72d23133170d62..c1fda38e51581e 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF 95800fd4d4b08678a6c0ebb63eb242893025b660 #5.2.1 + REF v5.3-rc02 SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 HEAD_REF master PATCHES @@ -15,6 +15,7 @@ vcpkg_from_github( opencl.patch use-the-lrintf-intrinsic.patch dont-build-gtest.patch + cxx17.patch # See https://github.com/InsightSoftwareConsortium/ITK/issues/4213#issuecomment-1722547712 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index e81f2229e03cb0..060fb32c850698 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", - "version": "5.2.1", - "port-version": 5, + "version": "5.3-rc02", + "port-version": 6, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ac181c9666931f..033e5418b5ca0a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3509,8 +3509,8 @@ "port-version": 0 }, "itk": { - "baseline": "5.2.1", - "port-version": 5 + "baseline": "5.3-rc02", + "port-version": 6 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index b848437c2c790c..bf4d9c7fd153fc 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40", + "version": "5.3-rc02", + "port-version": 6 + }, { "git-tree": "33def29a955f79fae7497d8be276decf175a9881", "version": "5.2.1", From 8e8f057d230c8cf18e6f01f08ed3decf27e52a9d Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:09:25 +0200 Subject: [PATCH 0026/1039] [liblzma] update to version 5.4.4 (#34306) --- ports/liblzma/portfile.cmake | 2 +- ports/liblzma/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/liblzma.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index fc0ecec4462627..0fdc38dfff9a5d 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tukaani-project/xz REF "v${VERSION}" - SHA512 67292be900a713035d2a3dab4c3b6697cf0db37a78faaa5e0d3f5a96909ef9645c15a6030af94fb7f4224c3ad8eacd1a653ba67dfdeb6372165c1c36e0cf16b7 + SHA512 c28461123562564e030f3f733f078bc4c840e87598d9f4b718d4bca639120d8133f969c45d7bdc62f33f081d789ec0f14a1791fb7da18515682bfe3c0c7362e0 HEAD_REF master PATCHES fix_config_include.patch diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index c73bfcfa495324..e9168357cc7c16 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblzma", - "version": "5.4.3", - "port-version": 1, + "version": "5.4.4", "description": "Compression library with an API similar to that of zlib.", "homepage": "https://tukaani.org/xz/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 033e5418b5ca0a..042676d3b095f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4369,8 +4369,8 @@ "port-version": 2 }, "liblzma": { - "baseline": "5.4.3", - "port-version": 1 + "baseline": "5.4.4", + "port-version": 0 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 0a475ce93723e3..ee12a2142a6597 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f285b7c4ffa2cc065c7c6fec4b61006f7fa2714e", + "version": "5.4.4", + "port-version": 0 + }, { "git-tree": "3f97f6a0904a3add9c3273f8ab1993902d75d5ef", "version": "5.4.3", From c13b09744c06fe4a82a2ba0b48c351bf847bdb6d Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:14:25 -0700 Subject: [PATCH 0027/1039] [libpqxx] Update to 7.8.1 (#34325) --- ports/libpqxx/fix_build_with_vs2017.patch | 28 +++++++++++------------ ports/libpqxx/portfile.cmake | 6 ++--- ports/libpqxx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpqxx.json | 5 ++++ 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ports/libpqxx/fix_build_with_vs2017.patch b/ports/libpqxx/fix_build_with_vs2017.patch index 9892415b0add1c..48b648b4fc8476 100644 --- a/ports/libpqxx/fix_build_with_vs2017.patch +++ b/ports/libpqxx/fix_build_with_vs2017.patch @@ -27,48 +27,48 @@ index abc1a39..cba0242 100644 #if defined(PQXX_HAVE_LIKELY) # define PQXX_LIKELY [[likely]] diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx -index ff4a93d..5b300d6 100644 +index 1e8a272..299248c 100644 --- a/include/pqxx/stream_from.hxx +++ b/include/pqxx/stream_from.hxx -@@ -153,7 +153,7 @@ public: +@@ -160,7 +160,7 @@ public: /** @deprecated Use factories @ref table or @ref raw_table instead. */ template -- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( -+ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &, from_table_t, std::string_view table, Iter columns_begin, Iter columns_end); -@@ -161,13 +161,13 @@ public: +@@ -168,13 +168,13 @@ public: /** @deprecated Use factory function @ref query instead. */ template -- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( -+ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( +- [[deprecated("Use transaction_base::stream() instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream() instead.") stream_from( transaction_base &tx, from_table_t, std::string_view table, Columns const &columns); #include "pqxx/internal/ignore-deprecated-pre.hxx" /// @deprecated Use factories @ref table or @ref raw_table instead. -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &tx, std::string_view table) : stream_from{tx, from_table, table} {} -@@ -175,14 +175,14 @@ public: +@@ -182,14 +182,14 @@ public: /// @deprecated Use factories @ref table or @ref raw_table instead. template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &tx, std::string_view table, Columns const &columns) : stream_from{tx, from_table, table, columns} {} /// @deprecated Use factories @ref table or @ref raw_table instead. template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( +- [[deprecated("Use transaction_base::stream instead.")]] stream_from( ++ PQXX_DEPRECATED("Use transaction_base::stream instead.") stream_from( transaction_base &, std::string_view table, Iter columns_begin, Iter columns_end); diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index cdbde3f5810e65..da75692fbffe5e 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 17e5a6c8ac3abc05329891aaa378bd6004b9c8ee # 7.7.4 - SHA512 51dc5525e801696b7716e4a4a7d8d794baa5bf7372da62a30e4b602bfb09ff53a4355bfc5e39945636cff018095d2917c9a79181bb3f824091b7780863b0073c + REF "${VERSION}" + SHA512 ce37fdfce2671d97e422ae3339fb5650065111b0635a7293200c56a8755a7dc7de80806816863c606c46b6049e4cb490d24dfb97446ea0014b55907554862fed HEAD_REF master PATCHES fix_build_with_vs2017.patch @@ -23,6 +23,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index 43e3536c0942c4..29e8aced825fe7 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libpqxx", - "version": "7.7.4", + "version": "7.8.1", "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 042676d3b095f7..2ac81a2f85c2b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4561,7 +4561,7 @@ "port-version": 2 }, "libpqxx": { - "baseline": "7.7.4", + "baseline": "7.8.1", "port-version": 0 }, "libprotobuf-mutator": { diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 21896623d77aea..404df4b63dc656 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8083e94ed4ded4546cbad5263a7efb4b9b154b73", + "version": "7.8.1", + "port-version": 0 + }, { "git-tree": "7ddefb009a457fb899a8661e46ba79544da6b2df", "version": "7.7.4", From ff323de5ad0e5db79496679622eebe4833c70393 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:15:30 +0800 Subject: [PATCH 0028/1039] [libsmb2] Bump to 2023-08-11 (#34323) --- ports/libsmb2/portfile.cmake | 17 ++++++++++------- ports/libsmb2/usage | 5 +++++ ports/libsmb2/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/libsmb2/vcpkg.json | 6 ++---- versions/baseline.json | 4 ++-- versions/l-/libsmb2.json | 5 +++++ 6 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 ports/libsmb2/usage create mode 100644 ports/libsmb2/vcpkg-cmake-wrapper.cmake diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index 958de2f59f15ef..dbce16c2048f88 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -3,23 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sahlberg/libsmb2 - REF d8c85a3119a0bd769590e448216130b368cd1099 - SHA512 d15a040ed6314ad6f7984cfa7b52d9ede9934b2a7ec9827e833f574c25c9f694b5372b3e0950e258a6244b7aaf32b9e59987a75a88681d8031d9837ba94629d5 + REF 99125c96750e192e2c50176548bf461e4a28f135 + SHA512 30cdc9bbcdcd384868e5865706b41f683b977ece4056040a29bb3b81ffdf83788ba8a39426132810b8cbbb778ae7db8e5e1be0b7c0a82d8beed75040de708240 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + # TODO: Add a feature to enable gssapi/krb5 support + -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON ) vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME smb2 CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -#the debug/share folder is generated empty by the provided cmake system file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/smb2") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libsmb2/usage b/ports/libsmb2/usage new file mode 100644 index 00000000000000..f58d837fb74e2b --- /dev/null +++ b/ports/libsmb2/usage @@ -0,0 +1,5 @@ +libsmb2 can be used from CMake via: + + find_package(SMB2 REQUIRED) + target_include_directories(main PRIVATE ${SMB2_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${SMB2_LIBRARIES}) diff --git a/ports/libsmb2/vcpkg-cmake-wrapper.cmake b/ports/libsmb2/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..c408581651fa95 --- /dev/null +++ b/ports/libsmb2/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(SMB2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${SMB2_PREV_MODULE_PATH}) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 303a41ab810871..387bd6b0dae6c2 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,12 +1,10 @@ { "name": "libsmb2", - "version-date": "2021-04-29", - "port-version": 2, + "version-date": "2023-08-11", "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", - "supports": "!osx", + "license": "LGPL-2.1-or-later", "dependencies": [ - "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 2ac81a2f85c2b9..5661943bb1689f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4673,8 +4673,8 @@ "port-version": 0 }, "libsmb2": { - "baseline": "2021-04-29", - "port-version": 2 + "baseline": "2023-08-11", + "port-version": 0 }, "libsndfile": { "baseline": "1.2.0", diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 4bc2bbdde87744..b6fee31f2b3939 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e925ba41cc6441c6f2491462a26bea64d0cdeb16", + "version-date": "2023-08-11", + "port-version": 0 + }, { "git-tree": "a70cca2c9bcfe6b7848efbf21a9b2779b4e47055", "version-date": "2021-04-29", From 3174753371073f81006ae4e9ac6e249a55196179 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:27:37 +0800 Subject: [PATCH 0029/1039] [canvas-ity] New port (#33629) --- ports/canvas-ity/portfile.cmake | 13 +++++++++++++ ports/canvas-ity/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/c-/canvas-ity.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/canvas-ity/portfile.cmake create mode 100644 ports/canvas-ity/vcpkg.json create mode 100644 versions/c-/canvas-ity.json diff --git a/ports/canvas-ity/portfile.cmake b/ports/canvas-ity/portfile.cmake new file mode 100644 index 00000000000000..a76c0df3ccc4c4 --- /dev/null +++ b/ports/canvas-ity/portfile.cmake @@ -0,0 +1,13 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO a-e-k/canvas_ity + REF fc5c115d8ca8be0cf81c2247270cc955f78b6138 + SHA512 19560fa09e8a8eeb09c05b26cf562dc506e6c88e1e66767a2214d2310188cb52ffe03294bd6448531703bd972e2a1995446a3cc20684c9d617ebe65ac93dd37a + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/src/canvas_ity.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/canvas-ity/vcpkg.json b/ports/canvas-ity/vcpkg.json new file mode 100644 index 00000000000000..75afea2efad6d0 --- /dev/null +++ b/ports/canvas-ity/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "canvas-ity", + "version": "1.0", + "description": "A tiny, single-header -like 2D rasterizer for C++", + "homepage": "https://github.com/a-e-k/canvas_ity", + "license": "ISC" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5661943bb1689f..41c2b79fbe96bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1412,6 +1412,10 @@ "baseline": "1.6.2", "port-version": 0 }, + "canvas-ity": { + "baseline": "1.0", + "port-version": 0 + }, "capnproto": { "baseline": "1.0.1", "port-version": 0 diff --git a/versions/c-/canvas-ity.json b/versions/c-/canvas-ity.json new file mode 100644 index 00000000000000..560454c5cec02c --- /dev/null +++ b/versions/c-/canvas-ity.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ba934f25e09c4ade51de82b8b8213ec2068aa826", + "version": "1.0", + "port-version": 0 + } + ] +} From a57f1ee551b5670b1e9232057235de75cab557ab Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Mon, 9 Oct 2023 15:29:42 -0700 Subject: [PATCH 0030/1039] [sdbus-cpp] New port (#33879) --- ports/sdbus-cpp/pic.patch | 14 +++++++++++++ ports/sdbus-cpp/portfile.cmake | 38 ++++++++++++++++++++++++++++++++++ ports/sdbus-cpp/usage | 3 +++ ports/sdbus-cpp/vcpkg.json | 28 +++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/sdbus-cpp.json | 9 ++++++++ 6 files changed, 96 insertions(+) create mode 100644 ports/sdbus-cpp/pic.patch create mode 100644 ports/sdbus-cpp/portfile.cmake create mode 100644 ports/sdbus-cpp/usage create mode 100644 ports/sdbus-cpp/vcpkg.json create mode 100644 versions/s-/sdbus-cpp.json diff --git a/ports/sdbus-cpp/pic.patch b/ports/sdbus-cpp/pic.patch new file mode 100644 index 00000000000000..3b2c06c45c6cd4 --- /dev/null +++ b/ports/sdbus-cpp/pic.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7332b23..822a594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,7 +130,7 @@ target_compile_definitions(sdbus-c++-objlib PRIVATE + target_include_directories(sdbus-c++-objlib PUBLIC $ + $) +-if(DEFINED BUILD_SHARED_LIBS) ++if(BUILD_SHARED_LIBS) +- set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ${BUILD_SHARED_LIBS}) ++ set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON) + endif() + if(BUILD_LIBSYSTEMD) + add_dependencies(sdbus-c++-objlib LibsystemdBuildProject) diff --git a/ports/sdbus-cpp/portfile.cmake b/ports/sdbus-cpp/portfile.cmake new file mode 100644 index 00000000000000..f9b952ad66460d --- /dev/null +++ b/ports/sdbus-cpp/portfile.cmake @@ -0,0 +1,38 @@ +message(WARNING "You will need to install sytemd dependencies to build sdbus-cpp:\nsudo apt install libsystemd-dev\n") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kistler-Group/sdbus-cpp + REF "v${VERSION}" + SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2 + PATCHES + pic.patch # can be dropped once https://github.com/Kistler-Group/sdbus-cpp/pull/361 is merged+released +) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool BUILD_CODE_GEN +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} + -DBUILD_LIBSYSTEMD=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sdbus-c++) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING-LGPL-Exception") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +if ("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES sdbus-c++-xml2cpp AUTO_CLEAN) +endif() diff --git a/ports/sdbus-cpp/usage b/ports/sdbus-cpp/usage new file mode 100644 index 00000000000000..bea252a66784da --- /dev/null +++ b/ports/sdbus-cpp/usage @@ -0,0 +1,3 @@ +sdbus-cpp provides CMake targets: + find_package(sdbus-c++ REQUIRED) + target_link_libraries(main PRIVATE SDBusCpp::sdbus-c++) diff --git a/ports/sdbus-cpp/vcpkg.json b/ports/sdbus-cpp/vcpkg.json new file mode 100644 index 00000000000000..3895a5f0e7a27a --- /dev/null +++ b/ports/sdbus-cpp/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "sdbus-cpp", + "version": "1.3.0", + "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++", + "homepage": "https://github.com/Kistler-Group/sdbus-cpp", + "license": "LGPL-2.1", + "supports": "linux", + "dependencies": [ + "dbus", + "libsystemd", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tool": { + "description": "build C++ codegen tool", + "dependencies": [ + "expat" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 41c2b79fbe96bd..80bd21092b7726 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7524,6 +7524,10 @@ "baseline": "2018-08-26-16e6f435", "port-version": 3 }, + "sdbus-cpp": { + "baseline": "1.3.0", + "port-version": 0 + }, "sdformat10": { "baseline": "10.0.0", "port-version": 3 diff --git a/versions/s-/sdbus-cpp.json b/versions/s-/sdbus-cpp.json new file mode 100644 index 00000000000000..6fdcf9ad52cc73 --- /dev/null +++ b/versions/s-/sdbus-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cae6cd5686aeefb86b4b97cda6d258d80a9eb5b6", + "version": "1.3.0", + "port-version": 0 + } + ] +} From 2b27fa31d6c45547768ab88d4a45bca6d168bc99 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:31:08 +0800 Subject: [PATCH 0031/1039] [bfgroup-lyra] Bump to 1.6.1 (#34367) --- ports/bfgroup-lyra/portfile.cmake | 15 +++++++++------ ports/bfgroup-lyra/usage | 4 ++++ ports/bfgroup-lyra/vcpkg.json | 2 +- versions/b-/bfgroup-lyra.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 ports/bfgroup-lyra/usage diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake index 1dcab723d4a094..e25fdd975d73e0 100644 --- a/ports/bfgroup-lyra/portfile.cmake +++ b/ports/bfgroup-lyra/portfile.cmake @@ -1,21 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bfgroup/Lyra - REF 1.6 - SHA512 e357fd0e925b67a51ad7232035ac66842676837baebf7a69eb416807b11400c283d098a22bf3ae27ce904700c5b849953ede1873d6535a8b34c4704ebcb09748 - HEAD_REF master + REF "${VERSION}" + SHA512 643c25fbe996af2e888eacb99a715e3d420dbfc21d48756703cf301ab6ba0d1f8eea1cd0764bd5c173d2ddcef7c799448d8c3a77676024205163305e1363d461 + HEAD_REF release ) +set(VCPKG_BUILD_TYPE release) # header-only port + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) + vcpkg_cmake_install() vcpkg_cmake_config_fixup( PACKAGE_NAME lyra CONFIG_PATH share/lyra/cmake ) -# Library is header-only, so no debug content. -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/bfgroup-lyra/usage b/ports/bfgroup-lyra/usage new file mode 100644 index 00000000000000..92538aa1d98871 --- /dev/null +++ b/ports/bfgroup-lyra/usage @@ -0,0 +1,4 @@ +bfgroup-lyra provides CMake targets: + + find_package(lyra CONFIG REQUIRED) + target_link_libraries(main PRIVATE bfg::lyra) diff --git a/ports/bfgroup-lyra/vcpkg.json b/ports/bfgroup-lyra/vcpkg.json index c7189d7d806a2e..25a353bd9e7632 100644 --- a/ports/bfgroup-lyra/vcpkg.json +++ b/ports/bfgroup-lyra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bfgroup-lyra", - "version": "1.6", + "version": "1.6.1", "description": "A simple to use, composable, command line parser for C++ 11 and beyond", "homepage": "https://bfgroup.github.io/Lyra/", "license": "BSL-1.0", diff --git a/versions/b-/bfgroup-lyra.json b/versions/b-/bfgroup-lyra.json index ef5ca5bf38fa83..c3a9a564ce6a65 100644 --- a/versions/b-/bfgroup-lyra.json +++ b/versions/b-/bfgroup-lyra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b58cd66176db34198f2a59a06f87afe194db2a45", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "bbd3e635da6198f0f2458ec62ff937287c5c5b45", "version": "1.6", diff --git a/versions/baseline.json b/versions/baseline.json index 80bd21092b7726..ed63870f057178 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -577,7 +577,7 @@ "port-version": 0 }, "bfgroup-lyra": { - "baseline": "1.6", + "baseline": "1.6.1", "port-version": 0 }, "bgfx": { From ca07471a8b8ead5e77ed8f195851e5b9db593889 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:31:56 +0800 Subject: [PATCH 0032/1039] [cpp-async] Bump to 1.1.0 (#34365) --- ports/cpp-async/portfile.cmake | 2 +- ports/cpp-async/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-async.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cpp-async/portfile.cmake b/ports/cpp-async/portfile.cmake index 0665aa2b363bee..a67b9aa14df5e3 100644 --- a/ports/cpp-async/portfile.cmake +++ b/ports/cpp-async/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cpp-async REF "v${VERSION}" - SHA512 9e28fd158e8caf0220fa28606d209ccf5e1f70dee5c2d059619e924615e379edafa9b18d642315b0fc64f41528573f3d10fb83b093ba1959466aaae43539ffe1 + SHA512 6351329db0b485ae26bda74fe78bfbd0890a46e6f89325a953b058f88da4826a139d0ae90d75411680e1ee3c13c3c02f30907653e3643bd0b9556a4be7ea6707 HEAD_REF main ) diff --git a/ports/cpp-async/vcpkg.json b/ports/cpp-async/vcpkg.json index e6f0a1fdc271cc..9c442ddd1d5beb 100644 --- a/ports/cpp-async/vcpkg.json +++ b/ports/cpp-async/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-async", - "version": "1.0.1", + "version": "1.1.0", "description": "Support types and functions for C++20 coroutines", "homepage": "https://github.com/microsoft/cpp-async", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index ed63870f057178..14c61e16525f2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1777,7 +1777,7 @@ "port-version": 6 }, "cpp-async": { - "baseline": "1.0.1", + "baseline": "1.1.0", "port-version": 0 }, "cpp-base64": { diff --git a/versions/c-/cpp-async.json b/versions/c-/cpp-async.json index 1d57e3a116c245..0bafe8c0228604 100644 --- a/versions/c-/cpp-async.json +++ b/versions/c-/cpp-async.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f29e519d60913ea86ca5cee69d9129a1e04b337", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "c9b2e9c3ddd004c4201a27963d4b1bedb2dc2b2c", "version": "1.0.1", From b506b1989584c78bb4a2a4a76161d97ecfe71807 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:32:13 -0700 Subject: [PATCH 0033/1039] [mdns] Update to 1.4.3 (#34364) --- ports/mdns/portfile.cmake | 6 +++--- ports/mdns/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mdns.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/mdns/portfile.cmake b/ports/mdns/portfile.cmake index 272ef3b93feabf..d6628d7bab941e 100644 --- a/ports/mdns/portfile.cmake +++ b/ports/mdns/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjansson/mdns - REF 1.4.2 - SHA512 fa3fcf130721ee6f7012225c1e7952bd41703c2488b1d0ffe2b8c73ed06744d1cd9f03b6ab19aa0b8074fbfaafe46f8e102d6a648756725a60dc076e896cfbf6 + REF "${VERSION}" + SHA512 0bbfeefdd3f324a8e5aa85227bfa45c2b5cd88c12a9f77df2a1c48cb2661ba8b283dd53541e39d20ed2705646dc8d8724a0287c58f9efa91d2b1b796a0ca9a7a HEAD_REF master ) @@ -17,4 +17,4 @@ vcpkg_cmake_configure( vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/mdns/vcpkg.json b/ports/mdns/vcpkg.json index c0dade8e7ba38e..728a2a1f313413 100644 --- a/ports/mdns/vcpkg.json +++ b/ports/mdns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mdns", - "version": "1.4.2", + "version": "1.4.3", "description": "Public domain mDNS/DNS-SD library in C", "homepage": "https://github.com/mjansson/mdns", "license": "Unlicense", diff --git a/versions/baseline.json b/versions/baseline.json index 14c61e16525f2f..2c0ebd61a91cce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5361,7 +5361,7 @@ "port-version": 3 }, "mdns": { - "baseline": "1.4.2", + "baseline": "1.4.3", "port-version": 0 }, "mdnsresponder": { diff --git a/versions/m-/mdns.json b/versions/m-/mdns.json index 1f40a43a9acc95..a53d9320ffdc6b 100644 --- a/versions/m-/mdns.json +++ b/versions/m-/mdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bfd722fb49f35c6a08ca9c1e4e1dea2a53d5df", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "56cbde1a40c13e9584e62d15f69c2579f6bcd476", "version": "1.4.2", From 30fd98658a9235b2aad537e99b6e3299a0293a21 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:32:45 +0800 Subject: [PATCH 0034/1039] [sokol] Bump to 2023-10-07 (#34363) --- ports/sokol/portfile.cmake | 15 +++++++-------- ports/sokol/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/s-/sokol.json | 5 +++++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ports/sokol/portfile.cmake b/ports/sokol/portfile.cmake index 9785eecca73c27..be80a3a82289f8 100644 --- a/ports/sokol/portfile.cmake +++ b/ports/sokol/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO floooh/sokol - REF 425e906d2af8c976c30f7e925a303fea9f0bf879 - SHA512 4606735b9466637f3b676402cc2d7ef96e4152836c901d7a84039c52951aec27922726de21a537e0fef2d2218f48e3a9a3c32c3bc67076c10d199f067f50dad9 + REF d98c8b92c25070f13d0491f5fade1d9d2ca885ad + SHA512 bb49dc3da366e70c7b6b16ebd490f9b2c88c496b278f1b9651321b3aab0977db92707d3955c2cb2654d8032647429ac90aa585de36644380112d988eac877cd0 HEAD_REF master ) -file(GLOB SOKOL_INCLUDE_FILES ${SOURCE_PATH}/*.h) -file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB SOKOL_INCLUDE_FILES "${SOURCE_PATH}/*.h") +file(COPY ${SOKOL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(GLOB SOKOL_UTIL_INCLUDE_FILES ${SOURCE_PATH}/util/*.h) -file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/util) +file(GLOB SOKOL_UTIL_INCLUDE_FILES "${SOURCE_PATH}/util/*.h") +file(COPY ${SOKOL_UTIL_INCLUDE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/util") -# 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/sokol/vcpkg.json b/ports/sokol/vcpkg.json index 1094d1204a54be..2394bb69704a59 100644 --- a/ports/sokol/vcpkg.json +++ b/ports/sokol/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sokol", - "version-date": "2019-09-09", - "port-version": 2, + "version-date": "2023-10-07", "description": "Minimal cross-platform standalone C headers", - "homepage": "https://github.com/floooh/sokol" + "homepage": "https://github.com/floooh/sokol", + "license": "Zlib" } diff --git a/versions/baseline.json b/versions/baseline.json index 2c0ebd61a91cce..dd365f846e2174 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7837,8 +7837,8 @@ "port-version": 1 }, "sokol": { - "baseline": "2019-09-09", - "port-version": 2 + "baseline": "2023-10-07", + "port-version": 0 }, "sol2": { "baseline": "3.3.0", diff --git a/versions/s-/sokol.json b/versions/s-/sokol.json index 93581b46a647d1..614b2ec14590b0 100644 --- a/versions/s-/sokol.json +++ b/versions/s-/sokol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc7a2147353f37a7902e5187718bbb74f6d1615", + "version-date": "2023-10-07", + "port-version": 0 + }, { "git-tree": "5ba547d31c66bb41bf11cb755706b99e1b615e2e", "version-date": "2019-09-09", From 40cad4c864626d0cfb500225d5fefc7d0b9935e9 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:33:03 +0800 Subject: [PATCH 0035/1039] [ltla-cppirlba] Bump to 2023-09-20 (#34362) --- ports/ltla-cppirlba/portfile.cmake | 4 ++-- ports/ltla-cppirlba/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/ltla-cppirlba.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ltla-cppirlba/portfile.cmake b/ports/ltla-cppirlba/portfile.cmake index 7a71588401d1ba..5822c2bb447f3b 100644 --- a/ports/ltla-cppirlba/portfile.cmake +++ b/ports/ltla-cppirlba/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LTLA/CppIrlba - REF d23a4c12b95563907cf8ca7584b7bb6625ff886b - SHA512 1fdc9552ab00c7c541b4cd34326075f257a30ebcf73dd633dd088b20a20cb0dd704be0c3295ab96d5a573cb1a783c19f34a3e5d860c719e413c098fd9df4cb3a + REF 228e207778597c8c3a0284fd2bfe4347dbb4646e + SHA512 4bfb4a508a62e3d5e3345bc59756353e6cd68e8d9a5cb9e7dd38ae71abd924a77e6c319bf8cd31b4f939be4531bf4527fd283515b40e8d5b88beaa0fd3411aff HEAD_REF master ) diff --git a/ports/ltla-cppirlba/vcpkg.json b/ports/ltla-cppirlba/vcpkg.json index eaafa717bbef97..638995702a1128 100644 --- a/ports/ltla-cppirlba/vcpkg.json +++ b/ports/ltla-cppirlba/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ltla-cppirlba", - "version-date": "2023-04-07", + "version-date": "2023-09-20", "description": "A C++ port of the IRLBA algorithm, based on the C code in the R package.", "homepage": "https://github.com/LTLA/CppIrlba", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index dd365f846e2174..379e803932d7ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5149,7 +5149,7 @@ "port-version": 0 }, "ltla-cppirlba": { - "baseline": "2023-04-07", + "baseline": "2023-09-20", "port-version": 0 }, "ltla-cppkmeans": { diff --git a/versions/l-/ltla-cppirlba.json b/versions/l-/ltla-cppirlba.json index df091854bf8f85..24d3483a70b002 100644 --- a/versions/l-/ltla-cppirlba.json +++ b/versions/l-/ltla-cppirlba.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6edf2cf4964bd6d76488af4320eea69e6604b226", + "version-date": "2023-09-20", + "port-version": 0 + }, { "git-tree": "a1a4fe3742a5fecbadcb34155df9230a279a3e1c", "version-date": "2023-04-07", From d3fbd135e40def23f6708c53f8aa2630b3a794a3 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 10 Oct 2023 06:34:56 +0800 Subject: [PATCH 0036/1039] [linalg] Bump to 2.2 (#34358) --- ports/linalg/portfile.cmake | 10 ++++++---- ports/linalg/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/l-/linalg.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/linalg/portfile.cmake b/ports/linalg/portfile.cmake index 23ae4c83c95ab1..27aa89180ce20a 100644 --- a/ports/linalg/portfile.cmake +++ b/ports/linalg/portfile.cmake @@ -1,11 +1,13 @@ #header-only library + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sgorsten/linalg - REF v2.1 - SHA512 48d8248ea1bca3d4fe35d038690f496cd0c8c9469d76eca684668ce6fef5df0eb9556f9b49e4da90e2c2e8ef475791877aa815c3f9437c097fbfc303134d02d7 + REF "v${VERSION}" + SHA512 736f6ff83fcc4a772ef5ab8e574b0e56aca9fcf2318d92f56f94684ffbd7283540b6496381d52834545b4902147bc67a3afa21ab877bc44bba84471c2eff6862 HEAD_REF master ) -configure_file(${SOURCE_PATH}/UNLICENSE ${CURRENT_PACKAGES_DIR}/share/linalg/copyright COPYONLY) -configure_file(${SOURCE_PATH}/linalg.h ${CURRENT_PACKAGES_DIR}/include/linalg.h COPYONLY) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/linalg.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE") diff --git a/ports/linalg/vcpkg.json b/ports/linalg/vcpkg.json index 2d8170835bf41d..2b0d2d594c0ed3 100644 --- a/ports/linalg/vcpkg.json +++ b/ports/linalg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "linalg", - "version": "2.1", - "port-version": 2, - "description": "linalg.h is a single header public domain linear algebra library for C++11" + "version": "2.2", + "description": "linalg.h is a single header public domain linear algebra library for C++11", + "homepage": "https://github.com/sgorsten/linalg", + "license": "Unlicense" } diff --git a/versions/baseline.json b/versions/baseline.json index 379e803932d7ee..5d27b4e0694b90 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5069,8 +5069,8 @@ "port-version": 2 }, "linalg": { - "baseline": "2.1", - "port-version": 2 + "baseline": "2.2", + "port-version": 0 }, "linenoise-ng": { "baseline": "4754bee2d8eb3", diff --git a/versions/l-/linalg.json b/versions/l-/linalg.json index a863c0854f8b63..600cdcb55ead75 100644 --- a/versions/l-/linalg.json +++ b/versions/l-/linalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8287026554baea7ac2fbbf2ec7c54d3ebe181b7", + "version": "2.2", + "port-version": 0 + }, { "git-tree": "dec66a04dc695329609da7aad70ecfde3e36aa4b", "version": "2.1", From 8cad42c221a0a6c8cba3fd5ad912cec288fc04e3 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:35:15 -0700 Subject: [PATCH 0037/1039] [libfreenect2] Update to 0.2.1 (#34347) --- ports/libfreenect2/portfile.cmake | 6 +++--- ports/libfreenect2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libfreenect2.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index a235bc592f6722..770dd0faa69861 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenKinect/libfreenect2 - REF v0.2.0 - SHA512 3525e3f21462cecd3b198f64545786ffddc2cafdfd8146e5a46f0300b83f29f1ad0739618a07ab195c276149d7e2e909f7662e2d379a2880593cac75942b0666 + REF "v${VERSION}" + SHA512 0fcee5471deb013d2b57581ef8d8838f652dfed2f457c4240d5b754674e949c59337a167ac74ad04b25ace69af470a7e014e0474a688d930a3323946feadee67 HEAD_REF master PATCHES fix-dependency-libusb.patch @@ -37,6 +37,6 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/GPL2" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/GPL2") vcpkg_fixup_pkgconfig() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index b8aa71df2b9de2..59e75a596f55c3 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libfreenect2", - "version": "0.2.0", - "port-version": 10, + "version": "0.2.1", "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 5d27b4e0694b90..c9eae07addefa6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4173,8 +4173,8 @@ "port-version": 1 }, "libfreenect2": { - "baseline": "0.2.0", - "port-version": 10 + "baseline": "0.2.1", + "port-version": 0 }, "libfs": { "baseline": "1.0.8", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index ff702f94936a3d..19640318d55208 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfa5e96443079122b324178a6ed421423067039a", + "version": "0.2.1", + "port-version": 0 + }, { "git-tree": "68766f591851bf3b1bf97eff04a69dcd894d712a", "version": "0.2.0", From aada2de03fce0540fa1e947252d6cd6b4b8a5e34 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:35:53 -0400 Subject: [PATCH 0038/1039] [DiscordCoreAPI] to v2.0.1 and [Jsonifier] to v0.9.9 (#34341) --- ports/discordcoreapi/portfile.cmake | 2 +- ports/discordcoreapi/vcpkg.json | 4 ++-- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 ++-- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 6e949c2609ae8c..58c50c6eb75dc6 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 60b63c65bdc32a541a9287afc6de21b0fa3caf717abbd442df08c8e52f1516f1d33b2fc6cf5f230061776aa48af5b4c54c9a0facf061e682371f566c991670a2 + SHA512 57a8389718cd0f03a6e7a53e39d5ee267140cb4696c89abf6ac424d78f69516d6dc12f24ac19bc07533f9509459b987e2d2c1d7426d2f727ea124f5fcb649512 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 9c49ebf14a6cdc..7781e56fa1e2b1 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,10 +1,10 @@ { "name": "discordcoreapi", - "version": "2.0", + "version": "2.0.1", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", - "supports": "(windows & x64 & !xbox) | (linux & x64)", + "supports": "(windows & x64 & !xbox) | (linux & x64) | (osx & x64)", "dependencies": [ "jsonifier", "libsodium", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index cd1f9563ea302c..1556a53bc03da2 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 6cc28660c8dd9a5e299d8ebcc2c26d1859925b00e58db96351a17a12934df78b1e1a2d3b26fccdee0e2bbb46a13e26dbae7149a80611b02bc69aad6874c11df2 + SHA512 1e51b64a802437674d87a6a61396b2e3878fece954be8560b6ef8fc58a6180c82c3e0f7d922c77c881dd3029f83866842fa146501f961faff3aa3072dadd5e1b HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 130ad4cb40a649..6038fd9b901e13 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,10 +1,10 @@ { "name": "jsonifier", - "version": "0.9.8", + "version": "0.9.9", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", - "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (osx & x64)", + "supports": "(windows & x64 & !xbox) | (linux & x64) | (osx & x64)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d3f996e9997558..29c97317da0d8c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -287,6 +287,7 @@ directxsdk:x64-windows=skip directxsdk:x64-windows-static-md=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail +discordcoreapi:x64-osx=fail discount:x64-android=fail dlib:arm64-uwp=fail dlib:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index c9eae07addefa6..54f3bf838dfd09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2173,7 +2173,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0", + "baseline": "2.0.1", "port-version": 0 }, "discount": { @@ -3605,7 +3605,7 @@ "port-version": 0 }, "jsonifier": { - "baseline": "0.9.8", + "baseline": "0.9.9", "port-version": 0 }, "jsonnet": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index aaa0d2bc20b63c..fb065baf9e7da2 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b4e38bd8dd9683ee4923d31a64426a01e8b3466", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "374bc763a70ab0e9556a40bdea62ea9a9cf7d8bd", "version": "2.0", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 1ce6a7c736920e..62aa5f801e2186 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e89f30157ff02233bb4ec6661f40356e6a94260", + "version": "0.9.9", + "port-version": 0 + }, { "git-tree": "3e076a2668e15aa6ad44ff29f45356467f745766", "version": "0.9.8", From 17e2bc75528ae7094ef5047af7909350a24b4f11 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:36:14 +0200 Subject: [PATCH 0039/1039] [cubeb] no docs (#34340) --- ports/cubeb/portfile.cmake | 1 + ports/cubeb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cubeb.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/cubeb/portfile.cmake b/ports/cubeb/portfile.cmake index f8e9b2ba4080c1..f6758162740a97 100644 --- a/ports/cubeb/portfile.cmake +++ b/ports/cubeb/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_cmake_configure( -DUSE_SANITIZERS=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DDOXYGEN_EXECUTABLE= # Prevents the generation of documentation ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cubeb) diff --git a/ports/cubeb/vcpkg.json b/ports/cubeb/vcpkg.json index 252c918e5fd7f7..74a0756b215f1b 100644 --- a/ports/cubeb/vcpkg.json +++ b/ports/cubeb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cubeb", "version-date": "2023-09-26", + "port-version": 1, "description": "Cross platform audio library", "homepage": "https://github.com/mozilla/cubeb", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index 54f3bf838dfd09..e0eadea23ba7d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1978,7 +1978,7 @@ }, "cubeb": { "baseline": "2023-09-26", - "port-version": 0 + "port-version": 1 }, "cuda": { "baseline": "10.1", diff --git a/versions/c-/cubeb.json b/versions/c-/cubeb.json index c6f400a1ee52f5..575a01b830e710 100644 --- a/versions/c-/cubeb.json +++ b/versions/c-/cubeb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eac0d45fa24887b010ffdd09284d936950d6b0e", + "version-date": "2023-09-26", + "port-version": 1 + }, { "git-tree": "734318573d1aab99ec902221d209cd01940b37e7", "version-date": "2023-09-26", From b7f94044d01f7d7d9c19cc3629c7ed4617e84820 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Oct 2023 00:36:45 +0200 Subject: [PATCH 0040/1039] [liblsquic] update (#34339) --- ports/liblsquic/portfile.cmake | 12 ++++++------ ports/liblsquic/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/liblsquic.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake index b0d18b4a505a0c..922610fa1f7769 100644 --- a/ports/liblsquic/portfile.cmake +++ b/ports/liblsquic/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO litespeedtech/lsquic - REF v3.1.1 - SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee + REF v${VERSION} + SHA512 40d742779bfa2dc6fdaf0ee8e9349498d373dcffcc6dd27867c18d87309a288ea6811d693043b5d98364d816b818b49445214497475844201241193c0f37b349 HEAD_REF master PATCHES disable-asan.patch @@ -17,9 +17,9 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH # Submodules vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH REPO litespeedtech/ls-qpack - REF v2.3.0 + REF v2.5.3 HEAD_REF master - SHA512 7f5a9dd15bcd32c1bfafbecc5cea4da30f50a852c02d2bd140a2baaafd80ccb822c1701b0d20699af6367e9c712f4fe019741507c44156e9897d25162de0b8b4 + SHA512 f90502c763abc84532f33d1b8f952aea7869e4e0c5f6bd344532ddd51c4a180958de4086d88b9ec96673a059c806eec9e70007651d4d4e1a73395919dee47ce0 ) if(NOT EXISTS "${SOURCE_PATH}/src/ls-hpack/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/src/liblsquic/ls-qpack") @@ -28,9 +28,9 @@ endif() vcpkg_from_github(OUT_SOURCE_PATH LSHPACK_SOURCE_PATH REPO litespeedtech/ls-hpack - REF v2.3.0 + REF v2.3.2 HEAD_REF master - SHA512 45866b18042125cbbd008eed2935a938a42e1682030aa52ff4a324ddbad7bf9bd483161352cc8988bae668e132ee8b4b043ddc09d9e0316a66aaefd927ae2d76 + SHA512 45d6c8296e8eee511e6a083f89460d5333fc9a49bc078dac55fdec6c46db199de9f150379f02e054571f954a5e3c79af3864dbc53dc57d10a8d2ed26a92d4278 ) if(NOT EXISTS "${SOURCE_PATH}/src/lshpack/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/src/lshpack") diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json index cb12234746972d..7c9e6f1834a3d1 100644 --- a/ports/liblsquic/vcpkg.json +++ b/ports/liblsquic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "liblsquic", - "version": "3.1.1", - "port-version": 2, + "version": "3.3.2", "description": "An implementation of the QUIC and HTTP/3 protocols.", "homepage": "https://github.com/litespeedtech/lsquic", "license": "MIT AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e0eadea23ba7d4..1c12a82dea79d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4369,8 +4369,8 @@ "port-version": 0 }, "liblsquic": { - "baseline": "3.1.1", - "port-version": 2 + "baseline": "3.3.2", + "port-version": 0 }, "liblzma": { "baseline": "5.4.4", diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json index 6c114d84eaf735..d94777b3eabf51 100644 --- a/versions/l-/liblsquic.json +++ b/versions/l-/liblsquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0368e7d992fcf1272735695f405a56c9a7c35ff6", + "version": "3.3.2", + "port-version": 0 + }, { "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56", "version": "3.1.1", From 545e152cd41f8ce33866d012f3b52c71f5e94bd6 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 10 Oct 2023 06:37:03 +0800 Subject: [PATCH 0041/1039] [cppmicroservices] Remove /WX option (#34344) --- ports/cppmicroservices/portfile.cmake | 3 ++- ports/cppmicroservices/remove-wx.patch | 13 +++++++++++++ ports/cppmicroservices/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/c-/cppmicroservices.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/cppmicroservices/remove-wx.patch diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index c535bad18c88c8..ad7b3cc77aad5c 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES werror.patch fix_strnicmp.patch + remove-wx.patch ) #nowide download @@ -36,7 +37,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # CppMicroServices uses a custom resource compiler to compile resources # the zipped resources are then appended to the target which cause the linker to crash diff --git a/ports/cppmicroservices/remove-wx.patch b/ports/cppmicroservices/remove-wx.patch new file mode 100644 index 00000000000000..dadae53f59804a --- /dev/null +++ b/ports/cppmicroservices/remove-wx.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2bec34f..801d049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -511,7 +511,7 @@ if(MSVC) + set(US_ENABLE_ASAN OFF) + endif() + +- set(US_CXX_FLAGS "/MP /WX /D${msvc_version_define} ${US_CXX_FLAGS}") ++ set(US_CXX_FLAGS "/MP /D${msvc_version_define} ${US_CXX_FLAGS}") + else() + + # If not cross-compiling, turn on Stack Smashing Protection. diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 54b0e6e64c42bd..4a7a4be789cdcb 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,8 +1,10 @@ { "name": "cppmicroservices", "version": "3.7.6", + "port-version": 1, "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", + "license": "Apache-2.0", "dependencies": [ "gtest", { diff --git a/versions/baseline.json b/versions/baseline.json index 1c12a82dea79d9..87fcadd1917ad4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1854,7 +1854,7 @@ }, "cppmicroservices": { "baseline": "3.7.6", - "port-version": 0 + "port-version": 1 }, "cpprestsdk": { "baseline": "2.10.18", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 647f576e655467..34f83579fdfc92 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b438280ccc1012bda6457141a3dea8071711ffb9", + "version": "3.7.6", + "port-version": 1 + }, { "git-tree": "3399e4ad64f4b4c0d32f4b5df723384a1bd98dbe", "version": "3.7.6", From 4c84b3649da7b808563ebb2e3342f17a5a7d7d6e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:37:25 -0700 Subject: [PATCH 0042/1039] [gstreamer] Change HEAD_REF from master to main (#34345) --- ports/gstreamer/portfile.cmake | 6 +++--- ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 053394f14a3393..ae8fbe2df52bee 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -5,12 +5,12 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_from_gitlab( - GITLAB_URL https://gitlab.freedesktop.org/ + GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO gstreamer/gstreamer - REF ${VERSION} + REF "${VERSION}" SHA512 0d69896d0a83452320df0d0f56c710df1365a259cd3f48dc7cd4df18d45b27caea7174aafa15ae5eb8637ccdef192c1047185b369b7232db4eaacbc57ffaaa22 - HEAD_REF master + HEAD_REF main PATCHES fix-clang-cl.patch fix-clang-cl-gstreamer.patch diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 105d02517385e9..5c8b05fa5506ad 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 1, + "port-version": 2, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 87fcadd1917ad4..ffe701bc2ac34d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3078,7 +3078,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 1 + "port-version": 2 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 90e1edd8925ad9..c695f25a1202ac 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "921fefd3f9b9ce85c031881f5861074957d1a7f1", + "version": "1.22.5", + "port-version": 2 + }, { "git-tree": "7f37f12f5a39fa6eea841721c51bb591039c3251", "version": "1.22.5", From d15a15bc94c18076e8c0f3f1527120acb37a8edc Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 10 Oct 2023 06:37:47 +0800 Subject: [PATCH 0043/1039] [harfbuzz] Fix build error (#34346) --- ports/harfbuzz/fix-win32-build.patch | 26 ++++++++++++++++++++++++++ ports/harfbuzz/portfile.cmake | 2 ++ ports/harfbuzz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) 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..f8551e3aff1c4a --- /dev/null +++ b/ports/harfbuzz/fix-win32-build.patch @@ -0,0 +1,26 @@ +diff --git a/src/meson.build b/src/meson.build +index 87e8962..bdfa797 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -387,6 +387,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' +@@ -559,8 +564,7 @@ defs_list = [harfbuzz_def] + + version = '0.@0@.0'.format(hb_version_int) + +-extra_hb_cpp_args = [] +-if cpp.get_define('_MSC_FULL_VER') != '' ++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 fbdbc608717321..650c43841d2f93 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF ${VERSION} SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79 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 ffd73c02a54e26..5f08cadde5efeb 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version": "8.2.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 ffe701bc2ac34d..8b6eb6a266f98a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3190,7 +3190,7 @@ }, "harfbuzz": { "baseline": "8.2.1", - "port-version": 0 + "port-version": 1 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 2a9dc543686d43..373057f27dfa25 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415", + "version": "8.2.1", + "port-version": 1 + }, { "git-tree": "6894af0b171aea403718ebb131b454a60b0c961a", "version": "8.2.1", From ef2eef17340f3fbd679327d286fad06dd6e838ed Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:39:24 -0700 Subject: [PATCH 0044/1039] [asiosdk] Fix old hash and usage (#34326) --- ports/asiosdk/portfile.cmake | 41 +++++++++++++++++++----------------- ports/asiosdk/usage | 2 +- ports/asiosdk/vcpkg.json | 2 +- versions/a-/asiosdk.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ports/asiosdk/portfile.cmake b/ports/asiosdk/portfile.cmake index 9807a4c2699538..3d3c2415a36456 100644 --- a/ports/asiosdk/portfile.cmake +++ b/ports/asiosdk/portfile.cmake @@ -1,29 +1,32 @@ -set(VERSION 2.3.3) - vcpkg_download_distfile(ARCHIVE URLS "https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip" - FILENAME "asiosdk_2.3.3_2019-06-14-eac6c1a57829.zip" - SHA512 eac6c1a57829b7f722a681c54b2f6469d54695523f08f727d0dd6744dcd7fce4f3249c57689bb15ed7a8bcb912833b226439d800913e122e0ef9ab73672f6542 + FILENAME "asiosdk_2.3.3_2019-06-14-d74c0bc09162.zip" + SHA512 d74c0bc09162640a377aaab2f2ce716f9ee7a6ef8d1aa1aa6bc223a4748c60fa900cc77b1cf6db66f8a4064a074b31a71d75cccc7de3634347865238d9c039af ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} - SOURCE_BASE ${VERSION} + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" ) -file(INSTALL ${SOURCE_PATH}/asio/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/asio) -file(INSTALL ${SOURCE_PATH}/common/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/common) -file(INSTALL ${SOURCE_PATH}/driver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/driver) -file(INSTALL ${SOURCE_PATH}/host/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/asiosdk/host) -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/changes.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement 2.0.1 - 2019.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${SOURCE_PATH}/ASIO SDK 2.3.pdf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/asio/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/asio") +file(INSTALL "${SOURCE_PATH}/common/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/common") +file(INSTALL "${SOURCE_PATH}/driver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/driver") +file(INSTALL "${SOURCE_PATH}/host/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/host") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/readme.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file( + INSTALL + "${SOURCE_PATH}/changes.txt" + "${SOURCE_PATH}/Steinberg ASIO Logo Artwork.zip" + "${SOURCE_PATH}/Steinberg ASIO 2.3.3 Licensing Agreement V2.0.3 - 2023.pdf" + "${SOURCE_PATH}/ASIO SDK 2.3.pdf" + "${CMAKE_CURRENT_LIST_DIR}/Findasiosdk.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION + "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/asiosdk/usage b/ports/asiosdk/usage index 1afa2ae84df3dc..3827cfa3df0e46 100644 --- a/ports/asiosdk/usage +++ b/ports/asiosdk/usage @@ -1,4 +1,4 @@ The package asiosdk provides CMake integration: find_package(asiosdk REQUIRED) - target_include_directories( PRIVATE ${ASIOSDK_INCLUDE_DIRS}) + target_include_directories(main PRIVATE ${ASIOSDK_INCLUDE_DIR}) diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json index 0d85c574fe95a5..dc44bde07c4aa9 100644 --- a/ports/asiosdk/vcpkg.json +++ b/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 6, + "port-version": 7, "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 6c75ac72908be5..eb278990417682 100644 --- a/versions/a-/asiosdk.json +++ b/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "798527dff966ba5c7ef8aab89eb941791d682090", + "version": "2.3.3", + "port-version": 7 + }, { "git-tree": "a58f240a86a38690339c96b11db0a62fd2388e4f", "version": "2.3.3", diff --git a/versions/baseline.json b/versions/baseline.json index 8b6eb6a266f98a..ac757d1cfc7ea1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -254,7 +254,7 @@ }, "asiosdk": { "baseline": "2.3.3", - "port-version": 6 + "port-version": 7 }, "asmjit": { "baseline": "2023-03-25", From 785aacdaff21fd74c93c202f5659b2d7c9d804d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 10 Oct 2023 01:10:41 +0200 Subject: [PATCH 0045/1039] [dbus] Fix features (#34332) --- ports/dbus/portfile.cmake | 7 ++++--- ports/dbus/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dbus.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index a7a5a1670b792a..740c9d141152b8 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO dbus/dbus - REF "dbus-${VERSION}" - SHA512 8e476b408514e6540c36beb84e8025827c22cda8958b6eb74d22b99c64765eb3cd5a6502aea546e3e5f0534039857b37edee89c659acef40e7cab0939947d4af + REF "dbus-${VERSION}" + SHA512 8e476b408514e6540c36beb84e8025827c22cda8958b6eb74d22b99c64765eb3cd5a6502aea546e3e5f0534039857b37edee89c659acef40e7cab0939947d4af HEAD_REF master PATCHES cmake.dep.patch @@ -13,7 +13,7 @@ vcpkg_from_gitlab( getpeereid.patch # missing check from configure.ac ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS options FEATURES x11 DBUS_BUILD_X11 x11 CMAKE_REQUIRE_FIND_PACKAGE_X11 @@ -36,6 +36,7 @@ vcpkg_cmake_configure( "-DCMAKE_INSTALL_SYSCONFDIR=${CURRENT_PACKAGES_DIR}/etc/${PORT}" "-DWITH_SYSTEMD_SYSTEMUNITDIR=lib/systemd/system" "-DWITH_SYSTEMD_USERUNITDIR=lib/systemd/user" + ${options} OPTIONS_RELEASE -DDBUS_DISABLE_ASSERT=OFF -DDBUS_ENABLE_STATS=OFF diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index af4741cd888b34..771baacbedfd41 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dbus", "version": "1.15.8", + "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 ac757d1cfc7ea1..63a5326fe67351 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2098,7 +2098,7 @@ }, "dbus": { "baseline": "1.15.8", - "port-version": 0 + "port-version": 1 }, "dcmtk": { "baseline": "3.6.7", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 0494991edc706c..0e39a12637cf87 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9104cc6d890ace8c14067e7cbf29c39f7a93b937", + "version": "1.15.8", + "port-version": 1 + }, { "git-tree": "a49c03bc95822c2f376e3f3758ac3087a428ddec", "version": "1.15.8", From 848006ded39bc0b77dcc8614de60990dc1c0bec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 9 Oct 2023 23:21:05 +0000 Subject: [PATCH 0046/1039] [qcoro] New port (#33273) --- ...0001-qt6-deprecated-qwebsocket-error.patch | 19 ++++++ ports/qcoro/portfile.cmake | 59 +++++++++++++++++++ ports/qcoro/usage | 36 +++++++++++ ports/qcoro/vcpkg.json | 56 ++++++++++++++++++ scripts/ci.baseline.txt | 2 + versions/baseline.json | 4 ++ versions/q-/qcoro.json | 9 +++ 7 files changed, 185 insertions(+) create mode 100644 ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch create mode 100644 ports/qcoro/portfile.cmake create mode 100644 ports/qcoro/usage create mode 100644 ports/qcoro/vcpkg.json create mode 100644 versions/q-/qcoro.json diff --git a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch new file mode 100644 index 00000000000000..9f84b4319a93e1 --- /dev/null +++ b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch @@ -0,0 +1,19 @@ +diff --git a/qcoro/websockets/qcorowebsocket.cpp b/qcoro/websockets/qcorowebsocket.cpp +index be9c1f7..c686d14 100644 +--- a/qcoro/websockets/qcorowebsocket.cpp ++++ b/qcoro/websockets/qcorowebsocket.cpp +@@ -32,7 +32,13 @@ public: + emitReady(true); + } + })) +- , mError(connect(socket, qOverload(&QWebSocket::error), this, [this](auto error) { ++ , mError(connect(socket, qOverload( ++#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) ++ &QWebSocket::errorOccurred ++#else ++ &QWebSocket::error ++#endif ++ ), this, [this](auto error) { + qWarning() << "QWebSocket failed to connect to a websocket server: " << error; + emitReady(false); + })) diff --git a/ports/qcoro/portfile.cmake b/ports/qcoro/portfile.cmake new file mode 100644 index 00000000000000..141554d50e3046 --- /dev/null +++ b/ports/qcoro/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO danvratil/qcoro + REF "v${VERSION}" + SHA512 f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee + HEAD_REF main + PATCHES 0001-qt6-deprecated-qwebsocket-error.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS EXTRA_OPTIONS + FEATURES + dbus QCORO_WITH_QTDBUS + network QCORO_WITH_QTNETWORK + websockets QCORO_WITH_QTWEBSOCKETS + quick QCORO_WITH_QTQUICK + qml QCORO_WITH_QML + test QCORO_WITH_QTTEST +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_QT_VERSION=6 + -DBUILD_TESTING=OFF + -DQCORO_BUILD_EXAMPLES=OFF + ${EXTRA_OPTIONS} +) + +vcpkg_cmake_install() + +if (QCORO_WITH_QTDBUS) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6DBus DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6DBus) +endif() +if (QCORO_WITH_QTNETWORK) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Network DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Network) +endif() +if (QCORO_WITH_QTWEBSOCKETS) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6WebSockets DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6WebSockets) +endif() +if (QCORO_WITH_QTQUICK) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Quick DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Quick) +endif() +if (QCORO_WITH_QML) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Qml DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Qml) +endif() +if (QCORO_WITH_QTTEST) + vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Test DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Test) +endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Coro DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6Coro) +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6 DO_NOT_DELETE_PARENT_CONFIG_PATH CONFIG_PATH lib/cmake/QCoro6) +vcpkg_cmake_config_fixup(PACKAGE_NAME QCoro6Core CONFIG_PATH lib/cmake/QCoro6Core) + +# Remove debug includes and CMake macros +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/qcoro/usage b/ports/qcoro/usage new file mode 100644 index 00000000000000..ddd875a8759744 --- /dev/null +++ b/ports/qcoro/usage @@ -0,0 +1,36 @@ +qcoro-qt6 provides CMake targets: + + # Generic coroutine types and tools + find_package(QCoro6Coro CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Coro) + + # Coroutine support for QtCore types + find_package(QCoro6Core CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Core) + + # Coroutine supports for QtDBus types + find_package(QCoro6DBus CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::DBus) + + # Coroutine support for QtNetwork types + find_package(QCoro6Network CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Network) + + # Coroutine support for QtQml types + find_package(QCoro6Qml CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Qml) + + # Coroutine support for QML + find_package(QCoro6Quick CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Quick) + + # Coroutine support for developing tests with QtTest + find_package(QCoro6Test CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::Test) + + # Coroutine support for QtWebSockets types + find_package(QCoro6WebSockets CONFIG REQUIRED) + target_link_libraries(main PRIVATE QCoro6::WebSockets) + +You can also use `QCoro` target namespace for transparent +support of both Qt5 and Qt6. diff --git a/ports/qcoro/vcpkg.json b/ports/qcoro/vcpkg.json new file mode 100644 index 00000000000000..3000d2faa70269 --- /dev/null +++ b/ports/qcoro/vcpkg.json @@ -0,0 +1,56 @@ +{ + "name": "qcoro", + "version": "0.9.0", + "description": "Coroutine support for Qt", + "homepage": "https://www.github.com/danvratil/qcoro", + "documentation": "https://qcoro.dvratil.cz", + "license": "MIT", + "dependencies": [ + "qtbase", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "dbus", + "network", + "qml", + "quick", + "test", + "websockets" + ], + "features": { + "dbus": { + "description": "Coroutine support for QtDBus module" + }, + "network": { + "description": "Coroutine support for QtNetwork module" + }, + "qml": { + "description": "Coroutine support for QtQml module", + "dependencies": [ + "qtdeclarative" + ] + }, + "quick": { + "description": "Coroutine support for QtQuick module", + "dependencies": [ + "qtdeclarative" + ] + }, + "test": { + "description": "Support code for easier testing of coroutines with QtTest." + }, + "websockets": { + "description": "Coroutine support for QtWebSockets module", + "dependencies": [ + "qtwebsockets" + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 29c97317da0d8c..0588e7b62c8ab7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -960,6 +960,8 @@ python3:x64-android=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail +# Triggers ICE in release build. +qcoro:x64-osx=fail qpid-proton:arm-neon-android=fail qpid-proton:arm64-uwp=fail qpid-proton:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 63a5326fe67351..3bc1f72b185b02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6708,6 +6708,10 @@ "baseline": "2.3.7", "port-version": 0 }, + "qcoro": { + "baseline": "0.9.0", + "port-version": 0 + }, "qcustomplot": { "baseline": "2.1.1", "port-version": 1 diff --git a/versions/q-/qcoro.json b/versions/q-/qcoro.json new file mode 100644 index 00000000000000..4a347717df90d6 --- /dev/null +++ b/versions/q-/qcoro.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b82c30bd542212b17946094149433dda747515f", + "version": "0.9.0", + "port-version": 0 + } + ] +} From 2e1062ac3e9f3c551362522d0ce224dbee428d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Mon, 9 Oct 2023 21:03:23 -0400 Subject: [PATCH 0047/1039] [libremidi] update to 4.2.3 (#34269) --- ports/libremidi/portfile.cmake | 11 +++++++++-- ports/libremidi/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/l-/libremidi.json | 5 +++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake index 9d44eb091c3b91..551fb1c85a5c06 100644 --- a/ports/libremidi/portfile.cmake +++ b/ports/libremidi/portfile.cmake @@ -3,14 +3,21 @@ vcpkg_from_github( REPO jcelerier/libremidi REF "v${VERSION}" - SHA512 7b73d5e1a565e9f85ac28fba041c66a151537a9205b4f3605fa70e18d5e651fa0562329853c7e08bf8e620f9d83d08d167b746d30c39bffcd325fbd6338d0538 + SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b HEAD_REF master ) +vcpkg_list(SET options) +if(VCPKG_TARGET_IS_LINUX) + vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=OFF) +else() + vcpkg_list(APPEND options -DLIBREMIDI_NO_ALSA=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DLIBREMIDI_NO_ALSA=ON + ${options} -DLIBREMIDI_NO_BOOST=ON -DLIBREMIDI_NO_JACK=ON ) diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json index 2b0dd25aaf3248..74cf2c657483f6 100644 --- a/ports/libremidi/vcpkg.json +++ b/ports/libremidi/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libremidi", - "version": "4.1.0", + "version": "4.2.3", "port-version": 1, "description": "A modern C++ MIDI real-time & file I/O library", "homepage": "https://github.com/jcelerier/libremidi", "license": "BSD-2-Clause", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 3bc1f72b185b02..1dde639fed3345 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4609,7 +4609,7 @@ "port-version": 1 }, "libremidi": { - "baseline": "4.1.0", + "baseline": "4.2.3", "port-version": 1 }, "libressl": { diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json index f537dc0172c268..edccfbdbd829fd 100644 --- a/versions/l-/libremidi.json +++ b/versions/l-/libremidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4427d9259242a0dbc53753710b42b6531276f392", + "version": "4.2.3", + "port-version": 1 + }, { "git-tree": "0a6cac97560ba37eae699bdb65f6561a8415d362", "version": "4.1.0", From 5a72c7346a9a7bc635112d5855a0757598d9472b Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Tue, 10 Oct 2023 04:03:37 +0300 Subject: [PATCH 0048/1039] [flecs] update to 3.2.8 (#34385) --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 035dd3e118a9cd..1255301e1a438a 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 d32628828eacc42646887de5a72a593ea42158d5f09e4ed789f86dff60f98f5be45c3a4a049c2b1173e2ab4da0313f544271eacd8f14a8c561815c51eebf8529 + SHA512 0931777bf7b43cd86a882bb3172ee8ce6294495eee010edc08afb33d09440280b46b2453395c69ac023f4f6d8a0600097c4b1797666c9094e1ae394659017853 HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index aafd2b6ada46b0..22f8d345848822 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.7", + "version": "3.2.8", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1dde639fed3345..8db068fa1990f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2613,7 +2613,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.7", + "baseline": "3.2.8", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index ed9855b2a4d481..8b97502ce90664 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "524cb7cfd119c5f71730df87f81208d2dc1c28a2", + "version": "3.2.8", + "port-version": 0 + }, { "git-tree": "ac488e485debfb252900bb5e9b6129f19628032b", "version": "3.2.7", From ae360361a434310ffee36d84eb01c033b648fb22 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 10 Oct 2023 03:03:54 +0200 Subject: [PATCH 0049/1039] [sentry-native] update to 0.6.6 (#34379) --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 3a5c9882e15354..51814f64a09cb0 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 fe28ecb66325f6dc81ba0e2f76c99b3f70c2a3e85e33a90eb16262b258e9e83a466c7b6bd2356bc44774d895b18d281c0238670aa2112bf48f0dc7de0eb94788 + SHA512 0fa548b70e3fbb87614521d797a577ffa185991f0942cf20dd965f8c068414512a63f5d715672ecf243aa31d18fdcda6ce355ad8614ede7b988d0a103cda7244 ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 2c412d8e4770a5..9e8d60ea8ece5e 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.5", + "version": "0.6.6", "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 8db068fa1990f2..a771a1b6957783 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7617,7 +7617,7 @@ "port-version": 2 }, "sentry-native": { - "baseline": "0.6.5", + "baseline": "0.6.6", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 35d48346653bf3..c8e101cdbc76f7 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eda2bc26483b80cda6cb44c7aa2506de7c254547", + "version": "0.6.6", + "port-version": 0 + }, { "git-tree": "57e5580a75a4aa261871733eeda97721e557fe58", "version": "0.6.5", From 11dd63f957afcb838090586fe61b55a5ac64c982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 10 Oct 2023 22:59:26 +0100 Subject: [PATCH 0050/1039] [colmap] Update to latest version from 2023-10-01 (#33251) --- ports/colmap/fix-dependencies.patch | 23 ----------------------- ports/colmap/portfile.cmake | 9 +++------ ports/colmap/usage | 2 +- ports/colmap/vcpkg.json | 17 +++++++---------- versions/baseline.json | 4 ++-- versions/c-/colmap.json | 5 +++++ 6 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 ports/colmap/fix-dependencies.patch diff --git a/ports/colmap/fix-dependencies.patch b/ports/colmap/fix-dependencies.patch deleted file mode 100644 index 5483b3087dd249..00000000000000 --- a/ports/colmap/fix-dependencies.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.orig 2023-03-12 19:26:41.000000000 +0100 -+++ CMakeLists.txt 2023-03-27 11:27:43.840624719 +0200 -@@ -99,14 +99,17 @@ - - find_package(Eigen3 REQUIRED) - --find_package(FreeImage REQUIRED) -+find_package(FreeImage CONFIG REQUIRED) -+set(FREEIMAGE_LIBRARIES freeimage::FreeImage) - - find_package(FLANN REQUIRED) - find_package(LZ4 REQUIRED) - --find_package(Metis REQUIRED) -+find_package(metis CONFIG REQUIRED) -+set(METIS_LIBRARIES metis) - --find_package(Glog REQUIRED) -+find_package(glog CONFIG REQUIRED) -+set(GLOG_LIBRARIES glog::glog) - - find_package(SQLite3 REQUIRED) - diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index 399f54daa02dab..e54cbdafc75332 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -1,13 +1,11 @@ -set(COLMAP_REF "30da037ce19bdceb6d239c45342fadb221bdabb2") # 3.8 with bugfixes +set(COLMAP_REF "9c704e89ff0a80e797725e112011f9f69e5aa28f") # Oct 1, 2023 vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO colmap/colmap REF "${COLMAP_REF}" - SHA512 2aad3c39efee025bebdbec41215f32968c3a63e160f9e7de0a6a2bf2d2c96bb1c20af0e10173d1d81ed4712e58fd97e7c8aabef8f9c47cc542d89b14c6ae420d - HEAD_REF dev - PATCHES - fix-dependencies.patch + SHA512 6ece735c403304c14887cd9b2b13a7e36bf07155fa959748c09d74854e0da6338766c11e6a371c26f983ccdb29f93b2600d685c907a5a137fe20d798b26805d8 + HEAD_REF main ) if (NOT TRIPLET_SYSTEM_ARCH STREQUAL "x64" AND ("cuda" IN_LIST FEATURES OR "cuda-redist" IN_LIST FEATURES)) @@ -74,7 +72,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/include/colmap/exe" - "${CURRENT_PACKAGES_DIR}/include/colmap/lib/Graclus/multilevelLib" "${CURRENT_PACKAGES_DIR}/include/colmap/tools" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/media" "${CURRENT_PACKAGES_DIR}/include/colmap/ui/shaders" diff --git a/ports/colmap/usage b/ports/colmap/usage index b71316b3cf81a3..75f933163f7c14 100644 --- a/ports/colmap/usage +++ b/ports/colmap/usage @@ -7,4 +7,4 @@ For example, under Windows, execute COLMAP as: The package colmap provides CMake integration: find_package(COLMAP REQUIRED) - target_link_libraries(main ${COLMAP_LIBRARIES}) + target_link_libraries(main colmap::colmap) diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index 1f54a343ed6938..8ce753f8bdd57f 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,10 +1,10 @@ { "name": "colmap", - "version-date": "2023-03-12", - "port-version": 1, + "version-date": "2023-10-01", "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", + "supports": "(linux | (windows & !static) | osx) & (x86 | x64)", "dependencies": [ "boost-filesystem", "boost-graph", @@ -18,12 +18,7 @@ "suitesparse" ] }, - { - "name": "cgal", - "features": [ - "qt" - ] - }, + "cgal", "eigen3", "flann", "freeimage", @@ -32,7 +27,6 @@ "glog", "qt5-base", "sqlite3", - "suitesparse", { "name": "vcpkg-cmake", "host": true @@ -56,7 +50,10 @@ ] }, "tests": { - "description": "Build all tests." + "description": "Build all tests.", + "dependencies": [ + "gtest" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index a771a1b6957783..090bbc11ad8d2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1709,8 +1709,8 @@ "port-version": 10 }, "colmap": { - "baseline": "2023-03-12", - "port-version": 1 + "baseline": "2023-10-01", + "port-version": 0 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index ea652317e7e899..46334e0dfd0b59 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3482baa430e8733afa927fae4d3951e300a5c67", + "version-date": "2023-10-01", + "port-version": 0 + }, { "git-tree": "be5a8b2aa2354b0d3aec03253dcd13358ba950da", "version-date": "2023-03-12", From 1c29631c9c2c2766989ce8652d2b90a23faadcbf Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 10 Oct 2023 14:59:58 -0700 Subject: [PATCH 0051/1039] [pugixml] Update to 1.14 (#34374) --- ports/pugixml/portfile.cmake | 8 ++++---- ports/pugixml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pugixml.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 498c86f51ae295..5f32c2cf3599d1 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/pugixml - REF a0e064336317c9347a91224112af9933598714e9 #v1.13.0 - SHA512 9fe2285215520b6ac5f832d457bdfedcf183787a7058bb970a20ea7ca111e1afd864f5b90a4810c79470afefc55c0199febf04d1600634c1ffdbbe000ef6e1df + REF "v${VERSION}" + SHA512 730d203829eb24d6e1c873f9b921ae97cf7a157fd45504151bc2e61adea5c536eaf33ff38c5ad61629b54a6686135ff1834a61102b4660fbb9ead4ecf20dfd34 HEAD_REF master ) @@ -14,9 +14,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pugixml) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json index 3eafc0a7898837..4f81e3a62f5813 100644 --- a/ports/pugixml/vcpkg.json +++ b/ports/pugixml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pugixml", - "version": "1.13.0", + "version": "1.14", "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 090bbc11ad8d2b..8e59f25078342a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6681,7 +6681,7 @@ "port-version": 0 }, "pugixml": { - "baseline": "1.13.0", + "baseline": "1.14", "port-version": 0 }, "pulzed-mini": { diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index d1ef05aa0bb41a..dccc7cd1c1bfb9 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e38344aea6e7529afde3895e0885ed5cb0c0542", + "version": "1.14", + "port-version": 0 + }, { "git-tree": "4547c4ff9371f06f34f087f2989f884ab3ef7b71", "version": "1.13.0", From 84b4fe24b0951c895479898317b6e92449885646 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 10 Oct 2023 15:00:28 -0700 Subject: [PATCH 0052/1039] [libpq] update to 16.0 (#34368) --- ports/libpq/portfile.cmake | 2 +- ports/libpq/unix/fix-configure.patch | 20 ++-- ports/libpq/vcpkg.json | 3 +- ports/libpq/windows/msbuild.patch | 115 ++++++++++------------- ports/libpq/windows/win_bison_flex.patch | 45 +++++---- versions/baseline.json | 4 +- versions/l-/libpq.json | 5 + 7 files changed, 90 insertions(+), 104 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 406372d31578e8..77abf18c278568 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${VERSION}/postgresql-${VERSION}.tar.bz2" FILENAME "postgresql-${VERSION}.tar.bz2" - SHA512 cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6 + SHA512 c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39 ) vcpkg_extract_source_archive( diff --git a/ports/libpq/unix/fix-configure.patch b/ports/libpq/unix/fix-configure.patch index c0a7f78906ca89..e5e1b91658042f 100644 --- a/ports/libpq/unix/fix-configure.patch +++ b/ports/libpq/unix/fix-configure.patch @@ -1,10 +1,10 @@ diff --git a/configure.ac b/configure.ac -index 9a73f50..a35395e 100644 +index 7f97248..48ff1a1 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [15.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [16.0], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. +cross_compiling=yes # Avoid conftest loading shared objects @@ -12,7 +12,7 @@ index 9a73f50..a35395e 100644 Untested combinations of 'autoconf' and PostgreSQL versions are not recommended. You can remove the check from 'configure.ac' but it is then your responsibility whether the result works or not.])]) -@@ -1274,7 +1275,8 @@ if test "$enable_thread_safety" = yes; then +@@ -1311,7 +1312,8 @@ if test "$enable_thread_safety" = yes; then fi if test "$with_readline" = yes; then @@ -22,7 +22,7 @@ index 9a73f50..a35395e 100644 if test x"$pgac_cv_check_readline" = x"no"; then AC_MSG_ERROR([readline library not found If you have readline already installed, see config.log for details on the -@@ -1284,7 +1286,7 @@ Use --without-readline to disable readline support.]) +@@ -1321,7 +1323,7 @@ Use --without-readline to disable readline support.]) fi if test "$with_zlib" = yes; then @@ -31,7 +31,7 @@ index 9a73f50..a35395e 100644 [AC_MSG_ERROR([zlib library not found If you have zlib already installed, see config.log for details on the failure. It is possible the compiler isn't looking in the proper directory. -@@ -1333,6 +1335,9 @@ if test "$with_ssl" = openssl ; then +@@ -1370,6 +1372,9 @@ if test "$with_ssl" = openssl ; then # Minimum required OpenSSL version is 1.0.1 AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) @@ -41,15 +41,15 @@ index 9a73f50..a35395e 100644 if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) -@@ -1340,6 +1345,7 @@ if test "$with_ssl" = openssl ; then +@@ -1377,6 +1382,7 @@ if test "$with_ssl" = openssl ; then AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) fi + fi - # Function introduced in OpenSSL 1.0.2. - AC_CHECK_FUNCS([X509_get_signature_nid]) - # Functions introduced in OpenSSL 1.1.0. We used to check for -@@ -1363,19 +1369,23 @@ if test "$with_pam" = yes ; then + # Functions introduced in OpenSSL 1.0.2. LibreSSL does not have + # SSL_CTX_set_cert_cb(). + AC_CHECK_FUNCS([X509_get_signature_nid SSL_CTX_set_cert_cb]) +@@ -1403,19 +1409,23 @@ if test "$with_pam" = yes ; then fi if test "$with_libxml" = yes ; then diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 2574d459e77639..13e9e6d4b23b70 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpq", - "version": "15.3", - "port-version": 2, + "version": "16.0", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/ports/libpq/windows/msbuild.patch b/ports/libpq/windows/msbuild.patch index ce243a326e6e1d..27ff546441f0cd 100644 --- a/ports/libpq/windows/msbuild.patch +++ b/ports/libpq/windows/msbuild.patch @@ -1,5 +1,5 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm -index 8de79c6..3bc677d 100644 +index 05548d7..097db91 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -53,6 +53,11 @@ sub Install @@ -83,7 +83,7 @@ index 8de79c6..3bc677d 100644 || croak "Could not copy $pf.pdb\n"; print "."; } -@@ -482,7 +506,7 @@ sub CopySubdirFiles +@@ -453,7 +477,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f.control", @@ -92,7 +92,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f.control in contrib $module"); print '.'; } -@@ -500,7 +524,7 @@ sub CopySubdirFiles +@@ -471,7 +495,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -101,7 +101,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -515,7 +539,7 @@ sub CopySubdirFiles +@@ -486,7 +510,7 @@ sub CopySubdirFiles foreach my $f (split /\s+/, $flist) { lcopy("$subdir/$module/$f", @@ -110,7 +110,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in $subdir $module"); print '.'; } -@@ -578,7 +602,7 @@ sub CopySubdirFiles +@@ -549,7 +573,7 @@ sub CopySubdirFiles if ($module eq 'spi'); foreach my $f (split /\s+/, $flist) { @@ -119,7 +119,7 @@ index 8de79c6..3bc677d 100644 || croak("Could not copy file $f in contrib $module"); print '.'; } -@@ -708,7 +732,7 @@ sub GenerateNLSFiles +@@ -675,7 +699,7 @@ sub GenerateNLSFiles my $majorver = shift; print "Installing NLS files..."; @@ -128,7 +128,7 @@ index 8de79c6..3bc677d 100644 my @flist; File::Find::find( { -@@ -730,12 +754,12 @@ sub GenerateNLSFiles +@@ -697,12 +721,12 @@ sub GenerateNLSFiles next unless /([^\/]+)\.po/; $lang = $1; @@ -146,35 +146,36 @@ index 8de79c6..3bc677d 100644 system(@args) && croak("Could not run msgfmt on $dir\\$_"); print "."; diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm -index f24d9e5..356cc31 100644 +index 62fec1f..ecb1b86 100644 --- a/src/tools/msvc/MSBuildProject.pm +++ b/src/tools/msvc/MSBuildProject.pm -@@ -81,13 +81,14 @@ EOF +@@ -80,14 +80,14 @@ EOF + print $f < EOF - -+ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; +- ++ my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : ''; $self->WriteItemDefinitionGroup( $f, 'Debug', { - defs => "_DEBUG;DEBUG=1", - opt => 'Disabled', + defs => "_DEBUG;DEBUG=1", + opt => 'Disabled', strpool => 'false', - runtime => 'MultiThreadedDebugDLL' + runtime => 'MultiThreadedDebug' . $maybe_dll }); $self->WriteItemDefinitionGroup( $f, -@@ -96,7 +97,7 @@ EOF - defs => "", - opt => 'Full', +@@ -96,7 +96,7 @@ EOF + defs => "", + opt => 'Full', strpool => 'true', - runtime => 'MultiThreadedDLL' + runtime => 'MultiThreaded' . $maybe_dll }); return; } -@@ -266,6 +267,8 @@ sub WriteConfigurationPropertyGroup +@@ -266,6 +266,8 @@ sub WriteConfigurationPropertyGroup ($self->{type} eq "exe") ? 'Application' : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary'); @@ -183,7 +184,7 @@ index f24d9e5..356cc31 100644 print $f < -@@ -311,7 +314,9 @@ sub WriteItemDefinitionGroup +@@ -311,7 +313,9 @@ sub WriteItemDefinitionGroup my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';'); my $targetmachine = @@ -191,42 +192,33 @@ index f24d9e5..356cc31 100644 + 'Machine' . uc($self->{platform}); + $targetmachine =~ s/WIN32/X86/; + my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false'; + my $arch = $self->{platform} eq 'Win32' ? 'x86' : 'x86_64'; my $includes = join ';', @{ $self->{includes} }, ""; - -@@ -347,7 +352,7 @@ sub WriteItemDefinitionGroup - .\\$cfgname\\$self->{name}\\$self->{name}.pdb - false - .\\$cfgname\\$self->{name}\\$self->{name}.map -- false -+ $randomizebase - - - Console diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm -index ef0a33c..dd68424 100644 +index 9e05eb9..8ac0a5d 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm -@@ -114,8 +114,10 @@ sub mkvcbuild +@@ -125,8 +125,10 @@ sub mkvcbuild if ($vsVersion >= '9.00') { -+ if ($solution->{platform} !~ /^ARM/) { ++ if ($solution->{platform} !~ /^ARM/) { push(@pgportfiles, 'pg_crc32c_sse42_choose.c'); push(@pgportfiles, 'pg_crc32c_sse42.c'); -+ } ++ } push(@pgportfiles, 'pg_crc32c_sb8.c'); } else -@@ -196,6 +198,7 @@ sub mkvcbuild +@@ -208,6 +210,7 @@ sub mkvcbuild 'syncrep_gram.y'); $postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l', 'jsonpath_gram.y'); -+ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && ++ ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') && $postgres->AddDefine('BUILDING_DLL'); $postgres->AddLibrary('secur32.lib'); $postgres->AddLibrary('ws2_32.lib'); -@@ -240,12 +243,13 @@ sub mkvcbuild +@@ -252,12 +255,13 @@ sub mkvcbuild $pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include'); $pltcl->AddReference($postgres); @@ -242,17 +234,17 @@ index ef0a33c..dd68424 100644 $found = 1; last; } -@@ -500,8 +504,7 @@ sub mkvcbuild +@@ -512,8 +516,7 @@ sub mkvcbuild . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; my $prefixcmd = qq("$solution->{options}->{python}\\python" -c "$pythonprog"); - my $pyout = `$prefixcmd`; - die "Could not query for python version!\n" if $?; -+ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; ++ my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}"; my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); # Sometimes (always?) if python is not present, the execution -@@ -517,8 +520,8 @@ sub mkvcbuild +@@ -529,8 +532,8 @@ sub mkvcbuild my $plpython = $solution->AddProject('plpython' . $pymajorver, 'dll', 'PLs', 'src/pl/plpython'); @@ -264,7 +256,7 @@ index ef0a33c..dd68424 100644 # Add transform modules dependent on plpython diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm -index 570bab5..2d51abe 100644 +index 0507ad0..48caab9 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -167,6 +167,11 @@ sub AddReference @@ -280,7 +272,7 @@ index 570bab5..2d51abe 100644 return; } diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm -index d30e8fc..231275b 100644 +index b6d31c3..27d89fc 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -63,6 +63,11 @@ sub DeterminePlatform @@ -308,22 +300,22 @@ index d30e8fc..231275b 100644 @@ -148,7 +156,7 @@ sub GetOpenSSLVersion sub GenerateFiles { - my $self = shift; -- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; + my $self = shift; +- my $bits = $self->{platform} eq 'Win32' ? 32 : 64; + my $bits = $self->{platform} =~ /64/ ? 64 : 32; my $ac_init_found = 0; my $package_name; my $package_version; -@@ -502,7 +510,7 @@ sub GenerateFiles - USE_PAM => undef, - USE_SLICING_BY_8_CRC32C => undef, - USE_SSE42_CRC32C => undef, +@@ -440,7 +448,7 @@ sub GenerateFiles + USE_PAM => undef, + USE_SLICING_BY_8_CRC32C => undef, + USE_SSE42_CRC32C => undef, - USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1, + USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1, - USE_SYSTEMD => undef, - USE_SYSV_SEMAPHORES => undef, - USE_SYSV_SHARED_MEMORY => undef, -@@ -760,14 +768,14 @@ sub GenerateFiles + USE_SYSTEMD => undef, + USE_SYSV_SEMAPHORES => undef, + USE_SYSV_SHARED_MEMORY => undef, +@@ -725,14 +733,14 @@ sub GenerateFiles || confess "Could not open pg_config_paths.h"; print $o <{options}->{zlib}) { $proj->AddIncludeDir($self->{options}->{zlib} . '\include'); @@ -357,7 +349,7 @@ index d30e8fc..231275b 100644 my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); # Starting at version 1.1.0 the OpenSSL installers have -@@ -1027,7 +1039,7 @@ sub AddProject +@@ -1032,7 +1044,7 @@ sub AddProject if ($self->{options}->{nls}) { $proj->AddIncludeDir($self->{options}->{nls} . '\include'); @@ -366,7 +358,7 @@ index d30e8fc..231275b 100644 } if ($self->{options}->{gss}) { -@@ -1060,6 +1072,10 @@ sub AddProject +@@ -1065,6 +1077,10 @@ sub AddProject if ($self->{options}->{icu}) { $proj->AddIncludeDir($self->{options}->{icu} . '\include'); @@ -377,7 +369,7 @@ index d30e8fc..231275b 100644 if ($self->{platform} eq 'Win32') { $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); -@@ -1077,22 +1093,22 @@ sub AddProject +@@ -1082,22 +1098,22 @@ sub AddProject { $proj->AddIncludeDir($self->{options}->{xml} . '\include'); $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2'); @@ -405,24 +397,15 @@ index d30e8fc..231275b 100644 if ($self->{options}->{uuid}) { diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl -index b8c514a..1fb7619 100644 +index cf83d7d..2d9a4ec 100644 --- a/src/tools/msvc/gendef.pl +++ b/src/tools/msvc/gendef.pl @@ -122,7 +122,7 @@ sub writedef # Strip the leading underscore for win32, but not x64 $f =~ s/^_// -- unless ($platform eq "x64"); -+ if ($platform eq "Win32"); +- unless ($arch eq "x86_64"); ++ if ($arch eq "Win32"); # Emit just the name if it's a function symbol, or emit the name # decorated with the DATA option for variables. -@@ -150,7 +150,7 @@ sub usage - usage() - unless scalar(@ARGV) == 2 - && ( ($ARGV[0] =~ /\\([^\\]+$)/) -- && ($ARGV[1] eq 'Win32' || $ARGV[1] eq 'x64')); -+ && ($ARGV[1] ne '')); - my $defname = uc $1; - my $deffile = "$ARGV[0]/$defname.def"; - my $platform = $ARGV[1]; diff --git a/ports/libpq/windows/win_bison_flex.patch b/ports/libpq/windows/win_bison_flex.patch index 645d53af2194cf..fc8230193cf85d 100644 --- a/ports/libpq/windows/win_bison_flex.patch +++ b/ports/libpq/windows/win_bison_flex.patch @@ -1,6 +1,26 @@ +diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl +index 25df669..373bedd 100644 +--- a/src/tools/msvc/pgbison.pl ++++ b/src/tools/msvc/pgbison.pl +@@ -13,7 +13,7 @@ use File::Basename; + + do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; + +-my ($bisonver) = `bison -V`; # grab first line ++my ($bisonver) = `win_bison -V`; # grab first line + $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number + + unless ($bisonver ge '2.3') +@@ -51,5 +51,5 @@ my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : ''); + + my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; + +-system("bison $nodep $headerflag $input -o $output"); ++system("win_bison $nodep $headerflag $input -o $output"); + exit $? >> 8; diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl -index aceed5ffd..f6ed215e8 100644 ---- a/src/tools/msvc/pgflex.pl +index c308a08..0807ce7 100644 +--- a/src/tools/msvc/pgflex.pl +++ b/src/tools/msvc/pgflex.pl @@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning'; @@ -20,24 +40,3 @@ index aceed5ffd..f6ed215e8 100644 if ($? == 0) { -diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl -index 895e398c0..f5b524a5d 100644 ---- a/src/tools/msvc/pgbison.pl -+++ b/src/tools/msvc/pgbison.pl -@@ -13,7 +13,7 @@ use File::Basename; - - do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl'; - --my ($bisonver) = `bison -V`; # grab first line -+my ($bisonver) = `win_bison -V`; # grab first line - $bisonver = (split(/\s+/, $bisonver))[3]; # grab version number - - unless ($bisonver eq '1.875' || $bisonver ge '2.2') -@@ -51,5 +51,5 @@ close($mf); - - my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : ""; - --system("bison $nodep $headerflag $input -o $output"); -+system("win_bison $nodep $headerflag $input -o $output"); - exit $? >> 8; - diff --git a/versions/baseline.json b/versions/baseline.json index 8e59f25078342a..a739c3b8ed981f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4561,8 +4561,8 @@ "port-version": 16 }, "libpq": { - "baseline": "15.3", - "port-version": 2 + "baseline": "16.0", + "port-version": 0 }, "libpqxx": { "baseline": "7.8.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index b4c4666cfe574f..c19c69f99241b9 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbd6314cbfd04132985a7a6412184d368c3cd0b6", + "version": "16.0", + "port-version": 0 + }, { "git-tree": "859b43f8db33293c411c365d945ecd4ae2cc056b", "version": "15.3", From 3199b26459bd8a4ba2863b2f60817dcad70e956b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 11 Oct 2023 00:01:19 +0200 Subject: [PATCH 0053/1039] [winpcap] fix build (#34298) --- ports/nmap/portfile.cmake | 13 +++- ports/nmap/vcpkg.json | 2 +- ports/soem/portfile.cmake | 2 + ports/soem/vcpkg.json | 5 ++ ports/winpcap/bison-flex.patch | 22 +++++++ ports/winpcap/create_bin.bat | 20 ------ ports/winpcap/create_lib.patch | 19 ------ ports/winpcap/fix-create-lib-batch.patch | 23 ------- ports/winpcap/portfile.cmake | 81 ++++++------------------ ports/winpcap/vcpkg.json | 4 +- ports/winpcap/wpcap.vcxproj.in | 42 ++++++------ scripts/ci.baseline.txt | 10 +-- versions/baseline.json | 6 +- versions/n-/nmap.json | 5 ++ versions/s-/soem.json | 5 ++ versions/w-/winpcap.json | 5 ++ 16 files changed, 102 insertions(+), 162 deletions(-) create mode 100644 ports/winpcap/bison-flex.patch delete mode 100644 ports/winpcap/create_bin.bat delete mode 100644 ports/winpcap/create_lib.patch delete mode 100644 ports/winpcap/fix-create-lib-batch.patch diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index dd92a494567f15..4440892871a166 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -18,9 +18,15 @@ if(VCPKG_TARGET_IS_WINDOWS) ) list(APPEND DEL_PROJS "libpcap" "libpcre" "libssh2" "libz") foreach (DEL_PROJ ${DEL_PROJS}) - file(REMOVE_RECURSE ${SOURCE_PATH}/${DEL_PROJ}) + file(REMOVE_RECURSE "${SOURCE_PATH}/${DEL_PROJ}") endforeach() - + + if(NOT EXISTS "${CURRENT_INSTALLED_DIR}/bin/Packet.dll") + vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF __declspec(dllimport)" "#define PCAP_API_DEF ") + else() # editable + vcpkg_replace_string("${SOURCE_PATH}/mswin32/pcap-include/pcap/export-defs.h" "#define PCAP_API_DEF " "#define PCAP_API_DEF __declspec(dllimport)") + endif() + # Clear vcpkg_execute_required_process( COMMAND "devenv.exe" @@ -28,7 +34,6 @@ if(VCPKG_TARGET_IS_WINDOWS) /Clean WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 ) - # Uprade message(STATUS "Upgrade solution...") vcpkg_execute_required_process( @@ -38,10 +43,12 @@ if(VCPKG_TARGET_IS_WINDOWS) WORKING_DIRECTORY ${SOURCE_PATH}/mswin32 LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) + file(REMOVE_RECURSE "${SOURCE_PATH}/mswin32/Lib") vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH mswin32/nmap.vcxproj PLATFORM ${MSBUILD_PLATFORM} + ADDITIONAL_LIBS Packet.lib wpcap.lib User32.lib Crypt32.lib ) else() set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread") diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json index 21a49388fcc568..59ae90b286bb98 100644 --- a/ports/nmap/vcpkg.json +++ b/ports/nmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmap", "version": "7.70", - "port-version": 10, + "port-version": 11, "description": "A library for scanning network ports.", "dependencies": [ { diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index b0daea2490f155..fa83adcf1b0186 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/soem/cmake") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json index 781494cea2f426..6915b4c80c15bf 100644 --- a/ports/soem/vcpkg.json +++ b/ports/soem/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soem", "version-date": "2023-06-09", + "port-version": 1, "description": "Simple Open Source EtherCAT Master", "homepage": "https://github.com/OpenEtherCATsociety/SOEM", "supports": "!uwp", @@ -9,6 +10,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "winpcap", "platform": "windows" diff --git a/ports/winpcap/bison-flex.patch b/ports/winpcap/bison-flex.patch new file mode 100644 index 00000000000000..201de00789598c --- /dev/null +++ b/ports/winpcap/bison-flex.patch @@ -0,0 +1,22 @@ +diff --git a/wpcap/PRJ/build_scanner_parser.bat b/wpcap/PRJ/build_scanner_parser.bat +index 31786d596..54cba739d 100644 +--- a/wpcap/PRJ/build_scanner_parser.bat ++++ b/wpcap/PRJ/build_scanner_parser.bat +@@ -4,7 +4,7 @@ echo Building the libpcap parser and scanner... + del /Q /F ..\libpcap\grammar.c > nul 2> nul + del /Q /F ..\libpcap\tokdefs.h > nul 2> nul + +-bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul ++win_bison -y -p pcap_ -d ../libpcap/GRAMMAR.Y > nul + if not %ERRORLEVEL% == 0 ( + echo failure in generating the grammar. + goto end +@@ -14,7 +14,7 @@ move y.tab.c ..\libpcap\grammar.c + move y.tab.h ..\libpcap\tokdefs.h + + del /Q /F ..\libpcap\scanner.c >/nul 2>/nul +-flex -Ppcap_ -t ../libpcap/scanner.l > ../libpcap/scanner.c ++win_flex -Ppcap_ -t ../libpcap/scanner.l > ../libpcap/scanner.c + + if not %ERRORLEVEL% == 0 ( + echo failure in generating the scanner. diff --git a/ports/winpcap/create_bin.bat b/ports/winpcap/create_bin.bat deleted file mode 100644 index aa9e7f10630485..00000000000000 --- a/ports/winpcap/create_bin.bat +++ /dev/null @@ -1,20 +0,0 @@ -@echo off - -IF "%2"=="" (set WPDPACKDESTDIR=.\WpdPack\) ELSE (set WPDPACKDESTDIR=%2) - -IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) - -echo Creating \Lib folder -mkdir %WPDPACKDESTDIR% >nul 2>nul -mkdir %WPDPACKDESTDIR%\Bin >nul 2>nul -mkdir %WPDPACKDESTDIR%\Bin\x64 >nul 2>nul - -xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.dll" %WPDPACKDESTDIR%\Bin\ >nul -xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.dll" %WPDPACKDESTDIR%\Bin\x64 >nul -xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.dll %WPDPACKDESTDIR%\Bin\ >nul -xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.dll %WPDPACKDESTDIR%\Bin\x64 >nul - -echo Folder \Bin created successfully - -set WPDPACKDESTDIR= -set WINPCAPSOURCEDIR= \ No newline at end of file diff --git a/ports/winpcap/create_lib.patch b/ports/winpcap/create_lib.patch deleted file mode 100644 index 8e144fa3d2488e..00000000000000 --- a/ports/winpcap/create_lib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/create_lib.bat b/create_lib.bat -index dbe511c..d431b88 100644 ---- a/create_lib.bat -+++ b/create_lib.bat -@@ -9,12 +9,10 @@ mkdir %WPDPACKDESTDIR% >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul - --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x86\wpcap.lib %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\PRJ\Release\x64\wpcap.lib %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\libpacket.a %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y %WINPCAPSOURCEDIR%\wpcap\LIB\libwpcap.a %WPDPACKDESTDIR%\Lib\ >nul - - echo Folder \Lib created successfully - diff --git a/ports/winpcap/fix-create-lib-batch.patch b/ports/winpcap/fix-create-lib-batch.patch deleted file mode 100644 index 0a1d9017d007c0..00000000000000 --- a/ports/winpcap/fix-create-lib-batch.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/create_lib.bat b/create_lib.bat -index c70a179..4690d9e 100644 ---- a/create_lib.bat -+++ b/create_lib.bat -@@ -7,10 +7,16 @@ IF ""=="%1" (set WINPCAPSOURCEDIR=.\) ELSE (set WINPCAPSOURCEDIR=%1) - echo Creating \Lib folder - mkdir %WPDPACKDESTDIR% >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib >nul 2>nul -+mkdir %WPDPACKDESTDIR%\Lib\debug\ >nul 2>nul - mkdir %WPDPACKDESTDIR%\Lib\x64 >nul 2>nul -+mkdir %WPDPACKDESTDIR%\Lib\x64\debug >nul 2>nul - --xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul --xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\debug\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Debug No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64\debug\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x86\wpcap.lib" %WPDPACKDESTDIR%\Lib\ >nul -+xcopy /v /Y "%WINPCAPSOURCEDIR%\wpcap\PRJ\Release No AirPcap\x64\wpcap.lib" %WPDPACKDESTDIR%\Lib\x64 >nul -+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x86\packet.lib %WPDPACKDESTDIR%\Lib\debug\ >nul -+xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Debug\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64\debug\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x86\packet.lib %WPDPACKDESTDIR%\Lib\ >nul - xcopy /v /Y %WINPCAPSOURCEDIR%\packetNtx\Dll\Project\Release\x64\packet.lib %WPDPACKDESTDIR%\Lib\x64 >nul - diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 0f5e9264a84cbc..f693025873dbc5 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_download_distfile(ARCHIVE SHA512 89a5109ed17f8069f7a43497f6fec817c58620dbc5fa506e52069b9113c5bc13f69c307affe611281cb727cfa0f8529d07044d41427e350b24468ccc89a87f33 ) -# MSBuild performs in-source builds, so to ensure reliability we must clear them each time -file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src") - if(VCPKG_CRT_LINKAGE STREQUAL "static") set(CRT_LINKAGE "MT") elseif(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -21,8 +18,10 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LIBRARY_LINKAGE "4") + set(lib_type StaticLibrary) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "2") + set(lib_type DynamicLibrary) endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/packetNtx.patch.in" "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" @ONLY) @@ -35,11 +34,13 @@ vcpkg_extract_source_archive( PATCHES "${CURRENT_BUILDTREES_DIR}/src/packetNtx.patch" "${CURRENT_BUILDTREES_DIR}/src/wpcap.patch" - "${CMAKE_CURRENT_LIST_DIR}/create_lib.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" + "bison-flex.patch" ) -file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION "${SOURCE_PATH}") +file(REMOVE_RECURSE "${SOURCE_PATH}/wpcap/libpcap/rpcapd/win32-pthreads") # avoid copying pthreadVC.lib; TODO: maybe should also use libpcap headers instead of this vendored stuff + +vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"4\"" "") +vcpkg_replace_string("${SOURCE_PATH}/wpcap/PRJ/wpcap.vcproj" "DebugInformationFormat=\"3\"" "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM Win32) @@ -47,6 +48,14 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(PLATFORM x64) endif() +vcpkg_find_acquire_program(BISON) +cmake_path(GET BISON PARENT_PATH BISON_DIR) +vcpkg_add_to_path("${BISON_DIR}") + +vcpkg_find_acquire_program(FLEX) +cmake_path(GET FLEX PARENT_PATH FLEX_DIR) +vcpkg_add_to_path("${FLEX_DIR}") + vcpkg_execute_required_process( COMMAND "devenv.exe" "Packet.sln" @@ -55,10 +64,6 @@ vcpkg_execute_required_process( LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - configure_file("${CURRENT_PORT_DIR}/Packet.vcxproj.in" "${SOURCE_PATH}/packetNtx/Dll/Project/Packet.vcxproj" COPYONLY) -endif() - vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "packetNtx/Dll/Project/Packet.sln" @@ -67,15 +72,16 @@ vcpkg_msbuild_install( PLATFORM ${PLATFORM} ) -vcpkg_find_acquire_program(BISON) -vcpkg_find_acquire_program(FLEX) +message(STATUS "Building Scanner/Parser") vcpkg_execute_required_process( COMMAND "${SOURCE_PATH}/wpcap/PRJ/build_scanner_parser.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" + WORKING_DIRECTORY "${SOURCE_PATH}/wpcap/PRJ" LOGNAME build_scanner_parser-${TARGET_TRIPLET} ) +message(STATUS "Building wpcap") + vcpkg_execute_required_process( COMMAND "devenv.exe" "wpcap.sln" @@ -84,9 +90,8 @@ vcpkg_execute_required_process( LOGNAME upgrade-wpcap-${TARGET_TRIPLET} ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" COPYONLY) -endif() +configure_file("${CURRENT_PORT_DIR}/wpcap.vcxproj.in" "${SOURCE_PATH}/wpcap/PRJ/wpcap.vcxproj" @ONLY) + vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" @@ -124,50 +129,6 @@ file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap/vlan.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap") -vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH}/create_lib.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME create_lib-${TARGET_TRIPLET} -) - -set(PCAP_LIBRARY_PATH "${SOURCE_PATH}/WpdPack/Lib") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PCAP_LIBRARY_PATH "${PCAP_LIBRARY_PATH}/x64") -endif() - -file(INSTALL - "${PCAP_LIBRARY_PATH}/Packet.lib" - "${PCAP_LIBRARY_PATH}/wpcap.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - -file(INSTALL - "${PCAP_LIBRARY_PATH}/debug/Packet.lib" - "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_execute_required_process( - COMMAND "${SOURCE_PATH}/create_bin.bat" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME create_bin-${TARGET_TRIPLET} - ) - - set(PCAP_BINARY_PATH "${SOURCE_PATH}/WpdPack/Bin") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(PCAP_BINARY_PATH "${PCAP_BINARY_PATH}/x64") - endif() - - file(INSTALL - "${PCAP_BINARY_PATH}/Packet.dll" - "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - - file(INSTALL - "${PCAP_BINARY_PATH}/Packet.dll" - "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "The latest license is available in https://www.winpcap.org/misc/copyright.htm and in the header files.") diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index 47dc1cdccf2218..7566e334dede60 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,10 +1,10 @@ { "name": "winpcap", "version": "4.1.3", - "port-version": 11, + "port-version": 12, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org", - "supports": "windows", + "supports": "windows & !uwp & !arm & !static", "dependencies": [ { "name": "vcpkg-msbuild", diff --git a/ports/winpcap/wpcap.vcxproj.in b/ports/winpcap/wpcap.vcxproj.in index 5740dec40787be..4fbaf3b8f50a07 100644 --- a/ports/winpcap/wpcap.vcxproj.in +++ b/ports/winpcap/wpcap.vcxproj.in @@ -41,46 +41,46 @@ - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte - StaticLibrary + @lib_type@ v141 MultiByte true - StaticLibrary + @lib_type@ v141 MultiByte @@ -165,11 +165,11 @@ MultiThreadedDebug Level3 - EditAndContinue + None ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -190,11 +190,10 @@ MultiThreadedDebug Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -209,11 +208,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -232,11 +230,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -255,11 +252,11 @@ MultiThreadedDebug Level3 - EditAndContinue + None ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x86;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -283,11 +280,10 @@ MultiThreadedDebug Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Debug\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Debug\x64;@CURRENT_PACKAGES_DIR@/debug/lib;%(AdditionalLibraryDirectories) false wpcap.def true @@ -302,11 +298,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x86;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x86;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows @@ -328,11 +323,10 @@ MultiThreaded Level3 - ProgramDatabase ws2_32.lib;packet.lib;%(AdditionalDependencies) - ..\..\packetNtx\Dll\Project\Release\x64;%(AdditionalLibraryDirectories) + ..\..\packetNtx\Dll\Project\Release\x64;@CURRENT_PACKAGES_DIR@/lib;%(AdditionalLibraryDirectories) wpcap.def true Windows diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0588e7b62c8ab7..c1896a01086eb2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1296,13 +1296,9 @@ wasmedge:arm64-android=fail wasmedge:x64-android=fail wavpack:arm-neon-android=fail wavpack:x64-android=fail -winpcap:arm64-windows = skip -winpcap:arm64-uwp = skip -winpcap:x64-uwp = skip -winpcap:x64-windows = skip -winpcap:x64-windows-static = skip -winpcap:x64-windows-static-md=skip -winpcap:x86-windows = skip +# Collides with libpcap -> similar headers +winpcap:x64-windows = skip +winpcap:x86-windows = skip wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index a739c3b8ed981f..733c4df870de66 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5834,7 +5834,7 @@ }, "nmap": { "baseline": "7.70", - "port-version": 10 + "port-version": 11 }, "nmslib": { "baseline": "2.1.1", @@ -7830,7 +7830,7 @@ }, "soem": { "baseline": "2023-06-09", - "port-version": 0 + "port-version": 1 }, "soil": { "baseline": "2021-04-22", @@ -8862,7 +8862,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 11 + "port-version": 12 }, "winpty": { "baseline": "0.4.3", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index 42f8154ba4e5b9..cd1029d5ce5510 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d96fe27573cd4c06549f6a711e54f0f26a1c4485", + "version": "7.70", + "port-version": 11 + }, { "git-tree": "fd1dcfaf73ff23b171247d76abdca50cd7f10f33", "version": "7.70", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index 6b32317372a38c..fbab3c1f5c440d 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdbb2e9fafc4dfc1aca0c45a872b3b202e2a9254", + "version-date": "2023-06-09", + "port-version": 1 + }, { "git-tree": "a02a02f57a58361241f7bb0890de819f94e198b3", "version-date": "2023-06-09", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 30e73f43459039..194f9641a64828 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a9aab1255bdc3aa23acbc3cbb89c175d56fdf9b", + "version": "4.1.3", + "port-version": 12 + }, { "git-tree": "fa00dc5de34d5076f7d7bad06b649b6ce4412b68", "version": "4.1.3", From dfc21e3f283230d01dd564635aef30ad18fdb6e9 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 11 Oct 2023 06:01:31 +0800 Subject: [PATCH 0054/1039] [SDL2] Update version to 2.28.4 (#34342) --- ports/sdl2/portfile.cmake | 3 ++- ports/sdl2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- 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 2fa57963787410..85de3d93e6f68e 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 6383280f12f7fc75b958a4354da2a5b3dfe4364eb7f65354546c5f9e95492c0f5da721a39dc9b90cdd91fdcea0153b153cdf31c0cd635e74786d23828d4184b0 + SHA512 3199e535033c8728bd12b97931d5c5d7a7dcc9b0f502109ff722982601b6fbb00995d71cbaab7d3b780c738deece235ef76ab1963ce946084c482c2d31a4abe8 HEAD_REF main PATCHES deps.patch @@ -51,6 +51,7 @@ vcpkg_cmake_configure( -DSDL_LIBSAMPLERATE_SHARED=OFF MAYBE_UNUSED_VARIABLES SDL_FORCE_STATIC_VCRT + PKG_CONFIG_USE_CMAKE_PREFIX_PATH ) vcpkg_cmake_install() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 16d148a40a419c..870805a02342d3 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version": "2.28.3", - "port-version": 1, + "version": "2.28.4", "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 733c4df870de66..1ccf841d92884d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7561,8 +7561,8 @@ "port-version": 6 }, "sdl2": { - "baseline": "2.28.3", - "port-version": 1 + "baseline": "2.28.4", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index e254df72244c67..5de84c2f71515d 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "289db88c23499b30e20bf972b2e1e68c093e5dea", + "version": "2.28.4", + "port-version": 0 + }, { "git-tree": "6b6220c48794ae1238dd8a6b491059446a8d3ebb", "version": "2.28.3", From 64c330e2e7c616c654a766354131ea0ad404917d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 11 Oct 2023 02:32:58 +0200 Subject: [PATCH 0055/1039] [soci] Fix dependencies in, intern, out (#34327) --- ports/soci/dependencies.diff | 100 ++++++++++++++++++ ports/soci/fix-dependency-libmysql.patch | 14 --- ports/soci/fix-mysql-feature-error.patch | 12 --- ports/soci/portfile.cmake | 69 ++++++------ ports/soci/usage | 7 ++ ...ude-dirs.patch => usage-requirements.diff} | 13 +-- ports/soci/vcpkg.json | 27 +++-- scripts/ci.baseline.txt | 5 + .../test_ports/vcpkg-ci-soci/portfile.cmake | 4 + .../vcpkg-ci-soci/project/CMakeLists.txt | 13 +++ .../test_ports/vcpkg-ci-soci/project/main.cpp | 11 ++ scripts/test_ports/vcpkg-ci-soci/vcpkg.json | 20 ++++ versions/baseline.json | 2 +- versions/s-/soci.json | 5 + 14 files changed, 229 insertions(+), 73 deletions(-) create mode 100644 ports/soci/dependencies.diff delete mode 100644 ports/soci/fix-dependency-libmysql.patch delete mode 100644 ports/soci/fix-mysql-feature-error.patch create mode 100644 ports/soci/usage rename ports/soci/{export-include-dirs.patch => usage-requirements.diff} (82%) create mode 100644 scripts/test_ports/vcpkg-ci-soci/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-soci/project/main.cpp create mode 100644 scripts/test_ports/vcpkg-ci-soci/vcpkg.json diff --git a/ports/soci/dependencies.diff b/ports/soci/dependencies.diff new file mode 100644 index 00000000000000..187022d0ec981f --- /dev/null +++ b/ports/soci/dependencies.diff @@ -0,0 +1,100 @@ +diff --git a/cmake/dependencies/Boost.cmake b/cmake/dependencies/Boost.cmake +index 366d32b..7ff041b 100644 +--- a/cmake/dependencies/Boost.cmake ++++ b/cmake/dependencies/Boost.cmake +@@ -10,4 +10,6 @@ endif() + set(Boost_RELEASE_VERSION + "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}") + ++set(BOOST_FOUND "${Boost_FOUND}") ++set(BOOST_LIBRARIES "${Boost_LIBRARIES}") + boost_external_report(Boost RELEASE_VERSION INCLUDE_DIR LIBRARIES) +diff --git a/cmake/dependencies/MySQL.cmake b/cmake/dependencies/MySQL.cmake +index 5599b08..0a4ce0f 100644 +--- a/cmake/dependencies/MySQL.cmake ++++ b/cmake/dependencies/MySQL.cmake +@@ -1,5 +1,9 @@ + set(MySQL_FIND_QUIETLY TRUE) + +-find_package(MySQL) ++find_package(MYSQL NAMES unofficial-libmysql REQUIRED) ++set(MYSQL_LIBRARIES "$") ++if(TARGET mysqlclient AND NOT TARGET libmysql) ++ set(MYSQL_LIBRARIES "$") ++endif() + + boost_external_report(MySQL INCLUDE_DIR LIBRARIES) +diff --git a/cmake/dependencies/PostgreSQL.cmake b/cmake/dependencies/PostgreSQL.cmake +index c6f2154..ef6bfcd 100644 +--- a/cmake/dependencies/PostgreSQL.cmake ++++ b/cmake/dependencies/PostgreSQL.cmake +@@ -1,5 +1,8 @@ + set(PostgreSQL_FIND_QUIETLY TRUE) + +-find_package(PostgreSQL) ++find_package(PostgreSQL REQUIRED) ++set(POSTGRESQL_FOUND TRUE) ++set(POSTGRESQL_INCLUDE_DIRS "${PostgreSQL_INCLUDE_DIRS}") ++set(POSTGRESQL_LIBRARIES "${PostgreSQL_LIBRARIES}") + + boost_external_report(PostgreSQL INCLUDE_DIRS LIBRARIES VERSION) +diff --git a/cmake/dependencies/SQLite3.cmake b/cmake/dependencies/SQLite3.cmake +index 0daa9a5..17775da 100644 +--- a/cmake/dependencies/SQLite3.cmake ++++ b/cmake/dependencies/SQLite3.cmake +@@ -1,5 +1,6 @@ + set(SQLITE3_FIND_QUIETLY TRUE) + +-find_package(SQLite3) ++find_package(SQLITE3 NAMES unofficial-sqlite3 CONFIG REQUIRED) ++set(SQLITE3_LIBRARIES unofficial::sqlite3::sqlite3) + + boost_external_report(SQLite3 INCLUDE_DIR LIBRARIES) +diff --git a/cmake/resources/SOCIConfig.cmake.in b/cmake/resources/SOCIConfig.cmake.in +index 8096a3c..354c18b 100644 +--- a/cmake/resources/SOCIConfig.cmake.in ++++ b/cmake/resources/SOCIConfig.cmake.in +@@ -1,3 +1,11 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++if("@WITH_MYSQL@") ++ find_dependency(unofficial-libmysql) ++endif() ++if("@WITH_SQLITE3@") ++ find_dependency(unofficial-sqlite3) ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/SOCITargets.cmake) +diff --git a/include/soci/mysql/soci-mysql.h b/include/soci/mysql/soci-mysql.h +index 376bb7e..fbe48fa 100644 +--- a/include/soci/mysql/soci-mysql.h ++++ b/include/soci/mysql/soci-mysql.h +@@ -21,8 +21,8 @@ + #ifdef _WIN32 + #include // SOCKET + #endif // _WIN32 +-#include // MySQL Client +-#include // MySQL Error codes ++#include // MySQL Client ++#include // MySQL Error codes + #include + + +diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt +index 871e151..3cffc80 100644 +--- a/src/backends/CMakeLists.txt ++++ b/src/backends/CMakeLists.txt +@@ -14,9 +14,9 @@ colormsg(_HIBLUE_ "Configuring SOCI backend libraries:") + foreach(dep ${SOCI_BACKENDS_DB_DEPENDENCIES}) + string(TOUPPER ${dep} depUP) + if (WITH_${depUP}) +- find_package(${dep}) +- endif() +- if(${dep}_FOUND OR ${depUP}_FOUND) ++ if(NOT (${dep}_FOUND OR ${depUP}_FOUND)) ++ message(FATAL_ERROR "${depUP} not found, check SociDependencies.cmake") ++ endif() + set(${depUP}_FOUND ON) + else() + set(${depUP}_FOUND OFF) diff --git a/ports/soci/fix-dependency-libmysql.patch b/ports/soci/fix-dependency-libmysql.patch deleted file mode 100644 index 809ec76d5be325..00000000000000 --- a/ports/soci/fix-dependency-libmysql.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 1233568..9a7cb61 100644 ---- a/cmake/modules/FindMySQL.cmake -+++ b/cmake/modules/FindMySQL.cmake -@@ -13,6 +13,9 @@ - # - # Redistribution and use is allowed according to the terms of the BSD license. - # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+find_package(libmysql REQUIRED) -+set(MySQL_FOUND 1) -+return() - - include(CheckCXXSourceCompiles) - diff --git a/ports/soci/fix-mysql-feature-error.patch b/ports/soci/fix-mysql-feature-error.patch deleted file mode 100644 index 05e9c4bfe04a23..00000000000000 --- a/ports/soci/fix-mysql-feature-error.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp -index 383248c..86a5bfd 100644 ---- a/src/backends/mysql/session.cpp -+++ b/src/backends/mysql/session.cpp -@@ -5,6 +5,7 @@ - // (See accompanying file LICENSE_1_0.txt or copy at - // http://www.boost.org/LICENSE_1_0.txt) - // -+typedef bool my_bool; - - #define SOCI_MYSQL_SOURCE - #include "soci/mysql/soci-mysql.h" diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 71dc324a17ae9b..cba1e3515895e8 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -5,57 +5,62 @@ vcpkg_from_github( SHA512 d501f55e7e7408e46b4823fd8a97d6ef587f5db0f5b98434be8dfc5693c91b8c3b84a24454279c83142ab1cd1fa139c6e54d6d9a67397b2ead61650fcc88bcdb HEAD_REF master PATCHES - fix-dependency-libmysql.patch - export-include-dirs.patch - fix-mysql-feature-error.patch # https://bugs.mysql.com/bug.php?id=85131 + dependencies.diff + usage-requirements.diff +) +file(REMOVE + "${SOURCE_PATH}/cmake/modules/FindPostgreSQL.cmake" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOCI_STATIC) -# Handle features -set(_COMPONENT_FLAGS "") -foreach(_feature IN LISTS ALL_FEATURES) - # Uppercase the feature name and replace "-" with "_" - string(TOUPPER "${_feature}" _FEATURE) - string(REPLACE "-" "_" _FEATURE "${_FEATURE}") - - # Turn "-DWITH_*=" ON or OFF depending on whether the feature - # is in the list. - if(_feature IN_LIST FEATURES) - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") - else() - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") - endif() - - if(_feature MATCHES "mysql") - set(MYSQL_OPT "-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql") - endif() -endforeach() +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + boost WITH_BOOST + boost CMAKE_REQUIRE_FIND_PACKAGE_Boost + empty SOCI_EMPTY + mysql WITH_MYSQL + odbc WITH_ODBC + odbc CMAKE_REQUIRE_FIND_PACKAGE_ODBC + postgresql WITH_POSTGRESQL + sqlite3 WITH_SQLITE3 + INVERTED_FEATURES + core WITH_DB2 + core WITH_FIREBIRD + core WITH_ORACLE + core WITH_VALGRIND +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DSOCI_TESTS=OFF -DSOCI_CXX11=ON - -DSOCI_STATIC=${SOCI_STATIC} -DSOCI_SHARED=${SOCI_DYNAMIC} - ${_COMPONENT_FLAGS} - ${MYSQL_OPT} + -DSOCI_STATIC=${SOCI_STATIC} + -DSOCI_TESTS=OFF + ${options} + MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_Boost + CMAKE_REQUIRE_FIND_PACKAGE_ODBC ) vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SOCI) -if ("mysql" IN_LIST FEATURES) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake" - "# Create imported target SOCI::soci_mysql" - "\ninclude(CMakeFindDependencyMacro)\nfind_dependency(libmysql)\n# Create imported target SOCI::soci_mysql" - ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/soci/soci-platform.h" "ifdef SOCI_DLL" "if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright +set(backends ${FEATURES}) +list(REMOVE_ITEM backends core boost) +if(backends STREQUAL "") + message(STATUS "Attention:\n\nThis soci build doesn't include any backends.\n") + set(backends "none") +endif() +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/soci/usage b/ports/soci/usage new file mode 100644 index 00000000000000..ce30356b1cee8a --- /dev/null +++ b/ports/soci/usage @@ -0,0 +1,7 @@ +soci provides CMake targets: + + find_package(soci CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SOCI::soci_core,SOCI::soci_core_static>) + + # Linking specific backends (enabled: @backends@) + target_link_libraries(main PRIVATE $,SOCI::soci_,SOCI::soci__static>) diff --git a/ports/soci/export-include-dirs.patch b/ports/soci/usage-requirements.diff similarity index 82% rename from ports/soci/export-include-dirs.patch rename to ports/soci/usage-requirements.diff index e141363fc2e894..9ecd405c96fd61 100644 --- a/ports/soci/export-include-dirs.patch +++ b/ports/soci/usage-requirements.diff @@ -1,15 +1,14 @@ diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake -index 5d4ef0d..bb0edf2 100644 +index 5d4ef0d..279cb75 100644 --- a/cmake/SociBackend.cmake +++ b/cmake/SociBackend.cmake -@@ -159,8 +159,14 @@ macro(soci_backend NAME) +@@ -159,8 +159,13 @@ macro(soci_backend NAME) ${THIS_BACKEND_HEADERS}) target_link_libraries(${THIS_BACKEND_TARGET} + PUBLIC ${SOCI_CORE_TARGET} ${THIS_BACKEND_DEPENDS_LIBRARIES}) -+ + target_include_directories(${THIS_BACKEND_TARGET} + PUBLIC + ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} @@ -17,20 +16,18 @@ index 5d4ef0d..bb0edf2 100644 if(WIN32) set_target_properties(${THIS_BACKEND_TARGET} -@@ -197,9 +203,15 @@ macro(soci_backend NAME) +@@ -197,8 +202,14 @@ macro(soci_backend NAME) # Still need to link the libraries for tests to work target_link_libraries (${THIS_BACKEND_TARGET_STATIC} + PUBLIC ++ ${SOCI_CORE_TARGET}_static ${THIS_BACKEND_DEPENDS_LIBRARIES} ) -- -+ + target_include_directories(${THIS_BACKEND_TARGET_STATIC} + PUBLIC + ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} + ) -+ + set_target_properties(${THIS_BACKEND_TARGET_STATIC} PROPERTIES - OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME} diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index db687ca0842709..67aa3e83ffe8a7 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,9 +1,9 @@ { "name": "soci", "version": "4.0.3", - "port-version": 1, - "description": "SOCI database access library", - "homepage": "https://github.com/SOCI/soci", + "port-version": 2, + "description": "SOCI - The C++ Database Access Library", + "homepage": "https://soci.sourceforge.net/", "license": "BSL-1.0", "dependencies": [ { @@ -26,6 +26,9 @@ "boost-tuple" ] }, + "empty": { + "description": "Build the backend skeleton for new backends development" + }, "mysql": { "description": "Build mysql backend", "dependencies": [ @@ -34,18 +37,30 @@ }, "odbc": { "description": "Build odbc backend", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + } + ] }, "postgresql": { "description": "Build postgresql backend", "dependencies": [ - "libpq" + { + "name": "libpq", + "default-features": false + } ] }, "sqlite3": { "description": "Build sqlite3 backend", "dependencies": [ - "sqlite3" + { + "name": "sqlite3", + "default-features": false + } ] } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c1896a01086eb2..49f226b2a618a8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1414,6 +1414,11 @@ vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-soci:x64-linux=pass +vcpkg-ci-soci:x64-osx=pass +vcpkg-ci-soci:x64-windows=pass +vcpkg-ci-soci:x64-windows-static=pass +vcpkg-ci-soci:x64-windows-static-md=pass vcpkg-ci-wxwidgets:arm64-windows=pass vcpkg-ci-wxwidgets:x64-linux=pass vcpkg-ci-wxwidgets:x64-osx=pass diff --git a/scripts/test_ports/vcpkg-ci-soci/portfile.cmake b/scripts/test_ports/vcpkg-ci-soci/portfile.cmake new file mode 100644 index 00000000000000..bc785962c8d5de --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/portfile.cmake @@ -0,0 +1,4 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt new file mode 100644 index 00000000000000..31535c1b8f0eed --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/project/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.7) +project(soci-test CXX) + +if(APPLE) + set(CMAKE_CXX_STANDARD 11) +endif() + +add_executable(main main.cpp) + +find_package(SOCI CONFIG REQUIRED) +target_link_libraries(main PRIVATE $,SOCI::soci_mysql,SOCI::soci_mysql_static>) +target_link_libraries(main PRIVATE $,SOCI::soci_postgresql,SOCI::soci_postgresql_static>) +target_link_libraries(main PRIVATE $,SOCI::soci_sqlite3,SOCI::soci_sqlite3_static>) diff --git a/scripts/test_ports/vcpkg-ci-soci/project/main.cpp b/scripts/test_ports/vcpkg-ci-soci/project/main.cpp new file mode 100644 index 00000000000000..86377acc547a1d --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/project/main.cpp @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +int main() +{ + soci::session mysql_db(soci::mysql, "test:mysql"); + soci::session pgsql_db(soci::postgresql, "test:postgresql"); + soci::session sqlite3_db(soci::sqlite3, "test.db"); +} diff --git a/scripts/test_ports/vcpkg-ci-soci/vcpkg.json b/scripts/test_ports/vcpkg-ci-soci/vcpkg.json new file mode 100644 index 00000000000000..8ff0c2916013b0 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-soci/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "vcpkg-ci-soci", + "version-string": "ci", + "description": "Validates soci", + "supports": "x64 & (linux | osx | windows) & !uwp", + "dependencies": [ + { + "name": "soci", + "features": [ + "mysql", + "postgresql", + "sqlite3" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1ccf841d92884d..8eb8e408f21974 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7818,7 +7818,7 @@ }, "soci": { "baseline": "4.0.3", - "port-version": 1 + "port-version": 2 }, "socket-io-client": { "baseline": "2023-02-14", diff --git a/versions/s-/soci.json b/versions/s-/soci.json index 9df5c8393297a8..b347173c78fdfb 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63f4471adc41e108aed34cd585a06e354f1b4762", + "version": "4.0.3", + "port-version": 2 + }, { "git-tree": "9a70ee9344f5a66ed9ad34a5f64608b81e66bfde", "version": "4.0.3", From 51475feaccb720ab40e5a0e3f8da70a4510defc0 Mon Sep 17 00:00:00 2001 From: Zhihao Lin <3955922+kkqy@users.noreply.github.com> Date: Wed, 11 Oct 2023 08:42:35 +0800 Subject: [PATCH 0056/1039] [talib] New port (#34316) --- ports/talib/portfile.cmake | 81 ++++++++++++++++++++++++++++++++++++++ ports/talib/vcpkg.json | 14 +++++++ versions/baseline.json | 4 ++ versions/t-/talib.json | 9 +++++ 4 files changed, 108 insertions(+) create mode 100644 ports/talib/portfile.cmake create mode 100644 ports/talib/vcpkg.json create mode 100644 versions/t-/talib.json diff --git a/ports/talib/portfile.cmake b/ports/talib/portfile.cmake new file mode 100644 index 00000000000000..f7a8e85e7f04dc --- /dev/null +++ b/ports/talib/portfile.cmake @@ -0,0 +1,81 @@ +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO "ta-lib/ta-lib" + REF "${VERSION}" + FILENAME "ta-lib-${VERSION}-msvc.zip" + SHA512 5f211327b6a1d4f00d0a2b9e276adadd118d7aa29fc87c6771d550fda124a863b4a20e3803f325f7c903c82ea12bfb23121a5f0566eeaa434e0f107a6eedb737 +) + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(LFLAG "d") +else() + set(LFLAG "m") +endif() + +# Debug build +if (NOT VCPKG_BUILD_TYPE) + vcpkg_execute_build_process( + COMMAND nmake -f Makefile + WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}d/win32/msvc" + LOGNAME build-${TARGET_TRIPLET}-dbg + ) + + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_abstract.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_libc.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_func.lib + ) + file( + INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}d.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME ta_common.lib + ) +endif() + +# Release build +vcpkg_execute_build_process( + COMMAND nmake -f Makefile + WORKING_DIRECTORY "${SOURCE_PATH}/c/make/c${LFLAG}r/win32/msvc" + LOGNAME build-${TARGET_TRIPLET}-rel +) + +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_abstract_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_abstract.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_libc_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_libc.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_func_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_func.lib +) +file( + INSTALL "${SOURCE_PATH}/c/lib/ta_common_c${LFLAG}r.lib" + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME ta_common.lib +) + +# Include files +file( + INSTALL "${SOURCE_PATH}/c/include" + DESTINATION ${CURRENT_PACKAGES_DIR} +) + +# License file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") diff --git a/ports/talib/vcpkg.json b/ports/talib/vcpkg.json new file mode 100644 index 00000000000000..a67a685f420950 --- /dev/null +++ b/ports/talib/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "talib", + "version-semver": "0.4.0", + "description": "TA-Lib - Technical Analysis Library", + "homepage": "https://ta-lib.github.io/", + "license": "BSD-2-Clause", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8eb8e408f21974..fe5e1b34cce418 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8128,6 +8128,10 @@ "baseline": "1.13.1", "port-version": 1 }, + "talib": { + "baseline": "0.4.0", + "port-version": 0 + }, "taocpp-json": { "baseline": "2020-09-14", "port-version": 3 diff --git a/versions/t-/talib.json b/versions/t-/talib.json new file mode 100644 index 00000000000000..4878e213ef84a3 --- /dev/null +++ b/versions/t-/talib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "639b6ba11c1768faf5ab92f42d4cdf0a1bba2270", + "version-semver": "0.4.0", + "port-version": 0 + } + ] +} From b40de44891dc1cab11d4722094ae44807a837b98 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 11 Oct 2023 11:10:58 -0700 Subject: [PATCH 0057/1039] [curl] Update to 8.4.0. (#34405) This fixes a HIGH severity vulnerability: https://daniel.haxx.se/blog/2023/10/11/curl-8-4-0/ See also: https://daniel.haxx.se/blog/2023/10/11/how-i-made-a-heap-overflow-in-curl/ Resolves: https://github.com/microsoft/vcpkg/issues/34281 --- ports/curl/0002_fix_uwp.patch | 33 ++++++++++++++--------- ports/curl/0005_remove_imp_suffix.patch | 4 +-- ports/curl/0012-fix-dependency-idn2.patch | 4 +-- ports/curl/0020-fix-pc-file.patch | 4 +-- ports/curl/0022-deduplicate-libs.patch | 4 +-- ports/curl/cmake-config.patch | 4 +-- ports/curl/dependencies.patch | 13 ++++----- ports/curl/export-components.patch | 4 +-- ports/curl/mbedtls-ws2_32.patch | 4 +-- ports/curl/portfile.cmake | 2 +- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 ++++ 13 files changed, 50 insertions(+), 35 deletions(-) diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index fd176d8e3d9aad..7e2cf7cd909f58 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -1,15 +1,24 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 9bb8f0b..7678f43 100644 +index 6f84919..b838245 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -216,6 +216,10 @@ if(BUILD_SHARED_LIBS) - $) - endif() - -+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ set_property(TARGET ${LIB_SELECTED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") -+endif() -+ - add_library(${LIB_NAME} ALIAS ${LIB_SELECTED}) - add_library(${PROJECT_NAME}::${LIB_NAME} ALIAS ${LIB_SELECTED}) - +@@ -162,6 +162,9 @@ if(BUILD_STATIC_LIBS) + INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++ endif() + if(CMAKEVERSION AND CMAKESONAME) + set_target_properties(${LIB_STATIC} PROPERTIES + VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME}) +@@ -197,6 +200,9 @@ if(BUILD_SHARED_LIBS) + INTERPROCEDURAL_OPTIMIZATION_RELEASE TRUE + INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE) + endif() ++ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ set_property(TARGET ${LIB_SHARED} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS") ++ endif() + if(CMAKEVERSION AND CMAKESONAME) + set_target_properties(${LIB_SHARED} PROPERTIES + VERSION ${CMAKEVERSION} SOVERSION ${CMAKESONAME}) diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index a5367056953852..5fe94196a5789e 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -1,8 +1,8 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 7678f43..00f61f8 100644 +index b838245..3199160 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -105,7 +105,6 @@ endif() +@@ -92,7 +92,6 @@ endif() if(WIN32 AND NOT IMPORT_LIB_SUFFIX AND CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL CMAKE_IMPORT_LIBRARY_SUFFIX) diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index 9db27979e1aa12..c0efbba3a208c7 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f6de81..6702845 100644 +index 1b19c68..bb5fba9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,6 +632,7 @@ endif() +@@ -839,7 +839,8 @@ endif() # Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) if(USE_LIBIDN2) diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index 21eab0933baf2d..aad6ed9c2a0492 100644 --- a/ports/curl/0020-fix-pc-file.patch +++ b/ports/curl/0020-fix-pc-file.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b2e428..ea430f4 100644 +index bb5fba9..9919fd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1505,7 +1505,9 @@ set(includedir "\${prefix}/include") +@@ -1624,7 +1624,9 @@ set(includedir "\${prefix}/include") set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") set(LIBCURL_LIBS "") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch index ac447ea8152500..aa47329589d352 100644 --- a/ports/curl/0022-deduplicate-libs.patch +++ b/ports/curl/0022-deduplicate-libs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a35ee52..ee133d5 100644 +index 9919fd3..7e513f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1611,6 +1611,7 @@ if(BUILD_SHARED_LIBS) +@@ -1654,6 +1654,7 @@ if(BUILD_SHARED_LIBS) else() set(ENABLE_SHARED "no") set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") diff --git a/ports/curl/cmake-config.patch b/ports/curl/cmake-config.patch index d80042c990c329..39b7d28316f6b0 100644 --- a/ports/curl/cmake-config.patch +++ b/ports/curl/cmake-config.patch @@ -1,8 +1,8 @@ diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index 056907c4f..56f7c9dd9 100644 +index c89c686..2f39949 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in -@@ -35,4 +35,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") +@@ -45,4 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") # Alias for either shared or static library diff --git a/ports/curl/dependencies.patch b/ports/curl/dependencies.patch index 80b5dba45a658d..affbc5ec3063f7 100644 --- a/ports/curl/dependencies.patch +++ b/ports/curl/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index dbe4ed2..edf87fa 100644 +index 056907c..c89c686 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in -@@ -31,5 +31,15 @@ if(@USE_ZLIB@) +@@ -31,6 +31,16 @@ if(@USE_ZLIB@) find_dependency(ZLIB @ZLIB_VERSION_MAJOR@) endif() @@ -18,11 +18,12 @@ index dbe4ed2..edf87fa 100644 + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") + diff --git a/CMakeLists.txt b/CMakeLists.txt -index ad3a63d..917cdbf 100644 +index 049ac34..cc0fe19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -151,7 +151,8 @@ set(CURL_LIBS "") +@@ -178,7 +178,8 @@ set(CURL_LIBS "") if(ENABLE_ARES) set(USE_ARES 1) @@ -32,7 +33,7 @@ index ad3a63d..917cdbf 100644 list(APPEND CURL_LIBS ${CARES_LIBRARY}) endif() -@@ -524,7 +525,9 @@ endif() +@@ -590,7 +591,9 @@ endif() option(CURL_BROTLI "Set to ON to enable building curl with brotli support." OFF) set(HAVE_BROTLI OFF) if(CURL_BROTLI) @@ -43,7 +44,7 @@ index ad3a63d..917cdbf 100644 if(BROTLI_FOUND) set(HAVE_BROTLI ON) set(CURL_LIBS "${BROTLI_LIBRARIES};${CURL_LIBS}") # For 'ld' linker. Emulate `list(PREPEND ...)` to stay compatible with Date: Thu, 12 Oct 2023 19:46:42 +0200 Subject: [PATCH 0058/1039] [llvm] update to v17.0.2 (#33600) --- ports/halide/portfile.cmake | 7 +- ports/halide/vcpkg.json | 27 +-- ports/llvm/0001-Fix-install-paths.patch | 208 ------------------ ports/llvm/0001-fix-install-package-dir.patch | 13 ++ ports/llvm/0002-Fix-DR-1734.patch | 17 -- ...patch => 0002-fix-tools-install-dir.patch} | 129 +++++------ ...-path.patch => 0003-fix-llvm-config.patch} | 4 +- .../0004-Fix-compiler-rt-install-path.patch | 44 ---- ...atch => 0004-disable-libomp-aliases.patch} | 31 ++- ...ve-numpy.patch => 0005-remove-numpy.patch} | 13 +- ...6-create-destination-mlir-directory.patch} | 11 +- ports/llvm/0007-Fix-install-bolt.patch | 21 -- .../llvm/0007-fix-compiler-rt-warnings.patch | 45 ++++ ports/llvm/0008-llvm_assert.patch | 18 -- ports/llvm/0011-missing-include.patch | 12 - ports/llvm/portfile.cmake | 186 +++++++++------- ports/llvm/vcpkg.json | 122 +++++----- ...ver-llvm-move-to-modern-pass-manager.patch | 127 +++++++++++ .../mesa/gallium-fix-build-with-llvm-17.patch | 42 ++++ ports/mesa/portfile.cmake | 13 +- ports/mesa/vcpkg.json | 3 +- ports/symengine/portfile.cmake | 4 +- ports/symengine/vcpkg.json | 3 +- scripts/test_ports/vcpkg-ci-llvm/vcpkg.json | 8 +- versions/baseline.json | 14 +- versions/h-/halide.json | 5 + versions/l-/llvm.json | 5 + versions/m-/mesa.json | 5 + versions/s-/symengine.json | 5 + 29 files changed, 541 insertions(+), 601 deletions(-) delete mode 100644 ports/llvm/0001-Fix-install-paths.patch create mode 100644 ports/llvm/0001-fix-install-package-dir.patch delete mode 100644 ports/llvm/0002-Fix-DR-1734.patch rename ports/llvm/{0005-Fix-tools-install-path.patch => 0002-fix-tools-install-dir.patch} (71%) rename ports/llvm/{0003-Fix-tools-path.patch => 0003-fix-llvm-config.patch} (87%) delete mode 100644 ports/llvm/0004-Fix-compiler-rt-install-path.patch rename ports/llvm/{0009-disable-libomp-aliases.patch => 0004-disable-libomp-aliases.patch} (59%) rename ports/llvm/{0010-remove-numpy.patch => 0005-remove-numpy.patch} (70%) rename ports/llvm/{0012-create-destination-mlir-directory.patch => 0006-create-destination-mlir-directory.patch} (55%) delete mode 100644 ports/llvm/0007-Fix-install-bolt.patch create mode 100644 ports/llvm/0007-fix-compiler-rt-warnings.patch delete mode 100644 ports/llvm/0008-llvm_assert.patch delete mode 100644 ports/llvm/0011-missing-include.patch create mode 100644 ports/mesa/clover-llvm-move-to-modern-pass-manager.patch create mode 100644 ports/mesa/gallium-fix-build-with-llvm-17.patch diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 34e9f9ba5ffba2..54ff0b5a6e0bb4 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide - REF "v${VERSION}" - SHA512 4fc5253ad0e8fca2fd347ef139c8c150e2fb5dd2351da2b13adb9e00530a9d55943bc4952c1d42706a9ffbb57f81ed2854536d9e2f32dfab0dfc741696cc7e61 + REF 6569a831f2ee7f1a2e3d809c36fb92514d710c44 + SHA512 48c5a000719835d5119fd2c50b026c9125aeab4021641d2891b89ac8da3ec7c02c5f86837779dcae6e6bc8d929f6a182045bebe7e0990e33844b4d52f21df519 HEAD_REF main ) @@ -18,11 +18,11 @@ vcpkg_check_features( target-opengl-compute TARGET_OPENGLCOMPUTE target-hexagon TARGET_HEXAGON target-metal TARGET_METAL - target-mips TARGET_MIPS target-nvptx TARGET_NVPTX target-opencl TARGET_OPENCL target-powerpc TARGET_POWERPC target-riscv TARGET_RISCV + target-webassembly TARGET_WEBASSEMBLY target-x86 TARGET_X86 ) @@ -36,6 +36,7 @@ vcpkg_cmake_configure( -DWITH_TESTS=OFF -DWITH_TUTORIALS=OFF -DWITH_UTILS=OFF + -DWITH_SERIALIZATION=OFF # Disable experimental serializer -DCMAKE_INSTALL_LIBDIR=bin "-DCMAKE_INSTALL_DATADIR=share/${PORT}" "-DHalide_INSTALL_CMAKEDIR=share/${PORT}" diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index c1762d39f32d3d..7b541db5860953 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,6 +1,7 @@ { "name": "halide", "version": "16.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", @@ -81,12 +82,12 @@ "target-d3d12compute", "target-hexagon", "target-metal", - "target-mips", "target-nvptx", "target-opencl", "target-opengl-compute", "target-powerpc", "target-riscv", + "target-webassembly", "target-x86" ] } @@ -134,18 +135,6 @@ "target-metal": { "description": "Include Metal target" }, - "target-mips": { - "description": "Include Mips target", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "target-mips" - ] - } - ] - }, "target-nvptx": { "description": "Include NVPTX target", "dependencies": [ @@ -188,6 +177,18 @@ } ] }, + "target-webassembly": { + "description": "Include WebAssembly target", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-webassembly" + ] + } + ] + }, "target-x86": { "description": "Include X86 target", "dependencies": [ diff --git a/ports/llvm/0001-Fix-install-paths.patch b/ports/llvm/0001-Fix-install-paths.patch deleted file mode 100644 index 9f303e642e3889..00000000000000 --- a/ports/llvm/0001-Fix-install-paths.patch +++ /dev/null @@ -1,208 +0,0 @@ - clang/cmake/modules/CMakeLists.txt | 4 ++-- - clang/utils/hmaptool/CMakeLists.txt | 2 +- - compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 2 +- - flang/cmake/modules/CMakeLists.txt | 4 ++-- - lld/cmake/modules/CMakeLists.txt | 4 ++-- - llvm/CMakeLists.txt | 2 +- - llvm/cmake/modules/AddLLVM.cmake | 2 +- - llvm/cmake/modules/CMakeLists.txt | 2 +- - mlir/cmake/modules/CMakeLists.txt | 8 ++++---- - mlir/test/CMakeLists.txt | 2 +- - openmp/tools/Modules/CMakeLists.txt | 2 +- - polly/cmake/CMakeLists.txt | 8 ++++---- - 12 files changed, 21 insertions(+), 21 deletions(-) - -diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt -index 6a7fa2fa27eb..a17f807ab155 100644 ---- a/clang/cmake/modules/CMakeLists.txt -+++ b/clang/cmake/modules/CMakeLists.txt -@@ -6,13 +6,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(CLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/clang" CACHE STRING -+set(CLANG_INSTALL_PACKAGE_DIR "share/clang" CACHE STRING - "Path for CMake subdirectory for Clang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/clang')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/clang") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt -index 511268069bd1..72915ec66504 100644 ---- a/clang/utils/hmaptool/CMakeLists.txt -+++ b/clang/utils/hmaptool/CMakeLists.txt -@@ -1,4 +1,4 @@ --install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) -+install(PROGRAMS hmaptool DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) - add_custom_target(hmaptool ALL DEPENDS "hmaptool") - set_target_properties(hmaptool PROPERTIES FOLDER "Utils") - -diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -index e322af89a042..0df6a7a775cd 100644 ---- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -+++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake -@@ -377,7 +377,7 @@ macro(load_llvm_config) - file(TO_CMAKE_PATH ${LLVM_CMAKE_DIR_FROM_LLVM_CONFIG} LLVM_CMAKE_DIR) - else() - file(TO_CMAKE_PATH ${LLVM_BINARY_DIR} LLVM_BINARY_DIR_CMAKE_STYLE) -- set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+ set(LLVM_CMAKE_DIR "${LLVM_BINARY_DIR_CMAKE_STYLE}/share/llvm") - endif() - - set(LLVM_CMAKE_INCLUDE_FILE "${LLVM_CMAKE_DIR}/LLVMConfig.cmake") -diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt -index 105cc09bf850..460db6c1d9e7 100644 ---- a/flang/cmake/modules/CMakeLists.txt -+++ b/flang/cmake/modules/CMakeLists.txt -@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(FLANG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/flang" CACHE STRING -+set(FLANG_INSTALL_PACKAGE_DIR "share/flang" CACHE STRING - "Path for CMake subdirectory for Flang (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/flang')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/flang") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt -index 57195bce45c9..e24c080725d7 100644 ---- a/lld/cmake/modules/CMakeLists.txt -+++ b/lld/cmake/modules/CMakeLists.txt -@@ -5,13 +5,13 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(LLD_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/lld" CACHE STRING -+set(LLD_INSTALL_PACKAGE_DIR "share/lld" CACHE STRING - "Path for CMake subdirectory for LLD (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/lld')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/lld") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt -index 4be91312271d..d6002808a205 100644 ---- a/llvm/CMakeLists.txt -+++ b/llvm/CMakeLists.txt -@@ -325,7 +325,7 @@ set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name - # LLVM_INSTALL_PACKAGE_DIR needs to be declared prior to adding the tools - # subdirectory in order to have the value available for llvm-config. - include(GNUInstallPackageDir) --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - - set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake -index 057431208322..89cbba8a5676 100644 ---- a/llvm/cmake/modules/AddLLVM.cmake -+++ b/llvm/cmake/modules/AddLLVM.cmake -@@ -1093,7 +1093,7 @@ function(process_llvm_pass_plugins) - message(FATAL_ERROR "LLVM_INSTALL_PACKAGE_DIR must be defined and writable. GEN_CONFIG should only be passe when building LLVM proper.") - endif() - # LLVM_INSTALL_PACKAGE_DIR might be absolute, so don't reuse below. -- set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+ set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - file(WRITE - "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake" - "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") -diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt -index 470881516915..36d2e9aa2120 100644 ---- a/llvm/cmake/modules/CMakeLists.txt -+++ b/llvm/cmake/modules/CMakeLists.txt -@@ -3,7 +3,7 @@ include(LLVMDistributionSupport) - include(FindPrefixFromConfig) - - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. - set(LLVM_EXPORTS_FILE ${llvm_cmake_builddir}/LLVMExports.cmake) -diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt -index 5fd9454cad93..af1d73a852c7 100644 ---- a/mlir/cmake/modules/CMakeLists.txt -+++ b/mlir/cmake/modules/CMakeLists.txt -@@ -6,16 +6,16 @@ include(FindPrefixFromConfig) - # Generate a list of CMake library targets so that other CMake projects can - # link against them. LLVM calls its version of this file LLVMExports.cmake, but - # the usual CMake convention seems to be ${Project}Targets.cmake. --set(MLIR_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/mlir" CACHE STRING -+set(MLIR_INSTALL_PACKAGE_DIR "share/mlir" CACHE STRING - "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -+set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/share/mlir") - - # Keep this in sync with llvm/cmake/CMakeLists.txt! --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS) - export(TARGETS ${MLIR_EXPORTS} FILE ${mlir_cmake_builddir}/MLIRTargets.cmake) -diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt -index 74f805865d2d..998ddb3b48e8 100644 ---- a/mlir/test/CMakeLists.txt -+++ b/mlir/test/CMakeLists.txt -@@ -8,7 +8,7 @@ endif() - # Passed to lit.site.cfg.py.so that the out of tree Standalone dialect test - # can find MLIR's CMake configuration - set(MLIR_CMAKE_DIR -- "${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir") -+ "${CMAKE_BINARY_DIR}/share/mlir") - - # Passed to lit.site.cfg.py.in to set up the path where to find the libraries - # for linalg integration tests. -diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt -index 22d818eea72d..75aacc4468d4 100644 ---- a/openmp/tools/Modules/CMakeLists.txt -+++ b/openmp/tools/Modules/CMakeLists.txt -@@ -12,4 +12,4 @@ - - - install(FILES "FindOpenMPTarget.cmake" -- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") -+ DESTINATION "share/openmp") -diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt -index 4c528d562e23..800080fb3f79 100644 ---- a/polly/cmake/CMakeLists.txt -+++ b/polly/cmake/CMakeLists.txt -@@ -4,15 +4,15 @@ include(GNUInstallPackageDir) - include(ExtendPath) - include(FindPrefixFromConfig) - --set(POLLY_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/polly" CACHE STRING -+set(POLLY_INSTALL_PACKAGE_DIR "share/polly" CACHE STRING - "Path for CMake subdirectory for Polly (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/polly')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(polly_cmake_builddir "${POLLY_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/polly") -+set(polly_cmake_builddir "${POLLY_BINARY_DIR}/share/polly") - --set(LLVM_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_PACKAGEDIR}/llvm" CACHE STRING -+set(LLVM_INSTALL_PACKAGE_DIR "share/llvm" CACHE STRING - "Path for CMake subdirectory for LLVM (defaults to '${CMAKE_INSTALL_PACKAGEDIR}/llvm')") - # CMAKE_INSTALL_PACKAGEDIR might be absolute, so don't reuse below. --set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") -+set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/share/llvm") - - if (CMAKE_CONFIGURATION_TYPES) - set(POLLY_EXPORTS_FILE_NAME "PollyExports-$>.cmake") diff --git a/ports/llvm/0001-fix-install-package-dir.patch b/ports/llvm/0001-fix-install-package-dir.patch new file mode 100644 index 00000000000000..6bbe1af08f89bb --- /dev/null +++ b/ports/llvm/0001-fix-install-package-dir.patch @@ -0,0 +1,13 @@ + openmp/tools/Modules/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openmp/tools/Modules/CMakeLists.txt b/openmp/tools/Modules/CMakeLists.txt +index 22d818eea72d..75aacc4468d4 100644 +--- a/openmp/tools/Modules/CMakeLists.txt ++++ b/openmp/tools/Modules/CMakeLists.txt +@@ -12,4 +12,4 @@ + + + install(FILES "FindOpenMPTarget.cmake" +- DESTINATION "${OPENMP_INSTALL_LIBDIR}/cmake/openmp") ++ DESTINATION "share/openmp") diff --git a/ports/llvm/0002-Fix-DR-1734.patch b/ports/llvm/0002-Fix-DR-1734.patch deleted file mode 100644 index 3a2f4a28e3e956..00000000000000 --- a/ports/llvm/0002-Fix-DR-1734.patch +++ /dev/null @@ -1,17 +0,0 @@ - llvm/include/llvm/Support/type_traits.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h -index 7b7d5d991f3f..469b681deea3 100644 ---- a/llvm/include/llvm/Support/type_traits.h -+++ b/llvm/include/llvm/Support/type_traits.h -@@ -176,7 +176,8 @@ class is_trivially_copyable { - (has_deleted_copy_assign || has_trivial_copy_assign) && - (has_deleted_copy_constructor || has_trivial_copy_constructor); - --#ifdef HAVE_STD_IS_TRIVIALLY_COPYABLE -+// due to DR 1734, a type can be std::is_trivially_copyable but not llvm::is_trivially_copyable -+#if 0 - static_assert(value == std::is_trivially_copyable::value, - "inconsistent behavior between llvm:: and std:: implementation of is_trivially_copyable"); - #endif diff --git a/ports/llvm/0005-Fix-tools-install-path.patch b/ports/llvm/0002-fix-tools-install-dir.patch similarity index 71% rename from ports/llvm/0005-Fix-tools-install-path.patch rename to ports/llvm/0002-fix-tools-install-dir.patch index a6d44d3ce33f19..4d0e5710a7e82b 100644 --- a/ports/llvm/0005-Fix-tools-install-path.patch +++ b/ports/llvm/0002-fix-tools-install-dir.patch @@ -1,10 +1,9 @@ + bolt/cmake/modules/AddBOLT.cmake | 2 +- clang-tools-extra/clang-tidy/tool/CMakeLists.txt | 2 +- clang-tools-extra/modularize/CMakeLists.txt | 2 +- clang/cmake/modules/AddClang.cmake | 2 +- clang/tools/c-index-test/CMakeLists.txt | 2 +- clang/tools/clang-format/CMakeLists.txt | 2 +- - clang/tools/clang-linker-wrapper/CMakeLists.txt | 2 +- - clang/tools/clang-nvlink-wrapper/CMakeLists.txt | 2 +- clang/tools/scan-build-py/CMakeLists.txt | 4 ++-- clang/tools/scan-build/CMakeLists.txt | 2 +- clang/tools/scan-view/CMakeLists.txt | 2 +- @@ -12,11 +11,25 @@ flang/tools/f18/CMakeLists.txt | 2 +- flang/tools/flang-driver/CMakeLists.txt | 2 +- lld/cmake/modules/AddLLD.cmake | 2 +- + lld/tools/lld/CMakeLists.txt | 2 +- lldb/cmake/modules/AddLLDB.cmake | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) +diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake +index 1f69b9046320..b0de5186dde4 100644 +--- a/bolt/cmake/modules/AddBOLT.cmake ++++ b/bolt/cmake/modules/AddBOLT.cmake +@@ -17,7 +17,7 @@ macro(add_bolt_tool name) + get_target_export_arg(${name} BOLT export_to_bolttargets) + install(TARGETS ${name} + ${export_to_bolttargets} +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ RUNTIME DESTINATION "${BOLT_TOOLS_INSTALL_DIR}" + COMPONENT bolt) + + if(NOT LLVM_ENABLE_IDE) diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt -index 3ce552872015..e09b917ae5f8 100644 +index 3ce552872015..ce5a899ebe6d 100644 --- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt @@ -64,6 +64,6 @@ install(PROGRAMS clang-tidy-diff.py @@ -24,35 +37,35 @@ index 3ce552872015..e09b917ae5f8 100644 COMPONENT clang-tidy) install(PROGRAMS run-clang-tidy.py - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-tidy RENAME run-clang-tidy) diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt -index fb17e353c39f..4b409e47446a 100644 +index 28635ca1089d..4516c8fb7ad0 100644 --- a/clang-tools-extra/modularize/CMakeLists.txt +++ b/clang-tools-extra/modularize/CMakeLists.txt -@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize +@@ -24,5 +24,5 @@ clang_target_link_libraries(modularize ) install(TARGETS modularize - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-extras) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake -index 21ac332e4f5f..1aaf785bdc99 100644 +index 75b0080f6715..46e32ddbe0cd 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake -@@ -166,7 +166,7 @@ macro(add_clang_tool name) +@@ -169,7 +169,7 @@ macro(add_clang_tool name) get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt -index 0ae1b4e55244..e8a34e136194 100644 +index 0ae1b4e55244..7774cd27afcd 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) @@ -60,43 +73,23 @@ index 0ae1b4e55244..e8a34e136194 100644 "@executable_path/../../lib") else() - set(INSTALL_DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ set(INSTALL_DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++ set(INSTALL_DESTINATION "${CLANG_TOOLS_INSTALL_DIR}") endif() install(TARGETS c-index-test diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt -index bbdef93b576b..8744e414da0a 100644 +index 30c93f8667c8..5c6f87f62e8e 100644 --- a/clang/tools/clang-format/CMakeLists.txt +++ b/clang/tools/clang-format/CMakeLists.txt -@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py +@@ -36,5 +36,5 @@ install(FILES clang-format.py DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT clang-format) install(PROGRAMS git-clang-format - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT clang-format) -diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt -index 88c19cad7b53..b50c9ff90586 100644 ---- a/clang/tools/clang-linker-wrapper/CMakeLists.txt -+++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt -@@ -44,4 +44,4 @@ target_link_libraries(clang-linker-wrapper - ${CLANG_LINKER_WRAPPER_LIB_DEPS} - ) - --install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS clang-linker-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") -diff --git a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -index 2c979e509795..f22b801fe19a 100644 ---- a/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -+++ b/clang/tools/clang-nvlink-wrapper/CMakeLists.txt -@@ -22,4 +22,4 @@ target_link_libraries(clang-nvlink-wrapper - ${CLANG_NVLINK_WRAPPER_LIB_DEPS} - ) - --install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS clang-nvlink-wrapper RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") diff --git a/clang/tools/scan-build-py/CMakeLists.txt b/clang/tools/scan-build-py/CMakeLists.txt -index 061dc7ef4dd9..91499600693b 100644 +index 3aca22c0b0a8..a8283219c99f 100644 --- a/clang/tools/scan-build-py/CMakeLists.txt +++ b/clang/tools/scan-build-py/CMakeLists.txt @@ -43,7 +43,7 @@ foreach(BinFile ${BinFiles}) @@ -104,7 +97,7 @@ index 061dc7ef4dd9..91499600693b 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/scan-build) install (PROGRAMS "bin/scan-build" - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" RENAME scan-build-py COMPONENT scan-build-py) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/scan-build-py) @@ -113,12 +106,12 @@ index 061dc7ef4dd9..91499600693b 100644 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-build-py) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) endif() diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt -index ef687b0e90a1..a52af70443c3 100644 +index ef687b0e90a1..47f31efc9174 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -126,12 +119,12 @@ index ef687b0e90a1..a52af70443c3 100644 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-build) endforeach() diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt -index 07aec76ee66f..ca6a3380ad0c 100644 +index 07aec76ee66f..55a945bb278d 100644 --- a/clang/tools/scan-view/CMakeLists.txt +++ b/clang/tools/scan-view/CMakeLists.txt @@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) @@ -139,48 +132,48 @@ index 07aec76ee66f..ca6a3380ad0c 100644 list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} - DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT scan-view) endforeach() diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake -index d516ca31b51f..4a0d4ce80168 100644 +index 41ce8738e7bf..d9659c4cf53a 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake -@@ -110,7 +110,7 @@ macro(add_flang_tool name) +@@ -115,7 +115,7 @@ macro(add_flang_tool name) get_target_export_arg(${name} Flang export_to_flangtargets) install(TARGETS ${name} ${export_to_flangtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${FLANG_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt -index dd0898730e2e..d01c2f8076e3 100644 +index d7538feef121..ec8b7737ee22 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt -@@ -56,7 +56,7 @@ if (NOT WIN32) +@@ -75,7 +75,7 @@ if (NOT WIN32) @ONLY ) add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc) - install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${FLANG_TOOLS_INSTALL_DIR}") endif() # TODO Move this to a more suitable location diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt -index 94c8ce6d58f1..466d41c58b1d 100644 +index 3ce8b407450d..6b2e2b0dc33a 100644 --- a/flang/tools/flang-driver/CMakeLists.txt +++ b/flang/tools/flang-driver/CMakeLists.txt -@@ -42,4 +42,4 @@ if(FLANG_PLUGIN_SUPPORT) +@@ -43,4 +43,4 @@ if(FLANG_PLUGIN_SUPPORT) export_executable_symbols_for_plugins(flang-new) endif() -install(TARGETS flang-new DESTINATION "${CMAKE_INSTALL_BINDIR}") -+install(TARGETS flang-new DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") ++install(TARGETS flang-new DESTINATION "${FLANG_TOOLS_INSTALL_DIR}") diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake -index d3924f7243d4..f328b62ad8c8 100644 +index d3924f7243d4..318b41b73705 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -47,7 +47,7 @@ macro(add_lld_tool name) @@ -188,15 +181,28 @@ index d3924f7243d4..f328b62ad8c8 100644 install(TARGETS ${name} ${export_to_lldtargets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" ++ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}" COMPONENT ${name}) if(NOT CMAKE_CONFIGURATION_TYPES) +diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt +index 12628395680b..ee58ed439a3a 100644 +--- a/lld/tools/lld/CMakeLists.txt ++++ b/lld/tools/lld/CMakeLists.txt +@@ -29,7 +29,7 @@ lld_target_link_libraries(lld + ) + + install(TARGETS lld +- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ RUNTIME DESTINATION "${LLD_TOOLS_INSTALL_DIR}") + + if(NOT LLD_SYMLINKS_TO_CREATE) + set(LLD_SYMLINKS_TO_CREATE diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake -index 3291a7c808e1..9fe9b9a7940d 100644 +index d47a30f5e109..f0bbc0e50627 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake -@@ -189,7 +189,7 @@ function(add_lldb_executable name) +@@ -216,7 +216,7 @@ function(add_lldb_executable name) endif() if(ARG_GENERATE_INSTALL) @@ -205,16 +211,3 @@ index 3291a7c808e1..9fe9b9a7940d 100644 if(ARG_INSTALL_PREFIX) set(install_dest ${ARG_INSTALL_PREFIX}) endif() -diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt -index df48cc0d6..1363144fd 100644 ---- a/lld/tools/lld/CMakeLists.txt -+++ b/lld/tools/lld/CMakeLists.txt -@@ -20,7 +20,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -+ RUNTIME DESTINATION "${LLVM_TOOLS_INSTALL_DIR}") - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/ports/llvm/0003-Fix-tools-path.patch b/ports/llvm/0003-fix-llvm-config.patch similarity index 87% rename from ports/llvm/0003-Fix-tools-path.patch rename to ports/llvm/0003-fix-llvm-config.patch index 66fec67d86631b..e1231d578d4cb9 100644 --- a/ports/llvm/0003-Fix-tools-path.patch +++ b/ports/llvm/0003-fix-llvm-config.patch @@ -2,10 +2,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp -index 2c6c55f89d38..f2b581559991 100644 +index e86eb2b44b10..04e00944f891 100644 --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/llvm/tools/llvm-config/llvm-config.cpp -@@ -307,7 +307,7 @@ int main(int argc, char **argv) { +@@ -304,7 +304,7 @@ int main(int argc, char **argv) { // bin dir). sys::fs::make_absolute(CurrentPath); CurrentExecPrefix = diff --git a/ports/llvm/0004-Fix-compiler-rt-install-path.patch b/ports/llvm/0004-Fix-compiler-rt-install-path.patch deleted file mode 100644 index b08c12154585e1..00000000000000 --- a/ports/llvm/0004-Fix-compiler-rt-install-path.patch +++ /dev/null @@ -1,44 +0,0 @@ - clang/lib/Headers/CMakeLists.txt | 2 +- - clang/runtime/CMakeLists.txt | 2 +- - compiler-rt/cmake/base-config-ix.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt -index 6e2060991b92..94ced7feda9b 100644 ---- a/clang/lib/Headers/CMakeLists.txt -+++ b/clang/lib/Headers/CMakeLists.txt -@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) - add_header_target("windows-resource-headers" ${windows_only_files}) - add_header_target("utility-resource-headers" ${utility_files}) - --set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include) - - ############################################################# - # Install rules for the catch-all clang-resource-headers target -diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt -index 9f4633bc85b1..6d7b70ee0dea 100644 ---- a/clang/runtime/CMakeLists.txt -+++ b/clang/runtime/CMakeLists.txt -@@ -84,7 +84,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) - -DLLVM_LIT_ARGS=${LLVM_LIT_ARGS} - -DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION} - -DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION} -+ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION} - -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} -diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake -index 8a6219568b3f..f9c9f6478280 100644 ---- a/compiler-rt/cmake/base-config-ix.cmake -+++ b/compiler-rt/cmake/base-config-ix.cmake -@@ -45,7 +45,7 @@ if (LLVM_TREE_AVAILABLE) - # Setup the paths where compiler-rt runtimes and headers should be stored. - set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) - set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) -+ set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION}) - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." - ${LLVM_INCLUDE_TESTS}) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" diff --git a/ports/llvm/0009-disable-libomp-aliases.patch b/ports/llvm/0004-disable-libomp-aliases.patch similarity index 59% rename from ports/llvm/0009-disable-libomp-aliases.patch rename to ports/llvm/0004-disable-libomp-aliases.patch index 3598464189c809..6736f2a31d53df 100644 --- a/ports/llvm/0009-disable-libomp-aliases.patch +++ b/ports/llvm/0004-disable-libomp-aliases.patch @@ -1,37 +1,32 @@ + openmp/runtime/src/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt -index e795032..5e8cba5 100644 +index bb5822264514..340cef14df89 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt -@@ -201,6 +201,7 @@ endif() +@@ -215,7 +215,7 @@ endif() set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) # Add symbolic links to libomp +-if(NOT WIN32) +if(0) - if(NOT WIN32) add_custom_command(TARGET omp POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBOMP_LIB_FILE} -@@ -210,6 +211,8 @@ if(NOT WIN32) - WORKING_DIRECTORY ${LIBOMP_LIBRARY_DIR} - ) - endif() -+endif() -+ - set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) - - # Create *.inc before compiling any sources -@@ -354,6 +357,7 @@ endif() - if(WIN32) - install(TARGETS omp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + libgomp${LIBOMP_LIBRARY_SUFFIX} +@@ -367,6 +367,7 @@ if(WIN32) + install(TARGETS omp ${export_to_llvmexports} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") -+ if(0) # Create aliases (regular copies) of the library for backwards compatibility ++ if(0) set(LIBOMP_ALIASES "libiomp5md") foreach(alias IN LISTS LIBOMP_ALIASES) -@@ -362,6 +366,7 @@ if(WIN32) + install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_LIB_FILE}\" +@@ -375,6 +376,7 @@ if(WIN32) install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E copy \"${LIBOMP_IMP_LIB_FILE}\" \"${alias}${CMAKE_STATIC_LIBRARY_SUFFIX}\" WORKING_DIRECTORY \"${outdir}\")") endforeach() + endif() else() - install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}") + install(TARGETS omp ${export_to_llvmexports} ${LIBOMP_INSTALL_KIND} DESTINATION "${OPENMP_INSTALL_LIBDIR}") diff --git a/ports/llvm/0010-remove-numpy.patch b/ports/llvm/0005-remove-numpy.patch similarity index 70% rename from ports/llvm/0010-remove-numpy.patch rename to ports/llvm/0005-remove-numpy.patch index aefd2eb53491e3..966af9c31e3b15 100644 --- a/ports/llvm/0010-remove-numpy.patch +++ b/ports/llvm/0005-remove-numpy.patch @@ -1,17 +1,11 @@ -From 80300a7f4533fdfc75ec60b0d1dc1c5d5a6b9e3c Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Fri, 14 Jul 2023 09:45:22 -0700 -Subject: [PATCH] remove_numpy - ---- mlir/cmake/modules/MLIRDetectPythonEnv.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake -index 9c8966591514..35c94f0d1acc 100644 +index 0a486c1bbb54..c07c55b1e17a 100644 --- a/mlir/cmake/modules/MLIRDetectPythonEnv.cmake +++ b/mlir/cmake/modules/MLIRDetectPythonEnv.cmake -@@ -26,7 +26,7 @@ macro(mlir_configure_python_dev_packages) +@@ -19,7 +19,7 @@ macro(mlir_configure_python_dev_packages) set(_python_development_component Development.Module) find_package(Python3 ${LLVM_MINIMUM_PYTHON_VERSION} @@ -20,6 +14,3 @@ index 9c8966591514..35c94f0d1acc 100644 unset(_python_development_component) message(STATUS "Found python include dirs: ${Python3_INCLUDE_DIRS}") message(STATUS "Found python libraries: ${Python3_LIBRARIES}") --- -2.41.0.windows.2 - diff --git a/ports/llvm/0012-create-destination-mlir-directory.patch b/ports/llvm/0006-create-destination-mlir-directory.patch similarity index 55% rename from ports/llvm/0012-create-destination-mlir-directory.patch rename to ports/llvm/0006-create-destination-mlir-directory.patch index a8d6db47be50ff..4950a48c3b5ec9 100644 --- a/ports/llvm/0012-create-destination-mlir-directory.patch +++ b/ports/llvm/0006-create-destination-mlir-directory.patch @@ -1,13 +1,16 @@ + mlir/python/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/mlir/python/CMakeLists.txt b/mlir/python/CMakeLists.txt -index 7eb6e05e4..b9e1a096a 100644 +index 50fbca38a08f..957a6722c21c 100644 --- a/mlir/python/CMakeLists.txt +++ b/mlir/python/CMakeLists.txt -@@ -483,6 +483,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI +@@ -527,6 +527,8 @@ add_mlir_python_common_capi_library(MLIRPythonCAPI ${_ADDL_TEST_SOURCES} ) +file(MAKE_DIRECTORY "${MLIR_BINARY_DIR}/python_packages/mlir_core/mlir/_mlir_libs") + ################################################################################ - # The fully assembled package of modules. - # This must come last. + # Custom targets. + ################################################################################ diff --git a/ports/llvm/0007-Fix-install-bolt.patch b/ports/llvm/0007-Fix-install-bolt.patch deleted file mode 100644 index 361f58e7e8e6d5..00000000000000 --- a/ports/llvm/0007-Fix-install-bolt.patch +++ /dev/null @@ -1,21 +0,0 @@ - bolt/tools/driver/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt -index e56be15dbcff..85b078e2e761 100644 ---- a/bolt/tools/driver/CMakeLists.txt -+++ b/bolt/tools/driver/CMakeLists.txt -@@ -35,13 +35,6 @@ set(BOLT_DEPENDS - ) - - add_custom_target(bolt DEPENDS ${BOLT_DEPENDS}) --install(PROGRAMS -- ${CMAKE_BINARY_DIR}/bin/llvm-bolt -- ${CMAKE_BINARY_DIR}/bin/perf2bolt -- ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff -- DESTINATION ${CMAKE_INSTALL_BINDIR} -- COMPONENT bolt -- ) - add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt) - set_target_properties(bolt PROPERTIES FOLDER "BOLT") - set_target_properties(install-bolt PROPERTIES FOLDER "BOLT") diff --git a/ports/llvm/0007-fix-compiler-rt-warnings.patch b/ports/llvm/0007-fix-compiler-rt-warnings.patch new file mode 100644 index 00000000000000..67ce0079b475b7 --- /dev/null +++ b/ports/llvm/0007-fix-compiler-rt-warnings.patch @@ -0,0 +1,45 @@ + compiler-rt/lib/asan/CMakeLists.txt | 2 +- + compiler-rt/lib/interception/CMakeLists.txt | 2 +- + compiler-rt/lib/ubsan/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt +index 1bfc6f0c5e37..f35c385c379a 100644 +--- a/compiler-rt/lib/asan/CMakeLists.txt ++++ b/compiler-rt/lib/asan/CMakeLists.txt +@@ -92,7 +92,7 @@ append_rtti_flag(OFF ASAN_CFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" ASAN_CFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" ASAN_CFLAGS) + endif() + + # Too many existing bugs, needs cleanup. +diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt +index 3242cf50e35f..abe9229340be 100644 +--- a/compiler-rt/lib/interception/CMakeLists.txt ++++ b/compiler-rt/lib/interception/CMakeLists.txt +@@ -21,7 +21,7 @@ append_rtti_flag(OFF INTERCEPTION_CFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" INTERCEPTION_CFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" INTERCEPTION_CFLAGS) + endif() + + add_compiler_rt_object_libraries(RTInterception +diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt +index 520a024fbede..75b0b12b9da2 100644 +--- a/compiler-rt/lib/ubsan/CMakeLists.txt ++++ b/compiler-rt/lib/ubsan/CMakeLists.txt +@@ -57,7 +57,7 @@ append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS) + + # Silence warnings in system headers with MSVC. + if(NOT CLANG_CL) +- append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external /external:W0 /external:anglebrackets" UBSAN_CXXFLAGS) ++ append_list_if(COMPILER_RT_HAS_EXTERNAL_FLAG "/experimental:external;/external:W0;/external:anglebrackets" UBSAN_CXXFLAGS) + endif() + + set(UBSAN_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}) + \ No newline at end of file diff --git a/ports/llvm/0008-llvm_assert.patch b/ports/llvm/0008-llvm_assert.patch deleted file mode 100644 index 2e1f653e50c70c..00000000000000 --- a/ports/llvm/0008-llvm_assert.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h -index 12bf196bb58e5..200eae8c3b71c 100644 ---- a/mlir/include/mlir/IR/PatternMatch.h -+++ b/mlir/include/mlir/IR/PatternMatch.h -@@ -1102,10 +1097,9 @@ void assertArgs(PatternRewriter &rewriter, ArrayRef values, - auto errorFn = [&](const Twine &msg) -> LogicalResult { - llvm::report_fatal_error(msg); - }; -- (void)std::initializer_list{ -- (assert(succeeded(ProcessPDLValue>::verifyAsArg(errorFn, values[I], I))), -- 0)...}; -+ assert((succeeded(ProcessPDLValue>:: -+ verifyAsArg(errorFn, values[I], I)) && -+ ...)); - #endif - } - diff --git a/ports/llvm/0011-missing-include.patch b/ports/llvm/0011-missing-include.patch deleted file mode 100644 index c09ed958f690bc..00000000000000 --- a/ports/llvm/0011-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/llvm/lib/Debuginfod/Debuginfod.cpp b/llvm/lib/Debuginfod/Debuginfod.cpp -index ef4e11ca3..29fdd6ffb 100644 ---- a/llvm/lib/Debuginfod/Debuginfod.cpp -+++ b/llvm/lib/Debuginfod/Debuginfod.cpp -@@ -40,6 +40,7 @@ - #include "llvm/Support/xxhash.h" - - #include -+#include - - namespace llvm { - static std::string uniqueKey(llvm::StringRef S) { return utostr(xxHash64(S)); } diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 4d7e26a182b162..51ed7d9b23579e 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -4,20 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF "llvmorg-${VERSION}" - SHA512 99beff9ee6f8c26f16ea53f03ba6209a119099cbe361701b0d5f4df9d5cc5f2f0da7c994c899a4cec876da8428564dc7a8e798226a9ba8b5c18a3ef8b181d39e + SHA512 362ddb94fdd22d05bd11c950f1711eafbd47424f6da0b1b061da012ef1b39dd8f7efeb91b53c036ea0708aa3845893fe39d1fb529ac3b928df738b88717d1aee HEAD_REF main PATCHES - 0001-Fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. - 0002-Fix-DR-1734.patch - 0003-Fix-tools-path.patch - 0004-Fix-compiler-rt-install-path.patch - 0005-Fix-tools-install-path.patch - 0007-Fix-install-bolt.patch - 0008-llvm_assert.patch - 0009-disable-libomp-aliases.patch - 0010-remove-numpy.patch - 0011-missing-include.patch - 0012-create-destination-mlir-directory.patch + 0001-fix-install-package-dir.patch + 0002-fix-tools-install-dir.patch + 0003-fix-llvm-config.patch + 0004-disable-libomp-aliases.patch + 0005-remove-numpy.patch + 0006-create-destination-mlir-directory.patch + 0007-fix-compiler-rt-warnings.patch # fixed in upstream ) vcpkg_check_features( @@ -28,10 +24,10 @@ vcpkg_check_features( utils LLVM_BUILD_UTILS utils LLVM_INCLUDE_UTILS utils LLVM_INSTALL_UTILS + enable-assertions LLVM_ENABLE_ASSERTIONS enable-rtti LLVM_ENABLE_RTTI enable-ffi LLVM_ENABLE_FFI enable-terminfo LLVM_ENABLE_TERMINFO - enable-threads LLVM_ENABLE_THREADS enable-ios COMPILER_RT_ENABLE_IOS enable-eh LLVM_ENABLE_EH enable-bindings LLVM_ENABLE_BINDINGS @@ -44,7 +40,7 @@ include("${cmake_vars_file}") # LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON disables this error. # See https://developercommunity.visualstudio.com/content/problem/845933/miscompile-boolean-condition-deduced-to-be-always.html # and thread "[llvm-dev] Longstanding failing tests - clang-tidy, MachO, Polly" on llvm-dev Jan 21-23 2020. -if(VCPKG_DETECTED_MSVC_VERSION LESS "1925" AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID STREQUAL "MSVC") +if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1925") list(APPEND FEATURE_OPTIONS -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON ) @@ -70,19 +66,6 @@ foreach(external_library IN LISTS llvm_external_libraries) endif() endforeach() -# By default assertions are enabled for Debug configuration only. -if("enable-assertions" IN_LIST FEATURES) - # Force enable assertions for all configurations. - list(APPEND FEATURE_OPTIONS - -DLLVM_ENABLE_ASSERTIONS=ON - ) -elseif("disable-assertions" IN_LIST FEATURES) - # Force disable assertions for all configurations. - list(APPEND FEATURE_OPTIONS - -DLLVM_ENABLE_ASSERTIONS=OFF - ) -endif() - # LLVM_ABI_BREAKING_CHECKS can be WITH_ASSERTS (default), FORCE_ON or FORCE_OFF. # By default in LLVM, abi-breaking checks are enabled if assertions are enabled. # however, this breaks linking with the debug versions, since the option is @@ -103,21 +86,24 @@ endif() set(LLVM_ENABLE_PROJECTS) if("bolt" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "bolt") + list(APPEND FEATURE_OPTIONS + -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) endif() if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang") - if("disable-clang-static-analyzer" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS - # Disable ARCMT - -DCLANG_ENABLE_ARCMT=OFF - # Disable static analyzer - -DCLANG_ENABLE_STATIC_ANALYZER=OFF - ) - endif() - # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (LLVM_TOOLS_INSTALL_DIR=tools/llvm) - # 2) Clang resource files are relocated from ./lib/clang/ to ./tools/llvm/lib/clang/ (see patch 0007-fix-compiler-rt-install-path.patch) - # So, the relative path should be changed from ../lib/clang/ to ./lib/clang/ - list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${VERSION}) + list(APPEND FEATURE_OPTIONS + -DCLANG_INSTALL_PACKAGE_DIR:PATH=share/clang + -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm + # Disable ARCMT + -DCLANG_ENABLE_ARCMT=OFF + # Disable static analyzer + -DCLANG_ENABLE_STATIC_ANALYZER=OFF + ) + # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (CLANG_TOOLS_INSTALL_DIR=tools/llvm) + # 2) Clang resource files should be relocated from lib/clang/ to ../tools/llvm/lib/clang/ + string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${VERSION}) + list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=../tools/llvm/lib/clang/${CLANG_VERSION_MAJOR}) endif() if("clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra") @@ -130,6 +116,10 @@ if("flang" IN_LIST FEATURES) message(FATAL_ERROR "Building Flang with MSVC is not supported on x86. Disable it until issues are fixed.") endif() list(APPEND LLVM_ENABLE_PROJECTS "flang") + list(APPEND FEATURE_OPTIONS + -DFLANG_INSTALL_PACKAGE_DIR:PATH=share/flang + -DFLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) list(APPEND FEATURE_OPTIONS # Flang requires C++17 -DCMAKE_CXX_STANDARD=17 @@ -140,6 +130,10 @@ if("libclc" IN_LIST FEATURES) endif() if("lld" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lld") + list(APPEND FEATURE_OPTIONS + -DLLD_INSTALL_PACKAGE_DIR:PATH=share/lld + -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm + ) endif() if("lldb" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "lldb") @@ -149,6 +143,11 @@ if("lldb" IN_LIST FEATURES) endif() if("mlir" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "mlir") + list(APPEND FEATURE_OPTIONS + -DMLIR_INSTALL_PACKAGE_DIR:PATH=share/mlir + -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm + -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF # Disables installation of object files in lib/objects-{CMAKE_BUILD_TYPE}. + ) if("enable-mlir-python-bindings" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -DMLIR_ENABLE_BINDINGS_PYTHON=ON @@ -158,6 +157,11 @@ if("mlir" IN_LIST FEATURES) endif() if("openmp" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "openmp") + list(APPEND FEATURE_OPTIONS + -DLIBOMP_INSTALL_ALIASES=OFF + -DOPENMP_ENABLE_LIBOMPTARGET=OFF # Currently libomptarget cannot be compiled on Windows or MacOS X. + -DOPENMP_ENABLE_OMPT_TOOLS=OFF # Currently tools are not tested well on Windows or MacOS X. + ) # Perl is required for the OpenMP run-time vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) @@ -167,30 +171,36 @@ if("openmp" IN_LIST FEATURES) endif() if("polly" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "polly") -endif() -if("pstl" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building pstl with MSVC is not supported. Disable it until issues are fixed.") - endif() - list(APPEND LLVM_ENABLE_PROJECTS "pstl") + list(APPEND FEATURE_OPTIONS + -DPOLLY_INSTALL_PACKAGE_DIR:PATH=share/polly + ) endif() set(LLVM_ENABLE_RUNTIMES) +if("libc" IN_LIST FEATURES) + list(APPEND LLVM_ENABLE_RUNTIMES "libc") +endif() if("libcxx" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building libcxx with MSVC is not supported, as cl doesn't support the #include_next extension.") + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND VCPKG_DETECTED_MSVC_VERSION LESS "1914") + # libcxx supports being built with clang-cl, but not with MSVC’s cl.exe, as cl doesn’t support the #include_next extension. + # Furthermore, VS 2017 or newer (19.14) is required. + # More info: https://releases.llvm.org/17.0.1/projects/libcxx/docs/BuildingLibcxx.html#support-for-windows + message(FATAL_ERROR "libcxx requiries MSVC 19.14 or newer.") endif() list(APPEND LLVM_ENABLE_RUNTIMES "libcxx") endif() if("libcxxabi" IN_LIST FEATURES) - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - message(FATAL_ERROR "Building libcxxabi with MSVC is not supported. Disable it until issues are fixed.") - endif() list(APPEND LLVM_ENABLE_RUNTIMES "libcxxabi") endif() if("libunwind" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") endif() +if("pstl" IN_LIST FEATURES) + if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + message(FATAL_ERROR "Building pstl with MSVC is not supported.") + endif() + list(APPEND LLVM_ENABLE_RUNTIMES "pstl") +endif() # this is for normal targets set(known_llvm_targets @@ -201,6 +211,7 @@ set(known_llvm_targets BPF Hexagon Lanai + LoongArch Mips MSP430 NVPTX @@ -214,7 +225,7 @@ set(known_llvm_targets XCore ) -set(LLVM_TARGETS_TO_BUILD "") +set(LLVM_TARGETS_TO_BUILD) foreach(llvm_target IN LISTS known_llvm_targets) string(TOLOWER "target-${llvm_target}" feature_name) if(feature_name IN_LIST FEATURES) @@ -224,10 +235,15 @@ endforeach() # this is for experimental targets set(known_llvm_experimental_targets - SPRIV + ARC + CSKY + DirectX + M68k + SPIRV + Xtensa ) -set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "") +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD) foreach(llvm_target IN LISTS known_llvm_experimental_targets) string(TOLOWER "target-${llvm_target}" feature_name) if(feature_name IN_LIST FEATURES) @@ -239,41 +255,44 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") -set(LLVM_LINK_JOBS 1) - file(REMOVE "${SOURCE_PATH}/llvm/cmake/modules/Findzstd.cmake") +if("${LLVM_ENABLE_RUNTIMES}" STREQUAL "") + list(APPEND FEATURE_OPTIONS + -DLLVM_INCLUDE_RUNTIMES=OFF + -DLLVM_BUILD_RUNTIMES=OFF + -DLLVM_BUILD_RUNTIME=OFF + ) +endif() + +# At least one target must be specified, otherwise default to "all". +if("${LLVM_TARGETS_TO_BUILD}" STREQUAL "") + set(LLVM_TARGETS_TO_BUILD "all") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/llvm" OPTIONS - ${FEATURE_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_BUILD_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_BUILD_BENCHMARKS=OFF - -DLIBOMP_INSTALL_ALIASES=OFF # Force TableGen to be built with optimization. This will significantly improve build time. -DLLVM_OPTIMIZED_TABLEGEN=ON + -DPACKAGE_VERSION=${VERSION} + # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. + -DLLVM_PARALLEL_LINK_JOBS=1 + -DLLVM_INSTALL_PACKAGE_DIR:PATH=share/llvm + -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}" - - -DPACKAGE_VERSION=${VERSION} - # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. - "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" - -DLLVM_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DCLANG_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DLLD_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DMLIR_TOOLS_INSTALL_DIR:PATH=tools/llvm - -DBOLT_TOOLS_INSTALL_DIR:PATH=tools/llvm # all others are strings - -DOPENMP_TOOLS_INSTALL_DIR:PATH=tools/llvm + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES COMPILER_RT_ENABLE_IOS - OPENMP_TOOLS_INSTALL_DIR - MLIR_TOOLS_INSTALL_DIR ) vcpkg_cmake_install(ADD_BIN_TO_PATH) @@ -317,26 +336,29 @@ endif() if("pstl" IN_LIST FEATURES) list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/lib/cmake") - list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + endif() endif() if("flang" IN_LIST FEATURES) - list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Config") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/CodeGen/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Dialect/CMakeFiles") + list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/HLFIR/CMakeFiles") list(APPEND empty_dirs "${CURRENT_PACKAGES_DIR}/include/flang/Optimizer/Transforms/CMakeFiles") endif() if(empty_dirs) foreach(empty_dir IN LISTS empty_dirs) if(NOT EXISTS "${empty_dir}") - message(SEND_ERROR "Directory '${empty_dir}' is not exist. Please remove it from the checking.") + message(WARNING "Directory '${empty_dir}' does not exist. Please remove it from the list of empty directories.") else() file(GLOB_RECURSE files_in_dir "${empty_dir}/*") if(files_in_dir) - message(SEND_ERROR "Directory '${empty_dir}' is not empty. Please remove it from the checking.") + message(WARNING "Directory '${empty_dir}' is not empty. Please remove it from the list of empty directories.") else() file(REMOVE_RECURSE "${empty_dir}") endif() @@ -358,9 +380,15 @@ if("mlir" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}") endif() -# LLVM still generates a few DLLs in the static build: -# * LLVM-C.dll -# * libclang.dll -# * LTO.dll -# * Remarks.dll -set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +if(VCPKG_TARGET_IS_WINDOWS) + # LLVM still generates a few DLLs in the static build: + # * LLVM-C.dll + # * libclang.dll + # * LTO.dll + # * Remarks.dll + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() \ No newline at end of file diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 4665ef82cf9aeb..03203dbb57af1d 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,14 +1,13 @@ { "name": "llvm", - "version": "15.0.7", - "port-version": 6, + "version": "17.0.2", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ { - "name": "atlmfc", + "name": "atl", "platform": "windows & !mingw" }, { @@ -26,8 +25,11 @@ ], "default-features": [ "clang", - "default-options", "default-targets", + "enable-bindings", + "enable-terminfo", + "enable-zlib", + "enable-zstd", "lld", "tools" ], @@ -80,34 +82,9 @@ } ] }, - "default-options": { - "description": "Build with default options.", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "disable-assertions", - "disable-clang-static-analyzer", - "enable-bindings", - "enable-terminfo", - "enable-threads", - "enable-zlib", - "enable-zstd" - ] - } - ] - }, "default-targets": { "description": "Build with platform-specific default targets.", "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "target-spirv" - ] - }, { "name": "llvm", "default-features": false, @@ -131,23 +108,9 @@ "target-arm" ], "platform": "arm & !arm64" - }, - { - "name": "llvm", - "default-features": false, - "features": [ - "target-all" - ], - "platform": "!x86 & !x64 & !arm & !arm64" } ] }, - "disable-assertions": { - "description": "Build LLVM without assertions." - }, - "disable-clang-static-analyzer": { - "description": "Build without static analyzer." - }, "enable-abi-breaking-checks": { "description": "Build LLVM with LLVM_ABI_BREAKING_CHECKS=FORCE_ON." }, @@ -214,9 +177,6 @@ "enable-terminfo": { "description": "Use terminfo database if available." }, - "enable-threads": { - "description": "Use threads if available." - }, "enable-zlib": { "description": "Build with ZLib.", "dependencies": [ @@ -243,6 +203,20 @@ } ] }, + "libc": { + "description": "Include libc library.", + "supports": "linux", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "clang", + "tools" + ] + } + ] + }, "libclc": { "description": "Include OpenCL library." }, @@ -253,7 +227,9 @@ "name": "llvm", "default-features": false, "features": [ - "libcxxabi" + "clang", + "libcxxabi", + "tools" ] } ] @@ -265,6 +241,8 @@ "name": "llvm", "default-features": false, "features": [ + "clang", + "libcxx", "tools" ] } @@ -347,7 +325,16 @@ ] }, "pstl": { - "description": "Include pstl (Parallel STL) library." + "description": "Include pstl (Parallel STL) library.", + "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "tools" + ] + } + ] }, "target-aarch64": { "description": "Build with AArch64 backend." @@ -361,11 +348,16 @@ "features": [ "target-aarch64", "target-amdgpu", + "target-arc", "target-arm", "target-avr", "target-bpf", + "target-csky", + "target-directx", "target-hexagon", "target-lanai", + "target-loongarch", + "target-m68k", "target-mips", "target-msp430", "target-nvptx", @@ -377,7 +369,8 @@ "target-ve", "target-webassembly", "target-x86", - "target-xcore" + "target-xcore", + "target-xtensa" ] } ] @@ -385,6 +378,9 @@ "target-amdgpu": { "description": "Build with AMDGPU backend." }, + "target-arc": { + "description": "Build with ARC backend (experimental)." + }, "target-arm": { "description": "Build with ARM backend." }, @@ -394,12 +390,24 @@ "target-bpf": { "description": "Build with BPF backend." }, + "target-csky": { + "description": "Build with CSKY backend (experimental)." + }, + "target-directx": { + "description": "Build with DirectX backend (experimental)." + }, "target-hexagon": { "description": "Build with Hexagon backend." }, "target-lanai": { "description": "Build with Lanai backend." }, + "target-loongarch": { + "description": "Build with LoongArch backend." + }, + "target-m68k": { + "description": "Build with M68k backend (experimental)." + }, "target-mips": { "description": "Build with Mips backend." }, @@ -419,7 +427,7 @@ "description": "Build with Sparc backend." }, "target-spirv": { - "description": "Build with Spriv backend." + "description": "Build with SPIRV backend (experimental)." }, "target-systemz": { "description": "Build with SystemZ backend." @@ -436,17 +444,11 @@ "target-xcore": { "description": "Build with XCore backend." }, + "target-xtensa": { + "description": "Build with Xtensa backend (experimental)." + }, "tools": { - "description": "Build LLVM tools.", - "dependencies": [ - { - "name": "llvm", - "default-features": false, - "features": [ - "enable-threads" - ] - } - ] + "description": "Build LLVM tools." }, "utils": { "description": "Build LLVM utils." diff --git a/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch b/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch new file mode 100644 index 00000000000000..902336776cbd19 --- /dev/null +++ b/ports/mesa/clover-llvm-move-to-modern-pass-manager.patch @@ -0,0 +1,127 @@ +From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Fri, 25 Aug 2023 12:43:44 +1000 +Subject: [PATCH] clover/llvm: move to modern pass manager. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This seems like it should work, but I haven't tested it yet. + +Tested-by: Dieter Nützel +Part-of: +--- + .../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++---- + 1 file changed, 51 insertions(+), 13 deletions(-) + +diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp +index 7a50fea332395..43d26fe1abbce 100644 +--- a/src/gallium/frontends/clover/llvm/invocation.cpp ++++ b/src/gallium/frontends/clover/llvm/invocation.cpp +@@ -27,13 +27,17 @@ + #include + #include + #include ++#include + #include +-#include ++#include + #include + #ifdef HAVE_CLOVER_SPIRV + #include + #endif + ++#include ++#include ++#include + #include + #include + #include +@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source, + + namespace { + void +- optimize(Module &mod, unsigned optimization_level, ++ optimize(Module &mod, ++ const std::string& ir_target, ++ unsigned optimization_level, + bool internalize_symbols) { +- ::llvm::legacy::PassManager pm; +- + // By default, the function internalizer pass will look for a function + // called "main" and then mark all other functions as internal. Marking + // functions as internal enables the optimizer to perform optimizations +@@ -458,19 +462,53 @@ namespace { + if (internalize_symbols) { + std::vector names = + map(std::mem_fn(&Function::getName), get_kernels(mod)); +- pm.add(::llvm::createInternalizePass( ++ internalizeModule(mod, + [=](const ::llvm::GlobalValue &gv) { + return std::find(names.begin(), names.end(), + gv.getName()) != names.end(); +- })); ++ }); + } + +- ::llvm::PassManagerBuilder pmb; +- pmb.OptLevel = optimization_level; +- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl( +- ::llvm::Triple(mod.getTargetTriple())); +- pmb.populateModulePassManager(pm); +- pm.run(mod); ++ ++ const char *opt_str = NULL; ++ LLVMCodeGenOptLevel level; ++ switch (optimization_level) { ++ case 0: ++ default: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelNone; ++ break; ++ case 1: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelLess; ++ break; ++ case 2: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelDefault; ++ break; ++ case 3: ++ opt_str = "default"; ++ level = LLVMCodeGenLevelAggressive; ++ break; ++ } ++ ++ const target &target = ir_target; ++ LLVMTargetRef targ; ++ char *err_message; ++ ++ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message)) ++ return; ++ LLVMTargetMachineRef tm = ++ LLVMCreateTargetMachine(targ, target.triple.c_str(), ++ target.cpu.c_str(), "", level, ++ LLVMRelocDefault, LLVMCodeModelDefault); ++ ++ if (!tm) ++ return; ++ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions(); ++ LLVMRunPasses(wrap(&mod), opt_str, tm, opts); ++ ++ LLVMDisposeTargetMachine(tm); + } + + std::unique_ptr +@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector &binaries, + auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log); + auto mod = link(*ctx, *c, binaries, r_log); + +- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library); ++ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library); + + static std::atomic_uint seq(0); + const std::string id = "." + mod->getModuleIdentifier() + "-" + +-- +GitLab + diff --git a/ports/mesa/gallium-fix-build-with-llvm-17.patch b/ports/mesa/gallium-fix-build-with-llvm-17.patch new file mode 100644 index 00000000000000..cea5a17f30798d --- /dev/null +++ b/ports/mesa/gallium-fix-build-with-llvm-17.patch @@ -0,0 +1,42 @@ +From cda32e18a08fa2f2289a7409f37f44d5643e6aea Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 23 Jun 2023 01:20:38 -0700 +Subject: [PATCH] gallium: Fix build with llvm 17 + +These headers are not available for C files in llvm 17+ +and they seem to be not needed to compile after all with llvm 17 +so add conditions to exclude them for llvm >= 17 + +Signed-off-by: Khem Raj +--- + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c +index cd2108f3a088d..b1a4d0388a6a0 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c ++++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c +@@ -46,15 +46,19 @@ + #if GALLIVM_USE_NEW_PASS == 1 + #include + #elif GALLIVM_HAVE_CORO == 1 ++#if LLVM_VERSION_MAJOR < 17 + #include +-#if LLVM_VERSION_MAJOR >= 7 ++#endif ++#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 + #include + #endif + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) + #include + #endif ++#if LLVM_VERSION_MAJOR < 17 + #include + #endif ++#endif + + unsigned gallivm_perf = 0; + +-- +GitLab + diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index feec2312c1ce91..d2f25670dd6fcd 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -7,19 +7,22 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF b590fd1951a1949e5fe2bbfd61f0814c402af263 # mesa-23.0.1 - SHA512 7a66a587ef01fb58b51f3ebea584b40f70114844484df528d38ad1caa071fac7d6e23f1ed80309847f7e28468071571294bb8812a9882c0b86c89cf5a4144fe9 + REF mesa-${VERSION} + SHA512 96f7602c98d532a269116bd5d3f9cbe87ca4425b309467cc19f83277a0faaa9804edea72dcaeb6f7774cac17790d5d76b58c357ef639cb6064e7480d93b861bf FILE_DISAMBIGUATOR 1 HEAD_REF master + PATCHES + gallium-fix-build-with-llvm-17.patch + clover-llvm-move-to-modern-pass-manager.patch ) -x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako ) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" OUT_PYTHON_VAR "PYTHON3" PACKAGES setuptools mako) vcpkg_find_acquire_program(FLEX) -get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +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 ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${BISON_DIR}") if(WIN32) # WIN32 HOST probably has win_flex and win_bison! diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index e2a39246fcdfb4..dbf67a89b777fb 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mesa", - "version": "23.0.1", - "port-version": 2, + "version": "23.2.1", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index 3056150551dc82..152d5884ea3988 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine REF "v${VERSION}" - SHA512 e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934 + SHA512 076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac HEAD_REF master ) @@ -58,4 +58,4 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/symengine/SymEngineConfig.cm [[${SYMENGINE_CMAKE_DIR}/../../include]] ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 4f3b4d9ba63d27..5fcc271221f3b9 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "symengine", - "version": "0.10.1", - "port-version": 1, + "version": "0.11.1", "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "license": "BSD-3-Clause", diff --git a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json index 7c76a68221a919..afa1a3eb731b18 100644 --- a/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-llvm/vcpkg.json @@ -10,15 +10,13 @@ "default-features": false, "features": [ "clang", + "compiler-rt", "default-targets", - "disable-assertions", - "disable-clang-static-analyzer", "enable-abi-breaking-checks", "enable-bindings", "enable-eh", "enable-rtti", "enable-terminfo", - "enable-threads", "enable-zlib", "lld", "lldb", @@ -38,11 +36,11 @@ "platform": "!static" }, { - "$comment": "Platform restriction due to CI artifact upload quirks; flang", + "$comment": "Platform restriction due to CI artifact upload quirks; libc", "name": "llvm", "default-features": false, "features": [ - "flang" + "libc" ], "platform": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index 77e54f501f0cf2..c66b745fa56d6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3178,7 +3178,7 @@ }, "halide": { "baseline": "16.0.0", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", @@ -5105,8 +5105,8 @@ "port-version": 0 }, "llvm": { - "baseline": "15.0.7", - "port-version": 6 + "baseline": "17.0.2", + "port-version": 0 }, "lmdb": { "baseline": "0.9.31", @@ -5381,8 +5381,8 @@ "port-version": 3 }, "mesa": { - "baseline": "23.0.1", - "port-version": 2 + "baseline": "23.2.1", + "port-version": 0 }, "meschach": { "baseline": "1.2b", @@ -8105,8 +8105,8 @@ "port-version": 0 }, "symengine": { - "baseline": "0.10.1", - "port-version": 1 + "baseline": "0.11.1", + "port-version": 0 }, "systemc": { "baseline": "2.3.3", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index d6810381c69bc0..5ba8cace1d2e24 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c12d736ad0a8329d09a23dc7ae3a094d4ce02df1", + "version": "16.0.0", + "port-version": 1 + }, { "git-tree": "be8971ecbab0879a1db7aedfec5095c0d1d942b3", "version": "16.0.0", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 1a224eb4e4e575..91ea1f569bc6c9 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bbd8fe3bd9dd7f507ec0b0713c5de3109d312b5", + "version": "17.0.2", + "port-version": 0 + }, { "git-tree": "484d2a5abb5ffc10d18e18603adb20bd01854012", "version": "15.0.7", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index ac00c004c71ea4..2832dbd483a946 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f318339b0c26814bbd53fce78471f1a95fdfe0d", + "version": "23.2.1", + "port-version": 0 + }, { "git-tree": "cdf9e52bbaf36ffdf540342ea090d8535ad7a883", "version": "23.0.1", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index 41b4b059ee86b4..36453c7c55d0a1 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2308025668dda013e8b55f395871ed7d73cd20d5", + "version": "0.11.1", + "port-version": 0 + }, { "git-tree": "af6b6ed24e9fd37de357cd126afe917b47febd25", "version": "0.10.1", From bed3d85abb629b4953a2d2ab5919ba1a3224f26a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:54:31 -0700 Subject: [PATCH 0059/1039] [azure-messaging-eventhubs-cpp] publish version 1.0.0-beta.3 (#34397) --- .../portfile.cmake | 29 +++++++++++++++ .../vcpkg.json | 35 +++++++++++++++++++ .../portfile.cmake | 4 +-- .../azure-messaging-eventhubs-cpp/vcpkg.json | 8 +---- ...ng-eventhubs-checkpointstore-blob-cpp.json | 9 +++++ .../a-/azure-messaging-eventhubs-cpp.json | 5 +++ versions/baseline.json | 8 +++-- 7 files changed, 87 insertions(+), 11 deletions(-) create mode 100644 ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake create mode 100644 ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json create mode 100644 versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake new file mode 100644 index 00000000000000..0cb708f1afb333 --- /dev/null +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-messaging-eventhubs-checkpointstore-blob_1.0.0-beta.1 + SHA512 7c55eda0c04bbc57729a7b479d8d5874b0e06927aff1916833520a3a944e63b6fceabd3565fd91549ec00157f2c4af5a87a6a2db55a5c24df611cd96572f9a08 +) + +if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/eventhubs/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob" "${SOURCE_PATH}/sdk/eventhubs/_") + file(RENAME "${SOURCE_PATH}/sdk/eventhubs" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/_/_/_" + OPTIONS + -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=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-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json new file mode 100644 index 00000000000000..77fe967455bfc6 --- /dev/null +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp", + "version-semver": "1.0.0-beta.1", + "description": [ + "Microsoft Azure Messaging Event Hubs Blob Checkpoint Store SDK for C++", + "This library provides an Azure-Storage-Blobs based implementation of an Azure Messaging Event Hubs SDK Checkpoint Store." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-amqp-cpp", + "default-features": false, + "version>=": "1.0.0-beta.2" + }, + { + "name": "azure-messaging-eventhubs-cpp", + "default-features": false, + "version>=": "1.0.0-beta.2" + }, + { + "name": "azure-storage-blobs-cpp", + "default-features": false, + "version>=": "12.8.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 2eac053723aa4d..1e2f17d19e857e 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.2 - SHA512 3677edf50218c39e378a968661c0ec0600b8760d3af33f204f3267e104449c0aef42b9520cb63b5e5810b89bf91f06979d009ffdd6d6d04d2c14e1a21f0e111f + REF azure-messaging-eventhubs_1.0.0-beta.3 + SHA512 0ad0e02755eba07408c6a837a742c0e58890a4b5f281709e1d84ea59a378c0a013068428d99e81d4972172760a3fb55a6026d34d8a558a5747c48a6b3f85e664 ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 4270cac3735138..521ce83e32249d 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.2", - "port-version": 1, + "version-semver": "1.0.0-beta.3", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." @@ -14,11 +13,6 @@ "default-features": false, "version>=": "1.0.0-beta.2" }, - { - "name": "azure-storage-blobs-cpp", - "default-features": false, - "version>=": "12.8.0" - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json new file mode 100644 index 00000000000000..0d16a7f4acd4c7 --- /dev/null +++ b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9289b19329d8fc1b12ef5a71d1cf2d743a32cc2a", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index dd1e776927b38e..f05325a35e0b68 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d50578e6b52b84c8be16a01ee83b4777c3c4bc9d", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "2e4e38f8b37bd9c3c6af8bd95887d9108ba1ca67", "version-semver": "1.0.0-beta.2", diff --git a/versions/baseline.json b/versions/baseline.json index c66b745fa56d6c..4a22b723483aba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -440,9 +440,13 @@ "baseline": "2022-01-21", "port-version": 1 }, + "azure-messaging-eventhubs-checkpointstore-blob-cpp": { + "baseline": "1.0.0-beta.1", + "port-version": 0 + }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.2", - "port-version": 1 + "baseline": "1.0.0-beta.3", + "port-version": 0 }, "azure-security-attestation-cpp": { "baseline": "1.1.0", From 231096cdeca32642d2d5ee58425e8d1d4cb73046 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 13 Oct 2023 01:58:46 +0800 Subject: [PATCH 0060/1039] [fann] update to 2023-01-26 (#34136) --- ports/fann/fix-build_type.patch | 12 ++++ ports/fann/fix-installation.patch | 81 ++++++++------------------ ports/fann/fix-uwp-build.patch | 6 +- ports/fann/portfile.cmake | 21 ++++--- ports/fann/remove-nouse-target.patch | 85 ++++++++++++++++++++++++++++ ports/fann/vcpkg.json | 7 ++- versions/baseline.json | 4 +- versions/f-/fann.json | 5 ++ 8 files changed, 147 insertions(+), 74 deletions(-) create mode 100644 ports/fann/fix-build_type.patch create mode 100644 ports/fann/remove-nouse-target.patch diff --git a/ports/fann/fix-build_type.patch b/ports/fann/fix-build_type.patch new file mode 100644 index 00000000000000..14af5c8fd97665 --- /dev/null +++ b/ports/fann/fix-build_type.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c35ea2..fafd904 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,7 +68,6 @@ set (FANN_VERSION_MINOR 2) + set (FANN_VERSION_PATCH 0) + set (FANN_VERSION_STRING ${FANN_VERSION_MAJOR}.${FANN_VERSION_MINOR}.${FANN_VERSION_PATCH}) + +-option(BUILD_SHARED_LIBS "build shared/static libs" ON) + + INCLUDE(DefineInstallationPaths) + diff --git a/ports/fann/fix-installation.patch b/ports/fann/fix-installation.patch index 270f0877a42fe7..3a7dae2bd628c3 100644 --- a/ports/fann/fix-installation.patch +++ b/ports/fann/fix-installation.patch @@ -1,70 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 12ea06c..6c33c25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,10 +156,5 @@ install (FILES + + ################# compile tests ################ + +-ADD_SUBDIRECTORY( lib/googletest ) +- +-if(COMPILER_SUPPORTS_CXX11) +- ADD_SUBDIRECTORY( tests ) +-endif() + + ENDIF() diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake -index 644cf1b..81e7c74 100644 +index 2969533..e70c4b7 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake -@@ -3,7 +3,7 @@ if (UNIX) - MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME") - SET(APPLICATION_NAME ${PROJECT_NAME}) - ENDIF (NOT APPLICATION_NAME) -- -+if (0) - # Suffix for Linux - SET(LIB_SUFFIX - CACHE STRING "Define suffix of directory name (32/64)" -@@ -122,9 +122,10 @@ if (UNIX) - CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)" - FORCE - ) -+endif() - endif (UNIX) +@@ -127,7 +127,7 @@ if (UNIX OR MINGW OR WIN32) + set (PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "pkgconfig dir" FORCE) + endif () --if (WIN32) +-if (MSCV) +if (0) # Same same SET(BIN_INSTALL_DIR .) SET(SBIN_INSTALL_DIR .) -@@ -134,5 +135,5 @@ if (WIN32) +@@ -137,5 +137,5 @@ if (MSCV) SET(ICON_INSTALL_DIR .) SET(SOUND_INSTALL_DIR .) SET(LOCALE_INSTALL_DIR lang) --endif (WIN32) -+endif (0) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fade00c..a4e6c3f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -14,7 +14,7 @@ floatfann.c - ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS floatfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -26,7 +26,7 @@ doublefann.c - ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS doublefann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -38,7 +38,7 @@ fixedfann.c - ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS fixedfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) - - - ########### next target ############### -@@ -50,5 +50,5 @@ floatfann.c - ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) - - SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) --INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} ) -+INSTALL(TARGETS fann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +-endif (MSCV) ++endif () diff --git a/ports/fann/fix-uwp-build.patch b/ports/fann/fix-uwp-build.patch index dd42358bd4d38b..bcd12e1f0bc16b 100644 --- a/ports/fann/fix-uwp-build.patch +++ b/ports/fann/fix-uwp-build.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b91f6fb..22c39d7 100644 +index 6c33c25..2c35ea2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,6 +22,10 @@ SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig) +@@ -82,6 +82,10 @@ configure_file (cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY) - INSTALL_FILES( ${PKGCONFIG_INSTALL_DIR} FILES fann.pc ) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/fann.pc DESTINATION ${PKGCONFIG_INSTALL_DIR}) +if (MSVC) + add_compile_options(/wd4996) diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index b74433baf2f656..b1829693e87ebc 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,12 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libfann/fann - REF 2.2.0 - SHA512 b307539a39d93078a489710ac77aa8c6e324f3cf5ef80299ce257d10c043913764abef83aceac5278a5bd243b1ee245b4e8331a9e13c774aa63c9cb604f86bdd + REF 8409b42d308bf9428b9d3e60927595e53a797bbc + SHA512 4ad66808d7c88911d4c6d63368240ece2d0cbc73d89a95d32261b95dc551c47c46b3a34cc81b8cb0e03fe3f9ea61cb304e028780357bcf332d660824b066fd1e HEAD_REF master PATCHES fix-installation.patch fix-uwp-build.patch + fix-build_type.patch + remove-nouse-target.patch ) set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") @@ -17,10 +19,11 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin - -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/lib -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/tools/${PORT} -DXDG_APPS_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/include -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_DBG}/share/${PORT} -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/share/${PORT}/doc @@ -32,10 +35,11 @@ vcpkg_cmake_configure( OPTIONS_RELEASE -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/sbin - -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/bin + -DLIB_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/lib -DEXEC_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/tools/${PORT} -DXDG_APPS_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} -DPLUGIN_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/tools/${PORT} + -DINCLUDE_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/include -DSHARE_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} -DDATA_INSTALL_PREFIX=${INSTALL_BASE_DIR_REL}/share/${PORT} -DHTML_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/doc @@ -52,10 +56,9 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/fann/remove-nouse-target.patch b/ports/fann/remove-nouse-target.patch new file mode 100644 index 00000000000000..82a26667900b14 --- /dev/null +++ b/ports/fann/remove-nouse-target.patch @@ -0,0 +1,85 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ac3ff73..2fb9a59 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,15 +23,12 @@ SET(floatfann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) +-ADD_LIBRARY(floatfann_static STATIC ${floatfann_LIB_SRCS}) ++ADD_LIBRARY(floatfann ${floatfann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(floatfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(floatfann_static PROPERTIES OUTPUT_NAME floatfann) + endif(UNIX) +-INSTALL(TARGETS floatfann floatfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS floatfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -42,15 +39,12 @@ SET(doublefann_LIB_SRCS + doublefann.c + ) + +-ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) +-ADD_LIBRARY(doublefann_static STATIC ${doublefann_LIB_SRCS}) ++ADD_LIBRARY(doublefann ${doublefann_LIB_SRCS}) + + SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(doublefann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(doublefann_static PROPERTIES OUTPUT_NAME doublefann) + endif(UNIX) +-INSTALL(TARGETS doublefann doublefann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS doublefann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -61,20 +55,16 @@ SET(fixedfann_LIB_SRCS + fixedfann.c + ) + +-ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) +-ADD_LIBRARY(fixedfann_static STATIC ${fixedfann_LIB_SRCS}) ++ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fixedfann m) +-TARGET_LINK_LIBRARIES(fixedfann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fixedfann_static PROPERTIES OUTPUT_NAME fixedfann) + endif(UNIX) +-INSTALL(TARGETS fixedfann fixedfann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) + +@@ -85,19 +75,15 @@ SET(fann_LIB_SRCS + floatfann.c + ) + +-ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) +-ADD_LIBRARY(fann_static STATIC ${fann_LIB_SRCS}) ++ADD_LIBRARY(fann ${fann_LIB_SRCS}) + + if(NOT MSVC) + TARGET_LINK_LIBRARIES(fann m) +-TARGET_LINK_LIBRARIES(fann_static m) + endif(NOT MSVC) + + SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) +-SET_TARGET_PROPERTIES(fann_static PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR}) + if (UNIX) +- SET_TARGET_PROPERTIES(fann_static PROPERTIES OUTPUT_NAME fann) + endif(UNIX) +-INSTALL(TARGETS fann fann_static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index 03f16620c3fae4..0441b07ee396b9 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fann", - "version": "2.2.0", - "port-version": 3, + "version-date": "2023-01-26", "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", "homepage": "https://github.com/libfann/fann", "license": "LGPL-2.1-only", @@ -9,6 +8,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4a22b723483aba..a19a18a5381e50 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2477,8 +2477,8 @@ "port-version": 0 }, "fann": { - "baseline": "2.2.0", - "port-version": 3 + "baseline": "2023-01-26", + "port-version": 0 }, "farmhash": { "baseline": "1.1", diff --git a/versions/f-/fann.json b/versions/f-/fann.json index e005396d3d4a4a..c99cc402c8fb8b 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94b730a699257765fce03efa37433036770904c4", + "version-date": "2023-01-26", + "port-version": 0 + }, { "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830", "version": "2.2.0", From 957ee5f17c3e10fca86f5fe500afd5ba5c596413 Mon Sep 17 00:00:00 2001 From: "Joshua T. Fisher" Date: Thu, 12 Oct 2023 10:59:25 -0700 Subject: [PATCH 0061/1039] [mpg123] Add patch for wasm triplet, fix checktypesize (#33959) --- ports/mpg123/fix-checktypesize.patch | 14 ++++++++++++++ ports/mpg123/portfile.cmake | 1 + ports/mpg123/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/mpg123/fix-checktypesize.patch diff --git a/ports/mpg123/fix-checktypesize.patch b/ports/mpg123/fix-checktypesize.patch new file mode 100644 index 00000000000000..68af0ca9e88606 --- /dev/null +++ b/ports/mpg123/fix-checktypesize.patch @@ -0,0 +1,14 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index 79e1f9b..e057567 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -5,6 +5,7 @@ include(CheckFunctionExists) + include(CheckIncludeFile) + include(CheckIncludeFiles) + include(CheckSymbolExists) ++include(CheckTypeSize) + include(CMakeDependentOption) + include(TestBigEndian) + + + diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 7761054c444e56..ae8ba26fe63f99 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_sourceforge( FILENAME "mpg123-${VERSION}.tar.bz2" SHA512 5dd550e06f5d0d432cac1b7e546215e56378b44588c1a98031498473211e08bc4228de45be41f7ba764f7f6c0eb752a6501235bcc3712c9a8d8852ae3c607d98 PATCHES + fix-checktypesize.patch fix-modulejack.patch fix-m1-build.patch ) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 0452cbb7f9b51d..0c08fb301106c5 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpg123", "version": "1.31.3", - "port-version": 1, + "port-version": 2, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index a19a18a5381e50..f9aaa39b3df873 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5582,7 +5582,7 @@ }, "mpg123": { "baseline": "1.31.3", - "port-version": 1 + "port-version": 2 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 77fca26318bfee..32aaa1c41e8fae 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58fbb0bf0ec6307689125ef1ba71112b670a42a9", + "version": "1.31.3", + "port-version": 2 + }, { "git-tree": "73f380749ae40814a07c7a0952e94db2970a9b85", "version": "1.31.3", From 5016afa7ed49f8bac5dc801555b7d6af9fe79f58 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 12 Oct 2023 11:49:39 -0700 Subject: [PATCH 0062/1039] Build Fixes 2023-10-11. (#34428) Results from build: https://dev.azure.com/vcpkg/public/_build/results?buildId=95281 PASSING, REMOVE FROM FAIL LIST: qcoro:x64-osx (/Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt). Caused by https://github.com/microsoft/vcpkg/pull/33273 The comment says that it's an ICE but it passed in CI; this might be a form of intermittent compiler crash. If we get a failure next time we should change this to skip instead. --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 49f226b2a618a8..2d288e273fceeb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -960,8 +960,6 @@ python3:x64-android=fail # Not yet ready for these platforms. qbittorrent:x64-osx=fail qbittorrent:x64-linux=fail -# Triggers ICE in release build. -qcoro:x64-osx=fail qpid-proton:arm-neon-android=fail qpid-proton:arm64-uwp=fail qpid-proton:arm64-android=fail From b2f2cd3e4b9e6782a73ac17d27307feda4baa71c Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 13 Oct 2023 10:23:11 +0800 Subject: [PATCH 0063/1039] [plplot] Fix download errors (#34441) --- ports/plplot/portfile.cmake | 2 +- ports/plplot/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/plplot.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index e38c3c93746508..e8836319c1fe37 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO plplot/plplot - REF "${VERSION} Source" + REF "${VERSION}%20Source" FILENAME "plplot-${VERSION}.tar.gz" SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8 PATCHES diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index 490c0ba7a000ff..054a7d80cffd63 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plplot", "version-semver": "5.15.0", - "port-version": 1, + "port-version": 2, "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", "homepage": "http://plplot.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index f9aaa39b3df873..0d2116ca6b9f2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6510,7 +6510,7 @@ }, "plplot": { "baseline": "5.15.0", - "port-version": 1 + "port-version": 2 }, "plustache": { "baseline": "0.4.0", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index 4f67b2bde98dcc..de2860c2d3f801 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "650f7b8973b4a28f84fc0e8ab1711e468417f564", + "version-semver": "5.15.0", + "port-version": 2 + }, { "git-tree": "3fb1fa2f2f5f9c3ea3543f5ba3074138be2d2320", "version-semver": "5.15.0", From 98da1aa3665fcddf84f604a99dc4c03587e90419 Mon Sep 17 00:00:00 2001 From: talregev Date: Fri, 13 Oct 2023 05:34:04 +0300 Subject: [PATCH 0064/1039] Update gz-cmake3 (#34010) --- ports/gz-cmake3/portfile.cmake | 12 ++++++------ ports/gz-cmake3/vcpkg.json | 2 +- ports/jsoncpp/portfile.cmake | 4 +++- ports/jsoncpp/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/g-/gz-cmake3.json | 5 +++++ versions/j-/jsoncpp.json | 5 +++++ 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake index 1a881c4eb7d9a3..76511dea4381d1 100644 --- a/ports/gz-cmake3/portfile.cmake +++ b/ports/gz-cmake3/portfile.cmake @@ -1,11 +1,11 @@ set(PACKAGE_NAME cmake) -ignition_modular_library(NAME ${PACKAGE_NAME} - REF ${PORT}_${VERSION} - VERSION ${VERSION} - SHA512 99fb6a137b8a913b49e7881e9b2c96ca1ae03fb48cfa30f635a69396ccb0eb108abb8a925fd85dc46f3b10f88758675da53eb6cae3325eabeac5e6bee6f54d91 - PATCHES - ) +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 59d6f90561e762c00035aae273420bc3d6a24af47b5d2914cd8547146f63919bc4c3e33e6c0942dc89bc75925cebff1bcbbf18e3239220ebc6bb194326c3197a +) # Install custom usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index e2e444dd5fe50f..e0cde38305c818 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-cmake3", - "version": "3.0.1", + "version": "3.4.0", "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index 84c1a54616361c..aaed28616a3e45 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( -DJSONCPP_WITH_CMAKE_PACKAGE=ON -DBUILD_STATIC_LIBS=${JSONCPP_STATIC} -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT} - -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF + -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF @@ -30,3 +30,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index f9daea0f09a9a7..b7e65e6f7760a6 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jsoncpp", "version": "1.9.5", + "port-version": 1, "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", "homepage": "https://github.com/open-source-parsers/jsoncpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0d2116ca6b9f2d..2a199984dba3d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3133,7 +3133,7 @@ "port-version": 6 }, "gz-cmake3": { - "baseline": "3.0.1", + "baseline": "3.4.0", "port-version": 0 }, "gz-common5": { @@ -3606,7 +3606,7 @@ }, "jsoncpp": { "baseline": "1.9.5", - "port-version": 0 + "port-version": 1 }, "jsonifier": { "baseline": "0.9.9", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index 865ab42b8c574e..59dee1f1af63a9 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04e105aecf5f7805dde15ac905cacb77ffcd3225", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "a1a12dbb8647dbc12381aa63fe0c66c48e2b4b31", "version": "3.0.1", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index ca8db93235910b..eccacde2a2fe60 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0213314186f58bfac60d8dee9895c137291db35d", + "version": "1.9.5", + "port-version": 1 + }, { "git-tree": "ee92c743e235ebd2eda342c656704f20a329bda9", "version": "1.9.5", From 2f94f0e5a6753f5b69ac52cdf7d00eb7f2891e3e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 13 Oct 2023 04:34:46 +0200 Subject: [PATCH 0065/1039] [libidn2] Generally disable AUTOPOINT (#34234) --- ports/libidn2/portfile.cmake | 2 +- ports/libidn2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libidn2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 000dd544b4c9ba..0fa9a5ddb614fe 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -29,9 +29,9 @@ vcpkg_list(SET options) 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() +set(ENV{AUTOPOINT} true) # true, the program if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_list(APPEND options "CPPFLAGS=\$CPPFLAGS -DIDN2_STATIC") diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index e56062289296cb..f0c5add11ff9b6 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libidn2", "version": "2.3.4", - "port-version": 2, + "port-version": 3, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 2a199984dba3d0..39b0314f26b8da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4298,7 +4298,7 @@ }, "libidn2": { "baseline": "2.3.4", - "port-version": 2 + "port-version": 3 }, "libigl": { "baseline": "2.4.0", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 552f76f234eccd..65f1e85078d4a9 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20e169744f242f67bc4b4dc310f5785d55dba58c", + "version": "2.3.4", + "port-version": 3 + }, { "git-tree": "4784d5f7f99d7ea1ebe6f1ef01943e402e7bfddf", "version": "2.3.4", From 19db77b44e64bde5e3a50364985d2bf16fed0615 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Fri, 13 Oct 2023 06:11:35 +0300 Subject: [PATCH 0066/1039] [aws-sdk-cpp] Remove `compute_build_only.cmake`. (#34384) --- ports/aws-sdk-cpp/compute_build_only.cmake | 1090 -------------------- ports/aws-sdk-cpp/generateFeatures.ps1 | 158 ++- ports/aws-sdk-cpp/portfile.cmake | 198 ++-- ports/aws-sdk-cpp/usage | 24 +- ports/aws-sdk-cpp/vcpkg.in.json | 75 +- ports/aws-sdk-cpp/vcpkg.json | 1 + versions/a-/aws-sdk-cpp.json | 5 + versions/baseline.json | 2 +- 8 files changed, 228 insertions(+), 1325 deletions(-) delete mode 100644 ports/aws-sdk-cpp/compute_build_only.cmake diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake deleted file mode 100644 index 27b93c24bc7575..00000000000000 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ /dev/null @@ -1,1090 +0,0 @@ -# Automatically generated by generateFeatures.ps1 -if("access-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY access-management) -endif() -if("accessanalyzer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY accessanalyzer) -endif() -if("account" IN_LIST FEATURES) - list(APPEND BUILD_ONLY account) -endif() -if("acm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY acm) -endif() -if("acm-pca" IN_LIST FEATURES) - list(APPEND BUILD_ONLY acm-pca) -endif() -if("alexaforbusiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY alexaforbusiness) -endif() -if("amp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amp) -endif() -if("amplify" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplify) -endif() -if("amplifybackend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifybackend) -endif() -if("amplifyuibuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY amplifyuibuilder) -endif() -if("apigateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigateway) -endif() -if("apigatewaymanagementapi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigatewaymanagementapi) -endif() -if("apigatewayv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apigatewayv2) -endif() -if("appconfig" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfig) -endif() -if("appconfigdata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appconfigdata) -endif() -if("appfabric" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appfabric) -endif() -if("appflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appflow) -endif() -if("appintegrations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appintegrations) -endif() -if("application-autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-autoscaling) -endif() -if("application-insights" IN_LIST FEATURES) - list(APPEND BUILD_ONLY application-insights) -endif() -if("applicationcostprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY applicationcostprofiler) -endif() -if("appmesh" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appmesh) -endif() -if("apprunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY apprunner) -endif() -if("appstream" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appstream) -endif() -if("appsync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY appsync) -endif() -if("arc-zonal-shift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY arc-zonal-shift) -endif() -if("athena" IN_LIST FEATURES) - list(APPEND BUILD_ONLY athena) -endif() -if("auditmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY auditmanager) -endif() -if("autoscaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling) -endif() -if("autoscaling-plans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY autoscaling-plans) -endif() -if("awsmigrationhub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY AWSMigrationHub) -endif() -if("awstransfer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY awstransfer) -endif() -if("backup" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backup) -endif() -if("backup-gateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backup-gateway) -endif() -if("backupstorage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY backupstorage) -endif() -if("batch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY batch) -endif() -if("billingconductor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY billingconductor) -endif() -if("braket" IN_LIST FEATURES) - list(APPEND BUILD_ONLY braket) -endif() -if("budgets" IN_LIST FEATURES) - list(APPEND BUILD_ONLY budgets) -endif() -if("ce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ce) -endif() -if("chime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime) -endif() -if("chime-sdk-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-identity) -endif() -if("chime-sdk-media-pipelines" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-media-pipelines) -endif() -if("chime-sdk-meetings" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-meetings) -endif() -if("chime-sdk-messaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-messaging) -endif() -if("chime-sdk-voice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY chime-sdk-voice) -endif() -if("cleanrooms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cleanrooms) -endif() -if("cloud9" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloud9) -endif() -if("cloudcontrol" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudcontrol) -endif() -if("clouddirectory" IN_LIST FEATURES) - list(APPEND BUILD_ONLY clouddirectory) -endif() -if("cloudformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudformation) -endif() -if("cloudfront" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudfront) -endif() -if("cloudhsm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsm) -endif() -if("cloudhsmv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudhsmv2) -endif() -if("cloudsearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearch) -endif() -if("cloudsearchdomain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudsearchdomain) -endif() -if("cloudtrail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail) -endif() -if("cloudtrail-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cloudtrail-data) -endif() -if("codeartifact" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeartifact) -endif() -if("codebuild" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codebuild) -endif() -if("codecatalyst" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecatalyst) -endif() -if("codecommit" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codecommit) -endif() -if("codedeploy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codedeploy) -endif() -if("codeguru-reviewer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-reviewer) -endif() -if("codeguru-security" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguru-security) -endif() -if("codeguruprofiler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codeguruprofiler) -endif() -if("codepipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codepipeline) -endif() -if("codestar" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar) -endif() -if("codestar-connections" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-connections) -endif() -if("codestar-notifications" IN_LIST FEATURES) - list(APPEND BUILD_ONLY codestar-notifications) -endif() -if("cognito-identity" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-identity) -endif() -if("cognito-idp" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-idp) -endif() -if("cognito-sync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cognito-sync) -endif() -if("comprehend" IN_LIST FEATURES) - list(APPEND BUILD_ONLY comprehend) -endif() -if("comprehendmedical" IN_LIST FEATURES) - list(APPEND BUILD_ONLY comprehendmedical) -endif() -if("compute-optimizer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY compute-optimizer) -endif() -if("config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY config) -endif() -if("connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect) -endif() -if("connect-contact-lens" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connect-contact-lens) -endif() -if("connectcampaigns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcampaigns) -endif() -if("connectcases" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectcases) -endif() -if("connectparticipant" IN_LIST FEATURES) - list(APPEND BUILD_ONLY connectparticipant) -endif() -if("controltower" IN_LIST FEATURES) - list(APPEND BUILD_ONLY controltower) -endif() -if("cur" IN_LIST FEATURES) - list(APPEND BUILD_ONLY cur) -endif() -if("customer-profiles" IN_LIST FEATURES) - list(APPEND BUILD_ONLY customer-profiles) -endif() -if("databrew" IN_LIST FEATURES) - list(APPEND BUILD_ONLY databrew) -endif() -if("dataexchange" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dataexchange) -endif() -if("datapipeline" IN_LIST FEATURES) - list(APPEND BUILD_ONLY datapipeline) -endif() -if("datasync" IN_LIST FEATURES) - list(APPEND BUILD_ONLY datasync) -endif() -if("dax" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dax) -endif() -if("detective" IN_LIST FEATURES) - list(APPEND BUILD_ONLY detective) -endif() -if("devicefarm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devicefarm) -endif() -if("devops-guru" IN_LIST FEATURES) - list(APPEND BUILD_ONLY devops-guru) -endif() -if("directconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY directconnect) -endif() -if("discovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY discovery) -endif() -if("dlm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dlm) -endif() -if("dms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dms) -endif() -if("docdb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY docdb) -endif() -if("docdb-elastic" IN_LIST FEATURES) - list(APPEND BUILD_ONLY docdb-elastic) -endif() -if("drs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY drs) -endif() -if("ds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ds) -endif() -if("dynamodb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodb) -endif() -if("dynamodbstreams" IN_LIST FEATURES) - list(APPEND BUILD_ONLY dynamodbstreams) -endif() -if("ebs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ebs) -endif() -if("ec2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2) -endif() -if("ec2-instance-connect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ec2-instance-connect) -endif() -if("ecr" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr) -endif() -if("ecr-public" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecr-public) -endif() -if("ecs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ecs) -endif() -if("eks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY eks) -endif() -if("elastic-inference" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastic-inference) -endif() -if("elasticache" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticache) -endif() -if("elasticbeanstalk" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticbeanstalk) -endif() -if("elasticfilesystem" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticfilesystem) -endif() -if("elasticloadbalancing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancing) -endif() -if("elasticloadbalancingv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticloadbalancingv2) -endif() -if("elasticmapreduce" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elasticmapreduce) -endif() -if("elastictranscoder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY elastictranscoder) -endif() -if("email" IN_LIST FEATURES) - list(APPEND BUILD_ONLY email) -endif() -if("emr-containers" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-containers) -endif() -if("emr-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY emr-serverless) -endif() -if("entityresolution" IN_LIST FEATURES) - list(APPEND BUILD_ONLY entityresolution) -endif() -if("es" IN_LIST FEATURES) - list(APPEND BUILD_ONLY es) -endif() -if("eventbridge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY eventbridge) -endif() -if("events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY events) -endif() -if("evidently" IN_LIST FEATURES) - list(APPEND BUILD_ONLY evidently) -endif() -if("finspace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace) -endif() -if("finspace-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY finspace-data) -endif() -if("firehose" IN_LIST FEATURES) - list(APPEND BUILD_ONLY firehose) -endif() -if("fis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fis) -endif() -if("fms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fms) -endif() -if("forecast" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecast) -endif() -if("forecastquery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY forecastquery) -endif() -if("frauddetector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY frauddetector) -endif() -if("fsx" IN_LIST FEATURES) - list(APPEND BUILD_ONLY fsx) -endif() -if("gamelift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamelift) -endif() -if("gamesparks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY gamesparks) -endif() -if("glacier" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glacier) -endif() -if("globalaccelerator" IN_LIST FEATURES) - list(APPEND BUILD_ONLY globalaccelerator) -endif() -if("glue" IN_LIST FEATURES) - list(APPEND BUILD_ONLY glue) -endif() -if("grafana" IN_LIST FEATURES) - list(APPEND BUILD_ONLY grafana) -endif() -if("greengrass" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrass) -endif() -if("greengrassv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY greengrassv2) -endif() -if("groundstation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY groundstation) -endif() -if("guardduty" IN_LIST FEATURES) - list(APPEND BUILD_ONLY guardduty) -endif() -if("health" IN_LIST FEATURES) - list(APPEND BUILD_ONLY health) -endif() -if("healthlake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY healthlake) -endif() -if("honeycode" IN_LIST FEATURES) - list(APPEND BUILD_ONLY honeycode) -endif() -if("iam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iam) -endif() -if("identity-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identity-management) -endif() -if("identitystore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY identitystore) -endif() -if("imagebuilder" IN_LIST FEATURES) - list(APPEND BUILD_ONLY imagebuilder) -endif() -if("importexport" IN_LIST FEATURES) - list(APPEND BUILD_ONLY importexport) -endif() -if("inspector" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector) -endif() -if("inspector2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY inspector2) -endif() -if("internetmonitor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY internetmonitor) -endif() -if("iot" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot) -endif() -if("iot-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-data) -endif() -if("iot-jobs-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-jobs-data) -endif() -if("iot-roborunner" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot-roborunner) -endif() -if("iot1click-devices" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot1click-devices) -endif() -if("iot1click-projects" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iot1click-projects) -endif() -if("iotanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotanalytics) -endif() -if("iotdeviceadvisor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotdeviceadvisor) -endif() -if("iotevents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents) -endif() -if("iotevents-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotevents-data) -endif() -if("iotfleethub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleethub) -endif() -if("iotfleetwise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotfleetwise) -endif() -if("iotsecuretunneling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsecuretunneling) -endif() -if("iotsitewise" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotsitewise) -endif() -if("iotthingsgraph" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotthingsgraph) -endif() -if("iottwinmaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iottwinmaker) -endif() -if("iotwireless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY iotwireless) -endif() -if("ivs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs) -endif() -if("ivs-realtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivs-realtime) -endif() -if("ivschat" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ivschat) -endif() -if("kafka" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kafka) -endif() -if("kafkaconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kafkaconnect) -endif() -if("kendra" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra) -endif() -if("kendra-ranking" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kendra-ranking) -endif() -if("keyspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY keyspaces) -endif() -if("kinesis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis) -endif() -if("kinesis-video-archived-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-archived-media) -endif() -if("kinesis-video-media" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-media) -endif() -if("kinesis-video-signaling" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-signaling) -endif() -if("kinesis-video-webrtc-storage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesis-video-webrtc-storage) -endif() -if("kinesisanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisanalytics) -endif() -if("kinesisanalyticsv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisanalyticsv2) -endif() -if("kinesisvideo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kinesisvideo) -endif() -if("kms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY kms) -endif() -if("lakeformation" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lakeformation) -endif() -if("lambda" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lambda) -endif() -if("lex" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex) -endif() -if("lex-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lex-models) -endif() -if("lexv2-models" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-models) -endif() -if("lexv2-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lexv2-runtime) -endif() -if("license-manager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager) -endif() -if("license-manager-linux-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-linux-subscriptions) -endif() -if("license-manager-user-subscriptions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY license-manager-user-subscriptions) -endif() -if("lightsail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lightsail) -endif() -if("location" IN_LIST FEATURES) - list(APPEND BUILD_ONLY location) -endif() -if("logs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY logs) -endif() -if("lookoutequipment" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutequipment) -endif() -if("lookoutmetrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutmetrics) -endif() -if("lookoutvision" IN_LIST FEATURES) - list(APPEND BUILD_ONLY lookoutvision) -endif() -if("m2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY m2) -endif() -if("machinelearning" IN_LIST FEATURES) - list(APPEND BUILD_ONLY machinelearning) -endif() -if("macie" IN_LIST FEATURES) - list(APPEND BUILD_ONLY macie) -endif() -if("macie2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY macie2) -endif() -if("managedblockchain" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain) -endif() -if("managedblockchain-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY managedblockchain-query) -endif() -if("marketplace-catalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-catalog) -endif() -if("marketplace-entitlement" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplace-entitlement) -endif() -if("marketplacecommerceanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY marketplacecommerceanalytics) -endif() -if("mediaconnect" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediaconnect) -endif() -if("mediaconvert" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediaconvert) -endif() -if("medialive" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medialive) -endif() -if("mediapackage" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage) -endif() -if("mediapackage-vod" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackage-vod) -endif() -if("mediapackagev2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediapackagev2) -endif() -if("mediastore" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore) -endif() -if("mediastore-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediastore-data) -endif() -if("mediatailor" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mediatailor) -endif() -if("medical-imaging" IN_LIST FEATURES) - list(APPEND BUILD_ONLY medical-imaging) -endif() -if("memorydb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY memorydb) -endif() -if("meteringmarketplace" IN_LIST FEATURES) - list(APPEND BUILD_ONLY meteringmarketplace) -endif() -if("mgn" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mgn) -endif() -if("migration-hub-refactor-spaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migration-hub-refactor-spaces) -endif() -if("migrationhub-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhub-config) -endif() -if("migrationhuborchestrator" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhuborchestrator) -endif() -if("migrationhubstrategy" IN_LIST FEATURES) - list(APPEND BUILD_ONLY migrationhubstrategy) -endif() -if("mobile" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobile) -endif() -if("monitoring" IN_LIST FEATURES) - list(APPEND BUILD_ONLY monitoring) -endif() -if("mq" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mq) -endif() -if("mturk-requester" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mturk-requester) -endif() -if("mwaa" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mwaa) -endif() -if("neptune" IN_LIST FEATURES) - list(APPEND BUILD_ONLY neptune) -endif() -if("neptunedata" IN_LIST FEATURES) - list(APPEND BUILD_ONLY neptunedata) -endif() -if("network-firewall" IN_LIST FEATURES) - list(APPEND BUILD_ONLY network-firewall) -endif() -if("networkmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY networkmanager) -endif() -if("nimble" IN_LIST FEATURES) - list(APPEND BUILD_ONLY nimble) -endif() -if("oam" IN_LIST FEATURES) - list(APPEND BUILD_ONLY oam) -endif() -if("omics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY omics) -endif() -if("opensearch" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearch) -endif() -if("opensearchserverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opensearchserverless) -endif() -if("opsworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworks) -endif() -if("opsworkscm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY opsworkscm) -endif() -if("organizations" IN_LIST FEATURES) - list(APPEND BUILD_ONLY organizations) -endif() -if("osis" IN_LIST FEATURES) - list(APPEND BUILD_ONLY osis) -endif() -if("outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY outposts) -endif() -if("panorama" IN_LIST FEATURES) - list(APPEND BUILD_ONLY panorama) -endif() -if("payment-cryptography" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography) -endif() -if("payment-cryptography-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY payment-cryptography-data) -endif() -if("pca-connector-ad" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pca-connector-ad) -endif() -if("personalize" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize) -endif() -if("personalize-events" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-events) -endif() -if("personalize-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY personalize-runtime) -endif() -if("pi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pi) -endif() -if("pinpoint" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint) -endif() -if("pinpoint-email" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint-email) -endif() -if("pinpoint-sms-voice-v2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pinpoint-sms-voice-v2) -endif() -if("pipes" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pipes) -endif() -if("polly" IN_LIST FEATURES) - list(APPEND BUILD_ONLY polly) -endif() -if("pricing" IN_LIST FEATURES) - list(APPEND BUILD_ONLY pricing) -endif() -if("privatenetworks" IN_LIST FEATURES) - list(APPEND BUILD_ONLY privatenetworks) -endif() -if("proton" IN_LIST FEATURES) - list(APPEND BUILD_ONLY proton) -endif() -if("qldb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb) -endif() -if("qldb-session" IN_LIST FEATURES) - list(APPEND BUILD_ONLY qldb-session) -endif() -if("queues" IN_LIST FEATURES) - list(APPEND BUILD_ONLY queues) -endif() -if("quicksight" IN_LIST FEATURES) - list(APPEND BUILD_ONLY quicksight) -endif() -if("ram" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ram) -endif() -if("rbin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rbin) -endif() -if("rds" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rds) -endif() -if("rds-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rds-data) -endif() -if("redshift" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift) -endif() -if("redshift-data" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-data) -endif() -if("redshift-serverless" IN_LIST FEATURES) - list(APPEND BUILD_ONLY redshift-serverless) -endif() -if("rekognition" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rekognition) -endif() -if("resiliencehub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resiliencehub) -endif() -if("resource-explorer-2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-explorer-2) -endif() -if("resource-groups" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resource-groups) -endif() -if("resourcegroupstaggingapi" IN_LIST FEATURES) - list(APPEND BUILD_ONLY resourcegroupstaggingapi) -endif() -if("robomaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY robomaker) -endif() -if("rolesanywhere" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rolesanywhere) -endif() -if("route53" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53) -endif() -if("route53-recovery-cluster" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-cluster) -endif() -if("route53-recovery-control-config" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-control-config) -endif() -if("route53-recovery-readiness" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53-recovery-readiness) -endif() -if("route53domains" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53domains) -endif() -if("route53resolver" IN_LIST FEATURES) - list(APPEND BUILD_ONLY route53resolver) -endif() -if("rum" IN_LIST FEATURES) - list(APPEND BUILD_ONLY rum) -endif() -if("s3" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3) -endif() -if("s3-crt" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-crt) -endif() -if("s3-encryption" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3-encryption) -endif() -if("s3control" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3control) -endif() -if("s3outposts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY s3outposts) -endif() -if("sagemaker" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker) -endif() -if("sagemaker-a2i-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-a2i-runtime) -endif() -if("sagemaker-edge" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-edge) -endif() -if("sagemaker-featurestore-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-featurestore-runtime) -endif() -if("sagemaker-geospatial" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-geospatial) -endif() -if("sagemaker-metrics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-metrics) -endif() -if("sagemaker-runtime" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sagemaker-runtime) -endif() -if("savingsplans" IN_LIST FEATURES) - list(APPEND BUILD_ONLY savingsplans) -endif() -if("scheduler" IN_LIST FEATURES) - list(APPEND BUILD_ONLY scheduler) -endif() -if("schemas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY schemas) -endif() -if("sdb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sdb) -endif() -if("secretsmanager" IN_LIST FEATURES) - list(APPEND BUILD_ONLY secretsmanager) -endif() -if("securityhub" IN_LIST FEATURES) - list(APPEND BUILD_ONLY securityhub) -endif() -if("securitylake" IN_LIST FEATURES) - list(APPEND BUILD_ONLY securitylake) -endif() -if("serverlessrepo" IN_LIST FEATURES) - list(APPEND BUILD_ONLY serverlessrepo) -endif() -if("service-quotas" IN_LIST FEATURES) - list(APPEND BUILD_ONLY service-quotas) -endif() -if("servicecatalog" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog) -endif() -if("servicecatalog-appregistry" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicecatalog-appregistry) -endif() -if("servicediscovery" IN_LIST FEATURES) - list(APPEND BUILD_ONLY servicediscovery) -endif() -if("sesv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sesv2) -endif() -if("shield" IN_LIST FEATURES) - list(APPEND BUILD_ONLY shield) -endif() -if("signer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY signer) -endif() -if("simspaceweaver" IN_LIST FEATURES) - list(APPEND BUILD_ONLY simspaceweaver) -endif() -if("sms" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sms) -endif() -if("sms-voice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sms-voice) -endif() -if("snow-device-management" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snow-device-management) -endif() -if("snowball" IN_LIST FEATURES) - list(APPEND BUILD_ONLY snowball) -endif() -if("sns" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sns) -endif() -if("sqs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sqs) -endif() -if("ssm" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm) -endif() -if("ssm-contacts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-contacts) -endif() -if("ssm-incidents" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-incidents) -endif() -if("ssm-sap" IN_LIST FEATURES) - list(APPEND BUILD_ONLY ssm-sap) -endif() -if("sso" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso) -endif() -if("sso-admin" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-admin) -endif() -if("sso-oidc" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sso-oidc) -endif() -if("states" IN_LIST FEATURES) - list(APPEND BUILD_ONLY states) -endif() -if("storagegateway" IN_LIST FEATURES) - list(APPEND BUILD_ONLY storagegateway) -endif() -if("sts" IN_LIST FEATURES) - list(APPEND BUILD_ONLY sts) -endif() -if("support" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support) -endif() -if("support-app" IN_LIST FEATURES) - list(APPEND BUILD_ONLY support-app) -endif() -if("swf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY swf) -endif() -if("synthetics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY synthetics) -endif() -if("text-to-speech" IN_LIST FEATURES) - list(APPEND BUILD_ONLY text-to-speech) -endif() -if("textract" IN_LIST FEATURES) - list(APPEND BUILD_ONLY textract) -endif() -if("timestream-query" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-query) -endif() -if("timestream-write" IN_LIST FEATURES) - list(APPEND BUILD_ONLY timestream-write) -endif() -if("tnb" IN_LIST FEATURES) - list(APPEND BUILD_ONLY tnb) -endif() -if("transcribe" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribe) -endif() -if("transcribestreaming" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transcribestreaming) -endif() -if("transfer" IN_LIST FEATURES) - list(APPEND BUILD_ONLY transfer) -endif() -if("translate" IN_LIST FEATURES) - list(APPEND BUILD_ONLY translate) -endif() -if("verifiedpermissions" IN_LIST FEATURES) - list(APPEND BUILD_ONLY verifiedpermissions) -endif() -if("voice-id" IN_LIST FEATURES) - list(APPEND BUILD_ONLY voice-id) -endif() -if("vpc-lattice" IN_LIST FEATURES) - list(APPEND BUILD_ONLY vpc-lattice) -endif() -if("waf" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf) -endif() -if("waf-regional" IN_LIST FEATURES) - list(APPEND BUILD_ONLY waf-regional) -endif() -if("wafv2" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wafv2) -endif() -if("wellarchitected" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wellarchitected) -endif() -if("wisdom" IN_LIST FEATURES) - list(APPEND BUILD_ONLY wisdom) -endif() -if("workdocs" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workdocs) -endif() -if("worklink" IN_LIST FEATURES) - list(APPEND BUILD_ONLY worklink) -endif() -if("workmail" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmail) -endif() -if("workmailmessageflow" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workmailmessageflow) -endif() -if("workspaces" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces) -endif() -if("workspaces-web" IN_LIST FEATURES) - list(APPEND BUILD_ONLY workspaces-web) -endif() -if("xray" IN_LIST FEATURES) - list(APPEND BUILD_ONLY xray) -endif() diff --git a/ports/aws-sdk-cpp/generateFeatures.ps1 b/ports/aws-sdk-cpp/generateFeatures.ps1 index f10ee40e7a2bc5..d0f9a5aba7229e 100644 --- a/ports/aws-sdk-cpp/generateFeatures.ps1 +++ b/ports/aws-sdk-cpp/generateFeatures.ps1 @@ -1,85 +1,73 @@ -[CmdletBinding()] -param( - [Parameter(Mandatory=$true)][string]$SourcesRef, - [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, - [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" -) - -$ErrorActionPreference = "Stop" - -$ManifestIn = "$PortDirectory/vcpkg.in.json" -$ManifestOut = "$PortDirectory/vcpkg.json" -$CMakeFragmentFile = "$PortDirectory/compute_build_only.cmake" - -$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" -if (-not (Test-Path $ExtractedSources)) { - if (Test-Path "$ExtractedSources.tmp") { - Remove-Item -Force "$ExtractedSources.tmp" - } - git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host - git -c "$ExtractedSources.tmp" checkout $SourcesRef - Move-Item "$ExtractedSources.tmp" "$ExtractedSources" -} -Write-Host "Using sources directory: $ExtractedSources" - - -$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name - -$manifest = Get-Content $ManifestIn | ConvertFrom-Json -$manifest | Add-Member ` - -NotePropertyName '$note' ` - -NotePropertyValue 'Automatically generated by generateFeatures.ps1' -$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} - -$cmakefragmenttext = @("# Automatically generated by generateFeatures.ps1") - -function GetDescription($dir, $modulename) -{ - if (Test-Path "$dir\CMakeLists.txt") - { - $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") - if ($descs.count -eq 1) { - $desc = $descs[0].Matches.Value -replace "`"","" - "$desc" - } - else { "C++ SDK for the AWS $modulename service" } - } - else { "C++ SDK for the AWS $modulename service" } -} - -$featureDependencies = @{} -Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` -| ForEach-Object { $_.Matches } ` -| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` -| Where-Object { $_ -ne "core" }) } - -foreach ($subfolder in $subfolders) -{ - $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" - if ($modulename -match "-tests`$") { continue } - if ($modulename -match "-sample`$") { continue } - if ($modulename -eq "core") { continue } - - $lowermodulename = $modulename.ToLower() - - $featureObj = @{ description = (GetDescription $subfolder $modulename) } - - if ($featureDependencies.ContainsKey($lowermodulename)) { - $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } - } - - $manifest.features.Add("$lowermodulename", $featureObj) - - $cmakefragmenttext += @( - "if(`"$lowermodulename`" IN_LIST FEATURES)", - " list(APPEND BUILD_ONLY $modulename)", - "endif()" - ) -} - -[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) - -Write-Verbose ($cmakefragmenttext -join "`n") -[IO.File]::WriteAllText($CMakeFragmentFile, ($cmakefragmenttext -join "`n") +"`n") - -& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut +[CmdletBinding()] +param( + [Parameter(Mandatory=$true)][string]$SourcesRef, + [Parameter(Mandatory=$false)][string]$PortDirectory = $PSScriptRoot, + [Parameter(Mandatory=$false)][string]$vcpkg = "$PSScriptRoot/../../vcpkg" +) + +$ErrorActionPreference = "Stop" + +$ManifestIn = "$PortDirectory/vcpkg.in.json" +$ManifestOut = "$PortDirectory/vcpkg.json" + +$ExtractedSources = "${env:TEMP}/aws-sdk-cpp-generateFeatures-$SourcesRef" +if (-not (Test-Path $ExtractedSources)) { + if (Test-Path "$ExtractedSources.tmp") { + Remove-Item -Force "$ExtractedSources.tmp" + } + git clone "https://github.com/aws/aws-sdk-cpp" "$ExtractedSources.tmp" | Out-Host + git -c "$ExtractedSources.tmp" checkout $SourcesRef + Move-Item "$ExtractedSources.tmp" "$ExtractedSources" +} +Write-Host "Using sources directory: $ExtractedSources" + + +$subfolders = Get-ChildItem -Path "$ExtractedSources\generated\src\aws-cpp-sdk-*", "$ExtractedSources\src\aws-cpp-sdk*" | Sort-Object -Property Name + +$manifest = Get-Content $ManifestIn | ConvertFrom-Json +$manifest | Add-Member ` + -NotePropertyName '$note' ` + -NotePropertyValue 'Automatically generated by generateFeatures.ps1' +$manifest | Add-Member -NotePropertyName 'features' -NotePropertyValue @{} + +function GetDescription($dir, $modulename) +{ + if (Test-Path "$dir\CMakeLists.txt") + { + $descs = @(Select-String -Path "$dir\CMakeLists.txt" -Pattern "`"C\+\+ SDK for the AWS [^`"]*`"") + if ($descs.count -eq 1) { + $desc = $descs[0].Matches.Value -replace "`"","" + "$desc" + } + else { "C++ SDK for the AWS $modulename service" } + } + else { "C++ SDK for the AWS $modulename service" } +} + +$featureDependencies = @{} +Select-String -Path "$ExtractedSources\cmake\sdksCommon.cmake" -Pattern "list\(APPEND SDK_DEPENDENCY_LIST `"([\w-]+):([\w-,]+)`"\)" -AllMatches ` +| ForEach-Object { $_.Matches } ` +| ForEach-Object { $featureDependencies[$_.Groups[1].Value] = @($_.Groups[2].Value -split "," ` +| Where-Object { $_ -ne "core" }) } + +foreach ($subfolder in $subfolders) +{ + $modulename = $subfolder.name -replace "^aws-cpp-sdk-","" + if ($modulename -match "-tests`$") { continue } + if ($modulename -match "-sample`$") { continue } + if ($modulename -eq "core") { continue } + + $lowermodulename = $modulename.ToLower() + + $featureObj = @{ description = (GetDescription $subfolder $modulename) } + + if ($featureDependencies.ContainsKey($lowermodulename)) { + $featureObj.dependencies = ,@{ name = "aws-sdk-cpp"; "default-features" = $false; "features" = $featureDependencies[$lowermodulename] } + } + + $manifest.features.Add("$lowermodulename", $featureObj) +} + +[IO.File]::WriteAllText($ManifestOut, (ConvertTo-Json -Depth 10 -InputObject $manifest)) + +& $vcpkg format-manifest --feature-flags=-manifests $ManifestOut diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index cc455a92c9d765..4cae7f1eca0b52 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -1,101 +1,99 @@ -vcpkg_buildpath_length_warning(37) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO aws/aws-sdk-cpp - REF "${VERSION}" +vcpkg_buildpath_length_warning(37) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/aws-sdk-cpp + REF "${VERSION}" SHA512 63de900870e9bec23d42e9458e0e9b1579a9e2dc7b0f404eae1b0dd406898b6d6841c5e2f498710b3828f212705437da3a2fe94813a6c3a842945100a05ae368 - PATCHES - patch-relocatable-rpath.patch - fix-aws-root.patch - lock-curl-http-and-tls-settings.patch -) - -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) - -set(EXTRA_ARGS) -if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) - set(rpath "@loader_path") -elseif (VCPKG_TARGET_IS_ANDROID) - set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" - "-DGIT_EXECUTABLE=--invalid-git-executable--" - "-DGIT_FOUND=TRUE" - "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" - "-DANDROID_BUILD_ZLIB=FALSE" - "-DANDROID_BUILD_CURL=FALSE" - "-DANDROID_BUILD_OPENSSL=FALSE" - ) -else() - set(rpath "\$ORIGIN") -endif() - -set(BUILD_ONLY core) -include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - ${EXTRA_ARGS} - "-DENABLE_UNITY_BUILD=ON" - "-DENABLE_TESTING=OFF" - "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" - "-DBUILD_ONLY=${BUILD_ONLY}" - "-DBUILD_DEPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" - "-DCMAKE_INSTALL_RPATH=${rpath}" - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files -) -vcpkg_cmake_install() - -foreach(TARGET IN LISTS BUILD_ONLY) - vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) -endforeach() -vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") - -vcpkg_copy_pdbs() - -file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") -foreach(AWS_TARGET IN LISTS AWS_TARGETS) - file(READ ${AWS_TARGET} _contents) - string(REGEX REPLACE - "bin\\/([A-Za-z0-9_.-]+\\.lib)" - "lib/\\1" - _contents "${_contents}") - file(WRITE ${AWS_TARGET} "${_contents}") -endforeach() - -file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") -list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") -foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) - file(READ "${AWS_CONFIG}" _contents) - file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") -endforeach() - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/nuget" - "${CURRENT_PACKAGES_DIR}/debug/nuget" -) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) - if(LIB_FILES) - file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(REMOVE ${LIB_FILES}) - endif() - file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) - if(DEBUG_LIB_FILES) - file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(REMOVE ${DEBUG_LIB_FILES}) - endif() - - file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") -endif() - -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + PATCHES + patch-relocatable-rpath.patch + fix-aws-root.patch + lock-curl-http-and-tls-settings.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) + +set(EXTRA_ARGS) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(rpath "@loader_path") +elseif (VCPKG_TARGET_IS_ANDROID) + set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID" + "-DGIT_EXECUTABLE=--invalid-git-executable--" + "-DGIT_FOUND=TRUE" + "-DNDK_DIR=$ENV{ANDROID_NDK_HOME}" + "-DANDROID_BUILD_ZLIB=FALSE" + "-DANDROID_BUILD_CURL=FALSE" + "-DANDROID_BUILD_OPENSSL=FALSE" + ) +else() + set(rpath "\$ORIGIN") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${EXTRA_ARGS} + "-DENABLE_UNITY_BUILD=ON" + "-DENABLE_TESTING=OFF" + "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + "-DBUILD_ONLY=${FEATURES}" + "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" + "-DCMAKE_INSTALL_RPATH=${rpath}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) +vcpkg_cmake_install() + +foreach(TARGET IN LISTS FEATURES) + vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") + +vcpkg_copy_pdbs() + +file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") +foreach(AWS_TARGET IN LISTS AWS_TARGETS) + file(READ ${AWS_TARGET} _contents) + string(REGEX REPLACE + "bin\\/([A-Za-z0-9_.-]+\\.lib)" + "lib/\\1" + _contents "${_contents}") + file(WRITE ${AWS_TARGET} "${_contents}") +endforeach() + +file(GLOB AWS_CONFIGS "${CURRENT_PACKAGES_DIR}/share/*/aws-cpp-sdk-*-config.cmake") +list(FILTER AWS_CONFIGS EXCLUDE REGEX "aws-cpp-sdk-core-config\\.cmake\$") +foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) + file(READ "${AWS_CONFIG}" _contents) + file(WRITE "${AWS_CONFIG}" "include(CMakeFindDependencyMacro)\nfind_dependency(aws-cpp-sdk-core)\n${_contents}") +endforeach() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/nuget" + "${CURRENT_PACKAGES_DIR}/debug/nuget" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) + if(LIB_FILES) + file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(REMOVE ${LIB_FILES}) + endif() + file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + if(DEBUG_LIB_FILES) + file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${DEBUG_LIB_FILES}) + endif() + + file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") +endif() + +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index c526d2c456125d..37e1f617b2cb38 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -1,12 +1,12 @@ -The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: - - When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. - find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) - target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) - - OR - - find_package(aws-cpp-sdk-core REQUIRED) - target_include_directories(main PRIVATE aws-cpp-sdk-core) - target_link_libraries(main PRIVATE aws-cpp-sdk-core) +The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + + When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. + find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) + target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) + + OR + + find_package(aws-cpp-sdk-core REQUIRED) + target_include_directories(main PRIVATE aws-cpp-sdk-core) + target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index a16daf2387efc0..a618a77d864b7f 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,37 +1,38 @@ -{ - "name": "aws-sdk-cpp", - "version": "1.11.160", - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "license": "Apache-2.0", - "supports": "!(windows & arm) & !uwp", - "dependencies": [ - "aws-crt-cpp", - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ], - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ] -} \ No newline at end of file +{ + "name": "aws-sdk-cpp", + "version": "1.11.160", + "port-version": 1, + "description": "AWS SDK for C++", + "homepage": "https://github.com/aws/aws-sdk-cpp", + "license": "Apache-2.0", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "aws-crt-cpp", + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ], + "platform": "!uwp & !windows" + }, + { + "name": "openssl", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "dynamodb", + "kinesis", + "s3" + ] +} diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 1a3e214bc10300..758ca68cb162a4 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.169", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 6cec92faa398e4..467a6bf644174c 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c0ad10a852e7facc0cea54e3990f16e0cb1ea8b", + "version": "1.11.169", + "port-version": 1 + }, { "git-tree": "714b1b2815e2a3f57c79c8703a9cdc9892240acd", "version": "1.11.169", diff --git a/versions/baseline.json b/versions/baseline.json index 39b0314f26b8da..26342a64999d25 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -402,7 +402,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.169", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "2023-03-23", From 88012347cc9ac4e61e26c34db59296c481f7f0d1 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:12:32 +0800 Subject: [PATCH 0067/1039] [libffi] Fix undefined function error (#34404) --- ports/libffi/fix_undefind_func.patch | 28 ++++++++++++++++++++++++++++ ports/libffi/portfile.cmake | 1 + ports/libffi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 ports/libffi/fix_undefind_func.patch diff --git a/ports/libffi/fix_undefind_func.patch b/ports/libffi/fix_undefind_func.patch new file mode 100644 index 00000000000000..de20045408ef97 --- /dev/null +++ b/ports/libffi/fix_undefind_func.patch @@ -0,0 +1,28 @@ +diff --git a/include/ffi_common.h b/include/ffi_common.h +index 2bd31b0..c53a794 100644 +--- a/include/ffi_common.h ++++ b/include/ffi_common.h +@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; + static trampoline. */ + int ffi_tramp_is_present (void *closure) FFI_HIDDEN; + ++/* Return a file descriptor of a temporary zero-sized file in a ++ writable and executable filesystem. */ ++int open_temp_exec_file(void) FFI_HIDDEN; ++ + /* Extended cif, used in callback from assembly routine */ + typedef struct + { +diff --git a/src/tramp.c b/src/tramp.c +index b9d273a..90efb07 100644 +--- a/src/tramp.c ++++ b/src/tramp.c +@@ -39,6 +39,8 @@ + #ifdef __linux__ + #define _GNU_SOURCE 1 + #endif ++#include ++#include + #include + #include + #include diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 40d936b35b84b9..f37cf125a3a232 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES dll-bindir.diff + fix_undefind_func.patch ) vcpkg_list(SET options) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index ba0a6bdca2e03b..5c8fcc9abdb51b 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.4", - "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 26342a64999d25..0084cb9e5d0c1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4158,7 +4158,7 @@ }, "libffi": { "baseline": "3.4.4", - "port-version": 5 + "port-version": 6 }, "libfido2": { "baseline": "1.13.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index e675172fcb9dbb..547478dfc6d905 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "982248d325407b09d26ad0d929f67fd0b873f984", + "version": "3.4.4", + "port-version": 6 + }, { "git-tree": "db85488447cfda7bcc5e08452d8581ac0295b4c9", "version": "3.4.4", From 48d59dee7343d1316cacf312940646eb316f8916 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Fri, 13 Oct 2023 05:12:53 +0200 Subject: [PATCH 0068/1039] [nghttp2] update to 1.57.0 (#34413) Fix CVE-2023-44487 (https://github.com/nghttp2/nghttp2/security/advisories/GHSA-vx74-f528-fxqg) --- ports/nghttp2/portfile.cmake | 2 +- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 732292c46ac698..6a8ada7f171932 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${VERSION} - SHA512 ba143045220f4d1fbbefa6c3944b0a2cd3535b9d4b07ea05fe08cbbaaa2f7eb1f0ff7a65e8e13a5711a3f88855de36ecada54470e583099be14b77ec360a3084 + SHA512 fe71183df125a5ca83c28525bef66a41d63da7af02fb47e3837b97b13bf7707a64a7e1f634aee18c2dd4b824671a3f04dbb6475c7db2cd86a773c40c47632860 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 60f7cb47c6860e..99750cf11f200c 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.56.0", + "version": "1.57.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 0084cb9e5d0c1f..f760d945d81a23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5797,7 +5797,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.56.0", + "baseline": "1.57.0", "port-version": 0 }, "nghttp2-asio": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 9729be2cb7f030..ccd8edc4cdf77b 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a369a1a84bf659607d06fcfdcf2b38996c0f935", + "version": "1.57.0", + "port-version": 0 + }, { "git-tree": "fbaeb01777a225a56a3f29ea40db69711f06256f", "version": "1.56.0", From 679741047ef2805e7ca1e525c2567c349f293b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 13 Oct 2023 05:13:16 +0200 Subject: [PATCH 0069/1039] [dav1d] Update to 1.3.0 (#34423) --- ports/dav1d/portfile.cmake | 2 +- ports/dav1d/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dav1d.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dav1d/portfile.cmake b/ports/dav1d/portfile.cmake index a0caef55cd8d40..4a9cf5f797ad24 100644 --- a/ports/dav1d/portfile.cmake +++ b/ports/dav1d/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO videolan/dav1d REF "${VERSION}" - SHA512 b2f39fdc95c851f136cbe2be40a75770e56ff0109ee55bd084861eb23a8c1dece070dde8a88781c5bb95e241e019e5985d88321560746ecbcb7ab2f22106c0b4 + SHA512 fce702048b876794d176dffe53d21aaf6a2e9521a306a078debc26a230b5042e7888edd63eb17bd17f06f30ce51901ebf37ea504da25eb911c1b926631cde278 ) vcpkg_find_acquire_program(NASM) diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json index 8f1a923ae60183..98dfb4d85e4a1b 100644 --- a/ports/dav1d/vcpkg.json +++ b/ports/dav1d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dav1d", - "version": "1.2.1", + "version": "1.3.0", "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f760d945d81a23..4236e81dab088d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2065,7 +2065,7 @@ "port-version": 5 }, "dav1d": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "daw-header-libraries": { diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 99f0e7e9caf26d..756ed0c027e0e5 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99fc7f3cc963cb7a3e567d13f313e5f0dbf46c72", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e819aee6d5e62ecd2981c858897773239e66b496", "version": "1.2.1", From 99f8d35037b997fa70380d8502234ff04f486c87 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 13 Oct 2023 05:13:28 +0200 Subject: [PATCH 0070/1039] [mongoose] update to 7.12 (#34458) Signed-off-by: Vitalii Koshura --- ports/mongoose/portfile.cmake | 2 +- ports/mongoose/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mongoose.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/mongoose/portfile.cmake b/ports/mongoose/portfile.cmake index 86cb5477de84bd..fefa7abe2f1a6d 100644 --- a/ports/mongoose/portfile.cmake +++ b/ports/mongoose/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cesanta/mongoose REF "${VERSION}" - SHA512 883807e4df1702e7def972d54a33ca6104d556bd5cfeb58890afa2d9f8825630507afbb3a7d7bb625d84d32162cc351cc1d3d29a5a40e281272fdd7176ca930a + SHA512 b243ab3e801c99f4c7c063be001e9a0cb30b301c719e2e44e47bdb815618cf1607bb57eba316332927b98de69460ff94ff521a2cf8c02fa03a201304193d4058 HEAD_REF master ) diff --git a/ports/mongoose/vcpkg.json b/ports/mongoose/vcpkg.json index c5ec19c73ef5ba..679ebe42769d38 100644 --- a/ports/mongoose/vcpkg.json +++ b/ports/mongoose/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongoose", - "version": "7.11", + "version": "7.12", "description": "Embedded web server / embedded networking library", "homepage": "https://cesanta.com/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4236e81dab088d..d234172f9c3714 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5529,7 +5529,7 @@ "port-version": 0 }, "mongoose": { - "baseline": "7.11", + "baseline": "7.12", "port-version": 0 }, "monkeys-audio": { diff --git a/versions/m-/mongoose.json b/versions/m-/mongoose.json index ec07e58e30e893..ceba3f6d180912 100644 --- a/versions/m-/mongoose.json +++ b/versions/m-/mongoose.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfea1ea4e50f4361b3381a638ac89d023d91c51a", + "version": "7.12", + "port-version": 0 + }, { "git-tree": "1da80484966f8ca2b0840d8bb37c523bd0ddbc87", "version": "7.11", From 1517fd7ab892465699c2c89ff1ebe0d7c2769d85 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:30:04 +0800 Subject: [PATCH 0071/1039] [basisu] Update to 1.16.4 and update the github organization (#34408) --- ports/basisu/fix-add-libgen-mingw.patch | 13 ------------- ports/basisu/fix-addostream.patch | 12 ------------ ports/basisu/portfile.cmake | 17 +++++++---------- ports/basisu/vcpkg.json | 4 ++-- versions/b-/basisu.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 ports/basisu/fix-add-libgen-mingw.patch delete mode 100644 ports/basisu/fix-addostream.patch diff --git a/ports/basisu/fix-add-libgen-mingw.patch b/ports/basisu/fix-add-libgen-mingw.patch deleted file mode 100644 index 5bac12ed7a8a44..00000000000000 --- a/ports/basisu/fix-add-libgen-mingw.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h -index 468f43b..02ec3c4 100644 ---- a/src/encoder/basisu_enc.h -+++ b/src/encoder/basisu_enc.h -@@ -24,7 +24,7 @@ - #include - #include - --#ifndef _WIN32 -+#if !defined(_WIN32) || defined(__MINGW32__) - #include - #endif - diff --git a/ports/basisu/fix-addostream.patch b/ports/basisu/fix-addostream.patch deleted file mode 100644 index cd9308bf59549a..00000000000000 --- a/ports/basisu/fix-addostream.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/encoder/basisu_enc.h b/src/encoder/basisu_enc.h -index 05656da..468f43b 100644 ---- a/src/encoder/basisu_enc.h -+++ b/src/encoder/basisu_enc.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #ifndef _WIN32 - #include diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index fa152cb8e5969c..b1ffe4326d7860 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -1,12 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO jherico/basis_universal - REF 497875f756ed0e3eb62e0ff08d55c62242f4be74 - SHA512 2293b78620a7ed510dbecf48bcae5f4b8524fe9020f864c8e79cf94ea9d95d51dddf83a5b4ea29cc95db19f87137bfef1cb68b7fbc6387e08bb42898d81c9303 + REPO BinomialLLC/basis_universal + REF "${VERSION}" + SHA512 7f7dd62741b4a3e13050233a2ed751e6108cde9eab7b05ea5882ded6ab49fe181cc30e795cf73f8fa625a71e77ae891fda5ea84e20b632b1397844d6539715b3 HEAD_REF master - PATCHES - fix-addostream.patch - fix-add-libgen-mingw.patch ) vcpkg_cmake_configure( @@ -19,9 +16,9 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tools(TOOL_NAMES "basisu_tool" AUTO_CLEAN) - +vcpkg_copy_tools(TOOL_NAMES "basisu" AUTO_CLEAN) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Remove unnecessary files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/basisu/vcpkg.json b/ports/basisu/vcpkg.json index 6cc7efe2f302a9..59a53779de1b78 100644 --- a/ports/basisu/vcpkg.json +++ b/ports/basisu/vcpkg.json @@ -1,10 +1,10 @@ { "name": "basisu", - "version": "1.11", - "port-version": 7, + "version": "1.16.4", "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", + "supports": "!android & !arm", "dependencies": [ "lodepng", { diff --git a/versions/b-/basisu.json b/versions/b-/basisu.json index ec05207fd2411e..01876593f34b70 100644 --- a/versions/b-/basisu.json +++ b/versions/b-/basisu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d355537e7392dad769a0c435f2a2cedf310b322c", + "version": "1.16.4", + "port-version": 0 + }, { "git-tree": "31adec97dda19e99a5745f46a5d2031981206bb1", "version": "1.11", diff --git a/versions/baseline.json b/versions/baseline.json index d234172f9c3714..ed300bff6b4836 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,8 +517,8 @@ "port-version": 0 }, "basisu": { - "baseline": "1.11", - "port-version": 7 + "baseline": "1.16.4", + "port-version": 0 }, "bcg729": { "baseline": "1.1.1", From 8d2f91227f0d12712d2e66e3c66bfa05ee68595d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:30:37 +0200 Subject: [PATCH 0072/1039] [shiva-sfml] delist/remove port (#34419) --- ports/shiva-sfml/portfile.cmake | 144 -------------------------------- ports/shiva-sfml/vcpkg.json | 21 ----- scripts/ci.baseline.txt | 5 -- versions/baseline.json | 4 - 4 files changed, 174 deletions(-) delete mode 100644 ports/shiva-sfml/portfile.cmake delete mode 100644 ports/shiva-sfml/vcpkg.json diff --git a/ports/shiva-sfml/portfile.cmake b/ports/shiva-sfml/portfile.cmake deleted file mode 100644 index efc79a81131c3c..00000000000000 --- a/ports/shiva-sfml/portfile.cmake +++ /dev/null @@ -1,144 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Milerius/shiva - REF 1.0 - SHA512 d1ce33e89b17fa8f82e21b51dfa1308e38c617fea52c34a20b7b6c8643318280df24c043238ddd73ba2dbc139c5b5de1c2cb3add1f5629a54694c78b415d73d1 - HEAD_REF master - ) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSHIVA_BUILD_TESTS=OFF - -DSHIVA_USE_SFML_AS_RENDERER=ON - -DSHIVA_INSTALL_PLUGINS=ON - -DSHIVA_BUILD_EXAMPLES=OFF -) - -vcpkg_cmake_install() - - -if (VCPKG_CMAKE_SYSTEM_NAME) - file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*") - file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*") -else() - file(GLOB PLUGINS_RELEASE "${SOURCE_PATH}/bin/Release/systems/*.dll") - file(GLOB PLUGINS_DEBUG "${SOURCE_PATH}/bin/Debug/systems/*.dll") -endif() - -message(STATUS "PLUGINS_RELEASE -> ${PLUGINS_RELEASE}") -message(STATUS "PLUGINS_DEBUG -> ${PLUGINS_DEBUG}") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/shiva-sfml) - - -if (VCPKG_CMAKE_SYSTEM_NAME) - set(SUFFIX_BINARY lib) -else() - set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) - set(SUFFIX_BINARY bin) -endif() - -##! Pre removing -if (VCPKG_CMAKE_SYSTEM_NAME) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -endif() - -##! Include -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/shiva-sfml") - -##! Release -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") - -##! Debug -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") - -##! Copy Plugins -file(COPY ${PLUGINS_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") -file(COPY ${PLUGINS_DEBUG} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") - -if (NOT VCPKG_CMAKE_SYSTEM_NAME) - find_file(LUADLL lua.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FMTDLL fmt.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FLACDLL FLAC.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(FREETYPEDLL freetype.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(LIBBZ2DLL libbz2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(LIBPNG16DLL libpng16.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(OGGDLL ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(OPENAL32DLL OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLAUDIO2DLL sfml-audio-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLGRAPHICS2DLL sfml-graphics-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLSYSTEM2DLL sfml-system-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(SFMLWINDOW2DLL sfml-window-2.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISDLL vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISENCDLL vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(VORBISFILEDLL vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - find_file(ZLIB1DLL zlib1.dll PATHS "${CURRENT_INSTALLED_DIR}/bin") - set(DEPENDANCIES_RELEASE_DLL - ${LUADLL} - ${FMTDLL} - ${FLACDLL} - ${FREETYPEDLL} - ${LIBBZ2DLL} - ${LIBPNG16DLL} - ${OGGDLL} - ${OPENAL32DLL} - ${SFMLAUDIO2DLL} - ${SFMLGRAPHICS2DLL} - ${SFMLSYSTEM2DLL} - ${SFMLWINDOW2DLL} - ${VORBISDLL} - ${VORBISENCDLL} - ${VORBISFILEDLL} - ${ZLIB1DLL}) - - find_file(LUADLL_D lua.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FMTDLL_D fmtd.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FLACDLL_D FLAC.dll PATHS $"{CURRENT_INSTALLED_DIR}/debug/bin") - find_file(FREETYPEDLL_D freetyped.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(LIBBZ2DLL_D libbz2d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(LIBPNG16DLL_D libpng16d.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(OGGDLL_D ogg.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(OPENAL32DLL_D OpenAL32.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLAUDIO2DLL_D sfml-audio-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLGRAPHICS2DLL_D sfml-graphics-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLSYSTEM2DLL_D sfml-system-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(SFMLWINDOW2DLL_D sfml-window-d-2.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISDLL_D vorbis.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISENCDLL_D vorbisenc.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(VORBISFILEDLL_D vorbisfile.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - find_file(ZLIB1DLL_D zlibd1.dll PATHS "${CURRENT_INSTALLED_DIR}/debug/bin") - set(DEPENDANCIES_DEBUG_DLL - ${LUADLL_D} - ${FMTDLL_D} - ${FLACDLL_D} - ${FREETYPEDLL_D} - ${LIBBZ2DLL_D} - ${LIBPNG16DLL_D} - ${OGGDLL_D} - ${OPENAL32DLL} - ${SFMLAUDIO2DLL_D} - ${SFMLGRAPHICS2DLL_D} - ${SFMLSYSTEM2DLL_D} - ${SFMLWINDOW2DLL_D} - ${VORBISDLL_D} - ${VORBISENCDLL_D} - ${VORBISFILEDLL_D} - ${ZLIB1DLL_D} - ) - - file(COPY ${DEPENDANCIES_RELEASE_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Release") - file(COPY ${DEPENDANCIES_DEBUG_DLL} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/${SUFFIX_BINARY}/shiva/plugins/shiva-sfml/Debug") -endif() - -file(WRITE "${CURRENT_PACKAGES_DIR}/include/shiva-sfml/empty.h" "") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/shiva-sfml/copyright" "") diff --git a/ports/shiva-sfml/vcpkg.json b/ports/shiva-sfml/vcpkg.json deleted file mode 100644 index 7d7ddd54dad7e6..00000000000000 --- a/ports/shiva-sfml/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "shiva-sfml", - "version": "1.0", - "port-version": 4, - "description": "shiva-sfml plugins of shiva C++ engine", - "dependencies": [ - { - "name": "sfml", - "platform": "windows" - }, - "shiva", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2d288e273fceeb..9969bb774860b1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1109,11 +1109,6 @@ septag-sx:x64-android=fail sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=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 shogun:arm64-uwp = skip shogun:x64-osx = skip diff --git a/versions/baseline.json b/versions/baseline.json index ed300bff6b4836..05ff2b6dfa8db2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7692,10 +7692,6 @@ "baseline": "1.0", "port-version": 7 }, - "shiva-sfml": { - "baseline": "1.0", - "port-version": 4 - }, "shogun": { "baseline": "6.1.4", "port-version": 9 From 8e811c33f99cc04aeb20dd40bcc53fcbd72f34b8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:36:00 +0200 Subject: [PATCH 0073/1039] [keystone] use python3 (#34420) --- ports/keystone/portfile.cmake | 4 ++-- ports/keystone/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/k-/keystone.json | 5 +++++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/keystone/portfile.cmake b/ports/keystone/portfile.cmake index a05cf1317f2851..3b652722dc6333 100644 --- a/ports/keystone/portfile.cmake +++ b/ports/keystone/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" KEYSTONE_BUILD_STATIC_RUNTIME) @@ -14,7 +14,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKEYSTONE_BUILD_STATIC_RUNTIME=${KEYSTONE_BUILD_STATIC_RUNTIME} - -DPYTHON_EXECUTABLE=${PYTHON2} + -DPYTHON_EXECUTABLE=${PYTHON3} # Add support for only a subset of architectures #-DLLVM_TARGETS_TO_BUILD="AArch64;X86" diff --git a/ports/keystone/vcpkg.json b/ports/keystone/vcpkg.json index f8fcdb38244fab..1c0f82da50b4d4 100644 --- a/ports/keystone/vcpkg.json +++ b/ports/keystone/vcpkg.json @@ -1,7 +1,7 @@ { "name": "keystone", "version-semver": "0.9.2", - "port-version": 2, + "port-version": 3, "description": "A Lightweight multi-platform, multi-architecture assembler framework.", "homepage": "https://github.com/keystone-engine/keystone", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9969bb774860b1..72344ca05e7465 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -510,8 +510,6 @@ jinja2cpplight:arm64-android=fail jinja2cpplight:x64-android=fail json-schema-validator:arm-neon-android=fail json-schema-validator:arm64-android=fail -keystone:x64-linux=fail # python2 -keystone:x64-osx=fail kfr:x64-android=fail kfr:x64-uwp=fail lastools:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 05ff2b6dfa8db2..4c17fb765b292c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3662,7 +3662,7 @@ }, "keystone": { "baseline": "0.9.2", - "port-version": 2 + "port-version": 3 }, "kf5archive": { "baseline": "5.98.0", diff --git a/versions/k-/keystone.json b/versions/k-/keystone.json index 68b76c7cae81b4..7ed0f91ddb92c8 100644 --- a/versions/k-/keystone.json +++ b/versions/k-/keystone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c08eb2c84899fd5de79744b811c859667c7cfc17", + "version-semver": "0.9.2", + "port-version": 3 + }, { "git-tree": "f0094b1730f5973d7c3661eec95eb009d1d272b9", "version-semver": "0.9.2", From 3dcf79d3201e3882a2e714c8077f8a7a93ffa01d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:46:51 +0200 Subject: [PATCH 0074/1039] [corrade] fix clang-16 build (#34417) --- ports/corrade/clang-16.patch | 32 ++++++++++++++++++++++++++++++++ ports/corrade/portfile.cmake | 1 + ports/corrade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/corrade.json | 5 +++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 ports/corrade/clang-16.patch diff --git a/ports/corrade/clang-16.patch b/ports/corrade/clang-16.patch new file mode 100644 index 00000000000000..a6e6fe1dff3670 --- /dev/null +++ b/ports/corrade/clang-16.patch @@ -0,0 +1,32 @@ +diff --git a/src/Corrade/Utility/StlForwardArray.h b/src/Corrade/Utility/StlForwardArray.h +index 0e78d61..363fafb 100644 +--- a/src/Corrade/Utility/StlForwardArray.h ++++ b/src/Corrade/Utility/StlForwardArray.h +@@ -55,7 +55,11 @@ possible or is unknown is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L223 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/array.h> ++#endif + #elif defined(CORRADE_TARGET_DINKUMWARE) + /* MSVC has it defined next to std::pair */ + #include +diff --git a/src/Corrade/Utility/StlForwardTuple.h b/src/Corrade/Utility/StlForwardTuple.h +index 5701bc0..3292ec8 100644 +--- a/src/Corrade/Utility/StlForwardTuple.h ++++ b/src/Corrade/Utility/StlForwardTuple.h +@@ -55,7 +55,11 @@ is equivalent to @cpp #include @ce. + + #ifdef CORRADE_TARGET_LIBCXX + /* https://github.com/llvm-mirror/libcxx/blob/73d2eccc78ac83d5947243c4d26a53f668b4f432/include/__tuple#L163 */ ++#if _LIBCPP_VERSION < 160000 + #include <__tuple> ++#else ++#include <__fwd/tuple.h> ++#endif + #elif defined(CORRADE_TARGET_LIBSTDCXX) + /* https://github.com/gcc-mirror/gcc/blob/c014d57d57a03e6061a57fa8534e90979567392b/libstdc%2B%2B-v3/include/std/type_traits#L2465-L2466 */ + #include diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index f50ef191f95422..964212a69e1c40 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-vs2019.patch build-corrade-rc-always.patch + clang-16.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index e34df643ecfd23..60dd63aead3727 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 6, + "port-version": 7, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4c17fb765b292c..af86253a6578cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1778,7 +1778,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 6 + "port-version": 7 }, "cpp-async": { "baseline": "1.1.0", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index 8f81e374c7b140..95a5e4e46efc0f 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8630a6d00fec6c7462af2e03bd0e1946f6812069", + "version-string": "2020.06", + "port-version": 7 + }, { "git-tree": "1a278fdbd46715f454e366df7d06410ae2fc9747", "version-string": "2020.06", From a67a4b68e1ddc52b3d60127cb1ec5c4ba9d0f018 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:48:17 +0200 Subject: [PATCH 0075/1039] [tracy] fix tools build (#34414) --- ports/tracy/002-fix-capstone-5.patch | 26 -------------------------- ports/tracy/portfile.cmake | 1 - ports/tracy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tracy.json | 5 +++++ 5 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 ports/tracy/002-fix-capstone-5.patch diff --git a/ports/tracy/002-fix-capstone-5.patch b/ports/tracy/002-fix-capstone-5.patch deleted file mode 100644 index 2c9f4c7533b851..00000000000000 --- a/ports/tracy/002-fix-capstone-5.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp -index cc56298..7b9370a 100644 ---- a/server/TracySourceView.cpp -+++ b/server/TracySourceView.cpp -@@ -2,7 +2,7 @@ - #include - #include - --#include -+#include - - #include "imgui.h" - #include "TracyCharUtil.hpp" -diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp -index fcb1718..2433e59 100644 ---- a/server/TracyWorker.cpp -+++ b/server/TracyWorker.cpp -@@ -19,7 +19,7 @@ - #include - #include - --#include -+#include - - #define ZDICT_STATIC_LINKING_ONLY - #include "../zstd/zdict.h" diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 827c028b2b1c3e..9c24d0058e611a 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch - 002-fix-capstone-5.patch 003-fix-imgui-path.patch 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 005-fix-imgui-path-legacy.patch diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 7431305451baba..814aa6b4faa2ea 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tracy", "version-semver": "0.9.1", - "port-version": 3, + "port-version": 4, "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 af86253a6578cb..6c3ab4c3b3c6d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8390,7 +8390,7 @@ }, "tracy": { "baseline": "0.9.1", - "port-version": 3 + "port-version": 4 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index bbbbb0828a4816..395a9383fc6b2f 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce810f0e5535da3969128dc5eee0ecf0fcb51162", + "version-semver": "0.9.1", + "port-version": 4 + }, { "git-tree": "2d84bb317ef020ff408ce8000ecb896d7fe4fe78", "version-semver": "0.9.1", From b90d1919143c82fa853e0c74ccd9a409f6f9a290 Mon Sep 17 00:00:00 2001 From: Darren Bolduc Date: Thu, 12 Oct 2023 23:49:47 -0400 Subject: [PATCH 0076/1039] [google-cloud-cpp] update to latest release (v2.17.0) (#34434) --- 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 7c1fb729483275..d651ea0337ab6b 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 a7767e37f0c4997e0d8493ea12e144b22ef529e23da54eb2a2f82848d9535bce23080948be80e5ef6697b55bbfc3ee11225f7ea83fe8fa5f622df7dc45144744 + SHA512 a3d84785b024e31e909592bca5a6589873bcd342848fae9520a9e7715bcb736db71184eeedbcbf6086105e6145937cabdd731a80879fd177f80895fdf09c3b46 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 64269ae90f3bd0..4aadd5149140b8 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.16.0", + "version": "2.17.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 6c3ab4c3b3c6d8..e956e21ab2de8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2993,7 +2993,7 @@ "port-version": 5 }, "google-cloud-cpp": { - "baseline": "2.16.0", + "baseline": "2.17.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 236ec813b9a4e8..c9b0ce2ccc7bec 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfe978bbc8c0f0e98f02aaaf2ab546f08107ce95", + "version": "2.17.0", + "port-version": 0 + }, { "git-tree": "76121e57d4d9f0ce925973295ee30a574d448e4f", "version": "2.16.0", From 8007fc4dff04f35383d85434c161d68454d0988f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 13 Oct 2023 05:52:45 +0200 Subject: [PATCH 0077/1039] [qt5-multimedia] fix xcode 15 build (#34418) --- ports/qt5-multimedia/portfile.cmake | 2 +- ports/qt5-multimedia/vcpkg.json | 1 + ports/qt5-multimedia/xcode15.patch | 12 ++++++++++++ versions/baseline.json | 2 +- versions/q-/qt5-multimedia.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/qt5-multimedia/xcode15.patch diff --git a/ports/qt5-multimedia/portfile.cmake b/ports/qt5-multimedia/portfile.cmake index 214726759f3cf1..d2f61ad9861eec 100644 --- a/ports/qt5-multimedia/portfile.cmake +++ b/ports/qt5-multimedia/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(PATCHES xcode15.patch) diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index fef4059774cfaa..68638dca3b400e 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-multimedia", "version": "5.15.11", + "port-version": 1, "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/xcode15.patch b/ports/qt5-multimedia/xcode15.patch new file mode 100644 index 00000000000000..699c57c0df01ce --- /dev/null +++ b/ports/qt5-multimedia/xcode15.patch @@ -0,0 +1,12 @@ +diff -ur a/src/plugins/avfoundation/camera/avfcamerautility.mm b/src/plugins/avfoundation/camera/avfcamerautility.mm +--- a/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:51:14.736887185 -0400 ++++ b/src/plugins/avfoundation/camera/avfcamerautility.mm 2023-04-01 11:54:19.979498301 -0400 +@@ -101,7 +101,7 @@ + } + }; + +-struct FormatHasNoFPSRange : std::unary_function ++struct FormatHasNoFPSRange + { + bool operator() (AVCaptureDeviceFormat *format) + { diff --git a/versions/baseline.json b/versions/baseline.json index e956e21ab2de8d..4cda39254625a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6834,7 +6834,7 @@ }, "qt5-multimedia": { "baseline": "5.15.11", - "port-version": 0 + "port-version": 1 }, "qt5-networkauth": { "baseline": "5.15.11", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 96c727bd1cc3c0..9510c155ba8c77 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c6f73398cdab1711339020a1dfe0630e0f89c4", + "version": "5.15.11", + "port-version": 1 + }, { "git-tree": "3c3d01a70310ae2d017d0e08428b1902c45b872f", "version": "5.15.11", From 65cad452fa38036c5fedf6df6702ef0796ad2d29 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:55:10 -0400 Subject: [PATCH 0078/1039] [murmur3] New port (#34335) --- ports/murmur3/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++ ports/murmur3/portfile.cmake | 28 +++++++++++++++++++++ ports/murmur3/usage | 3 +++ ports/murmur3/vcpkg.json | 17 +++++++++++++ versions/baseline.json | 4 +++ versions/m-/murmur3.json | 9 +++++++ 6 files changed, 108 insertions(+) create mode 100644 ports/murmur3/CMakeLists.txt create mode 100644 ports/murmur3/portfile.cmake create mode 100644 ports/murmur3/usage create mode 100644 ports/murmur3/vcpkg.json create mode 100644 versions/m-/murmur3.json diff --git a/ports/murmur3/CMakeLists.txt b/ports/murmur3/CMakeLists.txt new file mode 100644 index 00000000000000..73796950f7ec74 --- /dev/null +++ b/ports/murmur3/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required(VERSION 3.19) +project(murmur3 LANGUAGES C) +set(PROJECT_VERSION "${VERSION}") + +set(Header_Files "${PROJECT_NAME}.h") +set(Source_Files "${PROJECT_NAME}.c") + +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 "${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}") + +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/murmur3/portfile.cmake b/ports/murmur3/portfile.cmake new file mode 100644 index 00000000000000..c2cf1642d74333 --- /dev/null +++ b/ports/murmur3/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PeterScott/murmur3 + REF dae94be0c0f54a399d23ea6cbe54bca5a4e93ce4 + SHA512 1bc01eefc04f06704800a7448231db9f82fc809079bd3f43ef24d7dd3d8deaec2143f252a8e556dafe366401f898b676922b0c93ac181aaf38ae69ad638adbba + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/murmur3/usage b/ports/murmur3/usage new file mode 100644 index 00000000000000..cbb2d18aac30f8 --- /dev/null +++ b/ports/murmur3/usage @@ -0,0 +1,3 @@ +murmur3 provides CMake targets: + find_package(unofficial-murmur3 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::murmur3::murmur3) diff --git a/ports/murmur3/vcpkg.json b/ports/murmur3/vcpkg.json new file mode 100644 index 00000000000000..4bc78a0f5638f7 --- /dev/null +++ b/ports/murmur3/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "murmur3", + "version-date": "2015-05-02", + "description": "Murmur3 hash in C", + "homepage": "https://github.com/PeterScott/murmur3", + "license": "CC0-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 4cda39254625a4..aef406162b2953 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5668,6 +5668,10 @@ "baseline": "2.3.4", "port-version": 0 }, + "murmur3": { + "baseline": "2015-05-02", + "port-version": 0 + }, "murmurhash": { "baseline": "2016-01-09", "port-version": 7 diff --git a/versions/m-/murmur3.json b/versions/m-/murmur3.json new file mode 100644 index 00000000000000..44d1791a47aea1 --- /dev/null +++ b/versions/m-/murmur3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5f4ab89578aaab8f3e4edf66398db2a693753abb", + "version-date": "2015-05-02", + "port-version": 0 + } + ] +} From 1c5cac4b68933f25cdd953b7e2697d13d91ebda6 Mon Sep 17 00:00:00 2001 From: Pravila Date: Fri, 13 Oct 2023 04:56:09 +0100 Subject: [PATCH 0079/1039] [better-enums] New port (#34409) --- ports/better-enums/portfile.cmake | 11 +++++++++++ ports/better-enums/vcpkg.json | 7 +++++++ versions/b-/better-enums.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 31 insertions(+) create mode 100644 ports/better-enums/portfile.cmake create mode 100644 ports/better-enums/vcpkg.json create mode 100644 versions/b-/better-enums.json diff --git a/ports/better-enums/portfile.cmake b/ports/better-enums/portfile.cmake new file mode 100644 index 00000000000000..8b4a534a62903f --- /dev/null +++ b/ports/better-enums/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aantron/better-enums + REF ${VERSION} + SHA512 5997c74932803fb96beabbe029d80f6fdeab7c46f781a4e11ef775242d294dfd82ca05cac99787dd68a622db62510fd5533e9c0e85a62c7792c0dbe6237af6d9 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/enum.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/better-enums") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/better-enums/vcpkg.json b/ports/better-enums/vcpkg.json new file mode 100644 index 00000000000000..062b0d58da6ff5 --- /dev/null +++ b/ports/better-enums/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "better-enums", + "version": "0.11.3", + "description": "C++ compile-time enum to string, iteration, in a single header file.", + "homepage": "http://aantron.github.io/better-enums/", + "license": "BSD-2-Clause" +} diff --git a/versions/b-/better-enums.json b/versions/b-/better-enums.json new file mode 100644 index 00000000000000..f7905caa2712ae --- /dev/null +++ b/versions/b-/better-enums.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "64e0dbffe12134b2198b81043cc0dcfd0a340f33", + "version": "0.11.3", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index aef406162b2953..622f58aa53c426 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -556,6 +556,10 @@ "baseline": "4.8.30", "port-version": 9 }, + "better-enums": { + "baseline": "0.11.3", + "port-version": 0 + }, "bext-di": { "baseline": "1.2.0", "port-version": 1 From 3acb7541e854452d33f71037a8f63a88899e63d3 Mon Sep 17 00:00:00 2001 From: DownerCase <119755054+DownerCase@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:53:31 +0300 Subject: [PATCH 0080/1039] [Brotli] Fix emscripten (#34157) --- ports/brotli/emscripten.patch | 15 +++++++++++++++ ports/brotli/portfile.cmake | 12 +++++++++--- ports/brotli/vcpkg.json | 1 + versions/b-/brotli.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 ports/brotli/emscripten.patch diff --git a/ports/brotli/emscripten.patch b/ports/brotli/emscripten.patch new file mode 100644 index 00000000000000..24696d73eb864d --- /dev/null +++ b/ports/brotli/emscripten.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0589fc1..9b32b60 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,10 +153,8 @@ foreach(lib ${BROTLI_LIBRARIES_CORE}) + set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$" $) + endforeach() + +-if(NOT BROTLI_EMSCRIPTEN) + target_link_libraries(brotlidec brotlicommon) + target_link_libraries(brotlienc brotlicommon) +-endif() + + # For projects stuck on older versions of CMake, this will set the + # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 5b42104792ba46..461b4f60bd333c 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -8,14 +8,13 @@ vcpkg_from_github( install.patch fix-arm-uwp.patch pkgconfig.patch + emscripten.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBROTLI_DISABLE_TESTS=ON - # Required for wasm32-emscripten triplet to avoid "install" being turned off - -DBROTLI_EMSCRIPTEN=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -23,7 +22,14 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -vcpkg_copy_tools(TOOL_NAMES "brotli" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli") + +# Under emscripten the brotli executable tool is produced with .js extension but vcpkg_copy_tools +# has no special behaviour in this case and searches for the tool name with no extension +if(VCPKG_TARGET_IS_EMSCRIPTEN) + set(TOOL_SUFFIX ".js" ) +endif() + +vcpkg_copy_tools(TOOL_NAMES "brotli${TOOL_SUFFIX}" SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/brotli") 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/brotli/vcpkg.json b/ports/brotli/vcpkg.json index 40e5196f861074..1be0e557464f9a 100644 --- a/ports/brotli/vcpkg.json +++ b/ports/brotli/vcpkg.json @@ -1,6 +1,7 @@ { "name": "brotli", "version": "1.1.0", + "port-version": 1, "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", "license": "MIT", diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index 0a3da5eb0ae9e8..16e39e99d6c2a0 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5b5ae1ad26c80535c893cc0307121f0398549e", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "4156ea7744047f9ace2769b857d97d11154de28f", "version": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 622f58aa53c426..2d10a803734e09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1314,7 +1314,7 @@ }, "brotli": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "brpc": { "baseline": "1.6.0", From fa4a2a79b231583bfa3ef53f52d0b8e9822cb70c Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Fri, 13 Oct 2023 19:55:58 +0200 Subject: [PATCH 0081/1039] [ginkgo] Update to 1.6.0 (#34280) --- ports/ginkgo/portfile.cmake | 22 ++++++---------------- ports/ginkgo/vcpkg.json | 10 ++++++++-- versions/baseline.json | 4 ++-- versions/g-/ginkgo.json | 5 +++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ports/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index c8080e7670f224..a17f906d0df3a3 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -1,23 +1,20 @@ -vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH - URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff?full_index=1 - FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff - SHA512 f2997dc1af55db2a152092b70097238af77d7345329b9033a19301cfc4d8d494c5c41fbbd9a63b3303697764fc5f799dfe93647bafbbefae8981a978ecaa6a68 -) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ginkgo-project/ginkgo - REF v1.4.0 - SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 + REF "v${VERSION}" + SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 HEAD_REF master - PATCHES - ${WINDOWS_SYMBOLS_PATCH} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES openmp GINKGO_BUILD_OMP cuda GINKGO_BUILD_CUDA + mpi GINKGO_BUILD_MPI ) vcpkg_cmake_configure( @@ -33,7 +30,6 @@ vcpkg_cmake_configure( -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_SKIP_DEPENDENCY_UPDATE=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - -DGinkgo_NAME=ginkgo ${FEATURE_OPTIONS} ) @@ -41,12 +37,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo) vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" [[string(REPLACE "lib/cmake/Ginkgo" "" GINKGO_INSTALL_PREFIX "${GINKGO_CONFIG_FILE_PATH}")]] "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "GINKGO_INSTALL_PREFIX" "_IMPORT_PREFIX") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo\"" "/share/ginkgo\"") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "/lib/cmake/Ginkgo/Modules\"" "/share/ginkgo/Modules/Modules\"") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ginkgo/GinkgoConfig.cmake" "\"${SOURCE_PATH}/cmake/Modules/\"" "") - file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index 76d755a4764834..73aa6817f96ca1 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,10 +1,10 @@ { "name": "ginkgo", - "version-semver": "1.4.0", - "port-version": 2, + "version-semver": "1.6.0", "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", "homepage": "https://github.com/ginkgo-project/ginkgo", "license": "BSD-3-Clause", + "supports": "!(x86 | android)", "dependencies": [ { "name": "vcpkg-cmake", @@ -22,6 +22,12 @@ "cuda" ] }, + "mpi": { + "description": "Build the distributed MPI backend of Ginkgo", + "dependencies": [ + "mpi" + ] + }, "openmp": { "description": "Build the OpenMP backend of Ginkgo" } diff --git a/versions/baseline.json b/versions/baseline.json index 2d10a803734e09..958ba52566b3fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2901,8 +2901,8 @@ "port-version": 3 }, "ginkgo": { - "baseline": "1.4.0", - "port-version": 2 + "baseline": "1.6.0", + "port-version": 0 }, "gklib": { "baseline": "2022-07-27", diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index 941d040ee5ad79..a946d291131506 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09962781615d028b2b96be5aef56b0590fd7b54f", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "779490458d51f75bc22ed324afceffe0c3b0ee12", "version-semver": "1.4.0", From d79815eed609b60f84de6439299962f48ea23529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 13 Oct 2023 19:56:49 +0200 Subject: [PATCH 0082/1039] [ffmpeg] Enable dav1d feature on osx (#34421) --- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 756faa756d8060..8abac6cd6a8bb7 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "6.0", + "port-version": 1, "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." @@ -338,7 +339,6 @@ }, "dav1d": { "description": "AV1 decoding via libdav1d", - "supports": "!osx", "dependencies": [ "dav1d" ] diff --git a/versions/baseline.json b/versions/baseline.json index 958ba52566b3fb..83bcd3297f193b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2554,7 +2554,7 @@ }, "ffmpeg": { "baseline": "6.0", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "11.1.5.2", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index f2a4680e598c0b..13c40e2ea0c825 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c25989395c92bd79faf0b136fb4636e96d541c", + "version": "6.0", + "port-version": 1 + }, { "git-tree": "515f4b8df7a66e74ef6bcde4eae3841d3a96038f", "version": "6.0", From 582472e6046bf9f6c8fbf936e1529160191df0cd Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 13 Oct 2023 21:04:39 +0300 Subject: [PATCH 0083/1039] [fontconfig] Fix FC_TEMPLATEDIR (#34430) --- ports/fontconfig/portfile.cmake | 5 ++++- ports/fontconfig/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 2b35e1fab138c2..489b047671fe6c 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -20,7 +20,8 @@ vcpkg_configure_meson( -Dcache-build=disabled -Dtests=disabled ) -#https://www.freedesktop.org/software/fontconfig/fontconfig-user.html + +# https://www.freedesktop.org/software/fontconfig/fontconfig-user.html # Adding OPTIONS for e.g. baseconfig-dir etc. won't work since meson will try to install into those dirs! # Since adding OPTIONS does not work use a replacement in the generated config.h instead set(replacement "") @@ -29,9 +30,11 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h") vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}") +vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"") if(NOT VCPKG_BUILD_TYPE) set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h") vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}") + vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"") endif() vcpkg_install_meson(ADD_BIN_TO_PATH) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 25f9d8d3b3769e..1a4c499ea8ac7f 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fontconfig", "version": "2.14.2", + "port-version": 1, "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 83bcd3297f193b..93119411aae089 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2674,7 +2674,7 @@ }, "fontconfig": { "baseline": "2.14.2", - "port-version": 0 + "port-version": 1 }, "foonathan-lexy": { "baseline": "2022.12.1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 00a989f7054357..48fef57f6d4084 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de73339d579963e68fed652ed2e206b307a0c03f", + "version": "2.14.2", + "port-version": 1 + }, { "git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55", "version": "2.14.2", From 7973b37fd5786d4c7098e15535bde3bd3e3a04d2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 13 Oct 2023 20:05:30 +0200 Subject: [PATCH 0084/1039] [soci] Fix usage (#34436) --- ports/soci/portfile.cmake | 14 +++++++++++--- ports/soci/usage | 6 ++---- ports/soci/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/soci.json | 5 +++++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index cba1e3515895e8..b6757821d93b0b 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -55,12 +55,20 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(READ "${CURRENT_PORT_DIR}/usage" usage) set(backends ${FEATURES}) list(REMOVE_ITEM backends core boost) if(backends STREQUAL "") - message(STATUS "Attention:\n\nThis soci build doesn't include any backends.\n") - set(backends "none") + string(APPEND usage " +This soci build doesn't include any backend and may not be useful. +") endif() -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) +foreach(backend IN LISTS backends) + string(APPEND usage " + # Using the ${backend} backend directly + target_link_libraries(main PRIVATE $,SOCI::soci_${backend},SOCI::soci_${backend}_static>) +") +endforeach() +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") diff --git a/ports/soci/usage b/ports/soci/usage index ce30356b1cee8a..fc3044265bbc43 100644 --- a/ports/soci/usage +++ b/ports/soci/usage @@ -1,7 +1,5 @@ soci provides CMake targets: - find_package(soci CONFIG REQUIRED) + find_package(SOCI CONFIG REQUIRED) + # Using core (loading backends at runtime) target_link_libraries(main PRIVATE $,SOCI::soci_core,SOCI::soci_core_static>) - - # Linking specific backends (enabled: @backends@) - target_link_libraries(main PRIVATE $,SOCI::soci_,SOCI::soci__static>) diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index 67aa3e83ffe8a7..004473ef31d261 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,7 +1,7 @@ { "name": "soci", "version": "4.0.3", - "port-version": 2, + "port-version": 3, "description": "SOCI - The C++ Database Access Library", "homepage": "https://soci.sourceforge.net/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 93119411aae089..f1b505b42a9c10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7826,7 +7826,7 @@ }, "soci": { "baseline": "4.0.3", - "port-version": 2 + "port-version": 3 }, "socket-io-client": { "baseline": "2023-02-14", diff --git a/versions/s-/soci.json b/versions/s-/soci.json index b347173c78fdfb..c8b037402bb6f3 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24c340284022dab38da690548caa65c4f003bb7c", + "version": "4.0.3", + "port-version": 3 + }, { "git-tree": "63f4471adc41e108aed34cd585a06e354f1b4762", "version": "4.0.3", From 860c966502414945eb6ed16f8f0b23d84bd2766a Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Fri, 13 Oct 2023 18:05:57 +0000 Subject: [PATCH 0085/1039] [glib] update to 2.78.0 (#34439) --- ports/glib/fix-build-race-on-gio.patch | 24 --------------------- ports/glib/libintl.patch | 8 +++---- ports/glib/portfile.cmake | 4 ++-- ports/glib/suppress-libelf-dependency.patch | 12 +++++++++++ ports/glib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 7 files changed, 25 insertions(+), 32 deletions(-) delete mode 100644 ports/glib/fix-build-race-on-gio.patch create mode 100644 ports/glib/suppress-libelf-dependency.patch diff --git a/ports/glib/fix-build-race-on-gio.patch b/ports/glib/fix-build-race-on-gio.patch deleted file mode 100644 index 2d2c01b1bb3107..00000000000000 --- a/ports/glib/fix-build-race-on-gio.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/gio/kqueue/meson.build b/gio/kqueue/meson.build -index 7447e56..f3e573f 100644 ---- a/gio/kqueue/meson.build -+++ b/gio/kqueue/meson.build -@@ -10,6 +10,7 @@ kqueue_lib = static_library('kqueue', - include_directories : [configinc, glibinc], - dependencies : [ - gioenumtypes_dep, -+ libglib_dep, - gmodule_inc_dep, - ], - gnu_symbol_visibility : 'hidden', -diff --git a/gio/win32/meson.build b/gio/win32/meson.build -index 08be6b0..6699f10 100644 ---- a/gio/win32/meson.build -+++ b/gio/win32/meson.build -@@ -13,6 +13,7 @@ giowin32_lib = static_library('giowin32', - dependencies : [ - libintl, - gioenumtypes_dep, -+ libglib_dep, - gmodule_inc_dep, - ], - gnu_symbol_visibility : 'hidden', diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch index 6e966aab2d2b0a..e62c5667218c7f 100644 --- a/ports/glib/libintl.patch +++ b/ports/glib/libintl.patch @@ -1,14 +1,14 @@ diff --git a/meson.build b/meson.build -index f44fa2d4e..d465253af 100644 --- a/meson.build +++ b/meson.build -@@ -2088,9 +2088,9 @@ +@@ -2134,10 +2135,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 = [] --libintl = dependency('intl', required: false, allow_fallback: false) --if libintl.found() + libintl_prefix = '#include ' +-libintl = dependency('intl', required: false) +-if libintl.found() and libintl.type_name() != 'internal' +libintl = dependency('Intl', method:'cmake', required: true) +libintl_deps = [libintl] +if false diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index c36828c4438f86..bc4fe0601efe44 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 190a98e9a0ebb802a31b511e95725ed1fec9d750aed6bd87f14f3047d1f1d79458be3fa954fd6eb9af9f481a8deeaae73c95c990f5aa002a4b1166372ed4c4f1 + SHA512 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -10,7 +10,7 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES use-libiconv-on-windows.patch libintl.patch - fix-build-race-on-gio.patch # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3512 + suppress-libelf-dependency.patch ) if(APPLE) diff --git a/ports/glib/suppress-libelf-dependency.patch b/ports/glib/suppress-libelf-dependency.patch new file mode 100644 index 00000000000000..cf14dd5771e466 --- /dev/null +++ b/ports/glib/suppress-libelf-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/gio/meson.build b/gio/meson.build +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -935,7 +935,7 @@ endif + # Dependencies used by executables below + have_libelf = false + libelf = dependency('libelf', version : '>= 0.8.12', required : false) +-if libelf.found() ++if false + have_libelf = true + else + # This fallback is necessary on *BSD. elfutils isn't the only libelf diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 01f38b57d3c5ee..da1c7406f5d19a 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glib", - "version": "2.76.5", + "version": "2.78.0", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index f1b505b42a9c10..bb1d72d57255fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2941,7 +2941,7 @@ "port-version": 2 }, "glib": { - "baseline": "2.76.5", + "baseline": "2.78.0", "port-version": 0 }, "glibmm": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index ee968bfb39b576..b856f49bf3766f 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd9adf35a5c743b40cedce00c43542980f338229", + "version": "2.78.0", + "port-version": 0 + }, { "git-tree": "4ae4475a91c8ec7f156e5904da9f0c3f02224cdc", "version": "2.76.5", From 640cb26c1a85bc27146500d7f675760d1d4ed403 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 13 Oct 2023 19:06:57 +0100 Subject: [PATCH 0086/1039] [BoringSSL] rm debug suffix non-Windows, short name in UNIX pc (#34459) --- ports/boringssl/install-pc-files.cmake | 16 ++++++++++------ ports/boringssl/portfile.cmake | 8 ++++++-- ports/boringssl/vcpkg.json | 2 +- versions/b-/boringssl.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake index 262a533a8ba7b8..47eab26cdc6a44 100644 --- a/ports/boringssl/install-pc-files.cmake +++ b/ports/boringssl/install-pc-files.cmake @@ -3,6 +3,8 @@ function(install_pc_file name pc_data) if (NOT VCPKG_TARGET_IS_WINDOWS) string(REPLACE "-lcrypt32" "" pc_data "${pc_data}") string(REPLACE "-lws2_32" "" pc_data "${pc_data}") + string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") elseif (NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") string(REPLACE "-llibcrypto" "-lcrypto" pc_data "${pc_data}") @@ -11,12 +13,14 @@ function(install_pc_file name pc_data) configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") - string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") - else() - string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") - string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + if(VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lssl" "-lssld" pc_data "${pc_data}") + string(REPLACE "-lcrypto" "-lcryptod" pc_data "${pc_data}") + else() + string(REPLACE "-llibssl" "-llibssld" pc_data "${pc_data}") + string(REPLACE "-llibcrypto" "-llibcryptod" pc_data "${pc_data}") + endif() endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) endif() diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index dee6ccd95e256f..6fb4c9c80a790c 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -26,11 +26,15 @@ vcpkg_from_github( 0003-fix-shared-symbol-visibility.patch ) +if(VCPKG_TARGET_IS_WINDOWS) + # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. + set(CMAKE_CONFIGURE_OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - # the FindOpenSSL.cmake script differentiates debug and release binaries using this suffix. - -DCMAKE_DEBUG_POSTFIX=d + ${CMAKE_CONFIGURE_OPTIONS_DEBUG} ) vcpkg_cmake_install() diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index c47b1bcc45b4c0..6dc9f6b02db09e 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boringssl", - "version-date": "2023-09-25", + "version-date": "2023-10-13", "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 29f4edb13c3045..fe013489a906e5 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b809260036c7ee69cbf1a8a06e015354121d741", + "version-date": "2023-10-13", + "port-version": 0 + }, { "git-tree": "5f833bab8ecfc28f45a9034291e79f8cd126ad01", "version-date": "2023-09-25", diff --git a/versions/baseline.json b/versions/baseline.json index bb1d72d57255fe..d04fee7a61f3b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1289,7 +1289,7 @@ "port-version": 0 }, "boringssl": { - "baseline": "2023-09-25", + "baseline": "2023-10-13", "port-version": 0 }, "botan": { From 40293898895c66643b8da796070859aaae01b620 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:24:19 +0800 Subject: [PATCH 0087/1039] [libtins] Fix include header file cannot be found (#34461) --- ports/libtins/fix_include.patch | 22 ++++++++++++++++++++++ ports/libtins/portfile.cmake | 1 + ports/libtins/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtins.json | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/libtins/fix_include.patch diff --git a/ports/libtins/fix_include.patch b/ports/libtins/fix_include.patch new file mode 100644 index 00000000000000..c069cc0cc6ce46 --- /dev/null +++ b/ports/libtins/fix_include.patch @@ -0,0 +1,22 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 94bc8bf..14a15e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -211,6 +211,7 @@ ADD_LIBRARY( + ) + + TARGET_LINK_LIBRARIES(tins ${PCAP_LIBRARY} ${OPENSSL_LIBRARIES} ${LIBTINS_OS_LIBS}) ++target_include_directories(tins PUBLIC $) + + SET_TARGET_PROPERTIES(tins PROPERTIES OUTPUT_NAME tins) + SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIBTINS_VERSION} ) +diff --git a/libtins.pc.in b/libtins.pc.in +index e9a5c29..c7e3f6c 100644 +--- a/libtins.pc.in ++++ b/libtins.pc.in +@@ -7,4 +7,4 @@ Name: libtins + Description: C++ packet crafting, sniffing and interpretation library. + Version: @pkgconfig_version@ + Libs: -L${libdir} -ltins +-Cflags: -I${includedir}/tins ++Cflags: -I${includedir} diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 62cbde451d43b3..0b9ac8fc0cf2f1 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-source-writes.patch find-pcap_static.patch + fix_include.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBTINS_BUILD_SHARED) diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json index c9a7daa96afa8a..fb2a6865e38265 100644 --- a/ports/libtins/vcpkg.json +++ b/ports/libtins/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtins", "version": "4.3", - "port-version": 6, + "port-version": 7, "description": "High-level, multiplatform C++ network packet sniffing and crafting library", "license": "BSD-2-Clause", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index d04fee7a61f3b9..6e3297236731e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4778,7 +4778,7 @@ }, "libtins": { "baseline": "4.3", - "port-version": 6 + "port-version": 7 }, "libtomcrypt": { "baseline": "1.18.2", diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index d81d747b036c65..3ee2a13eef04e7 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30fbfd14d90e9aedac77f8272135a7e51444b01f", + "version": "4.3", + "port-version": 7 + }, { "git-tree": "4a1470befea5c6b5c7418f9b85f37d6f8733d7d5", "version": "4.3", From bb4ee90316e05f863e14d9930c7c5b01e50c67ea Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:24:46 +0200 Subject: [PATCH 0088/1039] [breakpad] Fix breakpad use atl not atlmfc (#34465) --- ports/breakpad/vcpkg.json | 4 ++-- versions/b-/breakpad.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index 5dd65371d87714..28c75a24edc83f 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,14 +1,14 @@ { "name": "breakpad", "version-date": "2022-07-12", - "port-version": 5, + "port-version": 6, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", "supports": "!uwp & (!windows | !arm) & (!windows | !arm64)", "dependencies": [ { - "name": "atlmfc", + "name": "atl", "platform": "windows" }, "libdisasm", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 098056c1855946..e4147f50ca4f78 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a244c96e6e67d802de17045cb395c0f11e0b3aa4", + "version-date": "2022-07-12", + "port-version": 6 + }, { "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e", "version-date": "2022-07-12", diff --git a/versions/baseline.json b/versions/baseline.json index 6e3297236731e4..efb9ca6176ec3e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1306,7 +1306,7 @@ }, "breakpad": { "baseline": "2022-07-12", - "port-version": 5 + "port-version": 6 }, "brigand": { "baseline": "1.3.0", From 8e214e8be19f211b115abbfde5cb4a50aa14f96b Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:28:34 +0800 Subject: [PATCH 0089/1039] [cryptopp] update to 8.9.0 (#34322) --- ports/cryptopp/fix-git-branch.patch | 18 ------------------ ports/cryptopp/patch.patch | 12 ++++++------ ports/cryptopp/portfile.cmake | 11 +++++------ ports/cryptopp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cryptopp.json | 5 +++++ 6 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 ports/cryptopp/fix-git-branch.patch diff --git a/ports/cryptopp/fix-git-branch.patch b/ports/cryptopp/fix-git-branch.patch deleted file mode 100644 index d3d03c2785b3b5..00000000000000 --- a/ports/cryptopp/fix-git-branch.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b0ee7a2..ad24d32 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,11 +214,8 @@ else() - endif() - endif() - --if (Git_FOUND) -- execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD -- WORKING_DIRECTORY ${cryptopp-cmake_SOURCE_DIR} -- OUTPUT_VARIABLE cryptopp_GIT_BRANCH) -- string(STRIP ${cryptopp_GIT_BRANCH} cryptopp_GIT_BRANCH) -+if(CRTPTOPP_GIT_BRANCH) -+ set(cryptopp_GIT_BRANCH ${CRTPTOPP_GIT_BRANCH}) - else() - set(cryptopp_GIT_BRANCH "master") - endif() diff --git a/ports/cryptopp/patch.patch b/ports/cryptopp/patch.patch index de8d7cd1b9ba55..5e168d2fe2efc8 100644 --- a/ports/cryptopp/patch.patch +++ b/ports/cryptopp/patch.patch @@ -1,8 +1,8 @@ diff --git a/config_cxx.h b/config_cxx.h -index 03153ba..6d9187d 100644 +index ffd57ad..353d7ce 100644 --- a/config_cxx.h +++ b/config_cxx.h -@@ -214,7 +214,7 @@ +@@ -217,7 +217,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??? @@ -12,18 +12,18 @@ index 03153ba..6d9187d 100644 # 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 +index 0994563..4546585 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)) +-#if (defined(_MSC_VER) && defined(__clang__)) ++#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__)) # error: "Unsupported configuration" #endif + @@ -126,6 +126,7 @@ #endif diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake index 175d224954425a..f68cd038d8417f 100644 --- a/ports/cryptopp/portfile.cmake +++ b/ports/cryptopp/portfile.cmake @@ -1,19 +1,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +string(REPLACE "." "_" CRYPTOPP_VERSION "${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO abdes/cryptopp-cmake - REF f857b775bcb4ff24e4993d85cce811587f8b0616 #CRYPTOPP_8_8_0 - SHA512 a33ef3393d051776672ecc15987dd55d848cb501f0d8cc19b411df49b47c1762469a0cb96a26132b154fa9c6ce36126f041f940e8c2f3651884b0d041dea580e + REF "CRYPTOPP_${CRYPTOPP_VERSION}" + SHA512 3ec33b107ab627a514e1ebbc4b6522ee8552525f36730d9b5feb85e61ba7fc24fd36eb6050e328c6789ff60d47796beaa8eebf7dead787a34395294fae9bb733 HEAD_REF master - PATCHES fix-git-branch.patch ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO weidai11/cryptopp - REF 4d0cad5401d1a2c998b314bc89288c9620d3021d #CRYPTOPP_8_8_0 - SHA512 2e7885c0ee2666113ca1129f4b420be50b5edc9de0d817da0ee959c6d7595cda6b173dbb8e830c57078f9ccb449c357a75b029645886e8e3b7bcd338ac3d8b17 + REF "CRYPTOPP_${CRYPTOPP_VERSION}" + SHA512 28a67141155c9c15e3e6a2173b3a8487cc38a2a2ade73bf4a09814ca541be6b06e9a501be26f7e2f42a2f80df21b076aa5d8ad4224dc0a1f8d7f3b24deae465e HEAD_REF master PATCHES patch.patch ) @@ -57,7 +57,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCRYPTOPP_SOURCES=${SOURCE_PATH} - -DCRTPTOPP_GIT_BRANCH=${VERSION} -DCRYPTOPP_BUILD_SHARED=OFF -DBUILD_STATIC=ON -DCRYPTOPP_BUILD_TESTING=OFF diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index c56814239f6599..e3706c6c2fb6bb 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cryptopp", - "version": "8.8.0", + "version": "8.9.0", "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index efb9ca6176ec3e..3e3166009c3996 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1945,7 +1945,7 @@ "port-version": 0 }, "cryptopp": { - "baseline": "8.8.0", + "baseline": "8.9.0", "port-version": 0 }, "cserialport": { diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 522b30f36c3b04..162b5a68ea06d7 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48788514ae1e84dea9055e603527c91f92c124fb", + "version": "8.9.0", + "port-version": 0 + }, { "git-tree": "ecb46c9c0fbce15e4238443a6d93275a052b3c9e", "version": "8.8.0", From 23f33ecab025d0d3316adf9cbc3727d27905cef5 Mon Sep 17 00:00:00 2001 From: Pravila Date: Fri, 13 Oct 2023 19:42:13 +0100 Subject: [PATCH 0090/1039] [thomasmonkman-filewatch] New port (#34412) --- ports/thomasmonkman-filewatch/portfile.cmake | 11 +++++++++++ ports/thomasmonkman-filewatch/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/t-/thomasmonkman-filewatch.json | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 ports/thomasmonkman-filewatch/portfile.cmake create mode 100644 ports/thomasmonkman-filewatch/vcpkg.json create mode 100644 versions/t-/thomasmonkman-filewatch.json diff --git a/ports/thomasmonkman-filewatch/portfile.cmake b/ports/thomasmonkman-filewatch/portfile.cmake new file mode 100644 index 00000000000000..e64a4c24c0000f --- /dev/null +++ b/ports/thomasmonkman-filewatch/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ThomasMonkman/filewatch + REF a59891baf375b73ff28144973a6fafd3fe40aa21 + SHA512 9a110b42a499ed7047bb8a79029134943582b388db810974ad6b5f91d1ec720e45a9a3543c4a56ee97d51439f5a34222bada0fb43281dcbc2e65bdee38f836d5 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/FileWatch.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/thomasmonkman-filewatch") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/thomasmonkman-filewatch/vcpkg.json b/ports/thomasmonkman-filewatch/vcpkg.json new file mode 100644 index 00000000000000..8ce8e5bc7a95ea --- /dev/null +++ b/ports/thomasmonkman-filewatch/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "thomasmonkman-filewatch", + "version-date": "2023-01-16", + "description": "File watcher in C++.", + "homepage": "https://github.com/ThomasMonkman/filewatch", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3e3166009c3996..2251462a104ff7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8228,6 +8228,10 @@ "baseline": "2023.1", "port-version": 0 }, + "thomasmonkman-filewatch": { + "baseline": "2023-01-16", + "port-version": 0 + }, "thor": { "baseline": "2022-04-16", "port-version": 0 diff --git a/versions/t-/thomasmonkman-filewatch.json b/versions/t-/thomasmonkman-filewatch.json new file mode 100644 index 00000000000000..5e210f5a94c3a2 --- /dev/null +++ b/versions/t-/thomasmonkman-filewatch.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "09215796e0a4591e54d9aa37ab46dc5edc7bd491", + "version-date": "2023-01-16", + "port-version": 0 + } + ] +} From 6932d6367fc32e9c26655abecc7699134b5bfb16 Mon Sep 17 00:00:00 2001 From: Ada Tufankjian Date: Fri, 13 Oct 2023 11:43:06 -0700 Subject: [PATCH 0091/1039] [enkiTS] Adding Port (#34386) --- ports/enkits/portfile.cmake | 30 ++++++++++++++++++++++++++++ ports/enkits/update_install.patch | 33 +++++++++++++++++++++++++++++++ ports/enkits/usage | 4 ++++ ports/enkits/vcpkg.json | 17 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/e-/enkits.json | 9 +++++++++ 6 files changed, 97 insertions(+) create mode 100644 ports/enkits/portfile.cmake create mode 100644 ports/enkits/update_install.patch create mode 100644 ports/enkits/usage create mode 100644 ports/enkits/vcpkg.json create mode 100644 versions/e-/enkits.json diff --git a/ports/enkits/portfile.cmake b/ports/enkits/portfile.cmake new file mode 100644 index 00000000000000..c55f6279885fb2 --- /dev/null +++ b/ports/enkits/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dougbinks/enkiTS + REF "v${VERSION}" + SHA512 72a05058caef8d6a33cd70500aeaf05cc61521721697969d4845279b5a79b63e7a6a3f3971c5eff2776e5575720b58252e9d251ef565c2123275a3e8540948db + HEAD_REF master + PATCHES + update_install.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENKITS_BUILD_C_INTERFACE=ON + -DENKITS_BUILD_EXAMPLES=OFF + -DENKITS_BUILD_SHARED=${BUILD_SHARED} + -DENKITS_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +# Must specify args due to case sensitivity on some filesystems +vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH share/enkiTS) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/enkits/update_install.patch b/ports/enkits/update_install.patch new file mode 100644 index 00000000000000..3596a0b2f30eee --- /dev/null +++ b/ports/enkits/update_install.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f8572e..f42ec18 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0) + + project( enkiTS ) + ++include(GNUInstallDirs) ++ + option( ENKITS_BUILD_C_INTERFACE "Build C interface" ON ) + option( ENKITS_BUILD_EXAMPLES "Build example applications" ON ) + option( ENKITS_BUILD_SHARED "Build shared library" OFF ) +@@ -59,9 +61,17 @@ if( UNIX ) + target_link_libraries( enkiTS ${CMAKE_THREAD_LIBS_INIT} ) + endif() + ++target_include_directories(enkiTS PUBLIC "$") + if( ENKITS_INSTALL ) +- install(TARGETS enkiTS DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/enkiTS") +- install(FILES ${ENKITS_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/enkiTS") ++ install( ++ TARGETS enkiTS ++ EXPORT enkiTS-config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(FILES ${ENKITS_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++ install( ++ EXPORT enkiTS-config ++ NAMESPACE enkiTS:: ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/enkiTS) + endif() + + if( UNIX ) diff --git a/ports/enkits/usage b/ports/enkits/usage new file mode 100644 index 00000000000000..ffb68ab7f4b180 --- /dev/null +++ b/ports/enkits/usage @@ -0,0 +1,4 @@ + enkits provides CMake targets: + + find_package(enkiTS CONFIG REQUIRED) + target_link_libraries(main PRIVATE enkiTS::enkiTS) diff --git a/ports/enkits/vcpkg.json b/ports/enkits/vcpkg.json new file mode 100644 index 00000000000000..139253fec4b6a0 --- /dev/null +++ b/ports/enkits/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "enkits", + "version": "1.11", + "description": "A permissively licensed C and C++ Task Scheduler for creating parallel programs.", + "homepage": "https://github.com/dougbinks/enkiTS", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2251462a104ff7..1cb1faeb8ce77b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2392,6 +2392,10 @@ "baseline": "1.3.17", "port-version": 2 }, + "enkits": { + "baseline": "1.11", + "port-version": 0 + }, "ensmallen": { "baseline": "2.19.1", "port-version": 0 diff --git a/versions/e-/enkits.json b/versions/e-/enkits.json new file mode 100644 index 00000000000000..6d2b78eef1e844 --- /dev/null +++ b/versions/e-/enkits.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8fe0e538a1d8685844297f35b7e00f4984d4bb09", + "version": "1.11", + "port-version": 0 + } + ] +} From 86538c1384f11a2e47293f9d73bc17413868ef5b Mon Sep 17 00:00:00 2001 From: Henry <6339134+honeway@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:44:27 +0800 Subject: [PATCH 0092/1039] [ninja] update to v1.11.1 (#34433) --- scripts/vcpkgTools.xml | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 2f7bfb8ce63a75..bd288557ab3e00 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -159,32 +159,25 @@ aria2-1.35.0-osx-darwin.tar.bz2 - 1.10.2 + 1.11.1 ninja.exe - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip - 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3 - ninja-win-1.10.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip + a700e794c32eb67b9f87040db7f1ba3a8e891636696fc54d416b01661c2421ff46fa517c97fd904adacdf8e621df3e68ea380105b909ae8b6651a78ae7eb3199 + ninja-win-1.11.1.zip - 1.10.2 + 1.11.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip - 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3 - ninja-linux-1.10.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip + 6403dac9196baffcff614fa73ea530752997c8db6bbfbaa0446b4b09d7327e2aa6e8615d1283c961d3bf0df497e85ba86604149f1505ee75f89d600245a45dde + ninja-linux-1.11.1.zip - 1.10.2 + 1.11.1 ninja - https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip - bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b - ninja-mac-1.10.2.zip - - - 1.8.2 - ninja - https://github.com/ivysnow/ninja/releases/download/v1.8.2/ninja-freebsd.zip - 56a55ae9a6b5dfad4f28f9fe9b8114f1475c999d2f07fff7efa7375f987e74b498e9b63c41fc6c577756f15f3a1459c6d5d367902de3bedebdf9a9fd49089a86 - ninja-freebsd-1.8.2.zip + https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip + dad33b0918c60bbf5107951a936175b1610b4894a408f4ba4b47a2f5b328fc982a52a2aed6a0cb75028ee4765af5083bea66611c37516826eb0c851366bb4427 + ninja-mac-1.11.1.zip 7.2.11 From d297ef5bff8c895965a97cbfab7a0f6495d2dd2f Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 14 Oct 2023 02:59:30 +0800 Subject: [PATCH 0093/1039] [libics] update to 1.6.6 (#34473) --- ports/libics/fix-integral-include.patch | 12 ++++++++++++ ports/libics/portfile.cmake | 5 +++-- ports/libics/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libics.json | 5 +++++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 ports/libics/fix-integral-include.patch diff --git a/ports/libics/fix-integral-include.patch b/ports/libics/fix-integral-include.patch new file mode 100644 index 00000000000000..4546dadc713960 --- /dev/null +++ b/ports/libics/fix-integral-include.patch @@ -0,0 +1,12 @@ +diff --git a/support/cpp_interface/libics.hpp b/support/cpp_interface/libics.hpp +index 73f76e6..4ea2b1e 100644 +--- a/support/cpp_interface/libics.hpp ++++ b/support/cpp_interface/libics.hpp +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #if defined(__WIN32__) && !defined(WIN32) + # define WIN32 diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index 2d66f422586319..1a8350bc14f508 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svi-opensource/libics - REF ae55128e0532d78aaea4adce21a3fa553d208b83 # 1.6.5 - SHA512 37a1e9034d7e32954840e18f3e3c19f6ed2f8c651ce0da53f678e2f04653be0fc4d9ab3dca8b6f0bfcaec2a9cc560ccfbc7d9034977faa14036281d6a3ca662a + REF "${VERSION}" + SHA512 290d6d7bd3f5611d0b46aa6406ef10449ee768bc14d0b34f0bb365ca46f98b7fd4065c94fd9594e357427a4d0644f2724a1f773c7f3b43adc3db2389b94ee88e HEAD_REF master + PATCHES fix-integral-include.patch ) vcpkg_cmake_configure( diff --git a/ports/libics/vcpkg.json b/ports/libics/vcpkg.json index 09e0691557b654..444c9aa0ae2b7d 100644 --- a/ports/libics/vcpkg.json +++ b/ports/libics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libics", - "version": "1.6.5", + "version": "1.6.6", "description": "Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.", "homepage": "https://github.com/svi-opensource/libics", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1cb1faeb8ce77b..3be04fbb92e75b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4297,7 +4297,7 @@ "port-version": 1 }, "libics": { - "baseline": "1.6.5", + "baseline": "1.6.6", "port-version": 0 }, "libideviceactivation": { diff --git a/versions/l-/libics.json b/versions/l-/libics.json index dd0bcac49050ad..5c7597217922d6 100644 --- a/versions/l-/libics.json +++ b/versions/l-/libics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd79bb59a4716358360e475a7aaa3ec6a20c80e1", + "version": "1.6.6", + "port-version": 0 + }, { "git-tree": "aea77d2369ae831edee51b05bc8dcad585795990", "version": "1.6.5", From 9b18ccb8d2a69798fa2330b936281aab4e17b537 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 14 Oct 2023 03:00:21 +0800 Subject: [PATCH 0094/1039] [libenvpp] update to 1.3.0 (#34470) --- ports/libenvpp/portfile.cmake | 2 +- ports/libenvpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libenvpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libenvpp/portfile.cmake b/ports/libenvpp/portfile.cmake index 31eae10e91c7a4..5000d6cfb8b37e 100644 --- a/ports/libenvpp/portfile.cmake +++ b/ports/libenvpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ph3at/libenvpp REF v${VERSION} - SHA512 d8d2e6405311be1cba47cdf1c8b29018c84716a0d34a18bf3b6fa8c05f5eddf447ddee407a407d765e92296c5d7e7b5f2fe4561fb66f5165826825158ef82fc8 + SHA512 0b4ed6496efc54165e8e161510146146cfefb90c303a913bab6a6749ae4292823c19f34734d417a2bd4d44d8d05a68c60acd852c03487f40ba6126eeb3db16bd HEAD_REF main PATCHES fix-dependencies.patch diff --git a/ports/libenvpp/vcpkg.json b/ports/libenvpp/vcpkg.json index 1037daeaeb7882..1225008c5b4f7b 100644 --- a/ports/libenvpp/vcpkg.json +++ b/ports/libenvpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libenvpp", - "version": "1.0.0", + "version": "1.3.0", "description": "A modern C++ library for type-safe environment variable parsing ", "homepage": "https://github.com/ph3at/libenvpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3be04fbb92e75b..f1adb6704bfee5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4129,7 +4129,7 @@ "port-version": 2 }, "libenvpp": { - "baseline": "1.0.0", + "baseline": "1.3.0", "port-version": 0 }, "libepoxy": { diff --git a/versions/l-/libenvpp.json b/versions/l-/libenvpp.json index b94e65ef036133..6d3a1d1d5344bf 100644 --- a/versions/l-/libenvpp.json +++ b/versions/l-/libenvpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5388e430f77d77307fe2d4358241e684886390bb", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "8eb66698367b380452b1f693237d383381e2373e", "version": "1.0.0", From ddf50bc4900e017a58b0bbfc32f81969d12971ca Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 14 Oct 2023 03:01:47 +0800 Subject: [PATCH 0095/1039] [libgpiod] update to 2.0.2 (#34472) --- ports/libgpiod/portfile.cmake | 2 +- ports/libgpiod/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libgpiod.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index 291c24bd2bf327..f46203caca188a 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git FETCH_REF "v${VERSION}" - REF ae275c375477f207912113e5cf190fada78f3f90 # v2.0.1 + REF d350f67ffd52e948ac81280d87b51b715d95044c ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index 12175cd7f45778..a23b75cc1822ba 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgpiod", - "version": "2.0.1", + "version": "2.0.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", diff --git a/versions/baseline.json b/versions/baseline.json index f1adb6704bfee5..9a916359f3755f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4237,7 +4237,7 @@ "port-version": 0 }, "libgpiod": { - "baseline": "2.0.1", + "baseline": "2.0.2", "port-version": 0 }, "libgpod": { diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index afbc40cd205752..ca4e4c5f6211b2 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e78935fc408abcc2e62d8d1ca1831b0fd5510b7d", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "d5fde793827568c4be74cb76793650e37e3e5354", "version": "2.0.1", From 1e0eede790b6b6dfb90e2999a3e15e717590540c Mon Sep 17 00:00:00 2001 From: Kristian Duske Date: Fri, 13 Oct 2023 21:28:22 +0200 Subject: [PATCH 0096/1039] Fix configure warning when using minizip (#34445) --- ports/assimp/build_fixes.patch | 6 ++++-- ports/assimp/vcpkg.json | 1 + versions/a-/assimp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 6d4a878722f5b9..ffa1869f8467da 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -268,7 +268,8 @@ index 5339454..45e07c0 100644 - hunter_add_package(minizip) +IF(1) + #hunter_add_package(minizip) - find_package(minizip CONFIG REQUIRED) +- find_package(minizip CONFIG REQUIRED) ++ find_package(unofficial-minizip CONFIG REQUIRED) ELSE() SET( unzip_SRCS @@ -969,9 +969,9 @@ ENDIF() @@ -383,7 +384,8 @@ index 5339454..45e07c0 100644 + ${OPENDDL_PARSER_LIBRARIES} - #poly2tri::poly2tri + poly2tri::poly2tri - minizip::minizip +- minizip::minizip ++ unofficial::minizip::minizip - ZLIB::zlib - RapidJSON::rapidjson + ZLIB::ZLIB diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 72899aa58a2b48..c7c7616810b49c 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "assimp", "version": "5.3.1", + "port-version": 1, "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 f6bd7699ab3355..7fe6c14694bd06 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572034c626843af86fe62b64905fd4e79f19535f", + "version": "5.3.1", + "port-version": 1 + }, { "git-tree": "f9934603cb6f42343b122951f22b5af3c1967cde", "version": "5.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index 9a916359f3755f..4688cd8469b092 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -266,7 +266,7 @@ }, "assimp": { "baseline": "5.3.1", - "port-version": 0 + "port-version": 1 }, "async-mqtt": { "baseline": "2.0.0", From ba823b1e1f330a2679273d29bda5b2ab6a603de8 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 Oct 2023 14:57:51 -0700 Subject: [PATCH 0097/1039] Patch Tuesday 2023-10-11 (except macOS) (#34431) --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- .../linux/changing-linux-packages.md | 3 +++ .../azure-pipelines/linux/managed-image.json | 2 +- .../azure-pipelines/linux/provision-image.sh | 3 +++ .../patch-tuesday-checklist.md | 20 ++++++++++++++++--- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- 6 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 scripts/azure-pipelines/linux/changing-linux-packages.md diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index d14d2aec155242..dd6094c4b90016 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,9 +4,9 @@ variables: android-pool: 'PrAnd-1ES-Pool' linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2023-09-13' + windows-pool: 'PrWin-2023-10-11' osx-pool: 'PrOsx-2023-09-11' - linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-09-13' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-10-11' parameters: - name: vcpkgToolSha diff --git a/scripts/azure-pipelines/linux/changing-linux-packages.md b/scripts/azure-pipelines/linux/changing-linux-packages.md new file mode 100644 index 00000000000000..f8b5f8265b016f --- /dev/null +++ b/scripts/azure-pipelines/linux/changing-linux-packages.md @@ -0,0 +1,3 @@ +- [ ] Update `provision-image.sh` to add the new apt package. +- [ ] Update `managed-image.json` to add the new apt package to the very long line of packages. +- [ ] Update the managed image named CPP_GITHUB\PrLin-1ES\PrLin-1ESImage by copying the contents of `managed-image.json` to the Settings\Image text box. diff --git a/scripts/azure-pipelines/linux/managed-image.json b/scripts/azure-pipelines/linux/managed-image.json index b26239528ed3de..090ae8a90ff7cc 100644 --- a/scripts/azure-pipelines/linux/managed-image.json +++ b/scripts/azure-pipelines/linux/managed-image.json @@ -3,7 +3,7 @@ { "name": "linux-install-packages", "parameters": { - "packages": "git curl zip unzip tar 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 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 libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go" + "packages": "git curl zip unzip tar 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 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 libxext-dev libxfixes-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev libxkbcommon-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev libxcb-cursor-dev libkrb5-dev libxcb-res0-dev libxcb-keysyms1-dev libxcb-xkb-dev libxcb-record0-dev python3-setuptools python3-mako python3-pip python3-venv nodejs libwayland-dev python-is-python3 guile-2.2-dev libxdamage-dev libdbus-1-dev libxtst-dev haskell-stack golang-go wayland-protocols" } }, { diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 9a280d2b328bac..28ad54864333cd 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -91,6 +91,9 @@ APT_PACKAGES="$APT_PACKAGES haskell-stack" ## required by boringssl APT_PACKAGES="$APT_PACKAGES golang-go" +## required by libdecor +APT_PACKAGES="$APT_PACKAGES wayland-protocols" + ## CUDA APT_PACKAGES="$APT_PACKAGES cuda-compiler-12-1 cuda-libraries-dev-12-1 cuda-driver-dev-12-1 \ cuda-cudart-dev-12-1 libcublas-12-1 libcurand-dev-12-1 cuda-nvml-dev-12-1 libcudnn8-dev libnccl2 \ diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index 1ceb337444469f..cb5857467aabc3 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -1,22 +1,36 @@ ## First time machine setup: * [ ] Install Azure PowerShell: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps +* [ ] Run `Connect-AzAccount -Subscription CPP_GITHUB` * [ ] Install Docker ## Each Patch Tuesday: * [ ] Check for depends:vm-update PRs and make relevant changes if possible. -* [ ] Check for Service 360 alerts about vulnerable software we are installing in the VMs and - update that. (Most often PowerShell needs to be updated to the current 7.2.x release) +* [ ] Check for Service 360 alerts (possibly at https://aka.ms/s360 ?) against the service named + "C++ VCPKG Validation" about vulnerable software we are installing in the VMs and update that. + (Most often PowerShell needs to be updated) +* [ ] Check for any other software for the Windows images we wish to update and make the edits to do + so in `scripts/azure-pipelines/windows` * [ ] Run android/create-docker-image.ps1 * [ ] Update azure-pipelines.yml to point to the new linux docker image from Azure Container Registry * [ ] Run windows/create-image.ps1 * [ ] Run windows/create-vmss.ps1 * [ ] Create new pools for these in Azure DevOps: https://dev.azure.com/vcpkg/public/_settings/agentqueues * Windows: 22 agents + * Make sure to check 'Grant access permission to all pipelines' * [ ] Update azure-pipelines.yml to point to the new pools. * [ ] Submit PR with those changes. * [ ] Submit a full CI rebuild with those changes: https://dev.azure.com/vcpkg/public/_build?definitionId=29 refs/pull/NUMBER/head +* [ ] Look at that and compare with recent build and resolve anything that's not an existing baseline issue. +* [ ] Merge the PR. +* [ ] Update the managed image for compiler testing and delete unused images. + * CPP_GITHUB\vcpkg-image-minting\PrWinEA + * Standard HDD LRS + * East Asia, 1 Replica + * West US 2, 1 Replica + * West US 3, 1 Replica +* [ ] After the last build finishes on the previous pool, delete it in the Azure Devops *Organization* UI and its Resource Group. ( https://dev.azure.com/vcpkg/_settings/agentpools ?) * [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and devdiv.visualstudio.com. -* [ ] Mint a new macOS base box. +* [ ] Mint a new macOS base box. (See instructions in `scripts/azure-pipelines/osx/README.md`) * [ ] Deploy the new base box to all hosts. diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 1d22346945a8cc..9a5a02afc506fa 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.6/PowerShell-7.3.6-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/PowerShell-7.3.8-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' From 486a4640db740f5994e492eb60748111dfc48de7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 Oct 2023 19:43:14 -0700 Subject: [PATCH 0098/1039] [libosip2, talib] Don't install include/makefile.am. (#34481) --- ports/libosip2/portfile.cmake | 2 +- ports/libosip2/vcpkg.json | 2 +- ports/talib/portfile.cmake | 1 + ports/talib/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/l-/libosip2.json | 5 +++++ versions/t-/talib.json | 5 +++++ 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index 977e0c2f8e42e2..c781c771854b39 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -34,7 +34,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" ) - file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN Makefile.* EXCLUDE) vcpkg_msbuild_install( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index cf25d2463804b7..e6bfe4f5d1b9c2 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libosip2", "version": "5.2.0", - "port-version": 4, + "port-version": 5, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm) & !uwp", diff --git a/ports/talib/portfile.cmake b/ports/talib/portfile.cmake index f7a8e85e7f04dc..f8218aa2bcf9ac 100644 --- a/ports/talib/portfile.cmake +++ b/ports/talib/portfile.cmake @@ -75,6 +75,7 @@ file( file( INSTALL "${SOURCE_PATH}/c/include" DESTINATION ${CURRENT_PACKAGES_DIR} + PATTERN Makefile.* EXCLUDE ) # License file diff --git a/ports/talib/vcpkg.json b/ports/talib/vcpkg.json index a67a685f420950..0dc503d9a3810a 100644 --- a/ports/talib/vcpkg.json +++ b/ports/talib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "talib", "version-semver": "0.4.0", + "port-version": 1, "description": "TA-Lib - Technical Analysis Library", "homepage": "https://ta-lib.github.io/", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4688cd8469b092..1b66224dd463b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4526,7 +4526,7 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 4 + "port-version": 5 }, "libosmium": { "baseline": "2.20.0", @@ -8142,7 +8142,7 @@ }, "talib": { "baseline": "0.4.0", - "port-version": 0 + "port-version": 1 }, "taocpp-json": { "baseline": "2020-09-14", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 74d6a3bc4f3155..0bebfe36308ba6 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2811fe1a0d4cb7faabaebfa4cf47e1296bcddd2", + "version": "5.2.0", + "port-version": 5 + }, { "git-tree": "9b3b93c2039a5369ddd07c5dfb482644ce18c961", "version": "5.2.0", diff --git a/versions/t-/talib.json b/versions/t-/talib.json index 4878e213ef84a3..5c49de26f762e2 100644 --- a/versions/t-/talib.json +++ b/versions/t-/talib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b21601e58da50f810bacb160a8960a131227aa28", + "version-semver": "0.4.0", + "port-version": 1 + }, { "git-tree": "639b6ba11c1768faf5ab92f42d4cdf0a1bba2270", "version-semver": "0.4.0", From 5e8067541bad3c7af1a70fa394b9bf35394c215b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 16 Oct 2023 10:46:13 -0700 Subject: [PATCH 0099/1039] [libcap, libgpiod] Use tarballs from kernel.org. (#34480) I noticed this while reviewing https://github.com/microsoft/vcpkg/pull/34472 that these would be better to use tarballs which are eligible to be asset cached. --- ports/libcap/portfile.cmake | 13 ++++++++----- ports/libcap/vcpkg.json | 2 +- ports/libgpiod/portfile.cmake | 13 ++++++++----- ports/libgpiod/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/l-/libcap.json | 5 +++++ versions/l-/libgpiod.json | 5 +++++ 7 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ports/libcap/portfile.cmake b/ports/libcap/portfile.cmake index 1dccf8170e9470..c463ae1692a82d 100644 --- a/ports/libcap/portfile.cmake +++ b/ports/libcap/portfile.cmake @@ -1,8 +1,11 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://git.kernel.org/pub/scm/libs/libcap/libcap.git - FETCH_REF "libcap-${VERSION}" - REF 3c7dda330bd9a154bb5b878d31fd591e4951fe17 +vcpkg_download_distfile(ARCHIVE + URLS https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-3c7dda330bd9a154bb5b878d31fd591e4951fe17.tar.gz + FILENAME libpcap-${VERSION}.tar.gz + SHA512 0732c9f07be38c2bb06409f1f31d7ed5ad31b38ae380650b334074856f89b885deabb9603e21a989e81b530050c068bbbf60157adbf3ca3893e4bca7d61f63d2 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json index 6d82f41d41d6e7..06189da7d53329 100644 --- a/ports/libcap/vcpkg.json +++ b/ports/libcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcap", "version": "2.69", - "port-version": 1, + "port-version": 2, "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.", "homepage": "https://git.kernel.org/pub/scm/libs/libcap/libcap.git", "license": "BSD-3-Clause OR GPL-2.0-only", diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index f46203caca188a..1e55e1f3da506e 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -1,8 +1,11 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - FETCH_REF "v${VERSION}" - REF d350f67ffd52e948ac81280d87b51b715d95044c +vcpkg_download_distfile(ARCHIVE + URLS https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-9068bb08dc3bf183eee6de2577ad266fe6b8f434.tar.gz + FILENAME libgpiod-${VERSION}.tar.gz + SHA512 3c569471007d12d94cb74377187dfe8b979de08f3747dca6348a4212ffb6d5f699af1d1135c25c70bcd17d533b09499fd0f1b3c5deac7d0a2d1bbf31092033c3 +) + +vcpkg_extract_source_archive(SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index a23b75cc1822ba..e58002eeca660d 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgpiod", "version": "2.0.2", + "port-version": 1, "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 1b66224dd463b8..4d0d4ded85ca0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4018,7 +4018,7 @@ }, "libcap": { "baseline": "2.69", - "port-version": 1 + "port-version": 2 }, "libcbor": { "baseline": "0.10.2", @@ -4238,7 +4238,7 @@ }, "libgpiod": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libcap.json b/versions/l-/libcap.json index 1fe3d4d68e66b7..1be64790592701 100644 --- a/versions/l-/libcap.json +++ b/versions/l-/libcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d699cd38c2cf76ab59628fc3437c381ccabd2383", + "version": "2.69", + "port-version": 2 + }, { "git-tree": "3f8091b1a094e5a0ab51652478289c040e98e7ca", "version": "2.69", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index ca4e4c5f6211b2..e9b53096623ec1 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c470b2f0c5a31ebee904f7486e50b2adf0f8e8c2", + "version": "2.0.2", + "port-version": 1 + }, { "git-tree": "e78935fc408abcc2e62d8d1ca1831b0fd5510b7d", "version": "2.0.2", From 48b883fb2bc9f0800a292e2c8f93f0ebe5c08d9a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 16 Oct 2023 19:48:03 +0200 Subject: [PATCH 0100/1039] [sdl2] Add feature alsa (#34311) --- ports/sdl2/portfile.cmake | 10 +++++++--- ports/sdl2/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 85de3d93e6f68e..e9c6837b054d37 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -15,11 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + alsa SDL_ALSA + alsa CMAKE_REQUIRE_FIND_PACKAGE_ALSA + ibus SDL_IBUS + samplerate SDL_LIBSAMPLERATE vulkan SDL_VULKAN - x11 SDL_X11 wayland SDL_WAYLAND - samplerate SDL_LIBSAMPLERATE - ibus SDL_IBUS + x11 SDL_X11 + INVERTED_FEATURES + alsa CMAKE_DISABLE_FIND_PACKAGE_ALSA ) if ("x11" IN_LIST FEATURES) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 870805a02342d3..4f67f6ea0bced0 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.28.4", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", @@ -22,6 +23,15 @@ "base" ], "features": { + "alsa": { + "description": "Support for alsa audio", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + } + ] + }, "base": { "description": "Base functionality for SDL", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4d0d4ded85ca0f..9ef366b78e3784 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7578,7 +7578,7 @@ }, "sdl2": { "baseline": "2.28.4", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 5de84c2f71515d..88e296f3c06f62 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d625914314454b36d303ce86753840f6193f2bd", + "version": "2.28.4", + "port-version": 1 + }, { "git-tree": "289db88c23499b30e20bf972b2e1e68c093e5dea", "version": "2.28.4", From d3b05ce062942d19fe8f840f8e9dce2acddc2ae1 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Mon, 16 Oct 2023 21:00:44 +0200 Subject: [PATCH 0101/1039] [libmediainfo] Update to 23.10 (#34498) --- ports/libmediainfo/portfile.cmake | 2 +- ports/libmediainfo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmediainfo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index f2fd10408f9083..5493c35e33b636 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib REF "v${MEDIAINFO_VERSION}" - SHA512 6bc58f98ac1fc9637db0e8dd3a2e15b62036a2d33763e148cde425fceea798324f7c5f53cd51fc698d5b5b05fe1fc0fbfc4f391d2ec135eba6763eedfa5bd101 + SHA512 1407f5690415ccb7997cc9bcbe7d90980a52b1d06e543a446a0da8e4cb3f09ba8fcfbf6be80b043d7f76eeb2ba219242da1c34f3225e0f0bfe044b2394c0c3ae HEAD_REF master PATCHES msvc-arm.diff diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index 243535c901d221..072cdd1dbd96ef 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmediainfo", - "version": "23.4", + "version": "23.10", "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9ef366b78e3784..ebc2c6d88e3f8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4405,7 +4405,7 @@ "port-version": 3 }, "libmediainfo": { - "baseline": "23.4", + "baseline": "23.10", "port-version": 0 }, "libmesh": { diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index 0fcde3542cacba..126956d9774c87 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2bccca86faecebdacabafa1ff7b63e34168d342", + "version": "23.10", + "port-version": 0 + }, { "git-tree": "a5adf3a515c6144124fe9bb1825505de0f234b8c", "version": "23.4", From b0177037994464be634262cc0726d166a1a03658 Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 16 Oct 2023 22:02:59 +0300 Subject: [PATCH 0102/1039] update gzcmak3 to 3.4.1 (#34497) --- ports/gz-cmake3/portfile.cmake | 2 +- ports/gz-cmake3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gz-cmake3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake index 76511dea4381d1..462e1ba3ed372f 100644 --- a/ports/gz-cmake3/portfile.cmake +++ b/ports/gz-cmake3/portfile.cmake @@ -4,7 +4,7 @@ ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}_${VERSION} VERSION ${VERSION} - SHA512 59d6f90561e762c00035aae273420bc3d6a24af47b5d2914cd8547146f63919bc4c3e33e6c0942dc89bc75925cebff1bcbbf18e3239220ebc6bb194326c3197a + SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69 ) # Install custom usage diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index e0cde38305c818..9d7bb5cb10f67d 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-cmake3", - "version": "3.4.0", + "version": "3.4.1", "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index ebc2c6d88e3f8b..b02ce96f25b660 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3141,7 +3141,7 @@ "port-version": 6 }, "gz-cmake3": { - "baseline": "3.4.0", + "baseline": "3.4.1", "port-version": 0 }, "gz-common5": { diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index 59dee1f1af63a9..6bf2db70868a73 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0061f3363187e8da74f252ff3c21c42e382e8c9", + "version": "3.4.1", + "port-version": 0 + }, { "git-tree": "04e105aecf5f7805dde15ac905cacb77ffcd3225", "version": "3.4.0", From cd962c7b05f4f87f7ea088bbdb71ac5f48bf666f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 16 Oct 2023 21:03:44 +0200 Subject: [PATCH 0103/1039] [imgui-node-editor] Update to 0.9.3 (#34494) * [imgui-node-editor] Update to 0.9.3 * [imgui-node-editor] Update version files --- ports/imgui-node-editor/portfile.cmake | 2 +- ports/imgui-node-editor/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imgui-node-editor.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/imgui-node-editor/portfile.cmake b/ports/imgui-node-editor/portfile.cmake index 031750bc8e214a..22666dbb9a70c2 100644 --- a/ports/imgui-node-editor/portfile.cmake +++ b/ports/imgui-node-editor/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thedmd/imgui-node-editor REF v${VERSION} - SHA512 7dbc34a7af1554a7e683e0b55d18fc08cf5832bf5d6a57a30820e7ef98a6fbb5a65a7287f6250d3b6f47b89ac0499f51fbe19d9c11850e26f74e3b0e806abb1b + SHA512 83573b6ed776095837373bc95be1c1f5b85e9c5fae2145647f9cb6fdc17d3889edce716ac9e27c1bbde56f00803a66db98ca856910e6e0ce8714d3c5ce3f7c3f HEAD_REF master ) diff --git a/ports/imgui-node-editor/vcpkg.json b/ports/imgui-node-editor/vcpkg.json index b03295a303b02b..9cbd3a3915e131 100644 --- a/ports/imgui-node-editor/vcpkg.json +++ b/ports/imgui-node-editor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui-node-editor", - "version": "0.9.2", + "version": "0.9.3", "description": "Node Editor built using Dear ImGui", "homepage": "https://github.com/thedmd/imgui-node-editor", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b02ce96f25b660..7a57b7386a74f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3441,7 +3441,7 @@ "port-version": 0 }, "imgui-node-editor": { - "baseline": "0.9.2", + "baseline": "0.9.3", "port-version": 0 }, "imgui-sfml": { diff --git a/versions/i-/imgui-node-editor.json b/versions/i-/imgui-node-editor.json index be4fe961d4acd7..d22e01fd960ff0 100644 --- a/versions/i-/imgui-node-editor.json +++ b/versions/i-/imgui-node-editor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b660409ffe6d690ff6a3fae999b249e4521b5583", + "version": "0.9.3", + "port-version": 0 + }, { "git-tree": "26e2cf3260ea1e08e61912431635f49d24b6ea87", "version": "0.9.2", From bb1f441695da830e27884e8db3709cd1f9647bfe Mon Sep 17 00:00:00 2001 From: Pravila Date: Mon, 16 Oct 2023 20:05:06 +0100 Subject: [PATCH 0104/1039] [libtracepoint,libtracepoint-control,libtracepoint-decode,libeventheader-tracepoint,libeventheader-decode] Update to 1.2.1 (#34477) * Update libtracepoint ports * Update version * Update libtracepoint-header * Update version libeventheader-tracepoint * Update libeventheader-decode * Update version --------- Co-authored-by: Pablo Rodriguez Avila --- ports/libeventheader-decode/portfile.cmake | 4 ++-- ports/libeventheader-decode/vcpkg.json | 6 +++--- ports/libeventheader-tracepoint/portfile.cmake | 4 ++-- ports/libeventheader-tracepoint/vcpkg.json | 4 ++-- ports/libtracepoint-control/portfile.cmake | 4 ++-- ports/libtracepoint-control/vcpkg.json | 4 ++-- ports/libtracepoint-decode/portfile.cmake | 4 ++-- ports/libtracepoint-decode/vcpkg.json | 2 +- ports/libtracepoint/portfile.cmake | 4 ++-- ports/libtracepoint/vcpkg.json | 2 +- versions/baseline.json | 10 +++++----- versions/l-/libeventheader-decode.json | 5 +++++ versions/l-/libeventheader-tracepoint.json | 5 +++++ versions/l-/libtracepoint-control.json | 5 +++++ versions/l-/libtracepoint-decode.json | 5 +++++ versions/l-/libtracepoint.json | 5 +++++ 16 files changed, 49 insertions(+), 24 deletions(-) diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake index 7827c203d79f61..cfd4f684488c6d 100644 --- a/ports/libeventheader-decode/portfile.cmake +++ b/ports/libeventheader-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json index 19e79c2746bf14..a4215bc43322f5 100644 --- a/ports/libeventheader-decode/vcpkg.json +++ b/ports/libeventheader-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-decode", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,11 +8,11 @@ "dependencies": [ { "name": "libeventheader-tracepoint", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "libtracepoint-decode", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake index 19d8ae4ee89c3f..7eaceed698d72f 100644 --- a/ports/libeventheader-tracepoint/portfile.cmake +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json index f66fbdb9667718..d1256054025269 100644 --- a/ports/libeventheader-tracepoint/vcpkg.json +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-tracepoint", - "version": "1.1.0", + "version": "1.2.1", "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-control/portfile.cmake b/ports/libtracepoint-control/portfile.cmake index 465cebc8e40d86..98bf67cb3865b8 100644 --- a/ports/libtracepoint-control/portfile.cmake +++ b/ports/libtracepoint-control/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-control/vcpkg.json b/ports/libtracepoint-control/vcpkg.json index fa6561a818302a..015c36ab4ecd94 100644 --- a/ports/libtracepoint-control/vcpkg.json +++ b/ports/libtracepoint-control/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-control", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for collecting Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint-decode", - "version>=": "1.1.0" + "version>=": "1.2.1" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake index 5233d415de4f4e..f5b9baa1fe0fab 100644 --- a/ports/libtracepoint-decode/portfile.cmake +++ b/ports/libtracepoint-decode/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json index 47ed70e0fed5e7..6502d573378855 100644 --- a/ports/libtracepoint-decode/vcpkg.json +++ b/ports/libtracepoint-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-decode", - "version": "1.1.0", + "version": "1.2.1", "description": "C++ classes for decoding Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake index bf7f04e9432019..2dd1328d131ad1 100644 --- a/ports/libtracepoint/portfile.cmake +++ b/ports/libtracepoint/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" - REF 3173fa8180eb5bb7167a686c8c18baf8ef0bf31b - SHA512 9bd2e16da96e37df58e4281d1341051eb90574cb29d380f04f90bba7507dc9b3037ded91206d5e1808b53734fc0fc1fd06c4a220b0f34d0078ac168e6c639462 + REF "v${VERSION}" + SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json index 8221e3e2dc7604..433dd8e408b8a9 100644 --- a/ports/libtracepoint/vcpkg.json +++ b/ports/libtracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint", - "version": "1.1.0", + "version": "1.2.1", "description": "C/C++ interface for generating Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7a57b7386a74f6..381c6954e7400d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4145,11 +4145,11 @@ "port-version": 0 }, "libeventheader-decode": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libeventheader-tracepoint": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libevhtp": { @@ -4801,15 +4801,15 @@ "port-version": 0 }, "libtracepoint": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libtracepoint-control": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libtracepoint-decode": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json index ea3869e9d25c2c..739d960aa7a86d 100644 --- a/versions/l-/libeventheader-decode.json +++ b/versions/l-/libeventheader-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75e4da728961822b82de47fb036aeae025893fb6", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "0e830f1815ed8de8c73a7e90841533854b54261c", "version": "1.1.0", diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json index c1ca544bb1777f..6b1255fd9830ff 100644 --- a/versions/l-/libeventheader-tracepoint.json +++ b/versions/l-/libeventheader-tracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "076106bc342a9e9253ced5bfd4e13ac16b360d20", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "ba5030dde966e742b068efb77cab8f820f0ab7ea", "version": "1.1.0", diff --git a/versions/l-/libtracepoint-control.json b/versions/l-/libtracepoint-control.json index eeda65aea1bdab..0e32295690ae1b 100644 --- a/versions/l-/libtracepoint-control.json +++ b/versions/l-/libtracepoint-control.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "410f33d930822507551474d486031021c4fea1dd", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "46fe85ffc8eb1f431685a49dace1cf330d54d6c9", "version": "1.1.0", diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json index 7b7e0e933d50e5..cf62f1e72bab52 100644 --- a/versions/l-/libtracepoint-decode.json +++ b/versions/l-/libtracepoint-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51ab3448c97daa75b873c3e4b70f2894908fc2f4", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "3559772cf7c926b54b92bdc0e72ecaa9e06534d6", "version": "1.1.0", diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json index 128184e5a81f16..f6a59a85d7552d 100644 --- a/versions/l-/libtracepoint.json +++ b/versions/l-/libtracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f85708521c851b4c64ad10c04ad0261343fef25", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "0106479d49132d017d8c89f4189bce8cb4251479", "version": "1.1.0", From 8194912f475313dfe929e6b441eadba69e853c98 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 16 Oct 2023 21:11:19 +0200 Subject: [PATCH 0105/1039] [vcpkg baseline][highs] Fix compiler selection (#34496) * [highs] Fix compiler selection * version --- ports/highs/fix-cmake-output.patch | 8 ++------ ports/highs/fix-compiler.patch | 20 ++++++++++++++++++++ ports/highs/portfile.cmake | 7 +++++-- ports/highs/usage | 4 ---- ports/highs/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/highs.json | 5 +++++ 7 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 ports/highs/fix-compiler.patch delete mode 100644 ports/highs/usage diff --git a/ports/highs/fix-cmake-output.patch b/ports/highs/fix-cmake-output.patch index 9561f0cb442d28..614bbe67a6276a 100644 --- a/ports/highs/fix-cmake-output.patch +++ b/ports/highs/fix-cmake-output.patch @@ -10,15 +10,11 @@ index 605a1e2..148c006 100644 return 0; }" HIGHS_HAVE_BITSCAN_REVERSE) -@@ -568,9 +569,9 @@ else(FAST_BUILD) - endif() - +@@ -570,7 +572,6 @@ else(FAST_BUILD) # Add tests in examples/tests -- add_subdirectory(examples) -+ #add_subdirectory(examples) + add_subdirectory(examples) - add_subdirectory(app) -+ #add_subdirectory(app) if(EXP) add_executable(doctest) diff --git a/ports/highs/fix-compiler.patch b/ports/highs/fix-compiler.patch new file mode 100644 index 00000000000000..e186e405a87a84 --- /dev/null +++ b/ports/highs/fix-compiler.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 605a1e275..47233aa10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ + cmake_minimum_required(VERSION 3.15) + + # set preference for clang compiler and intel compiler over gcc and other compilers ++if(0) + include(Platform/${CMAKE_SYSTEM_NAME}-Determine-C OPTIONAL) + include(Platform/${CMAKE_SYSTEM_NAME}-C OPTIONAL) + set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES}) +@@ -12,6 +13,7 @@ set(CMAKE_C_COMPILER_NAMES clang icc cc ${CMAKE_C_COMPILER_NAMES}) + include(Platform/${CMAKE_SYSTEM_NAME}-Determine-CXX OPTIONAL) + include(Platform/${CMAKE_SYSTEM_NAME}-CXX OPTIONAL) + set(CMAKE_CXX_COMPILER_NAMES clang++ icpc c++ ${CMAKE_CXX_COMPILER_NAMES}) ++endif() + + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + diff --git a/ports/highs/portfile.cmake b/ports/highs/portfile.cmake index 4e96d0a52786ce..3e20aa9394fdce 100644 --- a/ports/highs/portfile.cmake +++ b/ports/highs/portfile.cmake @@ -2,18 +2,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ERGO-Code/HiGHS REF "v${VERSION}" - SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130 + SHA512 9229d2e960354b8b8fd45588cd4eec7e54826ee6f3939ac691d7b2b6eb0580a66a3a2649c940a3869f58dbbcf08fdd9641919fc92666948c62e70c4bce8ac130 HEAD_REF master PATCHES fix-hconfig-path.patch fix-cmake-output.patch fix-threads.patch + fix-compiler.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFAST_BUILD=ON + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON ) vcpkg_cmake_install() @@ -22,4 +26,3 @@ vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/highs") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/highs/usage b/ports/highs/usage deleted file mode 100644 index 7d0fbe7170cab1..00000000000000 --- a/ports/highs/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package highs is compatible with built-in CMake targets: - - find_package(highs REQUIRED) - target_link_libraries(main PRIVATE highs::highs) diff --git a/ports/highs/vcpkg.json b/ports/highs/vcpkg.json index bbf340a4dba13c..dc140d715eaf9d 100644 --- a/ports/highs/vcpkg.json +++ b/ports/highs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "highs", "version": "1.6.0", + "port-version": 1, "description": "High performance library to solve linear, mixed-integer, and convex quadratic optimization problems.", "homepage": "https://highs.dev", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 381c6954e7400d..7e99c167a10f29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3254,7 +3254,7 @@ }, "highs": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "highway": { "baseline": "1.0.7", diff --git a/versions/h-/highs.json b/versions/h-/highs.json index 508cd5fc93b4c6..28519ab17eb645 100644 --- a/versions/h-/highs.json +++ b/versions/h-/highs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70dcabf84d768dffa37123812c300637dc9231a5", + "version": "1.6.0", + "port-version": 1 + }, { "git-tree": "bf3c23e1f9f53ae9d35cd62b49a064556bf9ec13", "version": "1.6.0", From accc60bdaa0c07e0bf4389a1219d7a969be2e626 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 16 Oct 2023 21:12:21 +0200 Subject: [PATCH 0106/1039] [libopenmpt] Update, cleanup (#34486) --- ports/libopenmpt/CMakeLists.txt | 12 ++++++------ ports/libopenmpt/portfile.cmake | 25 +++++++++++-------------- ports/libopenmpt/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libopenmpt.json | 5 +++++ 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index cce387beb2f1f9..e33601cc0bbfb9 100644 --- a/ports/libopenmpt/CMakeLists.txt +++ b/ports/libopenmpt/CMakeLists.txt @@ -11,7 +11,7 @@ endif() find_package(ZLIB REQUIRED) find_package(mpg123 CONFIG REQUIRED) -find_package(Vorbis REQUIRED) +find_package(Vorbis CONFIG REQUIRED) file(GLOB HEADERS libopenmpt/*.h libopenmpt/*.hpp src/openmpt/all/*.hpp) list(FILTER HEADERS EXCLUDE REGEX "_impl\\.hpp$|_internal\\.h$") @@ -82,16 +82,16 @@ set(exec_prefix [[${prefix}]]) set(includedir [[${prefix}/include]]) set(libdir [[${prefix}/lib]]) configure_file(libopenmpt/libopenmpt.pc.in libopenmpt.pc) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc DESTINATION lib/pkgconfig) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc" DESTINATION lib/pkgconfig) install(TARGETS libopenmpt EXPORT libopenmpt-targets) install(EXPORT libopenmpt-targets DESTINATION share/libopenmpt NAMESPACE libopenmpt::) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake [[ +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" [[ include(CMakeFindDependencyMacro) find_dependency(ZLIB) find_dependency(mpg123 CONFIG) -find_dependency(Vorbis) -include(${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake) +find_dependency(Vorbis CONFIG) +include("${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake") ]]) install(FILES ${HEADERS} DESTINATION include/libopenmpt) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake DESTINATION share/libopenmpt) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake" DESTINATION share/libopenmpt) diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index c568c7a848744a..a0fb876fdfbb29 100644 --- a/ports/libopenmpt/portfile.cmake +++ b/ports/libopenmpt/portfile.cmake @@ -1,20 +1,17 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO OpenMPT/openmpt - REF 6860d1dec9bd31ed450a44148e789c4054925ed0 # libopenmpt-0.6.7 - SHA512 04c9d6e2d604dc412574f20ec2ef055dc721530ea1b6ea276f93071be4e6f451a78cc66c30470e361c95995f27759c69534f70419856f1ba6cfe69478b9207db - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO OpenMPT/openmpt + REF "libopenmpt-${VERSION}" + SHA512 ff89a4bf9b1831a5ca1241bddbeff30a16bb32132165e73fb51f6ad43450c23ed236a1ad26e99f1e4af4a65cb58c8ca6140e09b7ac7cd57771526dec160d851b + HEAD_REF master ) -file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json) -string(JSON version GET "${vcpkg_json}" "version") - -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} - OPTIONS - -DVERSION=${version} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() @@ -27,5 +24,5 @@ else() vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "1") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index e60b7afbfe57fa..63ad48fa84c8cc 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopenmpt", - "version": "0.6.7", - "description": "a cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.", + "version": "0.6.12", + "description": "A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream.", "homepage": "https://openmpt.org/", "license": "BSD-3-Clause", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7e99c167a10f29..0895273eb3c216 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4509,7 +4509,7 @@ "port-version": 1 }, "libopenmpt": { - "baseline": "0.6.7", + "baseline": "0.6.12", "port-version": 0 }, "libopensp": { diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json index fe08a0b1092411..8b7fd4d0b8d7c1 100644 --- a/versions/l-/libopenmpt.json +++ b/versions/l-/libopenmpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f46d9666ff500c3694970f2031cdf0583d3be2e4", + "version": "0.6.12", + "port-version": 0 + }, { "git-tree": "5d66142c7858d9ac23b31a1ab5d596e2370ef7c2", "version": "0.6.7", From fd9f5aab49e90149538bdec5a2ae2b8efc334720 Mon Sep 17 00:00:00 2001 From: rinechran Date: Tue, 17 Oct 2023 04:12:50 +0900 Subject: [PATCH 0107/1039] [Thorvg] Update Thorvg port to v0.11.1 (#34474) * feat : version up 0.11.1 * docs : update baseline --- ports/thorvg/install-tools.patch | 20 -------------------- ports/thorvg/portfile.cmake | 5 ++--- ports/thorvg/vcpkg.json | 2 +- ports/thorvg/windows-build-option.patch | 4 ++-- versions/baseline.json | 2 +- versions/t-/thorvg.json | 5 +++++ 6 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 ports/thorvg/install-tools.patch diff --git a/ports/thorvg/install-tools.patch b/ports/thorvg/install-tools.patch deleted file mode 100644 index 69717b7241d24d..00000000000000 --- a/ports/thorvg/install-tools.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/tools/svg2png/meson.build b/src/tools/svg2png/meson.build -index c9fe63b6..010c6ac4 100644 ---- a/src/tools/svg2png/meson.build -+++ b/src/tools/svg2png/meson.build -@@ -5,4 +5,4 @@ executable('svg2png', - include_directories : headers, - cpp_args : compiler_flags, - install : true, -- link_with : thorvg_lib) -+ link_with : thorvg_lib , install_dir : get_option('bindir')) -diff --git a/src/tools/svg2tvg/meson.build b/src/tools/svg2tvg/meson.build -index 158376b5..8d960aec 100644 ---- a/src/tools/svg2tvg/meson.build -+++ b/src/tools/svg2tvg/meson.build -@@ -5,4 +5,4 @@ executable('svg2tvg', - include_directories : headers, - cpp_args : compiler_flags, - install : true, -- link_with : thorvg_lib) -+ link_with : thorvg_lib , install_dir : get_option('bindir')) diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index dfdc081653c99f..e1657571c6a098 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.11.0 - SHA512 abca41b95152d30fc20fd51383447958347e19b123c798b321bcc3ab6850c4f70edd1cd89dc60fdce866afa3f8ffe50a913cdfb4ffbf2d3c1384937cf80183d8 + REF v0.11.1 + SHA512 388c3d8bd5099c1e35911dc75ffa6aafc6ea9f1219845ea29dbef91db8c75b2e22b091df4340acc2b44d948cb18fcf8f3a511045ce6ff959a078b350c9a13756 HEAD_REF master PATCHES - install-tools.patch windows-build-option.patch ) diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index be1319fa5ccd4a..8bfed0d78db5c4 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thorvg", - "version": "0.11.0", + "version": "0.11.1", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/ports/thorvg/windows-build-option.patch b/ports/thorvg/windows-build-option.patch index 3709b06568c612..db0bc171e9af07 100644 --- a/ports/thorvg/windows-build-option.patch +++ b/ports/thorvg/windows-build-option.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 65e6ab51..87e2ed38 100644 +index 363b8c3b..a3cc862d 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ @@ -7,6 +7,6 @@ index 65e6ab51..87e2ed38 100644 'cpp', - default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14', 'strip=true'], + default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], - version : '0.11.0', + version : '0.11.1', license : 'MIT') diff --git a/versions/baseline.json b/versions/baseline.json index 0895273eb3c216..a93f9c9b91a37c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8241,7 +8241,7 @@ "port-version": 0 }, "thorvg": { - "baseline": "0.11.0", + "baseline": "0.11.1", "port-version": 0 }, "threadpool": { diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index c6a87790666131..468a9568e336c8 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46f0b52581895d5c9deeaa582387fcc32c25fa15", + "version": "0.11.1", + "port-version": 0 + }, { "git-tree": "f54024173375727d79da6658e23e99337a55a8a6", "version": "0.11.0", From f01fe7c2075d4ab8ebb30e622911fd4c90f09134 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:13:13 -0700 Subject: [PATCH 0108/1039] [nifticlib] update to 2022-07-04 to add include path to fix breaks app build (#34467) * [nifticlib] Add include path to fix breaks app build * update version * [nifticlib] update to commit 2022-07-04 * update version --------- Co-authored-by: vzhli17 --- ports/nifticlib/portfile.cmake | 11 ++++++----- ports/nifticlib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nifticlib.json | 5 +++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ports/nifticlib/portfile.cmake b/ports/nifticlib/portfile.cmake index b4d166d41a5341..56e3795525e659 100644 --- a/ports/nifticlib/portfile.cmake +++ b/ports/nifticlib/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO NIFTI-Imaging/nifti_clib - REF 65f801b9c2f1f15f4de4a19d45e6595c25765632 - SHA512 be03cdc6cf17fd9ff74c5ecc1f6b2132121bb4b7973a731da334af2a8428d1f0dbbf7b94b2511d1ff7e515b8cc4cf3316d62b189566fb6ffc88c6146eebd48ff + REPO NIFTI-Imaging/nifti_clib + REF 5a8016be2161058f116b39ca476734bd81bb83c5 + SHA512 782cb4e494d73b054f8e3ab5f059b952fa461ceb3a0e12989ef1485675d1009d107c496abe6a495fbc30214d92859faad2c58a3edb10899114b440476b613315 HEAD_REF master - PATCHES zlib_include.patch + PATCHES + zlib_include.patch ) if(VCPKG_TARGET_IS_WINDOWS) @@ -50,4 +51,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/nifticlib/vcpkg.json b/ports/nifticlib/vcpkg.json index c4201194c76d08..2e90bf03c7e6f5 100644 --- a/ports/nifticlib/vcpkg.json +++ b/ports/nifticlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nifticlib", - "version-date": "2020-04-30", - "port-version": 4, + "version-date": "2022-07-04", "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", "homepage": "https://github.com/NIFTI-Imaging/nifti_clib", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a93f9c9b91a37c..056aa9fc8577c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5833,8 +5833,8 @@ "port-version": 1 }, "nifticlib": { - "baseline": "2020-04-30", - "port-version": 4 + "baseline": "2022-07-04", + "port-version": 0 }, "nlohmann-fifo-map": { "baseline": "2018.05.07", diff --git a/versions/n-/nifticlib.json b/versions/n-/nifticlib.json index eecb403b5c8943..5be5f702c49be3 100644 --- a/versions/n-/nifticlib.json +++ b/versions/n-/nifticlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04096233d605e377c31588273d928c15538713ac", + "version-date": "2022-07-04", + "port-version": 0 + }, { "git-tree": "d889870db5d6d2e5afc8e738c6f6451c7d237a4c", "version-date": "2020-04-30", From 87b341399ba949f6212b2d606681a45bd9c0af7f Mon Sep 17 00:00:00 2001 From: Kristian Duske Date: Mon, 16 Oct 2023 21:26:45 +0200 Subject: [PATCH 0109/1039] Use unofficial-minizip for find_dependency to fix a configure warning (#34499) This was supposed to be fixed in 1e0eede790b6, but I missed the call to find_dependency. --- ports/assimp/build_fixes.patch | 2 +- ports/assimp/vcpkg.json | 2 +- versions/a-/assimp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index ffa1869f8467da..a58ff88da38535 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -80,7 +80,7 @@ index 6551dcb..0796448 100644 +find_dependency(pugixml CONFIG) +if(NOT @BUILD_SHARED_LIBS@) + find_dependency(kubazip CONFIG) -+ find_dependency(minizip CONFIG) ++ find_dependency(unofficial-minizip CONFIG) + #find_dependency(openddlparser CONFIG) + find_dependency(poly2tri CONFIG) + find_dependency(polyclipping CONFIG) diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index c7c7616810b49c..0ff10c38c4ebd1 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "assimp", "version": "5.3.1", - "port-version": 1, + "port-version": 2, "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 7fe6c14694bd06..550bb0594cf119 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a825878e38726e638f29d4defeadb9108ac20697", + "version": "5.3.1", + "port-version": 2 + }, { "git-tree": "572034c626843af86fe62b64905fd4e79f19535f", "version": "5.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index 056aa9fc8577c7..bfc936fb10e6b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -266,7 +266,7 @@ }, "assimp": { "baseline": "5.3.1", - "port-version": 1 + "port-version": 2 }, "async-mqtt": { "baseline": "2.0.0", From 2a8cdbfdc5349baa7041387bdb0acee84d2e8a91 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Tue, 17 Oct 2023 03:28:31 +0800 Subject: [PATCH 0110/1039] [readline-win32] Fix windows dynamic linking (#34502) * [readline-win32] Fix windows dynamic linking * Update version database --- ports/readline-win32/portfile.cmake | 4 ++-- ports/readline-win32/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/readline-win32.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/readline-win32/portfile.cmake b/ports/readline-win32/portfile.cmake index 494c512fc8d28a..45fd95691ab39c 100644 --- a/ports/readline-win32/portfile.cmake +++ b/ports/readline-win32/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaozhuai/readline-win32 - REF 8f141e9a77f81fae5b67f915621988aef116e9ae - SHA512 2eb88a2fa3780df1bb8fa5dfc0be197113d3789cd7b494c0c30509099a6c4818cf14d8301d312747107b2b4f8e52e5a2ed93d3fe5fbbd6b796f780e2f1e0f729 + REF 2b94fbb51f5da90b7bbd9b236da80be6f798e014 + SHA512 1285625ca6c608b98d13a783dd34461782bd88026bc09e6c9e70fd343e28561d1d7e5392b8068e52e93308029544276bdbc8ca12703c8976836561777a03dc17 HEAD_REF master ) diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json index bd171c66570fe6..e09abde7ede31d 100644 --- a/ports/readline-win32/vcpkg.json +++ b/ports/readline-win32/vcpkg.json @@ -1,7 +1,7 @@ { "name": "readline-win32", "version": "5.0", - "port-version": 7, + "port-version": 8, "description": "Implementation of readline for Windows Desktop", "homepage": "https://github.com/xiaozhuai/readline-win32", "license": "GPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index bfc936fb10e6b3..5cf3c03c71b0a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7266,7 +7266,7 @@ }, "readline-win32": { "baseline": "5.0", - "port-version": 7 + "port-version": 8 }, "readosm": { "baseline": "1.1.0a", diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index b5ab0d0b2b17ff..8fbd3e32b681b0 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c7dd189ed4434c993da75506f0b6d4e94b7f952", + "version": "5.0", + "port-version": 8 + }, { "git-tree": "932081e9a1f922cd1f3e710fd9fd426f882360aa", "version": "5.0", From e57b2167e66c847f991bd6bce1355b85acd944e8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 16 Oct 2023 21:28:42 +0200 Subject: [PATCH 0111/1039] [tiff] fix tools feature (#34415) --- ports/tiff/portfile.cmake | 13 ------------- ports/tiff/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tiff.json | 5 +++++ 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 2fc3e200721420..6307aae0e162b8 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -69,22 +69,9 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRE if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES - fax2ps - fax2tiff - pal2rgb - ppm2tiff - raw2tiff - tiff2bw - tiff2pdf - tiff2ps - tiff2rgba - tiffcmp tiffcp - tiffcrop - tiffdither tiffdump tiffinfo - tiffmedian tiffset tiffsplit AUTO_CLEAN diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index daed76e3ab689e..18a1950d5bdbab 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tiff", "version": "4.6.0", + "port-version": 1, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": "libtiff", diff --git a/versions/baseline.json b/versions/baseline.json index 5cf3c03c71b0a5..d0adcbd67170de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8258,7 +8258,7 @@ }, "tiff": { "baseline": "4.6.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index c25ec1ff3da757..954fad63654809 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c0fc716f916833234f0fb5e7061d52e9063e7c6", + "version": "4.6.0", + "port-version": 1 + }, { "git-tree": "88ab604b58a0473cf643b6f3890c2d0c8174ff62", "version": "4.6.0", From c1081fe6df2d5ea43f2f826b5c47bef3760cecae Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 17 Oct 2023 19:36:38 +0200 Subject: [PATCH 0112/1039] [nghttp3] update to 1.0.0 (#34528) --- ports/nghttp3/portfile.cmake | 2 +- ports/nghttp3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index 4709cdf51f6796..e78ad3f5b6c771 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 e6288157f897007a14587c3a31e26401c338a22b8e1547da731549a0c23e8b18e04048cb661e6b7072835b6bf7f3218f4a7a07c8e43ff94954c274221d8f92f9 + SHA512 a2f02342bdff8a39d9c95e061eaac068d92af3c93aaddc0119dfef4b4c4b545f2e434ef5e00d6901e5ecffb1f5e9fa6589b838543dbfcb3917255fba04589910 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index 5a302fcce301e1..a71c5c8b9a6494 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "0.15.0", + "version": "1.0.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d0adcbd67170de..33e24a89f16734 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5817,7 +5817,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "0.15.0", + "baseline": "1.0.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 0dc20e108f4c79..14d3de6dba0818 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9552b83f2dfc8fc3211ce4e18708570193d9625f", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "dc20ed3b2fc048cdcebb7f936b2614b42e66c286", "version": "0.15.0", From 311ae71f1e1e4ec23c13b1cc04c65da116973628 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 18 Oct 2023 01:38:18 +0800 Subject: [PATCH 0113/1039] [libsvm] update to 3.32 (#34526) * [libsvm] update to 3.32 * [libsvm] update to 3.32 --- ports/libsvm/portfile.cmake | 4 ++-- ports/libsvm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsvm.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index 674014c0f62441..f56d169389a234 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/libsvm - REF v325 - SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203 + REF v332 + SHA512 1b649e6baa7b23a082d510921d0be7b75c04331844c3057587db36b0f5a5a0a6a44ae3f187c2ffa19d70bc1bf25ea8c724ac2cd5c1842d684747469b5c99b9f6 HEAD_REF master ) diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json index a1ac6c75e94dee..a26218dcb266c3 100644 --- a/ports/libsvm/vcpkg.json +++ b/ports/libsvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsvm", - "version": "3.25", - "port-version": 1, + "version": "3.32", "description": "A library for Support Vector Machines.", "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 33e24a89f16734..9f3660fda8a5be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4753,8 +4753,8 @@ "port-version": 3 }, "libsvm": { - "baseline": "3.25", - "port-version": 1 + "baseline": "3.32", + "port-version": 0 }, "libsystemd": { "baseline": "254", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index e668294437c7d4..51339f2f856748 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "322988838e09b1a1ce9766a803eab0e9867e0e1d", + "version": "3.32", + "port-version": 0 + }, { "git-tree": "6ee5de615b1449a216f61cb83ec2704e93a34495", "version": "3.25", From 30876addcc700fe70acdd116e6be85337efca615 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 18 Oct 2023 01:38:47 +0800 Subject: [PATCH 0114/1039] [libtins] update to 4.5 (#34525) * [libtins] update to 4.5 * [libtins] update to 4.5 --- ports/libtins/portfile.cmake | 4 ++-- ports/libtins/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libtins.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index 0b9ac8fc0cf2f1..5d46ddbe5c4463 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mfontanini/libtins - REF v4.3 - SHA512 29d606004fe9a440c9a53eede42fd5c6dbd049677d2cca2c5cfd26311ee2ca4c64ca3e665fbc81efd5bfab5577a5181ed0754c617e139317d9ae0cabba05aff7 + REF "v${VERSION}" + SHA512 d8887949cb545dbaf4247c8405feb5cc1032f370bb418dd5344043dc97555b1b826a8d33cfc7dd0a7a9a9af6f3a46bd6fcbed89f98d5eb23fdd10294f823fcd6 HEAD_REF master PATCHES fix-source-writes.patch diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json index fb2a6865e38265..8dcb5c09e2e6e6 100644 --- a/ports/libtins/vcpkg.json +++ b/ports/libtins/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libtins", - "version": "4.3", - "port-version": 7, + "version": "4.5", "description": "High-level, multiplatform C++ network packet sniffing and crafting library", "license": "BSD-2-Clause", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 9f3660fda8a5be..9a3779374a6251 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4781,8 +4781,8 @@ "port-version": 6 }, "libtins": { - "baseline": "4.3", - "port-version": 7 + "baseline": "4.5", + "port-version": 0 }, "libtomcrypt": { "baseline": "1.18.2", diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index 3ee2a13eef04e7..f616561cdb74e2 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2aca4b43d1b64057b5316e609514d41ee7013c4b", + "version": "4.5", + "port-version": 0 + }, { "git-tree": "30fbfd14d90e9aedac77f8272135a7e51444b01f", "version": "4.3", From 853411c954d61dfc043c83243505fabfc4f612d5 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 18 Oct 2023 01:39:09 +0800 Subject: [PATCH 0115/1039] [libcial] Update version to v3.0.17 (#34504) * [libcial] Update version to v3.0.17 * version --- ports/libical/portfile.cmake | 4 ++-- ports/libical/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libical.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libical/portfile.cmake b/ports/libical/portfile.cmake index cddeeff791b663..bfb357c20bb3f6 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 5990fd0ac00ee3f068909ac86aa642c940720150 #v3.0.16 - SHA512 46e9330373e0c5ff4ffb658c2bd0a18cf082b539edf467323926c9b256122613b75190305f3365e52f26371bf51142c16dd40b8c18d2d13020e703b1d5d45042 + REF "v${VERSION}" + SHA512 11fbb4aba7503a3264b0efa30ad56aa923d31ec193bdb0b87b92bc88db9019fa670c8c9ee7998caa3a870e706446a58ead475f31bd703f0d2cb7aabf0f6a3aa7 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/libical/vcpkg.json b/ports/libical/vcpkg.json index 843b27cd184070..52dacb74deb429 100644 --- a/ports/libical/vcpkg.json +++ b/ports/libical/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libical", - "version": "3.0.16", - "port-version": 1, + "version": "3.0.17", "description": "Reference implementation of the iCalendar data type and serialization format", "homepage": "https://github.com/libical/libical", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9a3779374a6251..cd637f8c7a32c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4285,8 +4285,8 @@ "port-version": 0 }, "libical": { - "baseline": "3.0.16", - "port-version": 1 + "baseline": "3.0.17", + "port-version": 0 }, "libice": { "baseline": "1.0.10", diff --git a/versions/l-/libical.json b/versions/l-/libical.json index 63677c2b6a17b3..b2e6426e551ed3 100644 --- a/versions/l-/libical.json +++ b/versions/l-/libical.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef8cbea0185c5c9154f2ef0a38db78541f2e5769", + "version": "3.0.17", + "port-version": 0 + }, { "git-tree": "86f667b283c1e7d92dd68a3733d80d2e074db342", "version": "3.0.16", From bf3f056519a7cdb15977d9eb50f1d102fb230d6f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 17 Oct 2023 19:46:25 +0200 Subject: [PATCH 0116/1039] [ogre] Fix usage of ogre[core] (#34301) * [ogre] Fix usage of ogre[core] * version --- ports/ogre/portfile.cmake | 53 ++++++++++++++++++++++----------------- ports/ogre/vcpkg.json | 10 ++++---- versions/baseline.json | 2 +- versions/o-/ogre.json | 5 ++++ 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 81c7d8cb0a916f..dd39a0f8d80041 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -10,8 +10,6 @@ if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -set(PATCHLIB fix-dependencies.patch cfg-rel-paths.patch swig-python-polyfill.patch pkgconfig.patch same-install-rules-all-platforms.patch) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre @@ -19,7 +17,11 @@ vcpkg_from_github( SHA512 adadf0ce8510515c7519b87b502090c4a8d6694af0850ebd4a030d2dda497978eeb811746c74aa0cd1dc41adc0bf5f04fe38d02eb4ff03a56999c6635efe1e0e HEAD_REF master PATCHES - ${PATCHLIB} + fix-dependencies.patch + cfg-rel-paths.patch + swig-python-polyfill.patch + pkgconfig.patch + same-install-rules-all-platforms.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") @@ -28,26 +30,29 @@ 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 - bullet OGRE_BUILD_COMPONENT_BULLET - bullet CMAKE_REQUIRE_FIND_PACKAGE_Bullet - d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 - freeimage OGRE_BUILD_PLUGIN_FREEIMAGE - freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage - java OGRE_BUILD_COMPONENT_JAVA - openexr OGRE_BUILD_PLUGIN_EXRCODEC - openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR - python OGRE_BUILD_COMPONENT_PYTHON - python CMAKE_REQUIRE_FIND_PACKAGE_Python3 - csharp OGRE_BUILD_COMPONENT_CSHARP - overlay OGRE_BUILD_COMPONENT_OVERLAY - overlay CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE - zip OGRE_CONFIG_ENABLE_ZIP - strict OGRE_RESOURCEMANAGER_STRICT - tools OGRE_BUILD_TOOLS - tools OGRE_INSTALL_TOOLS + FEATURES + assimp OGRE_BUILD_PLUGIN_ASSIMP + assimp CMAKE_REQUIRE_FIND_PACKAGE_assimp + bullet OGRE_BUILD_COMPONENT_BULLET + bullet CMAKE_REQUIRE_FIND_PACKAGE_Bullet + d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + freeimage OGRE_BUILD_PLUGIN_FREEIMAGE + freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage + java OGRE_BUILD_COMPONENT_JAVA + openexr OGRE_BUILD_PLUGIN_EXRCODEC + openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR + python OGRE_BUILD_COMPONENT_PYTHON + python CMAKE_REQUIRE_FIND_PACKAGE_Python3 + csharp OGRE_BUILD_COMPONENT_CSHARP + overlay OGRE_BUILD_COMPONENT_OVERLAY + zip OGRE_CONFIG_ENABLE_ZIP + strict OGRE_RESOURCEMANAGER_STRICT + tools OGRE_BUILD_TOOLS + tools OGRE_INSTALL_TOOLS + INVERTED_FEATURES + assimp CMAKE_DISABLE_FIND_PACKAGE_assimp + bullet CMAKE_DISABLE_FIND_PACKAGE_Bullet + python CMAKE_DISABLE_FIND_PACKAGE_Python3 ) if("java" IN_LIST FEATURES OR "python" IN_LIST FEATURES OR "csharp" IN_LIST FEATURES) @@ -92,6 +97,8 @@ vcpkg_cmake_configure( -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF + -DCMAKE_REQUIRE_FIND_PACKAGE_FREETYPE=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_pugixml=ON -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -DCMAKE_DISABLE_FIND_PACKAGE_QT=ON diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index a76bdb54eb5580..fa466b82de3fe2 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,12 +1,16 @@ { "name": "ogre", "version": "14.0.1", - "port-version": 1, + "port-version": 2, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "supports": "!uwp", "dependencies": [ + { + "name": "freetype", + "default-features": false + }, "pugixml", { "name": "sdl2", @@ -72,10 +76,6 @@ "overlay": { "description": "Build overlay component", "dependencies": [ - { - "name": "freetype", - "default-features": false - }, { "name": "imgui", "features": [ diff --git a/versions/baseline.json b/versions/baseline.json index cd637f8c7a32c2..f85168955b9427 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6018,7 +6018,7 @@ }, "ogre": { "baseline": "14.0.1", - "port-version": 1 + "port-version": 2 }, "ogre-next": { "baseline": "2.3.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 9f8bbfc9b724a6..a8b9511de714ae 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a445b3c7be57d018422e139945ff622292cd5cff", + "version": "14.0.1", + "port-version": 2 + }, { "git-tree": "ba65238d3998c84df40961d63f7c254fbac7639d", "version": "14.0.1", From 91f1776a2c36e5431c4792c989aeaa50214fc0ff Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 18 Oct 2023 02:09:26 +0800 Subject: [PATCH 0117/1039] [dirent] update to 1.24 (#34043) * [dirent] update to 1.24 * [dirent] update to 1.24 * fix deps * fix deps * fix deps * fix deps * CI [skip actions] * CI [skip actions] * fix deps * CI [skip actions] * fix deps --- ports/dirent/portfile.cmake | 4 +- ports/dirent/vcpkg.json | 3 +- .../0016-Fix-file_famagic-function.patch | 40 +++++++++++++++++++ ports/libmagic/portfile.cmake | 1 + ports/libmagic/vcpkg.json | 2 +- versions/baseline.json | 6 +-- versions/d-/dirent.json | 5 +++ versions/l-/libmagic.json | 5 +++ 8 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 ports/libmagic/0016-Fix-file_famagic-function.patch diff --git a/ports/dirent/portfile.cmake b/ports/dirent/portfile.cmake index e8b57749387d8c..ad02af3261f1ef 100644 --- a/ports/dirent/portfile.cmake +++ b/ports/dirent/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tronkko/dirent - REF 1.23.2 - SHA512 e7a991445ee9ca8f1118753df559d28beb283b3c0d25edcfb23dd5322f2bdfeadffe802d0c908bb6d4dfc17bf5ec38bdecfa717319fb4e26682bee0ba0d14c5c + REF "${VERSION}" + SHA512 bdfc5cd41034719a7bcb3b04ad1c821b73e8ab37768b831362bdd36dceb2bab832ecb56ed6e99db145d38b15e295c0971496320b0482cb339dc973a9870bb72d HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) diff --git a/ports/dirent/vcpkg.json b/ports/dirent/vcpkg.json index 81e6361e6cc869..c07b74319c34e6 100644 --- a/ports/dirent/vcpkg.json +++ b/ports/dirent/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dirent", - "version": "1.23.2", - "port-version": 3, + "version": "1.24", "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.", "homepage": "https://github.com/tronkko/dirent", "license": "MIT" diff --git a/ports/libmagic/0016-Fix-file_famagic-function.patch b/ports/libmagic/0016-Fix-file_famagic-function.patch new file mode 100644 index 00000000000000..b3acf638c53805 --- /dev/null +++ b/ports/libmagic/0016-Fix-file_famagic-function.patch @@ -0,0 +1,40 @@ +diff --git a/src/fsmagic.c b/src/fsmagic.c +index 7244841..2c553c1 100644 +--- a/src/fsmagic.c ++++ b/src/fsmagic.c +@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $") + # define minor(dev) ((dev) & 0xff) + #endif + #undef HAVE_MAJOR +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + private int + bad_link(struct magic_set *ms, int err, char *buf) + { +@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + int ret, did = 0; + int mime = ms->flags & MAGIC_MIME; + int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION); +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + char buf[BUFSIZ+4]; + ssize_t nch; + struct stat tstatbuf; +@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + * Fstat is cheaper but fails for files you don't have read perms on. + * On 4.2BSD and similar systems, use lstat() to identify symlinks. + */ +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + if ((ms->flags & MAGIC_SYMLINK) == 0) + ret = lstat(fn, sb); + else +@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) + return -1; + break; + #endif +-#if S_IFLNK != 0 ++#if S_IFLNK != 0 && ! defined(_WIN32) + case S_IFLNK: + if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) { + if (ms->flags & MAGIC_ERROR) { diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index ed155792b7e108..902be26aafe152 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -15,6 +15,7 @@ if(VCPKG_TARGET_IS_WINDOWS) "0013-Check-for-backslash-in-argv-0-on-Windows.patch" "0014-Define-POSIX-macros-if-missing.patch" "0015-MSYS2-Remove-ioctl-call.patch" + "0016-Fix-file_famagic-function.patch" ) endif() diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index e37a180e755862..a8984202158d33 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmagic", "version": "5.40", - "port-version": 2, + "port-version": 3, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f85168955b9427..7c6341ec6a1598 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2169,8 +2169,8 @@ "port-version": 1 }, "dirent": { - "baseline": "1.23.2", - "port-version": 3 + "baseline": "1.24", + "port-version": 0 }, "discord-game-sdk": { "baseline": "3.2.1", @@ -4394,7 +4394,7 @@ }, "libmagic": { "baseline": "5.40", - "port-version": 2 + "port-version": 3 }, "libmariadb": { "baseline": "3.3.1", diff --git a/versions/d-/dirent.json b/versions/d-/dirent.json index 07e9e7d86851e1..c1af536dd5a7ec 100644 --- a/versions/d-/dirent.json +++ b/versions/d-/dirent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcace8750d2b6080c63877eed432f8b862501012", + "version": "1.24", + "port-version": 0 + }, { "git-tree": "6df6238f6f97735c39e2e9b19d90f3895c4a636b", "version": "1.23.2", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index d8d90fc1073548..d5b3517574d06b 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bb05dd744d7eb83ad0a8d887ef589aaea37f6b3", + "version": "5.40", + "port-version": 3 + }, { "git-tree": "d70a57e09ed4060b2ade1cb1f80bcbdbd8a7a1ec", "version": "5.40", From 034298f677f83835174b507f05d21bb0ac750024 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 17 Oct 2023 22:36:06 +0400 Subject: [PATCH 0118/1039] [libqtrest] Add new port (#34455) * QtRest: new port * Fix ref * Fix ref * Fix ref * qtrest -> libqtrest, review changes * versions * cleanups --- ports/libqtrest/portfile.cmake | 35 ++++++++++++++++++++++++++++++++++ ports/libqtrest/vcpkg.json | 29 ++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libqtrest.json | 9 +++++++++ 4 files changed, 77 insertions(+) create mode 100644 ports/libqtrest/portfile.cmake create mode 100644 ports/libqtrest/vcpkg.json create mode 100644 versions/l-/libqtrest.json diff --git a/ports/libqtrest/portfile.cmake b/ports/libqtrest/portfile.cmake new file mode 100644 index 00000000000000..f518909e0d44a2 --- /dev/null +++ b/ports/libqtrest/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO qtrest/qtrest + REF ${VERSION} + SHA512 2bdbbdde7c4f7a27943c93a2a26abe89e087e6b7c32d0e481422a8ad3e78c66c6921ef00c1cbf17f3b61db8a678685371c819218d10576ac9ec1548262415c04 + HEAD_REF master +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + qml WITH_QML_SUPPORT +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TYPE=${BUILD_TYPE} + -DBUILD_EXAMPLE=0 + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/libqtrest/vcpkg.json b/ports/libqtrest/vcpkg.json new file mode 100644 index 00000000000000..4ba8ac6a47cad0 --- /dev/null +++ b/ports/libqtrest/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libqtrest", + "version": "0.4.0", + "description": "Small and simple REST API (Json/Xml) client for any Qt/QML C++ application", + "homepage": "https://github.com/qtrest/qtrest", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "qml": { + "description": "Enable QML support to compile with required dependencies", + "dependencies": [ + { + "name": "qt5-declarative", + "default-features": false + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7c6341ec6a1598..adc6e74db83671 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4600,6 +4600,10 @@ "baseline": "4.1.1", "port-version": 2 }, + "libqtrest": { + "baseline": "0.4.0", + "port-version": 0 + }, "librabbitmq": { "baseline": "0.11.0", "port-version": 2 diff --git a/versions/l-/libqtrest.json b/versions/l-/libqtrest.json new file mode 100644 index 00000000000000..76765128975b10 --- /dev/null +++ b/versions/l-/libqtrest.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "efcb288a743d19fa7e795479221b17644864890e", + "version": "0.4.0", + "port-version": 0 + } + ] +} From 5a62a63f99e251c3a80016360cff2eb1cff1adb4 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 18 Oct 2023 02:36:23 +0800 Subject: [PATCH 0119/1039] [cpptoml] Disable LIBCXX feature (#34507) * [cpptoml] Disable LIBCXX feature * version * ${VERSION} * version --- ports/cpptoml/portfile.cmake | 9 +++++++-- ports/cpptoml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpptoml.json | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/cpptoml/portfile.cmake b/ports/cpptoml/portfile.cmake index 5ec1093639f5ce..0a3472ed39aa86 100644 --- a/ports/cpptoml/portfile.cmake +++ b/ports/cpptoml/portfile.cmake @@ -1,14 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skystrife/cpptoml - REF fededad7169e538ca47e11a9ee9251bc361a9a65 - SHA512 2ec50f4585bca33bb343170470048a7d7e7902f1ffa5709cf84ddf9f53a899ff1cc9ffa49e059f6dad93d13823c4d2661bc8109e4356078cdbdfef1a2be6a622 + REF "v${VERSION}" + SHA512 14edce576514d53a7e13562d7f8d2b66ea2b95f44038396c0e26232ec81783042ebecec31ee272a99afef96d5c8582a8e81ea5167a787844b98de6ee6f545cc5 HEAD_REF master ) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS -DENABLE_LIBCXX=OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${OPTIONS} -DCPPTOML_BUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) diff --git a/ports/cpptoml/vcpkg.json b/ports/cpptoml/vcpkg.json index 6a8034e969a73e..af9a005189b532 100644 --- a/ports/cpptoml/vcpkg.json +++ b/ports/cpptoml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpptoml", "version": "0.1.1", - "port-version": 3, + "port-version": 4, "description": "A header-only library for parsing TOML configuration files.", "homepage": "https://github.com/skystrife/cpptoml", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index adc6e74db83671..c67001750db439 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1874,7 +1874,7 @@ }, "cpptoml": { "baseline": "0.1.1", - "port-version": 3 + "port-version": 4 }, "cppunit": { "baseline": "1.15.1", diff --git a/versions/c-/cpptoml.json b/versions/c-/cpptoml.json index 74aeafc6d5282e..e42d19dcb4f499 100644 --- a/versions/c-/cpptoml.json +++ b/versions/c-/cpptoml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6993c08a35db3961ad0543456f236e3e5a2492c9", + "version": "0.1.1", + "port-version": 4 + }, { "git-tree": "fde8b7854f0796406eada5609cb2cc54728d73db", "version": "0.1.1", From 621b7abe07d61f565795d15fb829caf8dcde0c18 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:42:31 -0400 Subject: [PATCH 0120/1039] [ports/keccak-tiny] New port (#34356) * [ports/keccak-tiny] New port * [ports/keccak-tiny] Resolve hand-lint from vcpkg team * [ports/keccak-tiny/portfile.cmake] Guard check linkage for Windows Co-authored-by: Kai Pastor * [versions/k-/keccak-tiny.json] `./vcpkg x-add-version --all --overwrite-version` --------- Co-authored-by: Kai Pastor --- ports/keccak-tiny/CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++ ports/keccak-tiny/portfile.cmake | 28 +++++++++++++++++++ ports/keccak-tiny/usage | 3 +++ ports/keccak-tiny/vcpkg.json | 17 ++++++++++++ versions/baseline.json | 4 +++ versions/k-/keccak-tiny.json | 9 +++++++ 6 files changed, 107 insertions(+) create mode 100644 ports/keccak-tiny/CMakeLists.txt create mode 100644 ports/keccak-tiny/portfile.cmake create mode 100644 ports/keccak-tiny/usage create mode 100644 ports/keccak-tiny/vcpkg.json create mode 100644 versions/k-/keccak-tiny.json diff --git a/ports/keccak-tiny/CMakeLists.txt b/ports/keccak-tiny/CMakeLists.txt new file mode 100644 index 00000000000000..b6f9377637ca00 --- /dev/null +++ b/ports/keccak-tiny/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required(VERSION 3.19) +project(keccak-tiny VERSION 2014.09.08 LANGUAGES C) + +set(Header_Files "${PROJECT_NAME}.h") +set(Source_Files "${PROJECT_NAME}-unrolled.c") + +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 "${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}") + +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/keccak-tiny/portfile.cmake b/ports/keccak-tiny/portfile.cmake new file mode 100644 index 00000000000000..395b4b269a1edd --- /dev/null +++ b/ports/keccak-tiny/portfile.cmake @@ -0,0 +1,28 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO coruus/${PORT} + REF 64b6647514212b76ae7bca0dea9b7b197d1d8186 + SHA512 5cf14061efc1b3c934dfb28a08e2a478036109c449aed41d4deb975a9f0748db06f83c1de9e5d991009d04f0220a397f5f66232a4db04bbc0dea0c624522752c + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "CC0-1.0") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/keccak-tiny/usage b/ports/keccak-tiny/usage new file mode 100644 index 00000000000000..f6c1fe0d59fd1d --- /dev/null +++ b/ports/keccak-tiny/usage @@ -0,0 +1,3 @@ +keccak-tiny provides CMake targets: + find_package(unofficial-keccak-tiny CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::keccak-tiny::keccak-tiny) diff --git a/ports/keccak-tiny/vcpkg.json b/ports/keccak-tiny/vcpkg.json new file mode 100644 index 00000000000000..8223f5034a6832 --- /dev/null +++ b/ports/keccak-tiny/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "keccak-tiny", + "version-date": "2014-09-08", + "description": "A tiny implementation of SHA-3, SHAKE, Keccak, and sha3sum", + "homepage": "https://github.com/coruus/keccak-tiny", + "license": "CC0-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 c67001750db439..dabd3d70bf0c78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3664,6 +3664,10 @@ "baseline": "1.5.2", "port-version": 0 }, + "keccak-tiny": { + "baseline": "2014-09-08", + "port-version": 0 + }, "kenlm": { "baseline": "20230531", "port-version": 0 diff --git a/versions/k-/keccak-tiny.json b/versions/k-/keccak-tiny.json new file mode 100644 index 00000000000000..1a1c9c5afaecba --- /dev/null +++ b/versions/k-/keccak-tiny.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "068d9cedaf0a577eabe71f008037116929435931", + "version-date": "2014-09-08", + "port-version": 0 + } + ] +} From 5c82f7e6372c9b0ea25e1fd829dd50235ef37629 Mon Sep 17 00:00:00 2001 From: talregev Date: Wed, 18 Oct 2023 00:57:01 +0300 Subject: [PATCH 0121/1039] fix ogre-next dependencies (#34463) --- ports/ogre-next/fix-dependencies.patch | 68 ++++++++++++++++++++++++++ ports/ogre-next/portfile.cmake | 1 + ports/ogre-next/toolchain_fixes.patch | 32 ------------ ports/ogre-next/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/o-/ogre-next.json | 5 ++ 6 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 ports/ogre-next/fix-dependencies.patch diff --git a/ports/ogre-next/fix-dependencies.patch b/ports/ogre-next/fix-dependencies.patch new file mode 100644 index 00000000000000..18de8b3ae8aa1e --- /dev/null +++ b/ports/ogre-next/fix-dependencies.patch @@ -0,0 +1,68 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -73,23 +73,26 @@ + # Core dependencies + ####################################################################### + + # Find zlib +-find_package(ZLIB) ++find_package(ZLIB REQUIRED) + macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net" FALSE "" "") + + if (ZLIB_FOUND) + # Find zziplib +- find_package(ZZip) ++ find_package(ZZip NAMES unofficial-zziplib CONFIG REQUIRED) ++ set(ZZip_LIBRARIES unofficial::zziplib::libzzip) + macro_log_feature(ZZip_FOUND "zziplib" "Extract data from zip archives" "http://zziplib.sourceforge.net" FALSE "" "") + endif () + + # Find FreeImage +-find_package(FreeImage) ++find_package(FreeImage NAMES freeimage REQUIRED) ++set(FreeImage_LIBRARIES freeimage::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 NAMES freetype REQUIRED) ++set(FREETYPE_LIBRARIES freetype) + macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") + + find_package(Vulkan) + macro_log_feature(Vulkan_FOUND "vulkan-sdk" "Vulkan SDK" "https://vulkan.lunarg.com/" FALSE "" "") +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -43,14 +43,10 @@ + endif () + + set(STATIC_INST_FILES + Packages/FindDirectX.cmake +- Packages/FindFreeImage.cmake +- Packages/FindFreetype.cmake + Packages/FindOpenGLES.cmake + Packages/FindOpenGLES2.cmake +- Packages/FindZLIB.cmake +- Packages/FindZZip.cmake + Packages/FindSoftimage.cmake + ) + if (WIN32) + set(INST_FILES ${INST_FILES} +diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindZLIB.cmake +rename to CMake/Packages/FindZLIB_NOTUSE.cmake +diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindZZip.cmake +rename to CMake/Packages/FindZZip_NOTUSE.cmake +diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindFreeImage.cmake +rename to CMake/Packages/FindFreeImage_NOTUSE.cmake +diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindFreetype.cmake +rename to CMake/Packages/FindFreetype_NOTUSE.cmake diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 16b3a0e97637b4..d2963fffba0129 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix_find_package_sdl2.patch avoid-name-clashes.patch fix-error-c2039.patch + fix-dependencies.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index ff5eb485068143..334fab27553a6e 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -19,19 +19,6 @@ index f3a62f2..b53df6f 100644 endif() set(INST_FILES -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 @@ -149,25 +136,6 @@ index 4200aa0..35e4ea3 100644 -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 c112071..214d9e5 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 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index d9fdfe9e3fa877..8f3b24d4e6aafd 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version": "2.3.1", - "port-version": 2, + "port-version": 3, "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", @@ -11,6 +11,7 @@ "freeimage", "freetype", "openvr", + "pkgconf", "poco", "rapidjson", "sdl2", diff --git a/versions/baseline.json b/versions/baseline.json index dabd3d70bf0c78..0b2b01d1cb8b9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6030,7 +6030,7 @@ }, "ogre-next": { "baseline": "2.3.1", - "port-version": 2 + "port-version": 3 }, "ois": { "baseline": "1.5.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 9ac81a207509ff..5bc87f64235ff6 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c93cd3ebf7b2a50082e97f5f7a6f4ed1cf1f5c94", + "version": "2.3.1", + "port-version": 3 + }, { "git-tree": "0089cd2cc3d48d19a5b465f43454dfb0124f9723", "version": "2.3.1", From 49f690c205d9ca3e8eac931a5976df304fced6d8 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 19 Oct 2023 01:03:24 +0800 Subject: [PATCH 0122/1039] [libmaxminddb] update to 1.7.1 (#34561) * [libmaxminddb] update to 1.7.1 * [libmaxminddb] update to 1.7.1 --- ports/libmaxminddb/fix-linux-build.patch | 6 +++--- ports/libmaxminddb/portfile.cmake | 4 ++-- ports/libmaxminddb/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libmaxminddb.json | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch index bdf9b77805d2b4..db35979e633618 100644 --- a/ports/libmaxminddb/fix-linux-build.patch +++ b/ports/libmaxminddb/fix-linux-build.patch @@ -1,5 +1,5 @@ diff --git a/include/maxminddb.h b/include/maxminddb.h -index 13b276f..6c70e49 100644 +index 4002ec6..65482c5 100644 --- a/include/maxminddb.h +++ b/include/maxminddb.h @@ -24,11 +24,12 @@ extern "C" { @@ -7,13 +7,13 @@ index 13b276f..6c70e49 100644 #include +/* libmaxminddb package version from configure */ -+#define PACKAGE_VERSION "1.4.3" ++#define PACKAGE_VERSION "1.7.1" + #ifdef _WIN32 #include #include -/* libmaxminddb package version from configure */ --#define PACKAGE_VERSION "1.4.3" +-#define PACKAGE_VERSION "1.7.1" typedef ADDRESS_FAMILY sa_family_t; diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index 7c437a09178c21..70a393c3999b83 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO maxmind/libmaxminddb - REF 07797e9dfb6771190f9fa41a33babe19425ef552 #1.4.3 - SHA512 94f7fbd46a7846c804edad9759ceedf2f7c4b2085430322f74bea5c89f6c3fa0824f154f551119a8c69becec5120650efef89c6d7f5a2ef3df476086070c8c7e + REF "${VERSION}" + SHA512 0a5caa267712310ef5de4c33e008d02dff76f8a9672e370719cd1d3e0f8de1146b9120991f5c2e34ed81a4ee011510dcc4b30051f6e23a6fd0634f50d35252ec HEAD_REF master PATCHES fix-linux-build.patch ) diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index 721f1161b0aed9..9fdd6d252a9018 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmaxminddb", - "version": "1.4.3", - "port-version": 3, + "version": "1.7.1", "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0b2b01d1cb8b9b..beae0e6ed561df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4405,8 +4405,8 @@ "port-version": 3 }, "libmaxminddb": { - "baseline": "1.4.3", - "port-version": 3 + "baseline": "1.7.1", + "port-version": 0 }, "libmediainfo": { "baseline": "23.10", diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index 9c03ecca5fddef..da9a71ac9b1cba 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "2bac54e78c424e4420145ae4a407e7b88229a387", "version": "1.4.3", From 03ae1a2071b315c4c5a810c5326771df845e170c Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:04:28 -0700 Subject: [PATCH 0123/1039] [wxWidgets] Update to 3.2.3 (#34557) * [wxWidgets] Update to 3.2.3 * update version * update portfile.cmake * version --- ports/wxwidgets/fix-nanosvg.patch | 19 ------------------- ports/wxwidgets/fix_include.patch | 13 ------------- ports/wxwidgets/portfile.cmake | 6 ++---- ports/wxwidgets/relocatable-wx-config.patch | 15 +++------------ ports/wxwidgets/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wxwidgets.json | 5 +++++ 7 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 ports/wxwidgets/fix-nanosvg.patch delete mode 100644 ports/wxwidgets/fix_include.patch diff --git a/ports/wxwidgets/fix-nanosvg.patch b/ports/wxwidgets/fix-nanosvg.patch deleted file mode 100644 index fd48cf3f7987f2..00000000000000 --- a/ports/wxwidgets/fix-nanosvg.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git "a/build/cmake/config.cmake" "b/build/cmake/config.cmake" -index b68d167dac..5de1fd19ad 100644 ---- "a/build/cmake/config.cmake" -+++ "b/build/cmake/config.cmake" -@@ -40,6 +40,14 @@ macro(wx_get_dependencies var lib) - else() - get_target_property(dep_name ${dep} OUTPUT_NAME) - endif() -+ if(NOT dep_name) -+ set(prop_suffix) -+ if (CMAKE_BUILD_TYPE) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" prop_suffix) -+ set(prop_suffix "_${prop_suffix}") -+ endif() -+ get_target_property(dep_name ${dep} LOCATION${prop_suffix}) -+ endif() - else() - # For the value like $<$:LIB_PATH> - # Or $<$>:LIB_PATH> diff --git a/ports/wxwidgets/fix_include.patch b/ports/wxwidgets/fix_include.patch deleted file mode 100644 index e146a2e178e1f1..00000000000000 --- a/ports/wxwidgets/fix_include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h -index 8c57520e1..54ffb27d2 100644 ---- a/src/stc/scintilla/include/Scintilla.h -+++ b/src/stc/scintilla/include/Scintilla.h -@@ -27,7 +27,7 @@ int Scintilla_LinkLexers(void); - #endif - - // Include header that defines basic numeric types. --#if defined(_MSC_VER) -+#if defined(_MSC_VER) && !defined(__clang__) - // Older releases of MSVC did not have stdint.h. - #include - #elif defined( __VMS ) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index a23934b425a7d6..10e6e93ac0d815 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF "v${VERSION}" - SHA512 8ff645fe7ee97bf6358b3619efd737ef8f9eb0235ca481e921a64d451c45eb9671ee4e2807fea285153bc0bb434266234f6f4ab15f396bb8290f262fa879e9b3 + SHA512 d9cfad429c5c160944cd9c23c3a32ca72740e2d25d7392a06c22374bcbdd099affee5f541d59ac4a9983fb3d82f90bda7eaf92a93a1e8b5ace2c5bf29962ed53 HEAD_REF master PATCHES install-layout.patch @@ -12,8 +12,6 @@ vcpkg_from_github( fix-pcre2.patch gtk3-link-libraries.patch sdl2.patch - fix_include.patch - fix-nanosvg.patch ) vcpkg_check_features( @@ -191,4 +189,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/licence.txt") diff --git a/ports/wxwidgets/relocatable-wx-config.patch b/ports/wxwidgets/relocatable-wx-config.patch index 8a5e7c4d5bc69e..608c9c5469de73 100644 --- a/ports/wxwidgets/relocatable-wx-config.patch +++ b/ports/wxwidgets/relocatable-wx-config.patch @@ -1,17 +1,8 @@ diff --git a/wx-config.in b/wx-config.in -index 441f88c..b326867 100755 +index 4df8571..a90db3d 100644 --- a/wx-config.in +++ b/wx-config.in -@@ -91,7 +91,7 @@ EOF - - - # Contentious tools determined by configure. --EGREP="@EGREP@" -+EGREP="grep -E" # no absolute path from host - - - # For the people who know what they want, or think they do: -@@ -402,8 +402,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } +@@ -398,8 +398,23 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } # Determine the base directories we require. @@ -37,7 +28,7 @@ index 441f88c..b326867 100755 wxconfdir="@libdir@/wx/config" installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` -@@ -940,6 +949,9 @@ prefix=${this_prefix-$prefix} +@@ -936,6 +951,9 @@ prefix=${this_prefix-$prefix} exec_prefix=${this_exec_prefix-$exec_prefix} includedir="@includedir@" diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 4cdeb6b33988b0..14f297ebd4952b 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version": "3.2.2.1", - "port-version": 3, + "version": "3.2.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.", diff --git a/versions/baseline.json b/versions/baseline.json index beae0e6ed561df..1e1df4dd766b2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8965,8 +8965,8 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.2.2.1", - "port-version": 3 + "baseline": "3.2.3", + "port-version": 0 }, "wyhash": { "baseline": "2023-01-25", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 0ffbf0353c6a38..cf88dc82830459 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dfaace5786af8de744ecf9e02622b7b3e39087a", + "version": "3.2.3", + "port-version": 0 + }, { "git-tree": "2cbbd8d7a9d521546e8bc9b8957560806c4902e1", "version": "3.2.2.1", From 051b6d8f8d28b94c217342a28bbc7814b8bb2147 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:07:09 +0200 Subject: [PATCH 0124/1039] [tracy] update to 0.10 (#34544) --- ports/tracy/001-fix-vcxproj-vcpkg.patch | 4 +-- ports/tracy/004-fix-missing-threads-dep.patch | 30 ------------------- ports/tracy/portfile.cmake | 5 ++-- ports/tracy/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/t-/tracy.json | 5 ++++ 6 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 ports/tracy/004-fix-missing-threads-dep.patch diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch index f712a4974dde15..8baed20b3717ff 100644 --- a/ports/tracy/001-fix-vcxproj-vcpkg.patch +++ b/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -15,7 +15,7 @@ index 7be39025..ddb49fbc 100644 Fast -- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) +- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib @@ -35,7 +35,7 @@ index 7be39025..ddb49fbc 100644 true true -- brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) +- brotlicommon.lib;brotlidec.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows - $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib diff --git a/ports/tracy/004-fix-missing-threads-dep.patch b/ports/tracy/004-fix-missing-threads-dep.patch deleted file mode 100644 index 76d5eb64c8bf98..00000000000000 --- a/ports/tracy/004-fix-missing-threads-dep.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d69f71eb..31429d23 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,5 +143,11 @@ install(FILES ${common_includes} - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/common) - install(EXPORT TracyConfig - NAMESPACE Tracy:: -- FILE TracyConfig.cmake -+ FILE TracyTargets.cmake -+ DESTINATION share/Tracy) -+include(CMakePackageConfigHelpers) -+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in -+ "${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake" -+ INSTALL_DESTINATION share/Tracy) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TracyConfig.cmake - DESTINATION share/Tracy) -diff --git a/Config.cmake.in b/Config.cmake.in -new file mode 100644 -index 00000000..fc913ab3 ---- /dev/null -+++ b/Config.cmake.in -@@ -0,0 +1,6 @@ -+@PACKAGE_INIT@ -+ -+include(CMakeFindDependencyMacro) -+find_dependency(Threads REQUIRED) -+ -+include("${CMAKE_CURRENT_LIST_DIR}/TracyTargets.cmake") -\ No newline at end of file diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 9c24d0058e611a..1bf66f41bb6284 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,13 +7,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF v0.9.1 - SHA512 988f492501e5a449ecc89b98d4e8cb6164b65dfe2b5daf17ccc3035f1a477162b77ce7a2cc4c62d7b8a8d530d80f2b439c779319a6bd15b6d37b4a36406d8f4c + REF v0.10 + SHA512 3fc406a42380f6ebe671d560482733f3cdbca16dd7721ac2fce8f1cdefb96ba87701714c2ee8161d65d9e185bc5f9a0fe587a3843eb75f851b10eb895358cb64 HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch 003-fix-imgui-path.patch - 004-fix-missing-threads-dep.patch # https://github.com/wolfpld/tracy/pull/562 005-fix-imgui-path-legacy.patch ) diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 814aa6b4faa2ea..fd22aa637accb1 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tracy", - "version-semver": "0.9.1", - "port-version": 4, + "version-semver": "0.10.0", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1e1df4dd766b2a..ccc50a5dd77292 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8413,8 +8413,8 @@ "port-version": 4 }, "tracy": { - "baseline": "0.9.1", - "port-version": 4 + "baseline": "0.10.0", + "port-version": 0 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 395a9383fc6b2f..787f817187dd1f 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ffcc745825c95eec75922bfdf4433ccedf3981d", + "version-semver": "0.10.0", + "port-version": 0 + }, { "git-tree": "ce810f0e5535da3969128dc5eee0ecf0fcb51162", "version-semver": "0.9.1", From f6fffdc5bb3dc31f2cf46771480144561e4edf4e Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Wed, 18 Oct 2023 11:07:36 -0600 Subject: [PATCH 0125/1039] [libheif] update to version 1.17.0 (#34538) --- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 20241789a63efe..897bdd29cc10ae 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 ef32fced3a66d888caf2202b55bc4c81094045abfd2806216bbf0c359a30663c500ed5e33a9cef316bcfd933498e87753e9af6b3c179e84c370efd62900493c0 + SHA512 1b88197c23f19f1f877e19242a47f6e1e6dcfe60a92c0a58b64ca555cc39111c14fe592ef9d287ca383da2fc33fd5e41f21e0e0bc20b9cc668bd6b99b26aadc8 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 82796b95458342..84eb93f58dbfe0 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libheif", - "version": "1.16.2", + "version": "1.17.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 ccc50a5dd77292..be924a640f1f9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4273,7 +4273,7 @@ "port-version": 5 }, "libheif": { - "baseline": "1.16.2", + "baseline": "1.17.0", "port-version": 0 }, "libhsplasma": { diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 7ebd1b7efb46cf..0553c8796885e5 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfddf765a3840434bd1306bc48193566642e9bef", + "version": "1.17.0", + "port-version": 0 + }, { "git-tree": "1874b1dd0f2756a3254c8eec416430b941af7b6e", "version": "1.16.2", From cd3504e21030a0e6767ace96f3e4d689ed31a811 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 18 Oct 2023 19:07:58 +0200 Subject: [PATCH 0126/1039] [ngtcp2] update 1.0.0 (#34527) --- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index e93dce4b28ed8a..624963c3b35913 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 2979f7609c42a3dc7d5bf76c8d007ee35bfe6a25d5bfe44fe32f3b0d71c9d44b10f0b400c311d150e6cfbc770621416ef7151d4b0a15bf0842da3a597eb171bf + SHA512 eb05dfbdc0f3081acef68f9cd8f423c1c96bf1185153768dc38fea5506bbb5fff30ce51b2acd89299d9149f4fe89b00fdcc343dfa479b2eaac711688b3e5c6ff HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 896697d2455f4b..09c75fa0de46ae 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "0.19.1", + "version": "1.0.0", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index be924a640f1f9a..37b4a07b901bdb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5833,7 +5833,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "0.19.1", + "baseline": "1.0.0", "port-version": 0 }, "nifly": { diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index ca65f6a8394074..b8e3555c744d9d 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40104b5c6052054c49211e1a9098f833dba4a63d", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "05c0bba60ffa39b1368709bb4ef25102b4b74c7a", "version": "0.19.1", From bc1ffaed11eff1a65115b37c58b51f1624a2e03e Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 19 Oct 2023 01:08:16 +0800 Subject: [PATCH 0127/1039] fix deps (#34524) --- ports/cpp-httplib/portfile.cmake | 2 +- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 47f2671df9fd9b..07435654e3ccbe 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib REF "v${VERSION}" - SHA512 fac8fd1730e7f828053c61924d3ff9b660ad3cb385aa7a506c50c1ed1ca9820fb07691e28e03effcc60e391ecb78727108f1fdbe8b428917ab494738bed86d78 + SHA512 6e995502e0cfd9953044207fabce29a3d6de49e79464b6bf89e1a9e667dc66fe1972c38d6428ad8e8fb96236e85b2d9ac60cbb58b4de03e8f837a9122151a706 HEAD_REF master PATCHES fix-find-brotli.patch diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 44fe9e99cb514a..ef068b6e3425b5 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.14.0", + "version": "0.14.1", "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 37b4a07b901bdb..3dc99902d84b3d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1793,7 +1793,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.14.0", + "baseline": "0.14.1", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index db3998454a23cf..848ec94ca60921 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "209025ac7de89c4a8292aeffd8a59259dfc433c5", + "version": "0.14.1", + "port-version": 0 + }, { "git-tree": "5ed5d9de6eeab399563ab93d52f73b7d4691d1cc", "version": "0.14.0", From 7fbff6146a18e7a1efe07d81bf322b4eb4c6477b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:14:26 +0200 Subject: [PATCH 0128/1039] [gstreamer] fix core build (#34547) --- ports/gstreamer/base-must-be-enabled.patch | 13 +++++++++++++ ports/gstreamer/portfile.cmake | 1 + ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/gstreamer/base-must-be-enabled.patch diff --git a/ports/gstreamer/base-must-be-enabled.patch b/ports/gstreamer/base-must-be-enabled.patch new file mode 100644 index 00000000000000..5a4d3abeb32107 --- /dev/null +++ b/ports/gstreamer/base-must-be-enabled.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 6d07929..df015cb 100644 +--- a/meson.build ++++ b/meson.build +@@ -159,7 +159,7 @@ foreach sp : subprojects + subproj = subproject(project_name, required: is_required, default_options: default_options) + endif + +- if project_name == 'gst-plugins-base' ++ if project_name == 'gst-plugins-base' and subproj.found() + gst_base_orc_req = subproj.get_variable('orc_req', '') + if gst_base_orc_req != orc_req + error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build' diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index ae8fbe2df52bee..9dd0b051d04631 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_from_gitlab( gstreamer-disable-no-unused.patch srtp_fix.patch fix-bz2-windows-debug-dependency.patch + base-must-be-enabled.patch ${PATCHES} ) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 5c8b05fa5506ad..837919b59252e1 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 2, + "port-version": 3, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 3dc99902d84b3d..8a08a93697d6fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3090,7 +3090,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 2 + "port-version": 3 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c695f25a1202ac..f60db179491083 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bcd4e4f541fb90ffef24a354db74f5555f2ba6d", + "version": "1.22.5", + "port-version": 3 + }, { "git-tree": "921fefd3f9b9ce85c031881f5861074957d1a7f1", "version": "1.22.5", From 3e1bc1a3ca8b1c6e090c171094ce96cb0ea8e387 Mon Sep 17 00:00:00 2001 From: gentooise Date: Wed, 18 Oct 2023 19:15:03 +0200 Subject: [PATCH 0129/1039] [cpr] update cpr port and baseline to 1.10.5 (#34515) * update cpr port and baseline to 1.10.5 * use version as ref in portfile --- ports/cpr/001-cpr-config.patch | 12 ++++++------ ports/cpr/disable_werror.patch | 6 +++--- ports/cpr/portfile.cmake | 6 +++--- ports/cpr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ports/cpr/001-cpr-config.patch b/ports/cpr/001-cpr-config.patch index 9d666553d6be4c..116321b0b2c583 100644 --- a/ports/cpr/001-cpr-config.patch +++ b/ports/cpr/001-cpr-config.patch @@ -1,15 +1,15 @@ diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt -index 66fc9eb..cc00c72 100644 +index 52787f5..aa3687d 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt -@@ -30,6 +30,10 @@ set_target_properties(cpr - VERSION ${${PROJECT_NAME}_VERSION} - SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) - +@@ -46,6 +46,10 @@ set_target_properties(cpr + VERSION ${${PROJECT_NAME}_VERSION} + SOVERSION ${${PROJECT_NAME}_VERSION_MAJOR}) + +if (NOT DISABLE_INSTALL_HEADERS) + install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include/cpr DESTINATION include) +endif() + # Import GNU common install directory variables include(GNUInstallDirs) - + diff --git a/ports/cpr/disable_werror.patch b/ports/cpr/disable_werror.patch index 48803b8e34507f..1fc1be1a0e48a6 100644 --- a/ports/cpr/disable_werror.patch +++ b/ports/cpr/disable_werror.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb7c5f042..a5bc0b942 100644 +index 68b5343..fce2518 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK) +@@ -103,7 +103,7 @@ if(CPR_ENABLE_CPPCHECK) include(cmake/cppcheck.cmake) endif() - + -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") +if (1) else() diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index bd106bb2bfeeb5..5b37ded4533ec5 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 0445800cd2cace404ac37eb3e78ec5d1431a4f30 #1.10.2 - SHA512 77723343b2ce89a10b8622cf54127edd6639412e3d457caed31b4fa1d3935d79846b4be695c327001fc2228313591e320c9080dbf8c09e3b69265f81641b9973 + REF ${VERSION} + SHA512 aad193202ce0f24ed12c3992914c9a374f12fe9d84d5a375fc6e9ec6215cca6abf50372b71a11284aea039e00dd35b528fe5285667671dbb43b1b1fe4b7a74ef HEAD_REF master PATCHES 001-cpr-config.patch @@ -18,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON ${FEATURE_OPTIONS} diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 2f23201989e9eb..ea1f45ccc55ac3 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.10.2+3", + "version-semver": "1.10.5", "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 8a08a93697d6fd..29194bdf0d4135 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1897,7 +1897,7 @@ "port-version": 0 }, "cpr": { - "baseline": "1.10.2+3", + "baseline": "1.10.5", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 18e5ea04276a1c..63309fa152d1f2 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844", + "version-semver": "1.10.5", + "port-version": 0 + }, { "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad", "version-semver": "1.10.2+3", From db956472e9d39cdfad3dfaa42b4c4378105db880 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 18 Oct 2023 19:15:48 +0200 Subject: [PATCH 0130/1039] [idyntree] Update to 10.0.0 (#34513) * [idyntree] Update to 10.0.0 * [idyntree] Update versions --- ports/idyntree/portfile.cmake | 4 ++-- ports/idyntree/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/i-/idyntree.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/idyntree/portfile.cmake b/ports/idyntree/portfile.cmake index 44b6a16f0c88e8..412b44a5a200ec 100644 --- a/ports/idyntree/portfile.cmake +++ b/ports/idyntree/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO robotology/idyntree REF "v${VERSION}" - SHA512 4f3b0f14c4b280c3cf1f2d232e40b4ebebbccf241d31e6fdda94a7e2be8b245373c13ef9c99aa6424a37e56e927ef62d38961d02a1b11585a905d4bef47e3045 + SHA512 1861ed193789559354bcfa81183b2bcc985dde2d71c114d369e01c37268e64624f50a1c416f48392dc5b9230e0bfc576bd5714f4d4368994df4dffc4623d989a HEAD_REF master ) @@ -51,5 +51,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" ) -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.LGPL2" "${SOURCE_PATH}/LICENSE.LGPL3") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/idyntree/vcpkg.json b/ports/idyntree/vcpkg.json index 63cef5be4f22a4..14f0d389a6c60f 100644 --- a/ports/idyntree/vcpkg.json +++ b/ports/idyntree/vcpkg.json @@ -1,10 +1,9 @@ { "name": "idyntree", - "version": "9.0.0", - "port-version": 1, + "version": "10.0.0", "description": "Multibody Dynamics Library designed for Free Floating Robots.", "homepage": "https://github.com/robotology/idyntree", - "license": "LGPL-2.1-or-later", + "license": "BSD-3-Clause", "supports": "!xbox", "dependencies": [ "eigen3", diff --git a/versions/baseline.json b/versions/baseline.json index 29194bdf0d4135..7ad1bb12a13464 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3325,8 +3325,8 @@ "port-version": 0 }, "idyntree": { - "baseline": "9.0.0", - "port-version": 1 + "baseline": "10.0.0", + "port-version": 0 }, "if97": { "baseline": "2.1.3", diff --git a/versions/i-/idyntree.json b/versions/i-/idyntree.json index 6ac41a1e9644fa..e21ba65525faf1 100644 --- a/versions/i-/idyntree.json +++ b/versions/i-/idyntree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1899c3e91178e266bedb71a79fcf173f009db6b", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "50658eb0c1ccc3ada2d91638cddb51bec93dd2c5", "version": "9.0.0", From 4e0e7efa6a7181db9cf38e99e8d0ca9019affd0d Mon Sep 17 00:00:00 2001 From: Marco Correia Date: Wed, 18 Oct 2023 18:21:47 +0100 Subject: [PATCH 0131/1039] [liblemon] Supports recent compilers. (#34532) * Supports recent compilers. Recent compilers (e.g. clang>=16) changed the default c++ standard to cxx17. This will break compilation of liblemon. This commit forces code to be compiled in cxx14 mode. * Updates port version. --- ports/liblemon/portfile.cmake | 1 + ports/liblemon/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/liblemon.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index d8579e60596e95..6db26e44298fd8 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_CXX_STANDARD=14 -DLEMON_ENABLE_GLPK=OFF -DLEMON_ENABLE_ILOG=OFF -DLEMON_ENABLE_COIN=OFF diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index dc767810fb3d95..7232279f5aca8c 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblemon", "version-date": "2019-06-13", - "port-version": 7, + "port-version": 8, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7ad1bb12a13464..4b1e934cd0a36f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4366,7 +4366,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 7 + "port-version": 8 }, "liblinear": { "baseline": "243", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index fcbabec40c96e5..33774711fcb8b2 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bdd7ed9804fee3e743082bb048916a213777a79", + "version-date": "2019-06-13", + "port-version": 8 + }, { "git-tree": "e7357874ce9b71f43cb1c298dbb1228ac9241a69", "version-date": "2019-06-13", From a9794606a6173eb1ef367d4441939028096f410b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 18 Oct 2023 10:26:15 -0700 Subject: [PATCH 0132/1039] [mosquitto] Update to 2.0.18 (#34456) * [mosquitto] Update to 2.0.18 * Disable android. ``` ci/installed/arm-neon-android/debug/lib/libssl.a /mnt/vcpkg-ci/installed/arm-neon-android/debug/lib/libcrypto.a -pthread -ldl -latomic -lm && : ld: error: undefined symbol: getgrgid_r >>> referenced by misc_mosq.c:192 (/mnt/vcpkg-ci/buildtrees/mosquitto/src/v2.0.18-5deb484567.clean/lib/misc_mosq.c:192) >>> lib/CMakeFiles/libmosquitto.dir/misc_mosq.c.o:(mosquitto__fopen) clang: error: linker command failed with exit code 1 (use -v to see invocation) ``` --- ports/mosquitto/0002-win64-support.patch | 18 --------- .../0005-websocket-shared-lib-name.patch | 40 +++++++++---------- .../mosquitto/0006-pthreads-for-windows.patch | 15 +++++++ ports/mosquitto/portfile.cmake | 6 +-- ports/mosquitto/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/m-/mosquitto.json | 5 +++ 7 files changed, 46 insertions(+), 43 deletions(-) delete mode 100644 ports/mosquitto/0002-win64-support.patch create mode 100644 ports/mosquitto/0006-pthreads-for-windows.patch diff --git a/ports/mosquitto/0002-win64-support.patch b/ports/mosquitto/0002-win64-support.patch deleted file mode 100644 index c140a7873c52f5..00000000000000 --- a/ports/mosquitto/0002-win64-support.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2775a3da..ddd81b04 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) - if (WITH_THREADING) - add_definitions("-DWITH_THREADING") - if (WIN32) -- if (CMAKE_CL_64) -- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib) -- else (CMAKE_CL_64) -- set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib) -- endif (CMAKE_CL_64) -- set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) -+ find_package(pthread REQUIRED) - elseif (ANDROID) - set (PTHREAD_LIBRARIES "") - set (PTHREAD_INCLUDE_DIR "") diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch index 4ce8a826787233..33074e9c1bb175 100644 --- a/ports/mosquitto/0005-websocket-shared-lib-name.patch +++ b/ports/mosquitto/0005-websocket-shared-lib-name.patch @@ -1,20 +1,20 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9380a046..f2929e19 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -194,13 +194,13 @@ endif (WIN32) - - if (WITH_WEBSOCKETS) - if (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) - if (WIN32) - set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) - link_directories(${mosquitto_SOURCE_DIR}) - endif (WIN32) - else (STATIC_WEBSOCKETS) -- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) -+ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) - endif (STATIC_WEBSOCKETS) - endif (WITH_WEBSOCKETS) - +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 62ce99e..61f941e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -194,13 +194,13 @@ endif (WIN32) + + if (WITH_WEBSOCKETS) + if (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) + if (WIN32) + set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/ports/mosquitto/0006-pthreads-for-windows.patch b/ports/mosquitto/0006-pthreads-for-windows.patch new file mode 100644 index 00000000000000..14d59946f16dcb --- /dev/null +++ b/ports/mosquitto/0006-pthreads-for-windows.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c55e05..adece3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -68,8 +68,8 @@ option(WITH_THREADING "Include client library threading support?" ON) + if (WITH_THREADING) + add_definitions("-DWITH_THREADING") + if (WIN32) +- find_package(Threads REQUIRED) +- set (PTHREAD_LIBRARIES Threads::Threads) ++ find_package(pthread CONFIG REQUIRED) ++ set (PTHREAD_LIBRARIES PThreads4W::PThreads4W) + set (PTHREAD_INCLUDE_DIR "") + elseif (ANDROID) + set (PTHREAD_LIBRARIES "") diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index ab11f068f07d7d..f1487108e5c374 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -2,13 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto HEAD_REF master - REF v2.0.14 - SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945 + REF "v${VERSION}" + SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa PATCHES - 0002-win64-support.patch 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch 0005-websocket-shared-lib-name.patch + 0006-pthreads-for-windows.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index db31380700747d..d298cf9f3973e1 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mosquitto", - "version": "2.0.14", + "version": "2.0.18", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/", "license": "EPL-2.0", + "supports": "!android", "dependencies": [ "c-ares", "libwebsockets", diff --git a/versions/baseline.json b/versions/baseline.json index 4b1e934cd0a36f..80a9744dcce381 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5569,7 +5569,7 @@ "port-version": 3 }, "mosquitto": { - "baseline": "2.0.14", + "baseline": "2.0.18", "port-version": 0 }, "mozjpeg": { diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index b8884b9e345689..20220eac430be9 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117", + "version": "2.0.18", + "port-version": 0 + }, { "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d", "version": "2.0.14", From dcd1ee2a4fc7a697f751598ac7a3e0fc5dc46441 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Wed, 18 Oct 2023 21:35:37 +0400 Subject: [PATCH 0133/1039] [oboe] add new port (#34510) * New port: Oboe audio library / Android * Fixes * Fixes * Fixes * Fixes by review * Update version * Update versions/o-/oboe.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/oboe/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update version --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/oboe/fix_install.patch | 16 ++++++++++++++++ ports/oboe/portfile.cmake | 20 ++++++++++++++++++++ ports/oboe/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/o-/oboe.json | 9 +++++++++ 5 files changed, 67 insertions(+) create mode 100644 ports/oboe/fix_install.patch create mode 100644 ports/oboe/portfile.cmake create mode 100644 ports/oboe/vcpkg.json create mode 100644 versions/o-/oboe.json diff --git a/ports/oboe/fix_install.patch b/ports/oboe/fix_install.patch new file mode 100644 index 00000000000000..6916a32068c839 --- /dev/null +++ b/ports/oboe/fix_install.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3e3af59..aeac85d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,8 +94,8 @@ target_link_libraries(oboe PRIVATE log OpenSLES) + + # When installing oboe put the libraries in the lib/ folder e.g. lib/arm64-v8a + install(TARGETS oboe +- LIBRARY DESTINATION lib/${ANDROID_ABI} +- ARCHIVE DESTINATION lib/${ANDROID_ABI}) ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # Also install the headers + install(DIRECTORY include/oboe DESTINATION include) + diff --git a/ports/oboe/portfile.cmake b/ports/oboe/portfile.cmake new file mode 100644 index 00000000000000..e6aecf1e40ea9b --- /dev/null +++ b/ports/oboe/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/oboe + REF ${VERSION} + SHA512 7eeaf85f9889e03dd1e7f5de0e9f2cee815fc555fddfdb8c4d3450d67f6ae11b0ca43b63c73e869bfc4629d2f8e5bdb23a5833c665ca5226c339f74b9b34a8ad + HEAD_REF master + PATCHES + fix_install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/oboe/vcpkg.json b/ports/oboe/vcpkg.json new file mode 100644 index 00000000000000..e06d124b617cd2 --- /dev/null +++ b/ports/oboe/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oboe", + "version": "1.8.0", + "description": "Oboe is a C++ library which makes it easy to build high-performance audio apps on Android", + "homepage": "https://developer.android.com/games/sdk/oboe", + "license": "Apache-2.0", + "supports": "android", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 80a9744dcce381..dd05cda9c7efc1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6000,6 +6000,10 @@ "baseline": "1.3.0", "port-version": 2 }, + "oboe": { + "baseline": "1.8.0", + "port-version": 0 + }, "observer-ptr-lite": { "baseline": "0.4.0", "port-version": 3 diff --git a/versions/o-/oboe.json b/versions/o-/oboe.json new file mode 100644 index 00000000000000..90d27946745bb2 --- /dev/null +++ b/versions/o-/oboe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "844ba873a3df24fb50fcb6fc5deef22642dfccb1", + "version": "1.8.0", + "port-version": 0 + } + ] +} From d00370893e23824746e97fced11153c1113ec35d Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:52:34 -0700 Subject: [PATCH 0134/1039] [aws-sdk-cpp] Fix feature awsmigrationhub build error (#34506) * [aws-sdk-cpp] Fix feature awsmigrationhub build error * update version --- ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch | 10 ++++++++++ ports/aws-sdk-cpp/portfile.cmake | 3 ++- ports/aws-sdk-cpp/vcpkg.json | 2 +- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch diff --git a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch new file mode 100644 index 00000000000000..c2d98030136e81 --- /dev/null +++ b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch @@ -0,0 +1,10 @@ +diff --git a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt +index a8a888d..574b985 100644 +--- a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt ++++ b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_project(aws-cpp-sdk-AWSMigrationHub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) ++add_project(aws-cpp-sdk-awsmigrationhub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) + + file(GLOB AWS_AWSMIGRATIONHUB_HEADERS + "include/aws/AWSMigrationHub/*.h" diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 4cae7f1eca0b52..e66073eb24af2d 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( patch-relocatable-rpath.patch fix-aws-root.patch lock-curl-http-and-tls-settings.patch + fix-awsmigrationhub-build.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) @@ -96,4 +97,4 @@ endif() configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) -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/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 758ca68cb162a4..138894a9eec944 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.169", - "port-version": 1, + "port-version": 2, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 467a6bf644174c..c4e50267a8e9db 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb95756096209a013e786b104a11b0aa6357119d", + "version": "1.11.169", + "port-version": 2 + }, { "git-tree": "5c0ad10a852e7facc0cea54e3990f16e0cb1ea8b", "version": "1.11.169", diff --git a/versions/baseline.json b/versions/baseline.json index dd05cda9c7efc1..9cdc19775137c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -402,7 +402,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.169", - "port-version": 1 + "port-version": 2 }, "azmq": { "baseline": "2023-03-23", From 9cdd9888ea8a43641f156cceef570f705e182fa0 Mon Sep 17 00:00:00 2001 From: a3emdot <124900167+a3emdot@users.noreply.github.com> Date: Wed, 18 Oct 2023 19:54:42 +0200 Subject: [PATCH 0135/1039] [harfbuzz] Make 'cairo' an optional feature for 'harfbuzz' (#34476) * make 'cairo' an optional feature for 'harfbuzz' * regenerate versions * add 'defaulti-features : false' for feature 'cairo' * regenerate versions * add 'freetype' as a feature for feature 'cairo' * regenerate versions --- ports/harfbuzz/portfile.cmake | 6 +++++- ports/harfbuzz/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 650c43841d2f93..2e2555f20fc2bb 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -30,6 +30,11 @@ else() list(APPEND FEATURE_OPTIONS -Dglib=disabled) list(APPEND FEATURE_OPTIONS -Dgobject=disabled) endif() +if("cairo" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dcairo=enabled) # Enable Cairo graphics library support +else() + list(APPEND FEATURE_OPTIONS -Dcairo=disabled) +endif() list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers #if(VCPKG_TARGET_IS_WINDOWS) #link errors in qt5-base. probably requires changes to the pc files generated by meson @@ -53,7 +58,6 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -Dcairo=disabled # Use Cairo graphics library -Ddocs=disabled # Generate documentation with gtk-doc -Dtests=disabled -Dbenchmark=disabled diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 5f08cadde5efeb..fbb1c524480fe8 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "8.2.1", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", @@ -21,6 +21,18 @@ } ], "features": { + "cairo": { + "description": "Enable Cairo graphics library support", + "dependencies": [ + { + "name": "cairo", + "default-features": false, + "features": [ + "freetype" + ] + } + ] + }, "coretext": { "description": "Enable CoreText shaper backend on macOS", "supports": "osx" diff --git a/versions/baseline.json b/versions/baseline.json index 9cdc19775137c2..f3a3e1f78373d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3202,7 +3202,7 @@ }, "harfbuzz": { "baseline": "8.2.1", - "port-version": 1 + "port-version": 2 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 373057f27dfa25..534a83377304d8 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6359755bd398188b67a216f7627e9f297f47889", + "version": "8.2.1", + "port-version": 2 + }, { "git-tree": "1f39a3081e7055cbf5e8cc27b5f91fef2a274415", "version": "8.2.1", From 2815578f4a3486cec24c9b07d17e18e03bbaf667 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 18 Oct 2023 19:56:02 +0200 Subject: [PATCH 0136/1039] [mpg123] Fix pc file for Windows, update deps (#34462) * [vcpkg-ci-ffmpeg] Format manifest * [vcpkg-ci-ffmpeg] Test feature openmpt * [mpg123] Export shlwapi usage * [mpg123] Use yasm directly --- ports/mpg123/portfile.cmake | 7 ++++++- ports/mpg123/vcpkg.json | 10 +++++++--- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 13 +++++++------ versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index ae8ba26fe63f99..01856176c5c5fd 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -11,15 +11,20 @@ vcpkg_from_sourceforge( ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") yasm_tool_helper(APPEND_TO_PATH) endif() +vcpkg_list(SET options) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND options "-DLIBMPG123_LIBS=-lshlwapi") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/ports/cmake" OPTIONS -DUSE_MODULES=OFF -DBUILD_PROGRAMS=OFF + ${options} MAYBE_UNUSED_VARIABLES BUILD_PROGRAMS ) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 0c08fb301106c5..57a6faca7fd20f 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpg123", "version": "1.31.3", - "port-version": 2, + "port-version": 3, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", @@ -16,8 +16,12 @@ "host": true }, { - "name": "yasm-tool-helper", - "platform": "windows" + "name": "yasm", + "host": true, + "features": [ + "tools" + ], + "platform": "windows & !mingw" } ] } diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index d3f597073b7cf4..b43b1048c99717 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -23,6 +23,7 @@ "mp3lame", "nonfree", "openjpeg", + "openmpt", "openssl", "opus", "postproc", @@ -97,25 +98,25 @@ "name": "ffmpeg", "default-features": false, "features": [ - "x265" + "aom" ], - "platform": "!uwp & !(arm & windows)" + "platform": "!(windows & arm & !uwp)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "aom" + "dav1d" ], - "platform": "!(windows & arm & !uwp)" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "dav1d" + "x265" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!uwp & !(arm & windows)" }, { "name": "ffmpeg", diff --git a/versions/baseline.json b/versions/baseline.json index f3a3e1f78373d5..66e2459d215cfb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5598,7 +5598,7 @@ }, "mpg123": { "baseline": "1.31.3", - "port-version": 2 + "port-version": 3 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 32aaa1c41e8fae..27abc59b73d05e 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e990602e7caa6965db94c4ef01e3f1b44fb4f67", + "version": "1.31.3", + "port-version": 3 + }, { "git-tree": "58fbb0bf0ec6307689125ef1ba71112b670a42a9", "version": "1.31.3", From f330a325dd3535e2bf1067997ef40b7fddcb7e35 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 19 Oct 2023 18:29:18 +0200 Subject: [PATCH 0137/1039] [boost-iostreams] Fix mingw (#34387) * [boost-iostreams] Fix mingw * run generate-ports.ps1 --------- Co-authored-by: Javier Matos Denizac --- ports/boost-iostreams/b2-options.cmake | 8 ++++---- ports/boost-iostreams/vcpkg.json | 1 + scripts/boost/generate-ports.ps1 | 2 ++ versions/b-/boost-iostreams.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake index b95c08db023ba5..5b24d9d6ddb2b0 100644 --- a/ports/boost-iostreams/b2-options.cmake +++ b/ports/boost-iostreams/b2-options.cmake @@ -40,12 +40,12 @@ if("zlib" IN_LIST FEATURES) list(APPEND B2_OPTIONS -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" ) - # Overwride debug library name - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - if(WIN32) + # Overwride windows library names + if(WIN32) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") set(ZLIB_NAME zlibd) else() - set(ZLIB_NAME z) + set(ZLIB_NAME zlib) # for mingw endif() list(APPEND B2_OPTIONS -sZLIB_NAME=${ZLIB_NAME} diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 935e3e2cb008c9..98ed0e15fcf1f4 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-iostreams", "version": "1.83.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index a669d0635d931c..ca33285129e6e3 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -26,6 +26,8 @@ $defaultPortVersion = 0 $portVersions = @{ 'boost' = 1; 'boost-fiber' = 1; + 'boost-iostreams' = 1; + 'boost-modular-build-helper' = 1; } function Get-PortVersion { diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 6539dc598295c7..f0a409a7a64ee7 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be97780ebb3e46185f1838115f642ec2d110f76d", + "version": "1.83.0", + "port-version": 1 + }, { "git-tree": "da8972f0e4c59981021913e4ef16a39a9ff8d491", "version": "1.83.0", diff --git a/versions/baseline.json b/versions/baseline.json index 66e2459d215cfb..ff880d9675ef0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -926,7 +926,7 @@ }, "boost-iostreams": { "baseline": "1.83.0", - "port-version": 0 + "port-version": 1 }, "boost-iterator": { "baseline": "1.83.0", From d524a380386d799e37ab29634834b1818c07164a Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 20 Oct 2023 01:49:08 +0800 Subject: [PATCH 0138/1039] [libmorton] update to 0.2.12 (#34585) * [libmorton] update to 0.2.12 * [libmorton] update to 0.2.12 --- ports/libmorton/portfile.cmake | 2 +- ports/libmorton/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmorton.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libmorton/portfile.cmake b/ports/libmorton/portfile.cmake index 80c774e0e292fe..46e3dd457f2215 100644 --- a/ports/libmorton/portfile.cmake +++ b/ports/libmorton/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Forceflow/libmorton REF "v${VERSION}" - SHA512 ff1b0ebca3d38e886b4320bab38360dd537c3f63bf02aedfe5b00a81e026e52aff1a929361f8e2c4de9a18272a9e2a24c0085d7beb1be0adf6434777aad02ae5 + SHA512 020d9ba97204b8c028a8700d7212821dd75b6dbe1b4a77776777d06ef29bcad75cdc4e830f211daf6250779cc81ed4842a0632f89a7b7017eb071869a3c938fa HEAD_REF master ) diff --git a/ports/libmorton/vcpkg.json b/ports/libmorton/vcpkg.json index 8fff9e427f24f6..084c22d588738a 100644 --- a/ports/libmorton/vcpkg.json +++ b/ports/libmorton/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmorton", - "version": "0.2.11", + "version": "0.2.12", "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index ff880d9675ef0f..c6c0cc1367c930 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4441,7 +4441,7 @@ "port-version": 10 }, "libmorton": { - "baseline": "0.2.11", + "baseline": "0.2.12", "port-version": 0 }, "libmount": { diff --git a/versions/l-/libmorton.json b/versions/l-/libmorton.json index 1ff7edfe2036a9..baafdd4f92eeec 100644 --- a/versions/l-/libmorton.json +++ b/versions/l-/libmorton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f00ce462ab2d581aa3d0bb33c2ff37ff745377c", + "version": "0.2.12", + "port-version": 0 + }, { "git-tree": "01b61d968554cd38b6d3df05d11beda85750ff11", "version": "0.2.11", From 6110622d910487c4d4211c0d8f1a6b04b1e94e66 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 20 Oct 2023 01:49:31 +0800 Subject: [PATCH 0139/1039] update to 2.54.2 (#34563) --- ports/realsense2/portfile.cmake | 6 +++--- ports/realsense2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/realsense2.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index deed97f32d16f8..f5899614c90396 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.54.1 - SHA512 9b7146a5f6a4152d95286f679e0f5314ab0b040f67a030e42dfe01ad995af486d3d158d1ac7ef0bbe783a90e067d32e4bb4ba1a524fe75a89be6c7fe9c3a30ed + REF "v${VERSION}" + SHA512 20561294da571e0e1f5f8c9ac1039828512f3361a4241e5ad320bbb684626c1e78cd18e6a6344ec80fcd86dc699742c51069bc2b6895aec1dcbd9f394d2c9998 HEAD_REF master PATCHES fix_openni2.patch @@ -70,5 +70,5 @@ if(BUILD_OPENNI2_BINDINGS) endif() endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_fixup_pkgconfig() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 61ebac1dd16197..0390b62b5d1f8e 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "realsense2", - "version": "2.54.1", - "port-version": 1, + "version": "2.54.2", "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 c6c0cc1367c930..9705bd840409bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7285,8 +7285,8 @@ "port-version": 4 }, "realsense2": { - "baseline": "2.54.1", - "port-version": 1 + "baseline": "2.54.2", + "port-version": 0 }, "recast": { "baseline": "deprecated", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 19082cd83d5559..6ba3ef956305ef 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c860a042c288cc1618ea5e728e8eb715b233ff44", + "version": "2.54.2", + "port-version": 0 + }, { "git-tree": "29719e1172d7bb950bc88a29ba009e4c4c2d5f27", "version": "2.54.1", From af0cb21f3b2f73c943f784ef1dd0fe92e27e5c0f Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 20 Oct 2023 01:49:44 +0800 Subject: [PATCH 0140/1039] [libjuice] update to 1.3.1 (#34558) * [libjuice] update to 1.3.1 * [libjuice] update to 1.3.1 --- 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 2adc028c43fe37..c1e3c7726a7fca 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 eff89f7ae3450d66fcebe4d3d1d2aacca527eb8c #v1.0.6 - SHA512 f28e8116e9437f7e2c114c0b6e296ec2c4bda264428ca94c3aa7356bfc3c76ac77f4664678579c933f70e6cb380c68ad42c03a83d5140bf41e20fc4272f1ae54 + REF "v${VERSION}" + SHA512 187901d6d8e1210210667b0bca274ce9507d46cc5f3fe81e812fb7c16dc2739359a5d331ce03a9a3958252c4ea942a75ca29a624f486abb23c19dd10c71127bc HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index ccd998ba13b684..4758d98615c76d 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.0.6", + "version": "1.3.1", "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 9705bd840409bb..2718fecc98453a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4337,7 +4337,7 @@ "port-version": 2 }, "libjuice": { - "baseline": "1.0.6", + "baseline": "1.3.1", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 43ac165f40ce9e..4a9dbea80d749a 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ace25316c085db75ac26220e854bd83baa86294", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "f93f38276ee4097f4b4e85f58b14aaa7e0cda3d4", "version": "1.0.6", From c4d0b65dacb6a588ba925080123ea9e5c75e4727 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 20 Oct 2023 01:50:06 +0800 Subject: [PATCH 0141/1039] [libjpeg-turbo] update to 3.0.1 (#34555) * [libjpeg-turbo] update to 3.0.1 * [libjpeg-turbo] update to 3.0.1 --- ports/libjpeg-turbo/portfile.cmake | 2 +- ports/libjpeg-turbo/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 325c790c766dc3..e6dad47e3a8ce2 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 0efb7ce16333f4f3556b889bdd83b0f91697ce1645cbfb13db0c8a93ef47dd9cb0805c7160edaf946d4d54faf30a33bae90800c189e8b4bd44fcf3ce98179115 + SHA512 6f9f384bb3bf5476935b313576c03f11d3e22bf727aa135eb840a2c9b994890e6712e23f25996b91ee901e8242b41100fb8c3cb4905ffb72776edf14b2c05a12 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 f084727b5cb661..77578ea905b013 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libjpeg-turbo", - "version": "3.0.0", - "port-version": 2, + "version": "3.0.1", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 2718fecc98453a..350d0602f5b182 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4333,8 +4333,8 @@ "port-version": 1 }, "libjpeg-turbo": { - "baseline": "3.0.0", - "port-version": 2 + "baseline": "3.0.1", + "port-version": 0 }, "libjuice": { "baseline": "1.3.1", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 91026f6f0cfb64..71290878f0a4f5 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "481b08127d4002ba7441f144df259e03271e7592", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "4510832adaa3f5f415a59d26f5520ca250a8ff77", "version": "3.0.0", From 8941576c1931dec175f94fe2edfcadb647c3f343 Mon Sep 17 00:00:00 2001 From: Pravila Date: Thu, 19 Oct 2023 18:51:28 +0100 Subject: [PATCH 0142/1039] [pravila00-enum-string] New port (#34518) * Add pravila00-enum-string * Format vcpkg.json * Add version * Add version file * Add missing comma * Fix version * Update ports/pravila00-enum-string/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/pravila00-enum-string/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/pravila00-enum-string/vcpkg.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/pravila00-enum-string/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Rename port to enum-string * Add version for enum-string * Fix port name * Update version * Update port name * Add version --------- Co-authored-by: Pablo Rodriguez Avila Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/pravila00-enum-string/portfile.cmake | 13 +++++++++++++ ports/pravila00-enum-string/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/p-/pravila00-enum-string.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/pravila00-enum-string/portfile.cmake create mode 100644 ports/pravila00-enum-string/vcpkg.json create mode 100644 versions/p-/pravila00-enum-string.json diff --git a/ports/pravila00-enum-string/portfile.cmake b/ports/pravila00-enum-string/portfile.cmake new file mode 100644 index 00000000000000..5a099731d5d608 --- /dev/null +++ b/ports/pravila00-enum-string/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pravila00/enum-string + REF 3eec46f5520c287ee46692ea1d41833cbe0d80f2 + SHA512 5b29c27b8ceb358bae5a2b4fb5d198b7b4cd8a7c9926bd7685c27650da5cda9f6dc85b6a9694fe151d03b22e3230d5f3faf9143e865dffc0795b2952fca5fc0f + HEAD_REF main +) + +file(COPY "${SOURCE_PATH}/EnumString.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pravila00-enum-string/vcpkg.json b/ports/pravila00-enum-string/vcpkg.json new file mode 100644 index 00000000000000..a1afb14d86f804 --- /dev/null +++ b/ports/pravila00-enum-string/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pravila00-enum-string", + "version-date": "2023-10-16", + "description": "A utility to provide stringizing support for C++ enums.", + "homepage": "https://github.com/Pravila00/enum-string", + "license": "Unlicense" +} diff --git a/versions/baseline.json b/versions/baseline.json index 350d0602f5b182..ee4ebe9c3b002c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6628,6 +6628,10 @@ "baseline": "1.3", "port-version": 7 }, + "pravila00-enum-string": { + "baseline": "2023-10-16", + "port-version": 0 + }, "pravila00-make-vector": { "baseline": "2023-04-10", "port-version": 0 diff --git a/versions/p-/pravila00-enum-string.json b/versions/p-/pravila00-enum-string.json new file mode 100644 index 00000000000000..0a3a67d0405731 --- /dev/null +++ b/versions/p-/pravila00-enum-string.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a5172f6fa4786d4b0d4f41d843e24c04799a2d85", + "version-date": "2023-10-16", + "port-version": 0 + } + ] +} From 85f2afaa49c831a5c29ed7e1a1729891af486d82 Mon Sep 17 00:00:00 2001 From: Ankur Verma <31362771+ankurvdev@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:51:59 -0700 Subject: [PATCH 0143/1039] [ankurvdev-embedresource] adding new port (#34401) * Rename Port to ankurvdev-embedresource * Add sha --------- Co-authored-by: Ankur Verma --- ports/ankurvdev-embedresource/portfile.cmake | 29 ++++++++++ ports/ankurvdev-embedresource/vcpkg.json | 17 ++++++ .../portfile.cmake | 4 ++ .../project/CMakeLists.txt | 45 ++++++++++++++ .../project/main.cpp | 58 +++++++++++++++++++ .../vcpkg.json | 15 +++++ versions/a-/ankurvdev-embedresource.json | 9 +++ versions/baseline.json | 4 ++ 8 files changed, 181 insertions(+) create mode 100644 ports/ankurvdev-embedresource/portfile.cmake create mode 100644 ports/ankurvdev-embedresource/vcpkg.json create mode 100644 scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt create mode 100644 scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp create mode 100644 scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json create mode 100644 versions/a-/ankurvdev-embedresource.json diff --git a/ports/ankurvdev-embedresource/portfile.cmake b/ports/ankurvdev-embedresource/portfile.cmake new file mode 100644 index 00000000000000..bbc240b32f0e65 --- /dev/null +++ b/ports/ankurvdev-embedresource/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ankurvdev/embedresource + REF "v${VERSION}" + SHA512 96d2208fd5d654dad5662968296fa363cea0a935fec8474b780717c9303d2dd763833370bcdf02d6d63e264368b0955fa1f13c6e55685280df5fdaf9e72b8c9f + HEAD_REF main) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +vcpkg_copy_tools(TOOL_NAMES embedresource AUTO_CLEAN) + +file(READ "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" config_contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/embedresource/EmbedResourceConfig.cmake" +"find_program( + EMBEDRESOURCE_EXECUTABLE embedresource + PATHS + \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/${PORT}\" + NO_DEFAULT_PATH + REQUIRED) +${config_contents}" +) diff --git a/ports/ankurvdev-embedresource/vcpkg.json b/ports/ankurvdev-embedresource/vcpkg.json new file mode 100644 index 00000000000000..46ee2fa030eb45 --- /dev/null +++ b/ports/ankurvdev-embedresource/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ankurvdev-embedresource", + "version": "0.0.10", + "description": "Cross Platform Resource Embedding", + "homepage": "https://github.com/ankurvdev/embedresource", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "ankurvdev-embedresource", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake new file mode 100644 index 00000000000000..bc785962c8d5de --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/portfile.cmake @@ -0,0 +1,4 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_cmake_configure(SOURCE_PATH "${CURRENT_PORT_DIR}/project") +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt new file mode 100644 index 00000000000000..8bbcf70da08289 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/CMakeLists.txt @@ -0,0 +1,45 @@ +cmake_minimum_required(VERSION 3.12) + +project(embedresource-test VERSION 0.0.1) + +set(CMAKE_CXX_STANDARD 17) + +find_package(EmbedResource REQUIRED) + +file(SIZE "${CMAKE_CURRENT_LIST_DIR}/main.cpp" MAIN_CPP_FILE_SIZE) +file(SIZE "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" CMAKELISTS_TXT_FILE_SIZE) + +add_resource_library(sample_test_resources OBJECT RESOURCE_COLLECTION_NAME testdata1 RESOURCES main.cpp GENERATOR_COMMAND echo "CMakeLists.txt" GENERATOR_DEPEND CMakeLists.txt) +add_resource_library(testdata3 OBJECT RESOURCES main.cpp) + +macro(setup_target target) + target_add_resource(${target} RESOURCE_COLLECTION_NAME testdata2 RESOURCES main.cpp) + get_target_property(type ${target} TYPE) + if ("${type}" STREQUAL "STATIC_LIBRARY") + target_link_libraries(${target} PRIVATE $ $) + else() + target_link_libraries(${target} PRIVATE sample_test_resources testdata3) + endif() + + target_compile_definitions(${target} PRIVATE MAIN_CPP_FILE_SIZE=${MAIN_CPP_FILE_SIZE}) + target_compile_definitions(${target} PRIVATE CMAKELISTS_TXT_FILE_SIZE=${CMAKELISTS_TXT_FILE_SIZE}) +endmacro() + +add_executable(sample_test_exe main.cpp) +setup_target(sample_test_exe) + +add_library(sample_test_shlib SHARED main.cpp) +target_compile_features(sample_test_shlib PRIVATE cxx_std_20) +setup_target(sample_test_shlib) + +add_library(sample_test_lib STATIC main.cpp) +setup_target(sample_test_lib) + +install(TARGETS sample_test_shlib EXPORT sample_test_shlib) +install(EXPORT sample_test_shlib FILE sampleTargets.cmake DESTINATION cmake) + +install(TARGETS sample_test_lib EXPORT sample_test_lib) +install(EXPORT sample_test_lib FILE sampleTargets.cmake DESTINATION cmake) + +enable_testing() +add_test(NAME sample_test_exe COMMAND sample_test_exe) diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp new file mode 100644 index 00000000000000..39d7a8304f2613 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/project/main.cpp @@ -0,0 +1,58 @@ +#include +#include +#include +#include +#include + +DECLARE_RESOURCE_COLLECTION(testdata1); +DECLARE_RESOURCE_COLLECTION(testdata2); +DECLARE_RESOURCE_COLLECTION(testdata3); +DECLARE_RESOURCE(testdata3, main_cpp); + +void verify_resource(ResourceLoader const& r) +{ + if (r.name() == L"main.cpp") + { +#ifdef __cpp_lib_span + if (r.template data().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); } +#endif +#ifdef __cpp_lib_string_view + if (r.string().size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.string().size() != MAIN_CPP_FILE_SIZE"); } +#endif + } + else if (r.name() == L"CMakeLists.txt") + { +#ifdef __cpp_lib_span + if (r.template data().size() != CMAKELISTS_TXT_FILE_SIZE) + { + throw std::runtime_error("r.data.len() != CMAKELISTS_TXT_FILE_SIZE"); + } +#endif +#ifdef __cpp_lib_string_view + if (r.string().size() != CMAKELISTS_TXT_FILE_SIZE) { throw std::runtime_error("r.string().size() != CMAKELISTS_TXT_FILE_SIZE"); } +#endif + } + else { throw std::runtime_error("Unknown resource name"); } +} + +int main(int argc, char* argv[]) +try +{ + std::string_view res = LOAD_RESOURCE(testdata3, main_cpp).data; + if (res.size() != MAIN_CPP_FILE_SIZE) { throw std::runtime_error("r.data.len() != MAIN_CPP_FILE_SIZE"); } + + auto resourceCollection1 = LOAD_RESOURCE_COLLECTION(testdata1); + for (auto const r : resourceCollection1) { verify_resource(r); } + + auto resourceCollection2 = LOAD_RESOURCE_COLLECTION(testdata2); + for (auto const r : resourceCollection2) { verify_resource(r); } + + auto resourceCollection3 = LOAD_RESOURCE_COLLECTION(testdata3); + for (auto const r : resourceCollection2) { verify_resource(r); } + + return 0; +} catch (const std::exception& ex) +{ + std::cerr << "Failed: " << ex.what() << std::endl; + return -1; +} \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json new file mode 100644 index 00000000000000..1c13e817687ad5 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-ankurvdev-embedresource/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "vcpkg-ci-ankurvdev-embedresource", + "version-string": "ci", + "description": "Validates ankurvdev-embedresource", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "ankurvdev-embedresource" + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/a-/ankurvdev-embedresource.json b/versions/a-/ankurvdev-embedresource.json new file mode 100644 index 00000000000000..e80c7ad8dd2367 --- /dev/null +++ b/versions/a-/ankurvdev-embedresource.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b200fce22ffffeb4174ca68fcca609a9c4857c38", + "version": "0.0.10", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ee4ebe9c3b002c..c20a65e0cbf86c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -132,6 +132,10 @@ "baseline": "chromium_5414", "port-version": 7 }, + "ankurvdev-embedresource": { + "baseline": "0.0.10", + "port-version": 0 + }, "annoy": { "baseline": "1.17.2", "port-version": 0 From ff8e58c978c4947a47ad765c34bc61fd982c95b6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 19 Oct 2023 20:00:06 +0200 Subject: [PATCH 0144/1039] [gdal] Add upstream TIFF fix (#34586) --- ports/gdal/portfile.cmake | 1 + ports/gdal/upstream-b5858ed.diff | 21 +++++++++++++++++++++ ports/gdal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/gdal/upstream-b5858ed.diff diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3ddf916eebfdd4..07f27f062a6b83 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-gdal-target-interfaces.patch libkml.patch fix-jpeg.patch + upstream-b5858ed.diff ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") diff --git a/ports/gdal/upstream-b5858ed.diff b/ports/gdal/upstream-b5858ed.diff new file mode 100644 index 00000000000000..9c31afcc2df6c0 --- /dev/null +++ b/ports/gdal/upstream-b5858ed.diff @@ -0,0 +1,21 @@ +diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp +index ed79c0972e0..33846d66513 100644 +--- a/frmts/gtiff/geotiff.cpp ++++ b/frmts/gtiff/geotiff.cpp +@@ -2886,8 +2886,16 @@ static void ThreadDecompressionFunc(void *pData) + psJob->nXBlock, psJob->nYBlock); + if (apoBlocks[i] == nullptr) + { ++ // Temporary disabling of dirty block fushing, otherwise ++ // we can be in a deadlock situation, where the ++ // GTiffDataset::SubmitCompressionJob() method waits for jobs ++ // to be finished, that can't finish (actually be started) ++ // because this task and its siblings are taking all the ++ // available workers allowed by the global thread pool. ++ GDALRasterBlock::EnterDisableDirtyBlockFlush(); + apoBlocks[i] = poDS->GetRasterBand(iBand)->GetLockedBlockRef( + psJob->nXBlock, psJob->nYBlock, TRUE); ++ GDALRasterBlock::LeaveDisableDirtyBlockFlush(); + if (apoBlocks[i] == nullptr) + return false; + } diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index e66cb60ca46e84..2001a0c25ab0c8 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.7.2", + "port-version": 1, "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 c20a65e0cbf86c..974f040187bd94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2830,7 +2830,7 @@ }, "gdal": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index bcf45a4a550432..d91f56fd259c3e 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f", + "version-semver": "3.7.2", + "port-version": 1 + }, { "git-tree": "d01864aaa21a85e1e8f7bb6748d607e953c52e77", "version-semver": "3.7.2", From 8675d652cc90afb51a9089280548fffc03e6006d Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 19 Oct 2023 21:08:48 +0300 Subject: [PATCH 0145/1039] fix FindGzBullet.cmake (#34587) --- ports/gz-cmake3/dependencies.patch | 22 ++++++++++++++++++++++ ports/gz-cmake3/portfile.cmake | 2 ++ ports/gz-cmake3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gz-cmake3.json | 5 +++++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ports/gz-cmake3/dependencies.patch diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch new file mode 100644 index 00000000000000..169f24dd02b7f7 --- /dev/null +++ b/ports/gz-cmake3/dependencies.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake +--- a/cmake/FindGzBullet.cmake ++++ b/cmake/FindGzBullet.cmake +@@ -30,16 +30,17 @@ + + # Bullet. Force MODULE mode to use the FindBullet.cmake file distributed with + # CMake. Otherwise, we may end up using the BulletConfig.cmake file distributed + # with Bullet, which uses relative paths and may break transitive dependencies. +-find_package(Bullet MODULE ${gz_quiet_arg}) ++find_package(Bullet CONFIG REQUIRED) + + set(GzBullet_FOUND false) + # create Bullet target + if(BULLET_FOUND) + set(GzBullet_FOUND true) + + gz_import_target(GzBullet ++ INTERFACE + TARGET_NAME GzBullet::GzBullet + LIB_VAR BULLET_LIBRARIES + INCLUDE_VAR BULLET_INCLUDE_DIRS + ) diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake index 462e1ba3ed372f..6694814e3cac04 100644 --- a/ports/gz-cmake3/portfile.cmake +++ b/ports/gz-cmake3/portfile.cmake @@ -5,6 +5,8 @@ ignition_modular_library( REF ${PORT}_${VERSION} VERSION ${VERSION} SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69 + PATCHES + dependencies.patch ) # Install custom usage diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index 9d7bb5cb10f67d..37aa11321babc0 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-cmake3", "version": "3.4.1", + "port-version": 1, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 974f040187bd94..7acaa27516c88a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3146,7 +3146,7 @@ }, "gz-cmake3": { "baseline": "3.4.1", - "port-version": 0 + "port-version": 1 }, "gz-common5": { "baseline": "5.4.1", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index 6bf2db70868a73..dd5779d88c0465 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d7ac07eb757d7a69f1df27ad7a1ef71c26957d4", + "version": "3.4.1", + "port-version": 1 + }, { "git-tree": "c0061f3363187e8da74f252ff3c21c42e382e8c9", "version": "3.4.1", From 03ca89f0b973492b6056f265dbc2b706e89b66a3 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Thu, 19 Oct 2023 21:55:20 +0300 Subject: [PATCH 0146/1039] [google-cloud-cpp] Remove dependency to grpc when not used. (#34569) * [google-cloud-cpp] Remove dependency to grpc when not used. * Update version database. --- ports/google-cloud-cpp/portfile.cmake | 4 +++- ports/google-cloud-cpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index d651ea0337ab6b..ceec57ecdd10d3 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_github( support_absl_cxx17.patch ) -vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +if ("grpc-common" IN_LIST FEATURES) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +endif () set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 4aadd5149140b8..0fc6206bfaafe6 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "google-cloud-cpp", "version": "2.17.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", "supports": "!uwp", "dependencies": [ "abseil", - "grpc", + "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 7acaa27516c88a..074c5b86c4bd9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3006,7 +3006,7 @@ }, "google-cloud-cpp": { "baseline": "2.17.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 c9b0ce2ccc7bec..00e412cea04971 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb4b2fd7eea450ced2e6f33dcd9af1237f2de3c2", + "version": "2.17.0", + "port-version": 1 + }, { "git-tree": "cfe978bbc8c0f0e98f02aaaf2ab546f08107ce95", "version": "2.17.0", From 277733116c41c681b877bcfe16232e6b9e45bdcc Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Thu, 19 Oct 2023 11:57:22 -0700 Subject: [PATCH 0147/1039] [baseline] [cpptoml] Passing: remove from fail list (#34574) * remove from fail list * add iceoryx to fail list --- scripts/ci.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 72344ca05e7465..70a6ba8d77f5dc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -246,9 +246,6 @@ cppslippi:x64-android=fail cppslippi:x64-linux=fail cppslippi:x64-osx=fail cppcoro:x64-linux=fail -cpptoml:arm-neon-android=fail -cpptoml:arm64-android=fail -cpptoml:x64-android=fail cpputest:arm-neon-android=fail crashpad:x64-linux=fail cserialport:arm-neon-android=fail @@ -465,6 +462,9 @@ hwloc:arm-neon-android=fail hwloc:arm64-android=fail hwloc:x64-android=fail hyperscan:x64-android=fail +iceoryx:x64-android=fail +iceoryx:arm64-android=fail +iceoryx:arm-neon-android=fail ignition-common1:x64-linux=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail From f9ae3ba570186753bab12ecedb32469937d82c17 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 20 Oct 2023 01:28:17 +0300 Subject: [PATCH 0148/1039] [glm] Restore version 0.9.9.8 (#34591) * [glm] Restore version 0.9.9.8 * revert glm update --------- Co-authored-by: Javier Matos Denizac --- ports/glm/portfile.cmake | 8 ++++---- ports/glm/usage | 4 ---- ports/glm/vcpkg.json | 3 ++- versions/baseline.json | 4 ++-- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 ports/glm/usage diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index a3e5e2e8c92184..133c81ec6e7ccf 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF 5c46b9c07008ae65cb81ab79cd677ecc1934b903 # commit on 2023-06-08 - SHA512 17315dd05059accf3d4084d35dd037d4001f88a1d91da9a6fd5cedecab652c8bef8efa89cd45e21cd227f964a03408401edc2384c22e50caa449abf71b23fd6a + REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 + SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c HEAD_REF master ) @@ -19,5 +19,5 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/copying.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +# Put the license file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/copying.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glm/usage b/ports/glm/usage deleted file mode 100644 index 95602ece2bad5c..00000000000000 --- a/ports/glm/usage +++ /dev/null @@ -1,4 +0,0 @@ -glm provides CMake targets: - - find_package(glm CONFIG REQUIRED) - target_link_libraries(main PRIVATE glm::glm) diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json index 91bf95e6b0618b..a81138c051cc8f 100644 --- a/ports/glm/vcpkg.json +++ b/ports/glm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glm", - "version-date": "2023-06-08", + "version": "0.9.9.8", + "port-version": 2, "description": "OpenGL Mathematics (GLM)", "homepage": "https://glm.g-truc.net", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 074c5b86c4bd9a..fbd331fbbdefd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2957,8 +2957,8 @@ "port-version": 1 }, "glm": { - "baseline": "2023-06-08", - "port-version": 0 + "baseline": "0.9.9.8", + "port-version": 2 }, "globjects": { "baseline": "1.1.0", From dca3d12e95b7f224e7b0089baa92764fab7ba3bd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 19 Oct 2023 15:36:59 -0700 Subject: [PATCH 0149/1039] Update vcpkg-tool to 2023-10-18 (#34548) --- scripts/vcpkg-tool-metadata.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index c8387661b18f23..45e7e180970c2f 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-09-15 -VCPKG_MACOS_SHA=3c822003ec4e5eb3ea15d8ccf1a156f1d58e742b9d375a79693af9ad5b454796d4a42e05091bafefdf8359b56aee27ff8b07ff9bcb99f549a5bc81cb7ed47cc7 -VCPKG_MUSLC_SHA=125c77acbc6a2271eb882767e44da3fb0acd0719a35f2460e65eafcccae47967a5c370206d7af06b1d5a10d4ea53d04e620ca8df4bface8cd972b27eb89cf04e -VCPKG_GLIBC_SHA=08d27596961819573a66163ca5373e8f20137856d78d58154cc9ad0ba4864a1d22698d25c08c5ebcb3601f2952a476b0f1d12bed25c42cdbe6dab520870fabf3 -VCPKG_TOOL_SOURCE_SHA=a97ed33b6f3a5bbb9ae9e58ccd370f4941a5889098356aacb200effebc26f34b1ea205d21a749550db9e4c4c64b28a66f52bbfa0ba0bb4d5fc5b9be1fe4d76ff +VCPKG_TOOL_RELEASE_TAG=2023-10-18 +VCPKG_MACOS_SHA=a088881182d89cc8df5d4956eeafb5b1af08d0b5b99e84296796da13572cedaeb7e08c5256585b5417a39bb4b31a0c08323b63754fd75e45de0e5a61f21d6517 +VCPKG_MUSLC_SHA=0e278d8d5fe34f1c1513b18ff9061fe47a46e5d34d0834b1e966e0a7c0e7646af99679e39d6ea0e2b731eb5d0e0cc79e5b893cfeaeced083212d45a44f14a6e7 +VCPKG_GLIBC_SHA=89359cd737d9a19598cde8d27f4cd1e2c52d768ec8d2f8a9d2cd23f1054717cb9881e9e0587fa8726fa754cffd0b93d851b4d48f1e27cec9d9c25d92d1f35cff +VCPKG_TOOL_SOURCE_SHA=ef2f4973c417da1f127dcda4c9ee423fadc518b807d9347920559cf648720c71547bc7cb719209007cd3fda87e3655a85215deb523c4ece71b9147dfd2e52ae4 From 8eb57355a4ffb410a2e94c07b4dca2dffbee8e50 Mon Sep 17 00:00:00 2001 From: Capric Date: Fri, 20 Oct 2023 06:38:14 +0800 Subject: [PATCH 0150/1039] add mips64-linux to triplets/community (#34392) Co-authored-by: Ding Jiajia Co-authored-by: vzhli17 --- triplets/community/mips64-linux.cmake | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 triplets/community/mips64-linux.cmake diff --git a/triplets/community/mips64-linux.cmake b/triplets/community/mips64-linux.cmake new file mode 100644 index 00000000000000..25ba947eecb7b9 --- /dev/null +++ b/triplets/community/mips64-linux.cmake @@ -0,0 +1,6 @@ +set(VCPKG_TARGET_ARCHITECTURE mips64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE static) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + From fbba5251f75c149d71737fd3ef09629f41b5d5aa Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:32:21 +0800 Subject: [PATCH 0151/1039] fix error hash (#34584) --- ports/cpr/portfile.cmake | 2 +- ports/cpr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpr.json | 11 ++++++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 5b37ded4533ec5..1ccdc3f5cd9ac9 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr REF ${VERSION} - SHA512 aad193202ce0f24ed12c3992914c9a374f12fe9d84d5a375fc6e9ec6215cca6abf50372b71a11284aea039e00dd35b528fe5285667671dbb43b1b1fe4b7a74ef + SHA512 5e2fe69d5b4dfaa67f636098c8da904b43a22b21cc78bc52446e572ea47f492ce1de0f47fdc2cf34207729ccf007449278f218d8cdeef21f0b98356bca2e5e49 HEAD_REF master PATCHES 001-cpr-config.patch diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index ea1f45ccc55ac3..3cdf6d02f6964d 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpr", "version-semver": "1.10.5", + "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 fbd331fbbdefd4..79b0f1f22ba47f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1902,7 +1902,7 @@ }, "cpr": { "baseline": "1.10.5", - "port-version": 0 + "port-version": 1 }, "cpu-features": { "baseline": "0.9.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 63309fa152d1f2..79a0fd5c985f70 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,9 +1,14 @@ { "versions": [ { - "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844", - "version-semver": "1.10.5", - "port-version": 0 + "git-tree": "83379af62bd0d170537dd4ee3abba017d4a54659", + "version-semver": "1.10.5", + "port-version": 1 + }, + { + "git-tree": "b734e9b119682ee4c98e2b4a127a8e29fc750844", + "version-semver": "1.10.5", + "port-version": 0 }, { "git-tree": "96f05ba23a7dc5ba102ba451210b2c367669c1ad", From e0095fffa6e08eebcd0ba690ce378449ba83ef57 Mon Sep 17 00:00:00 2001 From: talregev Date: Fri, 20 Oct 2023 19:36:23 +0300 Subject: [PATCH 0152/1039] update to gz-math7 7.3.0 (#34627) --- ports/gz-math7/portfile.cmake | 2 +- ports/gz-math7/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gz-math7.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/gz-math7/portfile.cmake b/ports/gz-math7/portfile.cmake index f64aa64517f3cc..3891614c7c1eec 100644 --- a/ports/gz-math7/portfile.cmake +++ b/ports/gz-math7/portfile.cmake @@ -4,7 +4,7 @@ ignition_modular_library( NAME "${PACKAGE_NAME}" REF "${PORT}_${VERSION}" VERSION "${VERSION}" - SHA512 84617eeb6840b0bad8f94c38e8af11bf010c2e3166042541d0d79c44f60a70ee6fde395b2a1b801abedb36aa024f7fb14bbb993eb7be2949c72d8756ba4b3196 + SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed OPTIONS -DSKIP_SWIG=ON -DSKIP_PYBIND11=ON diff --git a/ports/gz-math7/vcpkg.json b/ports/gz-math7/vcpkg.json index 9eb5c8cdcfc1a2..762e221fb5974b 100644 --- a/ports/gz-math7/vcpkg.json +++ b/ports/gz-math7/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gz-math7", - "version": "7.0.2", - "port-version": 1, + "version": "7.3.0", "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 79b0f1f22ba47f..b941d32955f562 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3157,8 +3157,8 @@ "port-version": 0 }, "gz-math7": { - "baseline": "7.0.2", - "port-version": 1 + "baseline": "7.3.0", + "port-version": 0 }, "gz-msgs9": { "baseline": "9.5.0", diff --git a/versions/g-/gz-math7.json b/versions/g-/gz-math7.json index 7574a7ada977ae..61f24bdb5a1259 100644 --- a/versions/g-/gz-math7.json +++ b/versions/g-/gz-math7.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "788bff7f23bcb592cfbe23a0077ce5e338633515", + "version": "7.3.0", + "port-version": 0 + }, { "git-tree": "687462541825396052367baec48a08e4657d63d4", "version": "7.0.2", From 9bc8b9fda8e2f6fedccdb73210c0dda1052e4022 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:37:19 +0800 Subject: [PATCH 0153/1039] [libraqm] update to 0.10.1 (#34625) * [libraqm] update to 0.10.1 * [libraqm] update to 0.10.1 --- ports/libraqm/portfile.cmake | 6 +++--- ports/libraqm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libraqm.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libraqm/portfile.cmake b/ports/libraqm/portfile.cmake index f19f010bfc70f2..84d967ff4adc0c 100644 --- a/ports/libraqm/portfile.cmake +++ b/ports/libraqm/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) set(RAQM_VERSION_MAJOR 0) -set(RAQM_VERSION_MINOR 9) -set(RAQM_VERSION_MICRO 0) +set(RAQM_VERSION_MINOR 10) +set(RAQM_VERSION_MICRO 1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HOST-Oman/libraqm REF v${RAQM_VERSION_MAJOR}.${RAQM_VERSION_MINOR}.${RAQM_VERSION_MICRO} - SHA512 a45c442a087c806143e5a96878e1d84a31afb7b682d71931fcb014c8d56b974d5a0d6186b163067d44a15952b3c549763f84354ed799f20473795f15d719f060 + SHA512 d35fd37764c153235ad89721be7a2a11212c1d3241383d81499ca5fe83e90d625e29e42a00edd626bff78bd0f72209f36826c84f59cd1504258079ed532329b6 HEAD_REF master ) diff --git a/ports/libraqm/vcpkg.json b/ports/libraqm/vcpkg.json index b969212a213cff..3401c2bea0b80f 100644 --- a/ports/libraqm/vcpkg.json +++ b/ports/libraqm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libraqm", - "version": "0.9.0", - "port-version": 1, + "version": "0.10.1", "description": "A library for complex text layout", "homepage": "https://github.com/HOST-Oman/libraqm", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b941d32955f562..56e27f247b8d7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4617,8 +4617,8 @@ "port-version": 2 }, "libraqm": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.10.1", + "port-version": 0 }, "libraw": { "baseline": "0.21.1", diff --git a/versions/l-/libraqm.json b/versions/l-/libraqm.json index e8e89f1b8f03e4..1cfd676f9e10ff 100644 --- a/versions/l-/libraqm.json +++ b/versions/l-/libraqm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65a919304f99dbe9ed1c5f2777785cd89ed97ad2", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "aae562aa1a91357654efbd688ca511ae34d1afed", "version": "0.9.0", From a552b813423ed7d968472ca82705e40022d71d8d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:39:22 +0800 Subject: [PATCH 0154/1039] [libphonenumber] update to 8.13.23 (#34621) * [libphonenumber] update to 8.13.23 * [libphonenumber] update to 8.13.23 --- ports/libphonenumber/portfile.cmake | 2 +- ports/libphonenumber/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libphonenumber.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libphonenumber/portfile.cmake b/ports/libphonenumber/portfile.cmake index 774ee5e0274199..daccddbc190690 100644 --- a/ports/libphonenumber/portfile.cmake +++ b/ports/libphonenumber/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libphonenumber REF "v${VERSION}" - SHA512 b1ec99aa952558d2ba26d95d7c1bdfd8169f992b3190cc4236e1ce17e69db50ef2839b2840a9553541e09c7509b77c463a1036f84251844ec71bd5888ef78555 + SHA512 d7a576e64fd3f3ce9d4f79750d8c785c56efd97d90f37d0062fb2634124ed6b181c74e772b4d9e72daf8897cc9cae4d4e525dd8b5113739c8c7ac7279315cd66 HEAD_REF master PATCHES fix-re2-identifiers.patch diff --git a/ports/libphonenumber/vcpkg.json b/ports/libphonenumber/vcpkg.json index a8227cfc565bc4..aec3bf3ca41eb3 100644 --- a/ports/libphonenumber/vcpkg.json +++ b/ports/libphonenumber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libphonenumber", - "version": "8.13.17", + "version": "8.13.23", "description": "Google's common Java, C++ and JavaScript library for parsing, formatting, and validating international phone numbers.", "license": "Apache-2.0", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 56e27f247b8d7b..31a47aa524d096 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4561,7 +4561,7 @@ "port-version": 2 }, "libphonenumber": { - "baseline": "8.13.17", + "baseline": "8.13.23", "port-version": 0 }, "libplist": { diff --git a/versions/l-/libphonenumber.json b/versions/l-/libphonenumber.json index 9b0438921e7437..a1199b9036fa0b 100644 --- a/versions/l-/libphonenumber.json +++ b/versions/l-/libphonenumber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9df18bd6b1bab30de04c91942cf6724b6ff26f0c", + "version": "8.13.23", + "port-version": 0 + }, { "git-tree": "8c0eab944c22034092f0200dcbdd5a422eddc7f9", "version": "8.13.17", From 7ac307efa65678c85dbbb0d233a940e0fcf74c3b Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:49:56 +0800 Subject: [PATCH 0155/1039] update to 1.0.2088.41 (#34614) --- ports/webview2/portfile.cmake | 4 +--- ports/webview2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/webview2.json | 5 +++++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/webview2/portfile.cmake b/ports/webview2/portfile.cmake index 6a47ad7581f1e7..ed4c7a96db2663 100644 --- a/ports/webview2/portfile.cmake +++ b/ports/webview2/portfile.cmake @@ -2,12 +2,10 @@ if(VCPKG_TARGET_IS_UWP) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) endif() -set(VERSION 1.0.1210.39) - vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" FILENAME "microsoft.web.webview2.${VERSION}.zip" - SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf + SHA512 59d2293d2becb03ed99ab0a70a753adf49d998294d318d331047c2ec7c7dcb163ed84a09ab35765873c2364c3367a8033e2b1a5ad52c5b8e99f8d7a69b8e915e ) vcpkg_extract_source_archive( diff --git a/ports/webview2/vcpkg.json b/ports/webview2/vcpkg.json index 34a407b0e0b92e..22131b61553e9e 100644 --- a/ports/webview2/vcpkg.json +++ b/ports/webview2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "webview2", - "version": "1.0.1210.39", - "port-version": 1, + "version": "1.0.2088.41", "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", diff --git a/versions/baseline.json b/versions/baseline.json index 31a47aa524d096..58d4377f8a7a3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8869,8 +8869,8 @@ "port-version": 2 }, "webview2": { - "baseline": "1.0.1210.39", - "port-version": 1 + "baseline": "1.0.2088.41", + "port-version": 0 }, "wepoll": { "baseline": "1.5.8", diff --git a/versions/w-/webview2.json b/versions/w-/webview2.json index dc4844fb87435b..bab3df15557270 100644 --- a/versions/w-/webview2.json +++ b/versions/w-/webview2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cd32d80f7fd65a498507ca2de77f8ce5449dd30", + "version": "1.0.2088.41", + "port-version": 0 + }, { "git-tree": "8f620381c9d12e72ae72e693571bc98ab82510da", "version": "1.0.1210.39", From 2161f290afd6ec539bc664827e89447711aacb6a Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 20 Oct 2023 20:50:31 +0400 Subject: [PATCH 0156/1039] [ade] updated to 0.1.2d (#34602) * [ade] updated to 0.1.2d * updated version database --- ports/ade/portfile.cmake | 2 +- ports/ade/vcpkg.json | 2 +- versions/a-/ade.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ade/portfile.cmake b/ports/ade/portfile.cmake index 9f54cfa2f158ee..ccfb82cafe2c18 100644 --- a/ports/ade/portfile.cmake +++ b/ports/ade/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/ade REF "v${VERSION}" - SHA512 5ee9a13b8bff062fc742d117dc0315bb5d6ff2c747ce5c7df0c233870506ec5f2afbd2852fc3d6bb28b86426013fd7fdf0a1e49164f7cd644e78443904dc8711 + SHA512 46f2feee28d732a6940a5a95944f3283bde1b8c8e05466a8ca1c576623c54d1bed875ce2b24a941111d8976cb0c6ba5a4ac8408f042f5765debf1badf7d43348 HEAD_REF master ) diff --git a/ports/ade/vcpkg.json b/ports/ade/vcpkg.json index 3bc942ef8a9d87..9e3a46646d214d 100644 --- a/ports/ade/vcpkg.json +++ b/ports/ade/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ade", - "version-string": "0.1.2c", + "version-string": "0.1.2d", "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.", "dependencies": [ { diff --git a/versions/a-/ade.json b/versions/a-/ade.json index 51cad80808290c..a7f75babfb6a02 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "005ca3815ef985e0e10d716652be95e7775cf8de", + "version-string": "0.1.2d", + "port-version": 0 + }, { "git-tree": "c42175dddb51914574ff7fdcb8f653ed342f8ff2", "version-string": "0.1.2c", diff --git a/versions/baseline.json b/versions/baseline.json index 58d4377f8a7a3c..24cae8dd2bba7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -41,7 +41,7 @@ "port-version": 0 }, "ade": { - "baseline": "0.1.2c", + "baseline": "0.1.2d", "port-version": 0 }, "adios2": { From b97d94a8a7bcd3c304100823a9d8d3be8dc31410 Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:51:05 -0600 Subject: [PATCH 0157/1039] [libheif] update to 1.17.1 (#34595) --- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 897bdd29cc10ae..dc081bf1c98bab 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 1b88197c23f19f1f877e19242a47f6e1e6dcfe60a92c0a58b64ca555cc39111c14fe592ef9d287ca383da2fc33fd5e41f21e0e0bc20b9cc668bd6b99b26aadc8 + SHA512 a4dbb0b1bcd6957841ce218f931a2d836e58d0b60323753020c684e97e4920f7802316f8979d1276904cd2e5809dc8e0dcf85ff9474d5f70e59380c290716fe7 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 84eb93f58dbfe0..f0287217dcb3ae 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libheif", - "version": "1.17.0", + "version": "1.17.1", "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 24cae8dd2bba7a..1edf7cd87cc0a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4277,7 +4277,7 @@ "port-version": 5 }, "libheif": { - "baseline": "1.17.0", + "baseline": "1.17.1", "port-version": 0 }, "libhsplasma": { diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 0553c8796885e5..8b30de1245346a 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32b640f029df01a4322b7d36d9405cf366c7811d", + "version": "1.17.1", + "port-version": 0 + }, { "git-tree": "bfddf765a3840434bd1306bc48193566642e9bef", "version": "1.17.0", From 1e0e745cd08588f86755c2123874dd21ce89792d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:52:37 +0800 Subject: [PATCH 0158/1039] [libnop] update to 2021-11-03 (#34593) * [libnop] update to 2021-11-03 * [libnop] update to 2021-11-03 --- ports/libnop/portfile.cmake | 4 ++-- ports/libnop/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libnop.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libnop/portfile.cmake b/ports/libnop/portfile.cmake index 5c10f5e60ffdce..e261042956883c 100644 --- a/ports/libnop/portfile.cmake +++ b/ports/libnop/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/libnop - REF 910b55815be16109f04f4180e9adee14fb4ce281 - SHA512 74c5324eaa1b6b2ac8dfef94c835b5c5b044625f8e5efe3522470b1ecc4798ff43d344a013cee2f6901e83267c6167072947b754e63f1552ae7044cffe234c36 + REF 35e800d81f28c632956c5a592e3cbe8085ecd430 + SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e ) file(INSTALL ${SOURCE_PATH}/include/nop DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libnop/vcpkg.json b/ports/libnop/vcpkg.json index be09bef23df997..f342378f123663 100644 --- a/ports/libnop/vcpkg.json +++ b/ports/libnop/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnop", - "version-date": "2021-03-01", + "version-date": "2021-11-03", "description": "libnop is a header-only library for serializing and deserializing C++ data types without external code generators or runtime support libraries", "homepage": "https://github.com/google/libnop" } diff --git a/versions/baseline.json b/versions/baseline.json index 1edf7cd87cc0a0..5b58cf0cd09acd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4485,7 +4485,7 @@ "port-version": 3 }, "libnop": { - "baseline": "2021-03-01", + "baseline": "2021-11-03", "port-version": 0 }, "libodb": { diff --git a/versions/l-/libnop.json b/versions/l-/libnop.json index 2b8d1a131a7517..1e049f0fa7ef4e 100644 --- a/versions/l-/libnop.json +++ b/versions/l-/libnop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3612fe75503c2bf24d2e6069f7cd8dfff289d90", + "version-date": "2021-11-03", + "port-version": 0 + }, { "git-tree": "97da98d4a3cd4e60972f53211892baa5b2f066df", "version-date": "2021-03-01", From 6836a75c4aadc4c55ac38e84dece1002ed08734b Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:53:30 +0800 Subject: [PATCH 0159/1039] [libmspack] update to 0.11 (#34592) * [libmspack] update to 0.11 * [libmspack] update to 0.11 --- ports/libmspack/portfile.cmake | 4 ++-- ports/libmspack/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libmspack.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake index ad80eadc35b9e9..07d318fd800c92 100644 --- a/ports/libmspack/portfile.cmake +++ b/ports/libmspack/portfile.cmake @@ -1,11 +1,11 @@ set(LIB_NAME libmspack) -set(LIB_VERSION 0.10.1alpha) +set(LIB_VERSION 0.11alpha) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) vcpkg_download_distfile(ARCHIVE URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 + SHA512 40c487e5b4e2f63a6cada26d29db51f605e8c29525a1cb088566d02cf2b1cc9dba263f80e2101d7f8e9d69cf7684a15bcaf791fb4891ad013a56afc7256dfa62 ) vcpkg_extract_source_archive( diff --git a/ports/libmspack/vcpkg.json b/ports/libmspack/vcpkg.json index 6b57cfd6f8c4ca..468378b5b425f0 100644 --- a/ports/libmspack/vcpkg.json +++ b/ports/libmspack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmspack", - "version": "0.10.1", - "port-version": 6, + "version": "0.11", "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", "homepage": "https://www.cabextract.org.uk/libmspack", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5b58cf0cd09acd..43abfde737f1ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4457,8 +4457,8 @@ "port-version": 3 }, "libmspack": { - "baseline": "0.10.1", - "port-version": 6 + "baseline": "0.11", + "port-version": 0 }, "libmt32emu": { "baseline": "2.7.0", diff --git a/versions/l-/libmspack.json b/versions/l-/libmspack.json index 6f03352bd14bc0..f0d460cb1cd7fe 100644 --- a/versions/l-/libmspack.json +++ b/versions/l-/libmspack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "198f4c8a1eac2254110eaed939dc99744c78a58f", + "version": "0.11", + "port-version": 0 + }, { "git-tree": "b26826abcd6d912b526809624f838431cb470b3d", "version": "0.10.1", From d07d3f7da27d90c7d93956c94f295992ee3ce85a Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:55:00 +0800 Subject: [PATCH 0160/1039] [libpcap] update to 1.10.4 (#34622) * [libpcap] update to 1.10.4 * [libpcap] update to 1.10.4 * [libpcap] update * [libpcap] update --- ports/libpcap/add-disable-packet-option.patch | 16 +++++++--------- ports/libpcap/install-pc-on-msvc.patch | 14 +++++++------- ports/libpcap/portfile.cmake | 4 ++-- ports/libpcap/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libpcap.json | 5 +++++ 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ports/libpcap/add-disable-packet-option.patch b/ports/libpcap/add-disable-packet-option.patch index 9d89a550596e13..8cec80674ec8f5 100644 --- a/ports/libpcap/add-disable-packet-option.patch +++ b/ports/libpcap/add-disable-packet-option.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f675d1..e9d6d96 100644 +index 650be01..7565e58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire +@@ -521,6 +521,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire option(DISABLE_SNF "Disable Myricom SNF support" OFF) option(DISABLE_TC "Disable Riverbed TurboCap support" OFF) @@ -10,22 +10,20 @@ index 2f675d1..e9d6d96 100644 # # Debugging options. -@@ -302,7 +303,7 @@ if(WIN32) +@@ -579,7 +580,7 @@ if(WIN32) if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) include_directories(${CMAKE_HOME_DIRECTORY}/../../Common) endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) - + if(NOT DISABLE_PACKET) find_package(Packet) - if(PACKET_FOUND) + if(Packet_FOUND) set(HAVE_PACKET32 TRUE) -@@ -317,7 +318,8 @@ if(WIN32) +@@ -594,6 +595,7 @@ if(WIN32) check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) cmake_pop_check_state() - endif(PACKET_FOUND) -- + endif(Packet_FOUND) + endif() -+ + message(STATUS "checking for Npcap's version.h") check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H) - if(HAVE_VERSION_H) diff --git a/ports/libpcap/install-pc-on-msvc.patch b/ports/libpcap/install-pc-on-msvc.patch index 0f07f6d435ecdf..2cc9513ac7d241 100644 --- a/ports/libpcap/install-pc-on-msvc.patch +++ b/ports/libpcap/install-pc-on-msvc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b83fbbd..2f675d1 100644 +index 58c5159..650be01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) +@@ -3238,9 +3238,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) @@ -18,20 +18,20 @@ index b83fbbd..2f675d1 100644 set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") set(includedir "\${prefix}/include") -@@ -2715,10 +2718,14 @@ if(NOT MSVC) - foreach(LIB ${PCAP_LINK_LIBRARIES}) - set(LIBS "${LIBS} -l${LIB}") - endforeach(LIB) +@@ -3308,10 +3311,14 @@ if(NOT MSVC) + set(RPATH "") + endif() + endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) -+ +# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and +# pcap-config and process man pages and arrange that they be installed. +if(NOT MSVC) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) ++ # # Man pages. diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake index 4d1823bcb5f091..0971d9cb0859a0 100644 --- a/ports/libpcap/portfile.cmake +++ b/ports/libpcap/portfile.cmake @@ -14,8 +14,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO the-tcpdump-group/libpcap - REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1 - SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f + REF "libpcap-${VERSION}" + SHA512 7352ff4d5bded916c0802e4a846fcb6b26e3ea8025dbbf58543abd9d9f6e8f7f5d60e03bcadb222d20434b7e052f663a560d7487af4b81fba74cf5aea040d733 HEAD_REF master PATCHES install-pc-on-msvc.patch diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json index eaff7e2ced396e..d6d90f679beb3c 100644 --- a/ports/libpcap/vcpkg.json +++ b/ports/libpcap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpcap", - "version-semver": "1.10.1", - "port-version": 3, + "version-semver": "1.10.4", "description": "A portable C/C++ library for network traffic capture", "homepage": "https://www.tcpdump.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 43abfde737f1ac..37cedb74d67779 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4553,8 +4553,8 @@ "port-version": 4 }, "libpcap": { - "baseline": "1.10.1", - "port-version": 3 + "baseline": "1.10.4", + "port-version": 0 }, "libpff": { "baseline": "2021-11-14", diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json index 48295baaf347a4..9c0712eb3f8841 100644 --- a/versions/l-/libpcap.json +++ b/versions/l-/libpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3af367bec0a2e0049f723ffb3654d262e775ac45", + "version-semver": "1.10.4", + "port-version": 0 + }, { "git-tree": "6cf3667c0320e2ff5d92d45e91b07fb3bf2fe05e", "version-semver": "1.10.1", From cf1fe96a876a86090bc5ffc8e58d03a5ff6f12de Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:56:26 +0800 Subject: [PATCH 0161/1039] [graphviz] Fix installation prompts under Linux (#34619) * Fix installation prompts under Linux * update version --- ports/graphviz/portfile.cmake | 2 +- ports/graphviz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/graphviz.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 966004560681a4..d9962c243dcd7e 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_from_gitlab( if(VCPKG_TARGET_IS_OSX) message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with brew install libtool") elseif(VCPKG_TARGET_IS_LINUX) - message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be installed with apt-get install libtool") + message("${PORT} currently requires the following libraries from the system package manager:\n libtool\n\nThey can be install with `apt-get install libtool` on Ubuntu systems or `dnf install libtool-ltdl-devel` on Fedora systems") endif() vcpkg_list(SET OPTIONS) diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index ad63d6c76850df..292d248e75bd03 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphviz", "version-semver": "9.0.0", - "port-version": 1, + "port-version": 2, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "license": "EPL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 37cedb74d67779..6a793c9f705e62 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3062,7 +3062,7 @@ }, "graphviz": { "baseline": "9.0.0", - "port-version": 1 + "port-version": 2 }, "greatest": { "baseline": "1.5.0", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index 2c5bf547f06abb..c896650db79fc6 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83813d9389be10cbd741a2e6dbd32924972e6b82", + "version-semver": "9.0.0", + "port-version": 2 + }, { "git-tree": "ba712eb597e2f6b4cd9113689ccb72cb95025d6f", "version-semver": "9.0.0", From 987d23223dee1ee53d502e4989bbd7101a8bbaaf Mon Sep 17 00:00:00 2001 From: a3emdot <124900167+a3emdot@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:57:10 +0200 Subject: [PATCH 0162/1039] [harfbuzz] build hb-view (#34606) * build the diagnostic tool hb-view for the optional harfbuzz feature cairo * regenerate versions --- ports/harfbuzz/portfile.cmake | 3 +++ ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 2e2555f20fc2bb..09d9777cf882e5 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -100,6 +100,9 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/harfbuzzConfig.cmake.in" vcpkg_list(SET TOOL_NAMES) if("glib" IN_LIST FEATURES) vcpkg_list(APPEND TOOL_NAMES hb-subset hb-shape hb-ot-shape-closure hb-info) + if("cairo" IN_LIST FEATURES) + vcpkg_list(APPEND TOOL_NAMES hb-view) + endif() endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index fbb1c524480fe8..022969c466c700 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "8.2.1", - "port-version": 2, + "port-version": 3, "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 6a793c9f705e62..32770f17a0692d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3206,7 +3206,7 @@ }, "harfbuzz": { "baseline": "8.2.1", - "port-version": 2 + "port-version": 3 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 534a83377304d8..1cf75441ac7ca1 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5baafcf92a1de9e3b94fba26f36f4287dad722fb", + "version": "8.2.1", + "port-version": 3 + }, { "git-tree": "d6359755bd398188b67a216f7627e9f297f47889", "version": "8.2.1", From 6abb43bde504456cbaad91785172f80852947b90 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 21 Oct 2023 01:00:10 +0800 Subject: [PATCH 0163/1039] [fastrtps] Fix the macro definition in thread (#33994) * fix thread * update version * add upstream PR URL * update version * fix macro * update version * delete comment * update version * fix stl * update version * Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * Add type conversion * update version * update version * fix msvc test * update version * fix patch * update version * fix patch * update version --------- Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) --- ports/fastrtps/fix_thread.patch | 40 +++++++++++++++++++++++++++++++++ ports/fastrtps/portfile.cmake | 1 + versions/f-/fastrtps.json | 2 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 ports/fastrtps/fix_thread.patch diff --git a/ports/fastrtps/fix_thread.patch b/ports/fastrtps/fix_thread.patch new file mode 100644 index 00000000000000..075a940cfd4276 --- /dev/null +++ b/ports/fastrtps/fix_thread.patch @@ -0,0 +1,40 @@ +diff --git a/include/fastrtps/utils/TimedMutex.hpp b/include/fastrtps/utils/TimedMutex.hpp +index 8d5d968..7ba3e00 100644 +--- a/include/fastrtps/utils/TimedMutex.hpp ++++ b/include/fastrtps/utils/TimedMutex.hpp +@@ -23,10 +23,14 @@ + #include + + #if defined(_WIN32) ++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++#include ++#else + #include + extern int clock_gettime( + int, + struct timespec* tv); ++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 + #elif _GTHREAD_USE_MUTEX_TIMEDLOCK + #include + #else +@@ -37,6 +41,11 @@ namespace eprosima { + namespace fastrtps { + + #if defined(_WIN32) ++ ++#if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++using TimedMutex = std::timed_mutex; ++using RecursiveTimedMutex = std::recursive_timed_mutex; ++#else + class TimedMutex + { + public: +@@ -182,6 +191,8 @@ private: + + _Mtx_t mutex_; + }; ++#endif // if defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 193632528 ++ + #elif _GTHREAD_USE_MUTEX_TIMEDLOCK || !defined(__unix__) + using TimedMutex = std::timed_mutex; + using RecursiveTimedMutex = std::recursive_timed_mutex; diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 719e47f87c1823..cbceacd732f82c 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-find-package-asio.patch disable-symlink.patch fix-xtime.patch + fix_thread.patch #https://github.com/eProsima/Fast-DDS/pull/3904 ) vcpkg_cmake_configure( diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index eb9a83aba1d1f2..f00de7d937484a 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "17e66e986b0296a09cf61691351f381bea310538", + "git-tree": "75ba9fed16853532cfc26487e85e4309289b8dd2", "version": "2.7.0", "port-version": 3 }, From 830f86fb309ad7167468a433a890b7415fbb90a5 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 21 Oct 2023 01:01:42 +0800 Subject: [PATCH 0164/1039] [qtbase] apply cve fix (#34588) * Fix bugs * update version --- ports/qtbase/CVE-2023-43114-6.5.patch | 119 ++++++++++++++++++++++++++ ports/qtbase/portfile.cmake | 1 + ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 ++ 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 ports/qtbase/CVE-2023-43114-6.5.patch diff --git a/ports/qtbase/CVE-2023-43114-6.5.patch b/ports/qtbase/CVE-2023-43114-6.5.patch new file mode 100644 index 00000000000000..12b1c5005ccfb4 --- /dev/null +++ b/ports/qtbase/CVE-2023-43114-6.5.patch @@ -0,0 +1,119 @@ +diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp +index 44cc7fe63e..e44d85a3cb 100644 +--- a/src/gui/text/windows/qwindowsfontdatabase.cpp ++++ b/src/gui/text/windows/qwindowsfontdatabase.cpp +@@ -873,36 +873,70 @@ QT_WARNING_POP + return fontEngine; + } + +-static QList getTrueTypeFontOffsets(const uchar *fontData) ++static QList getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel) + { + QList offsets; +- const quint32 headerTag = *reinterpret_cast(fontData); ++ if (fileEndSentinel - fontData < 12) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ return offsets; ++ } ++ ++ const quint32 headerTag = qFromUnaligned(fontData); + if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) { + if (headerTag != MAKE_TAG(0, 1, 0, 0) + && headerTag != MAKE_TAG('O', 'T', 'T', 'O') + && headerTag != MAKE_TAG('t', 'r', 'u', 'e') +- && headerTag != MAKE_TAG('t', 'y', 'p', '1')) ++ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) { + return offsets; ++ } + offsets << 0; + return offsets; + } ++ ++ const quint32 maximumNumFonts = 0xffff; + const quint32 numFonts = qFromBigEndian(fontData + 8); +- for (uint i = 0; i < numFonts; ++i) { +- offsets << qFromBigEndian(fontData + 12 + i * 4); ++ if (numFonts > maximumNumFonts) { ++ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting."; ++ return offsets; ++ } ++ ++ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) { ++ for (quint32 i = 0; i < numFonts; ++i) ++ offsets << qFromBigEndian(fontData + 12 + i * 4); ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ + return offsets; + } + +-static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length) ++static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length) + { +- const quint16 numTables = qFromBigEndian(data + 4); +- for (uint i = 0; i < numTables; ++i) { +- const quint32 offset = 12 + 16 * i; +- if (*reinterpret_cast(data + offset) == tag) { +- *table = fileBegin + qFromBigEndian(data + offset + 8); +- *length = qFromBigEndian(data + offset + 12); +- return; ++ if (fileEndSentinel - data >= 6) { ++ const quint16 numTables = qFromBigEndian(data + 4); ++ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) { ++ for (quint32 i = 0; i < numTables; ++i) { ++ const quint32 offset = 12 + 16 * i; ++ if (qFromUnaligned(data + offset) == tag) { ++ const quint32 tableOffset = qFromBigEndian(data + offset + 8); ++ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ *table = fileBegin + tableOffset; ++ *length = qFromBigEndian(data + offset + 12); ++ if (quintptr(fileEndSentinel - *table) < *length) { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; ++ break; ++ } ++ return; ++ } ++ } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } ++ } else { ++ qCWarning(lcQpaFonts) << "Corrupted font data detected"; + } + *table = 0; + *length = 0; +@@ -915,8 +949,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + QList *values) + { + const uchar *data = reinterpret_cast(fontData.constData()); ++ const uchar *dataEndSentinel = data + fontData.size(); + +- QList offsets = getTrueTypeFontOffsets(data); ++ QList offsets = getTrueTypeFontOffsets(data, dataEndSentinel); + if (offsets.isEmpty()) + return; + +@@ -924,7 +959,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + const uchar *font = data + offsets.at(i); + const uchar *table; + quint32 length; +- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); + if (!table) + continue; + QFontNames names = qt_getCanonicalFontNames(table, length); +@@ -934,7 +969,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, + families->append(std::move(names)); + + if (values || signatures) +- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); ++ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); + + if (values) { + QFontValues fontValues; +-- +2.27.0.windows.1 diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index ccd4731ce3789a..9a96976ce01f88 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -19,6 +19,7 @@ set(${PORT}_PATCHES GLIB2-static.patch # alternative is to force pkg-config clang-cl_source_location.patch clang-cl_QGADGET_fix.diff + CVE-2023-43114-6.5.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 164f900871341c..64ec5f1d892011 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.5.3", + "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 32770f17a0692d..8ab54490f669fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6978,7 +6978,7 @@ }, "qtbase": { "baseline": "6.5.3", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.5.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index e51759879a7c53..342be9a090205b 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "348dbf9cdcda0559adb72c98c249e06f8a2e50e8", + "version": "6.5.3", + "port-version": 1 + }, { "git-tree": "8ff10ec91d1eda17f49dd867924e6e034a0abd5c", "version": "6.5.3", From 196e676f1497f798cc158e905261ad040fb98fdf Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Mon, 23 Oct 2023 11:08:18 -0700 Subject: [PATCH 0165/1039] passing remove from fail list (#34639) --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 70a6ba8d77f5dc..80672aedc5b881 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -641,9 +641,6 @@ libtar:arm64-android=fail libtcod:arm-neon-android=fail libtcod:arm64-android=fail libtcod:x64-android=fail -libtins:arm-neon-android=fail -libtins:arm64-android=fail -libtins:x64-android=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm64-uwp=fail libtorch:x64-osx=fail From fd94d3207fe5a7afbf5bd270dbe853508bdcbb7a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 24 Oct 2023 02:09:15 +0800 Subject: [PATCH 0166/1039] update to 1.3.8 (#34666) --- ports/open62541/portfile.cmake | 4 ++-- ports/open62541/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/open62541.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 46ec144ee80307..b2736584efad53 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF "v${VERSION}" - SHA512 bb45d288a097b461d2a7106153c7f4b4c38c73cf767fe15c6c9c2213a6e3fcaf9b436fb70c1e7c6dcbc8ef45f232a5bd2f140285fab486358cb5a3a17da96d6e + SHA512 48ae61fd096c3a45f57ecc70bec9bb4223d046eed017532937c99883e4e92f79d7425b4db02c1a7e451764b787313efd76b2ae3cd3011d575154199d5350a790 HEAD_REF master ) @@ -47,4 +47,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 10c7a39416a627..11911dac780765 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,7 +1,6 @@ { "name": "open62541", - "version": "1.3.5", - "port-version": 1, + "version": "1.3.8", "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8ab54490f669fb..53407e14bdb5c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6085,8 +6085,8 @@ "port-version": 0 }, "open62541": { - "baseline": "1.3.5", - "port-version": 1 + "baseline": "1.3.8", + "port-version": 0 }, "openal-soft": { "baseline": "1.23.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 1234dded03d514..4d45b6aea4b4ad 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50cf77d055c6249b2568880f61fb72b8f916d62", + "version": "1.3.8", + "port-version": 0 + }, { "git-tree": "3f1e010d847419f3f68439f1ad1d76df9b118f26", "version": "1.3.5", From 36fd7bdcef0e1d9fc9ad01732d65ecef3e569719 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:12:26 +0200 Subject: [PATCH 0167/1039] [OpenMPI] update (#34652) --- ports/openmpi/portfile.cmake | 4 ++-- ports/openmpi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openmpi.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 08a20a20fad4a9..bb30fd9ed2c705 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(OpenMPI_FULL_VERSION "4.1.3") +set(OpenMPI_FULL_VERSION "4.1.6") set(OpenMPI_SHORT_VERSION "4.1") vcpkg_download_distfile(ARCHIVE URLS "https://download.open-mpi.org/release/open-mpi/v${OpenMPI_SHORT_VERSION}/openmpi-${OpenMPI_FULL_VERSION}.tar.gz" FILENAME "openmpi-${OpenMPI_FULL_VERSION}.tar.gz" - SHA512 f7b177121863ef79df6106639d18a89c028442b1314340638273b12025c4dc2cf9b5316cb7e6ecca8b65a51ee40a306a6b0970d7cce727fbb269a14f89af3161 + SHA512 6fb38cafa75021f12a9674a05056d25cc9bb5e6dd88f26fee73a89736fb741bbfb37efee31e07edb372f21583144ccc2c03cd7861e9055e87699a22740173e0b ) vcpkg_extract_source_archive( diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 94e54a572a4ae4..a14612dea010c5 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openmpi", - "version": "4.1.3", - "port-version": 2, + "version": "4.1.6", "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index 53407e14bdb5c8..6dead50123cba4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6189,8 +6189,8 @@ "port-version": 1 }, "openmpi": { - "baseline": "4.1.3", - "port-version": 2 + "baseline": "4.1.6", + "port-version": 0 }, "openmvg": { "baseline": "2.0", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index 3dacc89cbb5cbd..147953942d6827 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a35bc145d32795f1a71cbe596de040805c3af780", + "version": "4.1.6", + "port-version": 0 + }, { "git-tree": "0958d31a6843d3961c39fb6d459543d9be852bad", "version": "4.1.3", From f51c848972587b638d430941cdb5b878bd22d7e2 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 23 Oct 2023 22:12:51 +0400 Subject: [PATCH 0168/1039] [xbyak] updated to v6.73 (#34650) * [xbyak] updated to v6.73 * updated version database --- ports/xbyak/portfile.cmake | 4 ++-- ports/xbyak/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xbyak.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index 1fb5618dfbd1b9..916e9fa400a984 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF v6.69 - SHA512 c202e5c3688c4dc8cd26d4371c511ffc0fd0885c4d31a6a5fa955c39ae6fcc98f5f0ac2b88c087e10b71b24a91c0e7f082683cd6be67c29a19170723d966a585 + REF "v${VERSION}" + SHA512 1af11bea9e75b9b2842197e52d21283fc5ea7ea3ae1034a3e4584e6ca7b364a60589675a0b171d4ff205029730948b91d353f13d11d52c07f1befedc106971b2 HEAD_REF master ) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 2e919bb187b03e..5065390016e0d8 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xbyak", - "version": "6.69", + "version": "6.73", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6dead50123cba4..5ddec66b96286f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9013,7 +9013,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "6.69", + "baseline": "6.73", "port-version": 0 }, "xcb": { diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 7b6431e94dc757..b73385de3d65ac 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c72f02ee8e100020f33b6f409cbabeca9fe8b0aa", + "version": "6.73", + "port-version": 0 + }, { "git-tree": "9774b99e4f632c777b1f0d1cec57f4918acc591a", "version": "6.69", From 9b767f1a444aeabb08853224a761fe4b5888524d Mon Sep 17 00:00:00 2001 From: Jonathan Sweemer Date: Tue, 24 Oct 2023 03:13:10 +0900 Subject: [PATCH 0169/1039] [quantlib] update to v1.32 (#34644) --- ports/quantlib/portfile.cmake | 2 +- ports/quantlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quantlib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index ad00681202f4e1..25a8810cba51da 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib REF "v${VERSION}" - SHA512 37147f7180b09ab2cfc49400255ffab470e5f3b07cf8eade0f9fe2b20a6bbc3c5c75deeb3b6beca698f62abb2114075fb4e70e43ef936028b9e30f6338dac785 + SHA512 a7854d6ff5810708c7289ba2aab7cb72040ec0ddc116fc8d39e983277ce4edc2bcf59ac63c4d71135cec7d85f43c6a4ca17353a9c060153564d002f98c54d1c9 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index ff3c41b235bc98..6a46e0eb4102ea 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.31.1", + "version": "1.32", "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 5ddec66b96286f..534498f06ea65c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7153,7 +7153,7 @@ "port-version": 0 }, "quantlib": { - "baseline": "1.31.1", + "baseline": "1.32", "port-version": 0 }, "quaternions": { diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 7fe1fdb0b0e881..3708d91dde6b81 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c1dde04a75974f93af79e0ee812e43f1260ab4b", + "version": "1.32", + "port-version": 0 + }, { "git-tree": "eb8bae6053207228b42d957b8a2e0d187f4173e7", "version": "1.31.1", From 987fe3881d8d0c895978493f785f7b14c8409799 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:14:14 -0700 Subject: [PATCH 0170/1039] [ktx] update to 4.3.0-alpha3 (#34628) * [ktx] update to 4.3.0-alpha3 * update version * update patch * update version --- ports/ktx/0001-Use-vcpkg-zstd.patch | 31 +++++++++++++++-------------- ports/ktx/0004-quirks.patch | 14 ++++++------- ports/ktx/portfile.cmake | 14 +++++++++---- ports/ktx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/ktx.json | 5 +++++ 6 files changed, 40 insertions(+), 28 deletions(-) diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch index a44c02b70993f8..f74fe7e245b192 100644 --- a/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc679fd1..c726fa71 100644 +index 0653da5..1265f3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -185,7 +185,6 @@ set(KTX_MAIN_SRC +@@ -265,7 +265,6 @@ set(KTX_MAIN_SRC lib/basisu/transcoder/basisu_transcoder.cpp lib/basisu/transcoder/basisu_transcoder.h lib/basisu/transcoder/basisu.h @@ -10,7 +10,7 @@ index bc679fd1..c726fa71 100644 lib/checkheader.c lib/dfdutils/createdfd.c lib/dfdutils/colourspaces.c -@@ -304,7 +303,6 @@ macro(commom_lib_settings lib write) +@@ -448,7 +447,6 @@ macro(common_libktx_settings target enable_write library_type) $ $ @@ -18,19 +18,20 @@ index bc679fd1..c726fa71 100644 $ $ -@@ -390,6 +388,10 @@ macro(commom_lib_settings lib write) - target_compile_definitions(${lib} PUBLIC KTX_FEATURE_KTX2) +@@ -538,6 +536,11 @@ macro(common_libktx_settings target enable_write library_type) + target_compile_definitions(${target} PUBLIC KTX_FEATURE_KTX2) endif() + # Use vcpkg zstd + find_package(zstd CONFIG REQUIRED) -+ target_link_libraries(${lib} PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ target_link_libraries(${target} PRIVATE ${ZSTD_LIBRARIES}) + if(WIN32) - # By wrapping in generator expression we force multi configuration - # generators (like Visual Studio) to take the exact path and not + if(MINGW) + # Check if the Threads package is provided; if using Mingw it MIGHT be diff --git a/cmake/KtxConfig.cmake b/cmake/KtxConfig.cmake -index 6386ba2f..537bf4f2 100644 +index 6386ba2..537bf4f 100644 --- a/cmake/KtxConfig.cmake +++ b/cmake/KtxConfig.cmake @@ -1,7 +1,8 @@ @@ -45,7 +46,7 @@ index 6386ba2f..537bf4f2 100644 include("${CMAKE_CURRENT_LIST_DIR}/KtxTargets.cmake") diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt -index 492233ae..8786d16c 100644 +index 492233a..2663169 100644 --- a/lib/basisu/CMakeLists.txt +++ b/lib/basisu/CMakeLists.txt @@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} @@ -53,7 +54,7 @@ index 492233ae..8786d16c 100644 if (ZSTD) - set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") endif() if (APPLE) @@ -69,7 +70,7 @@ index 492233ae..8786d16c 100644 # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. if (OPENCL_FOUND) diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt -index 588d91b4..0b380129 100644 +index 588d91b..edd7457 100644 --- a/lib/basisu/webgl/encoder/CMakeLists.txt +++ b/lib/basisu/webgl/encoder/CMakeLists.txt @@ -34,9 +34,7 @@ if (EMSCRIPTEN) @@ -79,7 +80,7 @@ index 588d91b4..0b380129 100644 - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstd.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) @@ -95,7 +96,7 @@ index 588d91b4..0b380129 100644 OUTPUT_NAME "basis_encoder" SUFFIX ".js" diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt -index 372653de..f75e3a35 100644 +index 372653d..3c9ed0c 100644 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt @@ -28,9 +28,7 @@ if (EMSCRIPTEN) @@ -105,7 +106,7 @@ index 372653de..f75e3a35 100644 - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstddeclib.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) diff --git a/ports/ktx/0004-quirks.patch b/ports/ktx/0004-quirks.patch index 14783cb665dfc6..f0692f5c72879a 100644 --- a/ports/ktx/0004-quirks.patch +++ b/ports/ktx/0004-quirks.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 068c6bb..84fa624 100644 +index 9775c89..a4dfc2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -215,7 +215,7 @@ if(MSVC) - # With /W4 VS2015 (V19.0) issues many warnings that VS2017 & 2019 don't - # so only increase warning level for recent versions. - add_compile_options($<$:/W4>) +@@ -235,7 +235,7 @@ include(cmake/mkvk.cmake) + # Global compile & link options including optimization flags + if(MSVC) + add_compile_options( /W4;/WX ) - add_compile_options( $,/Gz,/O2> ) + add_compile_options( $,,/O2> ) elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - add_compile_options(-Wall -Wextra) -@@ -801,6 +801,7 @@ if(EMSCRIPTEN) + add_compile_options(-Wall -Wextra -Werror) +@@ -851,6 +851,7 @@ if(EMSCRIPTEN) endif() add_library( objUtil STATIC diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index c6c0e25ea1cbdb..854fb4cfd2a935 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software REF "v${VERSION}" - SHA512 bb8f728009ba7e15eecd2d9eb7985883a6a85f4ea8fccfa7f25a5567240980d1eb8bcde67d90e56e5c93de910d1bc93704bc5cbd390a8cb660051a698d7fd573 + SHA512 9ef0100a402321b00faa822eb2a50fd0d1e17fa703edacdbacf9231484d911cc254aed1fa517988537dc5b7059921a793edaeb92e8b2965d25672cd9a2589a0f HEAD_REF master PATCHES 0001-Use-vcpkg-zstd.patch @@ -31,7 +31,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools KTX_FEATURE_TOOLS - vulkan KTX_FEATURE_VULKAN + vulkan KTX_FEATURE_VK_UPLOAD ) vcpkg_cmake_configure( @@ -49,11 +49,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_copy_pdbs() if(tools IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES + ktx toktx ktxsc ktxinfo @@ -61,12 +61,18 @@ if(tools IN_LIST FEATURES) ktx2check AUTO_CLEAN ) +else() + vcpkg_copy_pdbs() endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") file(COPY ${LICENSE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index b2005357fe6141..36bfc6b05cc575 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ktx", - "version-semver": "4.1.0", + "version-semver": "4.3.0-alpha3", "description": [ "The Khronos KTX library and tools.", "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ESâ„¢ï¸ and Vulkan® textures from them." diff --git a/versions/baseline.json b/versions/baseline.json index 534498f06ea65c..81571145ec6edf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3861,7 +3861,7 @@ "port-version": 0 }, "ktx": { - "baseline": "4.1.0", + "baseline": "4.3.0-alpha3", "port-version": 0 }, "kubazip": { diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index fa5bc1fe9f29c3..7883f0191f9f10 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47559725520a0015829f65dfda7f3b28a7a7d78f", + "version-semver": "4.3.0-alpha3", + "port-version": 0 + }, { "git-tree": "74b3fa8f53d6a1d173c09c2f87f865125717d894", "version-semver": "4.1.0", From 22453caae7ee072237191ecbddda2f416a1efb21 Mon Sep 17 00:00:00 2001 From: eao197 Date: Mon, 23 Oct 2023 21:14:57 +0300 Subject: [PATCH 0171/1039] [sobjectizer, so5extra] update to 5.8.1 and 1.6.1 (#34529) * SObjectizer and so5extra updated to the latest version. SObjectizer -> 5.8.1. so5extra -> 1.6.1. * x-add-version for SObjectizer and so5extra. --------- Co-authored-by: Monica --- ports/so5extra/portfile.cmake | 2 +- ports/so5extra/vcpkg.json | 2 +- ports/sobjectizer/portfile.cmake | 2 +- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/s-/so5extra.json | 5 +++++ versions/s-/sobjectizer.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index 6b2c926e1bde36..fd3af730992c6a 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/so5extra REF "v.${VERSION}" - SHA512 7dc632158e244ed82ec4220c022c8172cbb29fbf2176ed0899a17d655bcf047080dbaf8b35e6db666e071141bb59db140d2363eeb0e63b163988a507053c3075 + SHA512 ec9de55671ecd0d49fce3e677e11776306ec9ea993b06d67eaa3e5505ea171085c35aedea3cf29e03958b2c73f438c5ccd95539c75b63fd89c50d6367ccda1fe ) vcpkg_cmake_configure( diff --git a/ports/so5extra/vcpkg.json b/ports/so5extra/vcpkg.json index 731de0942d23bc..5b0b7683bd3244 100644 --- a/ports/so5extra/vcpkg.json +++ b/ports/so5extra/vcpkg.json @@ -1,6 +1,6 @@ { "name": "so5extra", - "version": "1.6.0", + "version": "1.6.1", "description": "A set of additional tools for SObjectizer framework.", "homepage": "https://github.com/Stiffstream/so5extra", "license": "BSD-3-Clause", diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index efce03e97bcc1a..6b3226a07ed6e7 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer REF "v.${VERSION}" - SHA512 b1131c25477f397e58d79ea5489b8ed42a7ca8f2ff7592f8ff2972bb7c905f1b23ec9596573b60d7c5beaa169d0dd8882210b4c39daa8213ea06134bde44ebde + SHA512 9484ef5fd07deb6c82dba868f089fbdfbae34b33380cd25cdb40ba57468b429e8746e76a4fd1808f33f3609f143150d17966642816b27a78e7a1153520b28f0e ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 57bed40d54b9dd..887c93759897bf 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.8.0.1", + "version": "5.8.1", "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 81571145ec6edf..5842a7d5584c8f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7841,11 +7841,11 @@ "port-version": 2 }, "so5extra": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "sobjectizer": { - "baseline": "5.8.0.1", + "baseline": "5.8.1", "port-version": 0 }, "soci": { diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json index a31ba6c15eb8eb..fcd6582258c95b 100644 --- a/versions/s-/so5extra.json +++ b/versions/s-/so5extra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec341c7fb5c8d09b831db9d31ce7ce70b9eb5252", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "c9d60e292e5e8e325a94f96069299824e59b1a90", "version": "1.6.0", diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index bf599d329b14f9..e960bc9edbc08b 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "318301f060f4853b2ed29d087e7d7730fe55d156", + "version": "5.8.1", + "port-version": 0 + }, { "git-tree": "d0e513c72a3e180c47d0f1d9f68256aa5eb3ea2b", "version": "5.8.0.1", From a0b6a284ad7dc1adafdbbd5a08cd873a7a4aeaa6 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Mon, 23 Oct 2023 20:18:23 +0200 Subject: [PATCH 0172/1039] [baresip-libre] update to 3.4.0 (#34225) * [baresip-libre] update to 3.4.0 * bump version * rename patch * bump version * rename patch * bump version * rename patch * bump version --- ...p.patch => fix-static-library-build.patch} | 35 ++++++++++--------- ports/baresip-libre/portfile.cmake | 4 +-- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 28 insertions(+), 20 deletions(-) rename ports/baresip-libre/{wip.patch => fix-static-library-build.patch} (79%) diff --git a/ports/baresip-libre/wip.patch b/ports/baresip-libre/fix-static-library-build.patch similarity index 79% rename from ports/baresip-libre/wip.patch rename to ports/baresip-libre/fix-static-library-build.patch index 260a640cf9f479..9a5ec2088491df 100644 --- a/ports/baresip-libre/wip.patch +++ b/ports/baresip-libre/fix-static-library-build.patch @@ -1,6 +1,6 @@ -diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt ---- re-3.3.0-orig/CMakeLists.txt 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/CMakeLists.txt 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.txt +--- re-3.4.0-orig/CMakeLists.txt 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/CMakeLists.txt 2023-10-04 08:48:23.000000000 +0200 @@ -93,7 +93,7 @@ endif() @@ -9,14 +9,17 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt +include("${CMAKE_CURRENT_LIST_DIR}/cmake/re-config.cmake") list(APPEND RE_DEFINITIONS - -DVERSION="${PROJECT_VERSION_FULL}" -@@ -696,11 +696,14 @@ + -DRE_VERSION="${PROJECT_VERSION_FULL}" +@@ -694,7 +694,7 @@ if(LIBRE_BUILD_STATIC) list(APPEND RE_INSTALL_TARGETS re) add_library(re STATIC $) - target_link_libraries(re PUBLIC ${LINKLIBS}) + target_link_libraries(re PRIVATE ${LINKLIBS}) - add_library(libre::re ALIAS re) + target_include_directories(re PUBLIC + $ + ) +@@ -702,6 +702,9 @@ if(MSVC) set_target_properties(re PROPERTIES OUTPUT_NAME "re-static") @@ -26,7 +29,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt endif() endif() -@@ -713,6 +716,28 @@ +@@ -714,6 +717,28 @@ add_subdirectory(packaging) endif() @@ -55,7 +58,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt configure_file(packaging/libre.pc.in libre.pc @ONLY) -@@ -724,6 +749,9 @@ +@@ -725,6 +750,9 @@ install(TARGETS ${RE_INSTALL_TARGETS} EXPORT libre @@ -65,7 +68,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -@@ -742,7 +770,9 @@ +@@ -743,7 +771,9 @@ install(EXPORT libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre @@ -75,7 +78,7 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt ) if(LIBRE_BUILD_SHARED) -@@ -754,12 +784,8 @@ +@@ -755,12 +785,8 @@ ) endif() @@ -90,9 +93,9 @@ diff -Naur re-3.3.0-orig/CMakeLists.txt re-3.3.0/CMakeLists.txt DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre COMPONENT Development ) -diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cmake ---- re-3.3.0-orig/cmake/libre-config.cmake 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/cmake/libre-config.cmake 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cmake/libre-config.cmake +--- re-3.4.0-orig/cmake/libre-config.cmake 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/cmake/libre-config.cmake 2023-10-03 10:01:11.000000000 +0200 @@ -1 +1,23 @@ -include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") +if("@LIBRE_BUILD_STATIC@") @@ -118,9 +121,9 @@ diff -Naur re-3.3.0-orig/cmake/libre-config.cmake re-3.3.0/cmake/libre-config.cm + set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) + endif() +endif() -diff -Naur re-3.3.0-orig/packaging/libre.pc.in re-3.3.0/packaging/libre.pc.in ---- re-3.3.0-orig/packaging/libre.pc.in 2023-07-05 08:55:20.000000000 +0200 -+++ re-3.3.0/packaging/libre.pc.in 2023-10-02 13:08:47.000000000 +0200 +diff -Naur --exclude='*.rej' re-3.4.0-orig/packaging/libre.pc.in re-3.4.0/packaging/libre.pc.in +--- re-3.4.0-orig/packaging/libre.pc.in 2023-08-09 09:53:10.000000000 +0200 ++++ re-3.4.0/packaging/libre.pc.in 2023-10-03 10:01:11.000000000 +0200 @@ -7,6 +7,7 @@ Description: @CMAKE_PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index a3f84372067133..dd7e59ba327336 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 9813f66e73df80e00f1947c8c2af0f9dc6afe8d197a453b622458f80d522edd5b420bfc783161d311b36936947764a7a1733038c121210ab65f8621a3502d372 + SHA512 97ea35e4d4f36a9b3e47bb942497d495247e01106bcceef98fba4ab8e36061acaca88d12568990f9c8014b1061941ea5e2c6e8c0287e6dcd83a60a70400b083d HEAD_REF main PATCHES - wip.patch + fix-static-library-build.patch use-c11.patch ) diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index deca1cb2fd4488..2b18d71d635312 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.3.0", + "version": "3.4.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 2d45ef1b5d30c4..95c7390813a85a 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db0ceb9ad55c2c774fac30663522efc247a1ce04", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "ece07432ef22395a14fe6cbdf5026d4b0f49872a", "version": "3.3.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5842a7d5584c8f..a68f7d55fe4b7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,7 +517,7 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "basisu": { From 374023bdbbc6368673ca84fe88ce40a6efa5002f Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:20:00 -0700 Subject: [PATCH 0173/1039] [vcpkg baseline][libpcap] Fix flex command --header-file (#34670) * fix libpcap * update version * DISABLE_PARALLEL_CONFIGURE * update git-tree --------- Co-authored-by: Monica --- ports/libpcap/portfile.cmake | 3 ++- ports/libpcap/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libpcap.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake index 0971d9cb0859a0..d412bab8cdf086 100644 --- a/ports/libpcap/portfile.cmake +++ b/ports/libpcap/portfile.cmake @@ -33,6 +33,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DDISABLE_NETMAP=ON -DDISABLE_BLUETOOTH=ON @@ -48,7 +49,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json index d6d90f679beb3c..bf007b5144294a 100644 --- a/ports/libpcap/vcpkg.json +++ b/ports/libpcap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpcap", "version-semver": "1.10.4", + "port-version": 1, "description": "A portable C/C++ library for network traffic capture", "homepage": "https://www.tcpdump.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a68f7d55fe4b7e..2a79f1a69bf2e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4554,7 +4554,7 @@ }, "libpcap": { "baseline": "1.10.4", - "port-version": 0 + "port-version": 1 }, "libpff": { "baseline": "2021-11-14", diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json index 9c0712eb3f8841..480eef1d4f6387 100644 --- a/versions/l-/libpcap.json +++ b/versions/l-/libpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bfda50e586151e14fb6704ed154e8747bc64ea9", + "version-semver": "1.10.4", + "port-version": 1 + }, { "git-tree": "3af367bec0a2e0049f723ffb3654d262e775ac45", "version-semver": "1.10.4", From 2d0bfe54b87600e0702f9a7ce20c034f00fc880e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 23 Oct 2023 20:26:58 +0200 Subject: [PATCH 0174/1039] [civetweb] Dynamic linkage, debug pc file (#34654) --- ports/civetweb/pkgconfig.patch | 49 ++++++++++++++++++++++++++++++++++ ports/civetweb/portfile.cmake | 23 ++++++++-------- ports/civetweb/usage | 4 +++ ports/civetweb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/civetweb.json | 5 ++++ 6 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 ports/civetweb/pkgconfig.patch create mode 100644 ports/civetweb/usage diff --git a/ports/civetweb/pkgconfig.patch b/ports/civetweb/pkgconfig.patch new file mode 100644 index 00000000000000..4c23cbff5ed92f --- /dev/null +++ b/ports/civetweb/pkgconfig.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5368c0..c297861 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -614,6 +614,10 @@ configure_package_config_file( + PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CIVETWEB_ENABLE_CXX + ) + ++set(PROJECT_VERSION "${VERSION}") ++if(CIVETWEB_ENABLE_SSL) ++ set(REQUIRES_OPENSSL openssl) ++endif() + configure_file( + cmake/${PROJECT_NAME}.pc.in + ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc +@@ -629,13 +633,13 @@ configure_file( + install( + FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) + + install( + FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-cpp.pc" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + ) + + write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake +diff --git a/cmake/civetweb-cpp.pc.in b/cmake/civetweb-cpp.pc.in +index ca1232c..495da46 100644 +--- a/cmake/civetweb-cpp.pc.in ++++ b/cmake/civetweb-cpp.pc.in +@@ -10,3 +10,4 @@ Requires: + Libs: -L${libdir} -l@PROJECT_NAME@-cpp + Cflags: -I${includedir} + ++Requires.private: civetweb +diff --git a/cmake/civetweb.pc.in b/cmake/civetweb.pc.in +index 27cea8f..0826f61 100644 +--- a/cmake/civetweb.pc.in ++++ b/cmake/civetweb.pc.in +@@ -11,3 +11,4 @@ Libs: -L${libdir} -l@PROJECT_NAME@ + Cflags: -I${includedir} + + ++Requires.private: @REQUIRES_OPENSSL@ diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 8387cac907ec16..35cc9d163592b4 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb @@ -9,7 +7,9 @@ vcpkg_from_github( PATCHES disable_warnings.patch # cl will simply ignore the other invalid options. fix-fseeko.patch + pkgconfig.patch ) +file(REMOVE_RECURSE "${SOURCE_PATH}/src/third_party") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -31,22 +31,23 @@ vcpkg_cmake_configure( -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_WEBSOCKETS=ON -DCIVETWEB_ALLOW_WARNINGS=ON + "-DVERSION=${VERSION}" ${FEATURE_OPTIONS} ) vcpkg_cmake_install() - +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb) +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/civetweb.h" "defined(CIVETWEB_DLL_IMPORTS)" 1) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/CivetServer.h" "defined(CIVETWEB_CXX_DLL_IMPORTS)" 1) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb.pc") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/civetweb-cpp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/civetweb-cpp.pc") -vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/civetweb/usage b/ports/civetweb/usage new file mode 100644 index 00000000000000..287a2ff668b201 --- /dev/null +++ b/ports/civetweb/usage @@ -0,0 +1,4 @@ +civetweb provides CMake targets: + + find_package(civetweb CONFIG REQUIRED) + target_link_libraries(main PRIVATE civetweb::civetweb) diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index ab5c083e912a1e..9c097815586cf3 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "civetweb", "version": "1.16", + "port-version": 1, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 2a79f1a69bf2e8..5fe6a006d8a90c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1582,7 +1582,7 @@ }, "civetweb": { "baseline": "1.16", - "port-version": 0 + "port-version": 1 }, "cjson": { "baseline": "1.7.16", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 323c526f176300..3faace72dd04d0 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23fa18e460290d6b0629ca6487f69b56845cfbda", + "version": "1.16", + "port-version": 1 + }, { "git-tree": "46ba5309a5759827c0d729344e8f17cc5f3132b9", "version": "1.16", From 0d8e0f293029940b5dd2fe10f6a4b18607d91c09 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 23 Oct 2023 22:28:01 +0400 Subject: [PATCH 0175/1039] [tbb] explicitly disable hwloc feature for UWP (#34648) * tbb: disable hwloc feature for UWP * updated version database --- ports/tbb/vcpkg.json | 8 ++++---- versions/baseline.json | 2 +- versions/t-/tbb.json | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index f90944c83ae44a..a2a9cdb7bc1219 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -2,11 +2,11 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", "version": "2021.10.0", - "port-version": 2, + "port-version": 3, "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", - "supports": "(windows & !uwp) | linux | osx | ios | android", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -20,13 +20,13 @@ "default-features": [ { "name": "hwloc", - "platform": "!static & !osx" + "platform": "!static & !osx & !uwp" } ], "features": { "hwloc": { "description": "Builds TBB with TBBBind support for Hybrid CPUs or NUMA architectures.", - "supports": "!static & !osx", + "supports": "!static & !osx & !uwp", "dependencies": [ "hwloc" ] diff --git a/versions/baseline.json b/versions/baseline.json index 5fe6a006d8a90c..01c810d8901450 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8182,7 +8182,7 @@ }, "tbb": { "baseline": "2021.10.0", - "port-version": 2 + "port-version": 3 }, "tcb-span": { "baseline": "2022-06-15", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 920d8ad518626d..b3f2497a118304 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4cde1e2a3654b8540b76ac295675a37bdbca311", + "version": "2021.10.0", + "port-version": 3 + }, { "git-tree": "376c59cda9f516006ce87b0f5da05be5a67fed7d", "version": "2021.10.0", From af4749fc9dddb81306abc40773a073798d8ca6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wegner?= Date: Mon, 23 Oct 2023 20:28:34 +0200 Subject: [PATCH 0176/1039] [dav1d] Add UWP support. (#34647) It builds fine for me. --- ports/dav1d/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/d-/dav1d.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json index 98dfb4d85e4a1b..727efd556fc723 100644 --- a/ports/dav1d/vcpkg.json +++ b/ports/dav1d/vcpkg.json @@ -1,10 +1,11 @@ { "name": "dav1d", "version": "1.3.0", + "port-version": 1, "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.", "homepage": "https://code.videolan.org/videolan/dav1d", "license": "BSD-2-Clause", - "supports": "!(uwp | (windows & x86 & !static))", + "supports": "!(windows & x86 & !static)", "dependencies": [ { "name": "vcpkg-tool-meson", diff --git a/versions/baseline.json b/versions/baseline.json index 01c810d8901450..7610dd90fbaa0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2074,7 +2074,7 @@ }, "dav1d": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "daw-header-libraries": { "baseline": "2.96.1", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 756ed0c027e0e5..6d077fdfe0463c 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68bf154a3ecc55fd1ad71ff6773ed3f0c418fbba", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "99fc7f3cc963cb7a3e567d13f313e5f0dbf46c72", "version": "1.3.0", From bcc8b849b3739b7655d8cf95c3d00c4e6298c15b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 23 Oct 2023 20:29:14 +0200 Subject: [PATCH 0177/1039] [libconfig] Cleanup, fix libconfig++ cmake export (#34646) * [libconfig] No vendored CMakeLists.txt * [libconfig] Cleanup * [libconfig] Fix libconfig++ cmake export --- ports/libconfig/CMakeLists.txt | 53 ------------------ ports/libconfig/libconfig++-cmake-export.diff | 22 ++++++++ ports/libconfig/portfile.cmake | 56 ++++++------------- ports/libconfig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libconfig.json | 5 ++ 6 files changed, 45 insertions(+), 95 deletions(-) delete mode 100644 ports/libconfig/CMakeLists.txt create mode 100644 ports/libconfig/libconfig++-cmake-export.diff diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt deleted file mode 100644 index ab6711ad9c8a74..00000000000000 --- a/ports/libconfig/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -cmake_minimum_required(VERSION 3.5.1) -project(libconfig C CXX) - -if(MSVC) - add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST) -endif() - -set(C_SOURCES - lib/grammar.c - lib/libconfig.c - lib/scanctx.c - lib/scanner.c - lib/strbuf.c - lib/strvec.c - lib/util.c - lib/wincompat.c -) - -set(CPP_SOURCES - lib/libconfigcpp.cc -) - -set(CMAKE_C_STANDARD 99) - -include_directories(lib ${STDINT_H}) - -add_library(libconfig ${C_SOURCES}) -add_library(libconfig++ ${CPP_SOURCES}) - -if(BUILD_SHARED_LIBS) - target_compile_definitions(libconfig PRIVATE -DLIBCONFIG_EXPORTS) - target_compile_definitions(libconfig++ PRIVATE -DLIBCONFIGXX_EXPORTS) -else() - target_compile_definitions(libconfig PUBLIC -DLIBCONFIG_STATIC) - target_compile_definitions(libconfig++ PUBLIC -DLIBCONFIGXX_STATIC) -endif() - -if (WIN32) - # Linux doesn't have shlwapi - target_link_libraries(libconfig shlwapi) -endif() -target_link_libraries(libconfig++ PRIVATE libconfig) - -install( - TARGETS libconfig libconfig++ - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES lib/libconfig.h++ lib/libconfig.h DESTINATION include) -endif() diff --git a/ports/libconfig/libconfig++-cmake-export.diff b/ports/libconfig/libconfig++-cmake-export.diff new file mode 100644 index 00000000000000..d7ef5911abca57 --- /dev/null +++ b/ports/libconfig/libconfig++-cmake-export.diff @@ -0,0 +1,22 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 3a64deb..233c89f 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -112,7 +112,7 @@ install(TARGETS ${libname} + ) + + install(TARGETS ${libname}++ +- EXPORT libconfig++Targets ++ EXPORT libconfigTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -121,7 +121,7 @@ install(TARGETS ${libname}++ + + + include(CMakePackageConfigHelpers) +-foreach(target_name libconfig libconfig++) ++foreach(target_name libconfig) + write_basic_package_version_file("${target_name}ConfigVersion.cmake" + VERSION ${PACKAGE_VERSION} + COMPATIBILITY SameMajorVersion diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index a5471ba9034ebd..d4022d721edd8a 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -1,52 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hyperrealm/libconfig - REF v1.7.3 + REF "v${VERSION}" SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4 HEAD_REF master + PATCHES + libconfig++-cmake-export.diff ) -if (NOT VCPKG_USE_HEAD_VERSION) - message("If you would like to use cmake with the port, use `--head` option with vcpkg install.") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -endif() - -if (NOT VCPKG_USE_HEAD_VERSION) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON - ) -else() - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=OFF - ) -endif() - +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) vcpkg_cmake_install() - vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) -if (VCPKG_USE_HEAD_VERSION) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libconfig) -endif() - -foreach(FILE "${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "${CURRENT_PACKAGES_DIR}/include/libconfig.h") - file(READ ${FILE} _contents) - string(REPLACE "defined(LIBCONFIGXX_EXPORTS)" "0" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_EXPORTS)" "0" _contents "${_contents}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - string(REPLACE "defined(LIBCONFIGXX_STATIC)" "0" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_STATIC)" "0" _contents "${_contents}") - else() - string(REPLACE "defined(LIBCONFIGXX_STATIC)" "1" _contents "${_contents}") - string(REPLACE "defined(LIBCONFIG_STATIC)" "1" _contents "${_contents}") - endif() - file(WRITE ${FILE} "${_contents}") -endforeach() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h" "defined(LIBCONFIG_STATIC)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libconfig.h++" "defined(LIBCONFIGXX_STATIC)" "1") +endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 46e5a2b8161bdc..794e91f4642103 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfig", "version": "1.7.3", - "port-version": 3, + "port-version": 4, "description": "C/C++ library for processing configuration files", "homepage": "https://github.com/hyperrealm/libconfig", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7610dd90fbaa0c..be39ab665b2bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4042,7 +4042,7 @@ }, "libconfig": { "baseline": "1.7.3", - "port-version": 3 + "port-version": 4 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 7f98184b0bd1a3..38ee00e4698c22 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "378d40ce036cf220dfaedf27f625a28d6e72d3e9", + "version": "1.7.3", + "port-version": 4 + }, { "git-tree": "9056cd67b1885ed4721a931467fb7fd1eb5b4bf3", "version": "1.7.3", From f31f2c7ac9005e14940ee872f01b33eaac835e38 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 24 Oct 2023 02:35:25 +0800 Subject: [PATCH 0178/1039] [matio] Add usage (#34505) * add usage * update version * fix usage * update version * fix review * udpate version * fix variables * update version --- ports/matio/portfile.cmake | 12 ++++++++++++ ports/matio/usage | 5 +++++ ports/matio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/matio.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/matio/usage diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 924b302cabb4b1..9d9bd70db7de5c 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -27,10 +27,22 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix [[${prefix}]]) +set(libdir [[${prefix}/lib]]) +set(includedir [[${prefix}/include]]) +configure_file("${SOURCE_PATH}/matio.pc.in" "${SOURCE_PATH}/matio.pc" @ONLY) +file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT VCPKG_BUILD_TYPE) + set(includedir [[${prefix}/../include]]) + file(INSTALL "${SOURCE_PATH}/matio.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() vcpkg_copy_tools(TOOL_NAMES matdump AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CURRENT_PORT_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/matio/usage b/ports/matio/usage new file mode 100644 index 00000000000000..4a697912dfe247 --- /dev/null +++ b/ports/matio/usage @@ -0,0 +1,5 @@ +matio can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig REQUIRED) + pkg_check_modules(matio REQUIRED IMPORTED_TARGET matio) + target_link_libraries(main PRIVATE PkgConfig::matio) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index b5ff9bbc078740..5e6aa4d8ce3abb 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "matio", "version": "1.5.23", - "port-version": 2, + "port-version": 3, "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index be39ab665b2bc4..5c4b9c1139fe9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5354,7 +5354,7 @@ }, "matio": { "baseline": "1.5.23", - "port-version": 2 + "port-version": 3 }, "matplotlib-cpp": { "baseline": "2020-08-27", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index bfd65ec39e899b..f0f3fc82ed8103 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42d087530e333855d74225712aab7755d2eb6be2", + "version": "1.5.23", + "port-version": 3 + }, { "git-tree": "28df0a44f618c5fd412fafda91507f3bad6ac4b1", "version": "1.5.23", From 3265c187c74914aa5569b75355badebfdbab7987 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:38:03 -0700 Subject: [PATCH 0179/1039] [itk] Fix download failure (#34533) * [itk] Fix download failure * update version * remove port-version * update version --------- Co-authored-by: vzhli17 --- ports/itk/portfile.cmake | 4 ++-- ports/itk/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/i-/itk.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index c1fda38e51581e..3604a1db86431c 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO InsightSoftwareConsortium/ITK - REF v5.3-rc02 - SHA512 fe703bc6ed681cb9983d7d6e21c8ffa7650337e470c09a7241de58a463c23e315516b1a81a18c14f682706056a0ec66932b63d2e24945bdcea03169bc1122bb2 + REF "v${VERSION}" + SHA512 48e38864d7cd20b4ff23cfca1a29b4cbf453ce842e037ca473ce5c7e9a5b1c0bf6b12e4c544c812bff2b4bb9feca409587175b6570929c9ac172cb4402d679da HEAD_REF master PATCHES double-conversion.patch diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 060fb32c850698..24ace7568eb606 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "itk", - "version": "5.3-rc02", - "port-version": 6, + "version-string": "5.3rc02", "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5c4b9c1139fe9d..4a68d6096fd065 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3529,8 +3529,8 @@ "port-version": 0 }, "itk": { - "baseline": "5.3-rc02", - "port-version": 6 + "baseline": "5.3rc02", + "port-version": 0 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index bf4d9c7fd153fc..924de2af6fd062 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b74bb68b58026e759112afb8155d44650cee24b4", + "version-string": "5.3rc02", + "port-version": 0 + }, { "git-tree": "9da4bc8949edd65bc3e0afa8e694480e330f5f40", "version": "5.3-rc02", From 2abeb44b60ee0110f6b40dc496acc60ba605c1f8 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 25 Oct 2023 00:01:05 +0800 Subject: [PATCH 0180/1039] [x86-simd-sort] update to 3.0 (#34685) --- ports/x86-simd-sort/portfile.cmake | 4 ++-- ports/x86-simd-sort/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/x86-simd-sort.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/x86-simd-sort/portfile.cmake b/ports/x86-simd-sort/portfile.cmake index 5d5b2f8720c4d0..287f17ee6909ae 100644 --- a/ports/x86-simd-sort/portfile.cmake +++ b/ports/x86-simd-sort/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/x86-simd-sort - REF 7d7591cf5927e83e4a1e7c4b6f2c4dc91a97889f - SHA512 6b71f25e0ec1adcd81a6ce3ecf60316a841c48d9b438ae2afde9b2a17a90d13047cb1d7bce7dcecf15718f4fb299adad7875b022b57f90965f5e7a25e16e6721 + REF "v${VERSION}" + SHA512 9713413b5d368cdcc066db6161a63ffe35e1d8986f417c88cb1eb91426c8b9aec4481c4dac003b8721c279575d79e7b1182c7ea78dcbdb96e41b04863a715284 HEAD_REF master ) diff --git a/ports/x86-simd-sort/vcpkg.json b/ports/x86-simd-sort/vcpkg.json index 7802f4f1d913a2..55b946107c17be 100644 --- a/ports/x86-simd-sort/vcpkg.json +++ b/ports/x86-simd-sort/vcpkg.json @@ -1,6 +1,6 @@ { "name": "x86-simd-sort", - "version-date": "2023-03-04", + "version": "3.0", "description": "C++ header file library for high-performance SIMD-based sorting algorithms for primitive datatypes", "homepage": "https://github.com/intel/x86-simd-sort", "license": "BSD-3-Clause" diff --git a/versions/baseline.json b/versions/baseline.json index 4a68d6096fd065..061425db8e49cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8997,7 +8997,7 @@ "port-version": 10 }, "x86-simd-sort": { - "baseline": "2023-03-04", + "baseline": "3.0", "port-version": 0 }, "xapian": { diff --git a/versions/x-/x86-simd-sort.json b/versions/x-/x86-simd-sort.json index 6cd7250da81e3e..d973c76d640bf9 100644 --- a/versions/x-/x86-simd-sort.json +++ b/versions/x-/x86-simd-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54331ace9e00eeff0f8508317ef48d011a8821bc", + "version": "3.0", + "port-version": 0 + }, { "git-tree": "dbe8f88ac8cc85689eb7666fa8beb6d819c4573a", "version-date": "2023-03-04", From 78af68fdcc3506eda7289fcc0d39888042ddd50d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 25 Oct 2023 00:02:01 +0800 Subject: [PATCH 0181/1039] [uwebsockets] update to 20.47.0 (#34683) * [uwebsockets] update to 20.47.0 * [uwebsockets] update to 20.47.0 --- ports/uwebsockets/portfile.cmake | 2 +- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 9047e9a172a585..7bef5e87dff583 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 38022fc555a89654828d872ef2b4ef3a6b01e8eccfe511cb8df37dff772c6c09b379933da73606970ac8581333b3be26ad7b0a8cdec8d19fe05b326fbf4f6c84 + SHA512 f6324663db534a0c70fbe94f77900ac0dedfd837abe091c7bf41c92865309dea01dc91703ac435a2e4d4f71342beb595fabba9477743c932cd1dfee8b2a7c3e2 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 221e3f031b99c1..2758a3b13d3bf1 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.45.0", + "version-semver": "20.47.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 061425db8e49cd..547184a6dc00d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8629,7 +8629,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "20.45.0", + "baseline": "20.47.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index cc2edea3095d71..706d11581258da 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "accbc9586fca80fd1345c5f2f3cf8449c76dcb24", + "version-semver": "20.47.0", + "port-version": 0 + }, { "git-tree": "db7e8088e0a542c51cea89ed081e8bcae6baec8c", "version-semver": "20.45.0", From a53ad97dd3c0e94e42a0bb2f927d94231a61f6fc Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 25 Oct 2023 00:02:36 +0800 Subject: [PATCH 0182/1039] [reactiveplusplus] update to 0.2.3 (#34674) * [reactiveplusplus] update to 0.2.3 * [reactiveplusplus] update to 0.2.3 --- ports/reactiveplusplus/portfile.cmake | 4 ++-- ports/reactiveplusplus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/reactiveplusplus.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/reactiveplusplus/portfile.cmake b/ports/reactiveplusplus/portfile.cmake index 35ea573118d7d2..41da550f306594 100644 --- a/ports/reactiveplusplus/portfile.cmake +++ b/ports/reactiveplusplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO victimsnino/ReactivePlusPlus - REF v0.2.2 - SHA512 86c374c7523c028528ce985f053901a1f0f37a18c2d16085a60fd5d0819ae052cc3d6bfe6065627044b51e65b24de93399be9ba6f0ca8ec92622358112f1c821 + REF "v${VERSION}" + SHA512 24bc81cf6b26ed994f0740140dedcca2fa794f28e1c59cb6ddb876286a65678dcc849ea7e3ce8d71eb12e1d210eaa2f3e913e0f4e6fc7414e3afaa82c3e0b06a HEAD_REF master ) diff --git a/ports/reactiveplusplus/vcpkg.json b/ports/reactiveplusplus/vcpkg.json index db2a44a9929f56..2fb816e44e435c 100644 --- a/ports/reactiveplusplus/vcpkg.json +++ b/ports/reactiveplusplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "reactiveplusplus", - "version": "0.2.2", + "version": "0.2.3", "description": "ReactivePlusPlus is reactive programming library for C++ language", "homepage": "https://github.com/victimsnino/ReactivePlusPlus", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 547184a6dc00d8..6001e0f2b27886 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7265,7 +7265,7 @@ "port-version": 0 }, "reactiveplusplus": { - "baseline": "0.2.2", + "baseline": "0.2.3", "port-version": 0 }, "readerwriterqueue": { diff --git a/versions/r-/reactiveplusplus.json b/versions/r-/reactiveplusplus.json index 02c43d205af4f3..7ded1acf3a2523 100644 --- a/versions/r-/reactiveplusplus.json +++ b/versions/r-/reactiveplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c5e055740d26b07149cc34e3dc41ef0674844b2", + "version": "0.2.3", + "port-version": 0 + }, { "git-tree": "352a13ae0dacf015a5c79bbfcaceea5d0a5877cf", "version": "0.2.2", From 0d0f90d23357c70dbf81cd4ff2d72d14aa116a31 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 25 Oct 2023 00:06:00 +0800 Subject: [PATCH 0183/1039] [pipewire] update to 0.3.83 (#34669) --- ports/pipewire/portfile.cmake | 7 +++---- ports/pipewire/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pipewire.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/pipewire/portfile.cmake b/ports/pipewire/portfile.cmake index b11368ec87e7f7..5da0152fe12f73 100644 --- a/ports/pipewire/portfile.cmake +++ b/ports/pipewire/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org/ OUT_SOURCE_PATH SOURCE_PATH REPO pipewire/pipewire REF ${VERSION} - SHA512 94d23a3660f76624abc18a1716519b4d18258a0a4c3047438df231f813df760f21f65b80c174f34b4de111da28b49ae3a46de961637e89828d67ecf614b17ba2 + SHA512 140d02242b1c76e4ced9bccaf306e7881103aa7081778b0e734a3eab12f3dae8c2824cca83d5e01c05817808c41da8280a4bf5a025448cff4ff9376219ae8050 HEAD_REF master # branch name ) @@ -12,7 +11,7 @@ vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dalsa=disabled - -Daudioconvert=disabled + -Daudioconvert=enabled -Daudiomixer=disabled -Daudiotestsrc=disabled -Davahi=disabled @@ -76,7 +75,7 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/pipewire/vcpkg.json b/ports/pipewire/vcpkg.json index 4bacb36e393432..42502c4a2ad9ce 100644 --- a/ports/pipewire/vcpkg.json +++ b/ports/pipewire/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pipewire", - "version": "0.3.62", + "version": "0.3.83", "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 6001e0f2b27886..39ac43ef3887a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6477,7 +6477,7 @@ "port-version": 2 }, "pipewire": { - "baseline": "0.3.62", + "baseline": "0.3.83", "port-version": 0 }, "pistache": { diff --git a/versions/p-/pipewire.json b/versions/p-/pipewire.json index 305b1592fff5bb..dbf6eb78a00355 100644 --- a/versions/p-/pipewire.json +++ b/versions/p-/pipewire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "482bffaec768a8c253cd14b8dec373db14a49338", + "version": "0.3.83", + "port-version": 0 + }, { "git-tree": "a013a40facd5bdfc94419f5ce591b2c776922462", "version": "0.3.62", From 398ede5dd802678eca0247636b684a436f27d636 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 24 Oct 2023 09:06:44 -0700 Subject: [PATCH 0184/1039] [glaze] update to 1.5.3 (#34624) * [glaze] update to 1.5.3 * update version * [glaze] update to 1.5.4 * update version --------- Co-authored-by: vzhli17 --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 0dd851dc8372ef..e63098bb3b21e7 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 f9730a9b572d50f4d7f50cb7d8584d3c1169ecf34e58017e96cc581de066e864fa5551f6a8d32aaf1a99ddbcebe3b3cbc2961b77a9b33dc83fb75f4558007531 + SHA512 c4f89aa0fd28a821f977a7b363985ba6a88b54a22d76beea27d2750d3d912a46092ed436b010f679237a83f6375d2fba7c4e54cbf4650f2ba1e7bdf7b1804c59 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 4cc1225c8df4c2..3be32bbcc849a9 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.5.1", + "version": "1.5.4", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 39ac43ef3887a9..e2d51a197946ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2929,7 +2929,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.5.1", + "baseline": "1.5.4", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 94149adb97d024..68abcd04c10b0d 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4b6e2335f681c7d5183776b595718244791df78", + "version": "1.5.4", + "port-version": 0 + }, { "git-tree": "bfeb3e970fc4dd67fcf667cc5e50d3833a07561b", "version": "1.5.1", From e6a164736f323557dab2489b5670b3eb54bfb13c Mon Sep 17 00:00:00 2001 From: evpobr Date: Tue, 24 Oct 2023 21:08:39 +0500 Subject: [PATCH 0185/1039] [libsndfile] Update to 1.2.2 (#34388) Co-authored-by: Kai Pastor --- .../001-avoid-installing-find-modules.patch | 16 ++++++++++++++++ ports/libsndfile/portfile.cmake | 6 ++++-- ports/libsndfile/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsndfile.json | 5 +++++ 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 ports/libsndfile/001-avoid-installing-find-modules.patch diff --git a/ports/libsndfile/001-avoid-installing-find-modules.patch b/ports/libsndfile/001-avoid-installing-find-modules.patch new file mode 100644 index 00000000000000..3ae1b21b01bbe6 --- /dev/null +++ b/ports/libsndfile/001-avoid-installing-find-modules.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b501f08..022864f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -855,11 +847,6 @@ if (ENABLE_PACKAGE_CONFIG) + ${CMAKE_CURRENT_BINARY_DIR}/SndFileConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_PACKAGEDIR} + ) +- +- if (NOT BUILD_SHARED_LIBS AND FIND_MODULES_INSTALL_LIST) +- file(COPY ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +- install(FILES ${FIND_MODULES_INSTALL_LIST} DESTINATION ${CMAKE_INSTALL_PACKAGEDIR}) +- endif () + else () + + install (TARGETS sndfile ${sdnfile_PROGRAMS} diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 730ca68190c95d..710932b4d2016f 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsndfile - REF 1.2.0 - SHA512 58d2567a4eb67f9af7a472ae02f62ce64bb6f54687bf670c84335a4d1c194d3e8d6933089ae9e2603137a035155447df4b0f59c054731d74d9814c1b757c833a + REF 1.2.2 + SHA512 fb8b4d367240a8ac9d55be6f053cb19419890691c56a8552d1600d666257992b6e8e41a413a444c9f2d6c5d71406013222c92a3bfa67228944a26475444240a1 HEAD_REF master + PATCHES + 001-avoid-installing-find-modules.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index 241781b700daa5..3633fc1ce0e407 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsndfile", - "version-semver": "1.2.0", - "port-version": 2, + "version-semver": "1.2.2", "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index e2d51a197946ac..e052ebbe1091d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4705,8 +4705,8 @@ "port-version": 0 }, "libsndfile": { - "baseline": "1.2.0", - "port-version": 2 + "baseline": "1.2.2", + "port-version": 0 }, "libsnoretoast": { "baseline": "0.8.0", diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index ca603248d7ecb0..416229efccade2 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c973dc3a659457ad4bd00a68da7903b674720f69", + "version-semver": "1.2.2", + "port-version": 0 + }, { "git-tree": "f78736afe548520c2bd5675eec91a9c15112a0fb", "version-semver": "1.2.0", From 4ff2d52566e93d7d169700c6a451cb266773c3b0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 24 Oct 2023 18:09:15 +0200 Subject: [PATCH 0186/1039] [check,libsbml] Update, port fixes (#34656) * [libsbml] Update, port fixes * [check] Follow VCPKG_LIBRARY_LINKAGE * [check] Don't install checkmk * [check] Burn-in dllimport * [libsbml] Devendor dirent * [libsbml] Burn-in library linkage * Finish * Fix typo * [libsbml] Shorten patch --- ports/check/linkage.patch | 20 +++++ ports/check/portfile.cmake | 24 ++--- ports/check/usage | 4 + ports/check/vcpkg.json | 2 +- ports/libsbml/dependencies.diff | 131 ++++++++++++++++++++++++++++ ports/libsbml/dirent.diff | 28 ++++++ ports/libsbml/fix-deps-libxml.patch | 38 -------- ports/libsbml/libsbml-config.cmake | 4 +- ports/libsbml/no-docs.diff | 12 +++ ports/libsbml/portfile.cmake | 86 +++++++----------- ports/libsbml/test-shared.diff | 14 +++ ports/libsbml/vcpkg.json | 8 +- versions/baseline.json | 6 +- versions/c-/check.json | 5 ++ versions/l-/libsbml.json | 5 ++ 15 files changed, 274 insertions(+), 113 deletions(-) create mode 100644 ports/check/linkage.patch create mode 100644 ports/check/usage create mode 100644 ports/libsbml/dependencies.diff create mode 100644 ports/libsbml/dirent.diff delete mode 100644 ports/libsbml/fix-deps-libxml.patch create mode 100644 ports/libsbml/no-docs.diff create mode 100644 ports/libsbml/test-shared.diff diff --git a/ports/check/linkage.patch b/ports/check/linkage.patch new file mode 100644 index 00000000000000..3c18c522f3c03c --- /dev/null +++ b/ports/check/linkage.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a02dbe..3e147e4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -188,7 +188,14 @@ target_include_directories(checkShared + ) + + if(NOT THIS_IS_SUBPROJECT) +- install(TARGETS check checkShared ++ if(BUILD_SHARED_LIBS) ++ set(lib checkShared) ++ set_target_properties(check PROPERTIES EXCLUDE_FROM_ALL 1) ++ else() ++ set(lib check) ++ set_target_properties(checkShared PROPERTIES EXCLUDE_FROM_ALL 1) ++ endif() ++ install(TARGETS ${lib} + EXPORT check-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake index 1d0920ddb07f37..3033360ad95ea7 100644 --- a/ports/check/portfile.cmake +++ b/ports/check/portfile.cmake @@ -4,33 +4,33 @@ vcpkg_from_github( REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2 SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e HEAD_REF master - PATCHES fix-lib-path.patch + PATCHES + fix-lib-path.patch + linkage.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCHECK_ENABLE_TESTS=OFF -DBUILD_TESTING=OFF -DCHECK_ENABLE_GCOV=OFF - -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DCHECK_ENABLE_TESTS=OFF -DCHECK_ENABLE_TIMEOUT_TESTS=OFF + -DENABLE_MEMORY_LEAKING_TESTS=OFF + -DINSTALL_CHECKMK=OFF ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) - vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/check) +vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/check.h" "#define CK_DLL_EXP" "#define CK_DLL_EXP __declspec(dllimport)") endif() -# cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.LESSER") diff --git a/ports/check/usage b/ports/check/usage new file mode 100644 index 00000000000000..a511e134c93d19 --- /dev/null +++ b/ports/check/usage @@ -0,0 +1,4 @@ +check provides CMake targets: + + find_package(check CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,Check::check,Check::checkShared>) diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index 94886bedac951d..dbc06c330762c6 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,7 +1,7 @@ { "name": "check", "version": "0.15.2", - "port-version": 4, + "port-version": 5, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check", "license": "LGPL-2.1-only", diff --git a/ports/libsbml/dependencies.diff b/ports/libsbml/dependencies.diff new file mode 100644 index 00000000000000..1f54a0400bfce5 --- /dev/null +++ b/ports/libsbml/dependencies.diff @@ -0,0 +1,131 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8af3a4..3926b68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -421,8 +421,9 @@ set(LIBSBML_XML_LIBRARY_LIBS) + if(WITH_EXPAT) + + if(NOT TARGET EXPAT::EXPAT) +- find_package(EXPAT REQUIRED) + endif() ++ find_package(EXPAT NAMES expat REQUIRED) ++ set(EXPAT_LIBRARY expat::expat) + + add_definitions( -DUSE_EXPAT ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_EXPAT) +@@ -443,7 +444,8 @@ endif(WITH_EXPAT) + set(USE_LIBXML OFF) + if(WITH_LIBXML) + +- find_package(LIBXML REQUIRED) ++ find_package(LIBXML NAMES LibXml2 REQUIRED) ++ set(LIBXML_LIBRARY LibXml2::LibXml2) + + add_definitions( -DUSE_LIBXML ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) +@@ -495,7 +497,7 @@ endif() + option(WITH_BZIP2 "Enable the use of bzip2 compression." ${BZIP_INITIAL_VALUE}) + set(USE_BZ2 OFF) + if(WITH_BZIP2) +- find_package(BZ2 REQUIRED) ++ find_package(BZip2 REQUIRED) + set(USE_BZ2 ON) + add_definitions( -DUSE_BZ2 ) + list(APPEND SWIG_EXTRA_ARGS -DUSE_BZ2) +@@ -521,6 +525,9 @@ Separate multiple directories using semicolons." ) + # Locate zlib + # + ++if(WITH_ZLIB) ++ find_package(ZLIB REQUIRED) ++endif() + set(ZLIB_INITIAL_VALUE) + if (NOT LIBZ_LIBRARY) + find_library(LIBZ_LIBRARY +@@ -614,7 +621,6 @@ valid. It should contain the file zlib.h, but it does not.") + endif(WITH_ZLIB) + + # install find scripts only for used dependencies +-install(FILES ${LIBSBML_FIND_MODULES} DESTINATION share/cmake/Modules) + + ############################################################################### + # +@@ -671,7 +677,12 @@ if(WITH_CHECK) + + enable_testing() + +- find_package(CHECK REQUIRED) ++ find_package(CHECK NAMES check REQUIRED) ++ if(BUILD_SHARED_LIBS) ++ add_library(CHECK::CHECK ALIAS Check::checkShared) ++ else() ++ add_library(CHECK::CHECK ALIAS Check::check) ++ endif() + + if (UNIX) + # setup valgrind +@@ -1005,17 +1016,18 @@ install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX}) + # + + set (PRIVATE_LIBS "-lstdc++ -lm") ++set (PRIVATE_REQUIRES "") + if (WITH_ZLIB) +-set (PRIVATE_LIBS "${LIBZ_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " zlib") + endif() + if (WITH_BZIP2) +-set (PRIVATE_LIBS "${LIBBZ_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " bzip2") + endif() + if (WITH_LIBXML) +-set (PRIVATE_LIBS "${LIBXML_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " libxml-2.0") + endif() + if (WITH_EXPAT) +-set (PRIVATE_LIBS "${LIBEXPAT_LIBRARY} ${PRIVATE_LIBS}") ++ string(APPEND PRIVATE_REQUIRES " expat") + endif() + if (WITH_XERCES) + set (PRIVATE_LIBS "${XERCES_LIBRARY} ${PRIVATE_LIBS}") +@@ -1037,9 +1049,7 @@ if (WITH_XERCES) + file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Conflicts: xerces-c = 2.6.0\n") + endif() + +-if (WITH_LIBXML) +-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: libxml-2.0 >= 2.6.22\n") +-endif() ++file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" "Requires.private: ${PRIVATE_REQUIRES}\n") + + if (UNIX OR MINGW) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libsbml.pc" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 79301a6..0957d29 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -311,7 +311,7 @@ if(WITH_BZIP2) + sbml/compress/bzfstream.h + sbml/compress/bzfstream.cpp + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} BZ2::BZ2) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} BZip2::BZip2) + + endif() + +@@ -405,7 +405,7 @@ if(WITH_EXPAT) + sbml/xml/ExpatHandler.h + sbml/xml/ExpatParser.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} EXPAT::EXPAT) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} expat::expat) + + endif(WITH_EXPAT) + +@@ -423,7 +423,7 @@ if(WITH_LIBXML) + sbml/xml/LibXMLParser.h + sbml/xml/LibXMLTranscode.h + ) +- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) ++ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) + + endif(WITH_LIBXML) + diff --git a/ports/libsbml/dirent.diff b/ports/libsbml/dirent.diff new file mode 100644 index 00000000000000..538bca3fdd482c --- /dev/null +++ b/ports/libsbml/dirent.diff @@ -0,0 +1,28 @@ +diff --git a/src/sbml/validator/test/tps/dirent.c b/src/sbml/validator/test/tps/dirent.c +index beafc5e..48a60ca 100644 +--- a/src/sbml/validator/test/tps/dirent.c ++++ b/src/sbml/validator/test/tps/dirent.c +@@ -1,3 +1,4 @@ ++#if 0 + /* ///////////////////////////////////////////////////////////////////////////// + * File: dirent.c + * +@@ -239,3 +240,4 @@ struct dirent *readdir(DIR *dir) + } + + /* ////////////////////////////////////////////////////////////////////////// */ ++#endif +diff --git a/src/sbml/validator/test/tps/dirent.h b/src/sbml/validator/test/tps/dirent.h +index 4703aa2..8e4c29c 100644 +--- a/src/sbml/validator/test/tps/dirent.h ++++ b/src/sbml/validator/test/tps/dirent.h +@@ -46,6 +46,9 @@ + + #ifndef SYNSOFT_UNIXEM_INCL_H_DIRENT + #define SYNSOFT_UNIXEM_INCL_H_DIRENT ++#include ++#endif ++#if 0 + + #ifndef _SYNSOFT_DOCUMENTATION_SKIP_SECTION + # define SYNSOFT_UNIXEM_VER_H_DIRENT_MAJOR 2 diff --git a/ports/libsbml/fix-deps-libxml.patch b/ports/libsbml/fix-deps-libxml.patch deleted file mode 100644 index 1b30586d26eb1c..00000000000000 --- a/ports/libsbml/fix-deps-libxml.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42b3bd6..34e9a4c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -442,17 +442,15 @@ endif(WITH_EXPAT) - set(USE_LIBXML OFF) - if(WITH_LIBXML) - -- find_package(LIBXML REQUIRED) -+ find_package(LibXml2 REQUIRED) - - add_definitions( -DUSE_LIBXML ) - list(APPEND SWIG_EXTRA_ARGS -DUSE_LIBXML) - set(USE_LIBXML ON) - -- set(LIBSBML_XML_LIBRARY "libxml2") -- set(LIBSBML_XML_LIBRARY_INCLUDE ${LIBXML_INCLUDE_DIR}) -- set(LIBSBML_XML_LIBRARY_LIBS ${LIBXML_LIBRARY}) -+ set(LIBSBML_XML_LIBRARY "LibXml2::LibXml2") -+ set(LIBSBML_XML_LIBRARY_LIBS ${LIBSBML_XML_LIBRARY}) - -- list(APPEND LIBSBML_FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/FindLIBXML.cmake") - - endif(WITH_LIBXML) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 79301a6..985f6cb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -423,7 +423,7 @@ if(WITH_LIBXML) - sbml/xml/LibXMLParser.h - sbml/xml/LibXMLTranscode.h - ) -- set(LIBSBML_LIBS ${LIBSBML_LIBS} LIBXML::LIBXML) -+ set(LIBSBML_LIBS ${LIBSBML_LIBS} LibXml2::LibXml2) - - endif(WITH_LIBXML) - diff --git a/ports/libsbml/libsbml-config.cmake b/ports/libsbml/libsbml-config.cmake index 76a1cf6372ce8a..c0cd40a1d34fea 100644 --- a/ports/libsbml/libsbml-config.cmake +++ b/ports/libsbml/libsbml-config.cmake @@ -1,6 +1,6 @@ include(CMakeFindDependencyMacro) -find_dependency(libsbml-static CONFIG) +find_dependency(@name@ CONFIG) if(NOT TARGET libsbml) add_library(libsbml INTERFACE IMPORTED) - target_link_libraries(libsbml INTERFACE libsbml-static) + target_link_libraries(libsbml INTERFACE $) endif() diff --git a/ports/libsbml/no-docs.diff b/ports/libsbml/no-docs.diff new file mode 100644 index 00000000000000..acac8f31ff2258 --- /dev/null +++ b/ports/libsbml/no-docs.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ad678a..f856774 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1012,7 +1012,6 @@ set(DOCUMENTATION_FILES + VERSION.txt + ) + +-install(FILES ${DOCUMENTATION_FILES} DESTINATION ${MISC_PREFIX}) + + ############################################################################### + # diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index 5400ae90f61f2d..cab0f5008da5fb 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -2,16 +2,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sbmlteam/libsbml REF "v${VERSION}" - SHA512 c40f164ebd05a36f140ce2684dedb4bbccc51a2732383d3935fca1258738a9b9ba5bc1be2061f3b113b213e5cbb7fe22e9dca43ff78d91964c79cad093e55466 + SHA512 2770c1d3295e22ed8fb8dfa2480efa160fc61fbeeca3a9e214e210acb3fd6531a5cfb22eeb72c5334158bf8ba21c27015d0910487a7ef060f594a708f197676c HEAD_REF development PATCHES - fix-deps-libxml.patch + dependencies.diff + dirent.diff + no-docs.diff + test-shared.diff ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DYNAMIC_LIBRARY) +if("expat" IN_LIST FEATURES AND "libxml2" IN_LIST FEATURES) + message("Feature expat conflicts with feature libxml2. Selecting libxml2.") + list(REMOVE_ITEM FEATURES "expat") +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES comp ENABLE_COMP @@ -22,76 +30,46 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qual ENABLE_QUAL render ENABLE_RENDER bzip2 WITH_BZIP2 + expat WITH_EXPAT + libxml2 WITH_LIBXML zlib WITH_ZLIB test WITH_CHECK namespace WITH_CPP_NAMESPACE ) -# Handle conflict features -set(WITH_EXPAT OFF) -if ("expat" IN_LIST FEATURES) - set(WITH_EXPAT ON) -endif() - -set(WITH_LIBXML OFF) -if ("libxml2" IN_LIST FEATURES) - set(WITH_LIBXML ON) -endif() - -if (WITH_EXPAT AND WITH_LIBXML) - message("Feature expat conflict with feature libxml2, currently using libxml2...") - set(WITH_EXPAT OFF) -endif() - -if ("test" IN_LIST FEATURES AND WIN32) - message(FATAL_ERROR "Feature test only support UNIX.") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} - -DWITH_EXPAT=${WITH_EXPAT} - -DWITH_LIBXML=${WITH_LIBXML} + OPTIONS + ${FEATURE_OPTIONS} -DENABLE_L3V2EXTENDEDMATH:BOOL=ON -DWITH_STATIC_RUNTIME=${STATIC_RUNTIME} -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} -DLIBSBML_SKIP_STATIC_LIBRARY=${DYNAMIC_LIBRARY} + MAYBE_UNUSED_VARIABLES + WITH_STATIC_RUNTIME ) vcpkg_cmake_install() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) -else() - vcpkg_cmake_config_fixup(PACKAGE_NAME libsbml-static CONFIG_PATH lib/cmake) - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libsbml-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -endif() - vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt") -if (TXT_FILES) - file(REMOVE ${TXT_FILES}) -endif() -file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt") -if (TXT_FILES) - file(REMOVE ${TXT_FILES}) -endif() - -if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md") +foreach(name IN ITEMS libsbml libsbml-static sbml sbml-static) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${name}-config.cmake") + vcpkg_cmake_config_fixup(PACKAGE_NAME "${name}" CONFIG_PATH lib/cmake) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake") + configure_file("${CURRENT_PORT_DIR}/libsbml-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) + endif() + break() + endif() +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/common/extern.h" "defined LIBSBML_STATIC" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sbml/xml/XMLExtern.h" "defined(LIBLAX_STATIC)" "1") endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") -endif() +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}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/test-shared.diff b/ports/libsbml/test-shared.diff new file mode 100644 index 00000000000000..71bc6808652096 --- /dev/null +++ b/ports/libsbml/test-shared.diff @@ -0,0 +1,14 @@ +diff --git a/src/sbml/test/CMakeLists.txt b/src/sbml/test/CMakeLists.txt +index 7a408d7..462d58a 100644 +--- a/src/sbml/test/CMakeLists.txt ++++ b/src/sbml/test/CMakeLists.txt +@@ -49,6 +49,9 @@ if (EXTRA_INCLUDE_DIRS) + include_directories(${EXTRA_INCLUDE_DIRS}) + endif(EXTRA_INCLUDE_DIRS) + ++if(NOT TARGET ${LIBSBML_LIBRARY}-static) ++ add_library(${LIBSBML_LIBRARY}-static ALIAS ${LIBSBML_LIBRARY}) ++endif() + + add_executable(test_sbml_sbml ${TEST_FILES}) + target_link_libraries(test_sbml_sbml ${LIBSBML_LIBRARY}-static CHECK::CHECK) diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index dcb514e6d74100..3b3c6f7a8d4cfc 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsbml", - "version": "5.20.0", - "port-version": 1, + "version": "5.20.2", "description": "A library for reading / writing SBML files", "homepage": "https://github.com/sbmlteam/libsbml", "license": "LGPL-2.1", @@ -69,6 +68,7 @@ "dependencies": [ { "name": "libsbml", + "default-features": false, "features": [ "layout" ] @@ -77,8 +77,10 @@ }, "test": { "description": "Unit testing of libSBMLs implementation", + "supports": "!windows | mingw | (windows & static)", "dependencies": [ - "check" + "check", + "dirent" ] }, "zlib": { diff --git a/versions/baseline.json b/versions/baseline.json index e052ebbe1091d9..d90d8e5cfdeed8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1542,7 +1542,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 4 + "port-version": 5 }, "chipmunk": { "baseline": "7.0.3", @@ -4665,8 +4665,8 @@ "port-version": 1 }, "libsbml": { - "baseline": "5.20.0", - "port-version": 1 + "baseline": "5.20.2", + "port-version": 0 }, "libsbsms": { "baseline": "2.3.0", diff --git a/versions/c-/check.json b/versions/c-/check.json index d66579d7462a60..2be960805e8084 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c993fcbc415d3c12c9161215529c1d36ba7e5f96", + "version": "0.15.2", + "port-version": 5 + }, { "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", "version": "0.15.2", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 66ddcb5815861e..e00d74be3f6402 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5610c6abee862e6ef538a8c62fde2c6ff62325e0", + "version": "5.20.2", + "port-version": 0 + }, { "git-tree": "9d718a41ed85525971eb0cc46dbb31e91673c576", "version": "5.20.0", From 1a243cf7bb85bb58d8f10d0a74c5652dd3681c1c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 24 Oct 2023 20:19:54 +0400 Subject: [PATCH 0187/1039] [openvino] support dynamic protobuf (#34651) * [openvino] support dynamic protobuf * updated version database --- ports/openvino/008-dynamic-protubuf.patch | 156 ++++ ports/openvino/009-tensorflow-proto-odr.patch | 746 ++++++++++++++++++ ports/openvino/portfile.cmake | 13 +- ports/openvino/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/o-/openvino.json | 5 + 6 files changed, 922 insertions(+), 3 deletions(-) create mode 100644 ports/openvino/008-dynamic-protubuf.patch create mode 100644 ports/openvino/009-tensorflow-proto-odr.patch diff --git a/ports/openvino/008-dynamic-protubuf.patch b/ports/openvino/008-dynamic-protubuf.patch new file mode 100644 index 00000000000000..60f5835a1eb700 --- /dev/null +++ b/ports/openvino/008-dynamic-protubuf.patch @@ -0,0 +1,156 @@ +diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp +index fa917dadb1..6194fca758 100644 +--- a/src/frontends/common/src/manager.cpp ++++ b/src/frontends/common/src/manager.cpp +@@ -20,11 +20,6 @@ class FrontEndManager::Impl { + std::mutex m_loading_mutex; + std::vector m_plugins; + +- /// \brief map of shared object per frontend +- static std::unordered_map> m_shared_objects_map; +- /// \brief Mutex to guard access the shared object map +- static std::mutex m_shared_objects_map_mutex; +- + public: + Impl() { + search_all_plugins(); +@@ -36,10 +31,6 @@ public: + auto fe_obj = std::make_shared(); + fe_obj->m_shared_object = std::make_shared(plugin.get_so_pointer()); + fe_obj->m_actual = plugin.get_creator().m_creator(); +- +- std::lock_guard guard(m_shared_objects_map_mutex); +- m_shared_objects_map.emplace(plugin.get_creator().m_name, fe_obj->m_shared_object); +- + return fe_obj; + } + +@@ -128,8 +119,8 @@ public: + } + + static void shutdown() { +- std::lock_guard guard(m_shared_objects_map_mutex); +- m_shared_objects_map.clear(); ++ std::lock_guard guard(get_shared_objects_mutex()); ++ get_shared_objects_map().clear(); + } + + private: +@@ -154,6 +145,7 @@ private: + {".xml", {"ir", "ir"}}, + {".onnx", {"onnx", "onnx"}}, + {".pb", {"tf", "tensorflow"}}, ++ {".pbtxt", {"tf", "tensorflow"}}, + {".tflite", {"tflite", "tensorflow_lite"}}, + {".pdmodel", {"paddle", "paddle"}}, + // {".ts", {"pytorch", "pytorch"}}, +@@ -224,9 +216,6 @@ private: + } + }; + +-std::unordered_map> FrontEndManager::Impl::m_shared_objects_map{}; +-std::mutex FrontEndManager::Impl::m_shared_objects_map_mutex{}; +- + FrontEndManager::FrontEndManager() : m_impl(new Impl()) {} + + FrontEndManager::FrontEndManager(FrontEndManager&&) noexcept = default; +diff --git a/src/frontends/common/src/plugin_loader.cpp b/src/frontends/common/src/plugin_loader.cpp +index a044152d8d..a98eff766b 100644 +--- a/src/frontends/common/src/plugin_loader.cpp ++++ b/src/frontends/common/src/plugin_loader.cpp +@@ -16,17 +16,32 @@ + + #include + +-#include + #include + #include + + #include "openvino/util/file_util.hpp" ++#include "openvino/util/log.hpp" + #include "openvino/util/shared_object.hpp" + #include "plugin_loader.hpp" + + using namespace ov; + using namespace ov::frontend; + ++// Note, static methods below are required to create an order of initialization of static variables ++// e.g. if users (not encouraged) created ov::Model globally, we need to ensure proper order of initialization ++ ++/// \return map of shared object per frontend ++std::unordered_map>& ov::frontend::get_shared_objects_map() { ++ static std::unordered_map> shared_objects_map; ++ return shared_objects_map; ++} ++ ++/// \return Mutex to guard access the shared object map ++std::mutex& ov::frontend::get_shared_objects_mutex() { ++ static std::mutex shared_objects_map_mutex; ++ return shared_objects_map_mutex; ++} ++ + #ifdef OPENVINO_STATIC_LIBRARY + + # include "ov_frontends.hpp" +@@ -131,6 +146,10 @@ bool PluginInfo::load() { + m_load_failed = true; + return false; + } ++ ++ std::lock_guard guard(get_shared_objects_mutex()); ++ get_shared_objects_map().emplace(get_creator().m_name, get_so_pointer()); ++ + return true; + } + +diff --git a/src/frontends/common/src/plugin_loader.hpp b/src/frontends/common/src/plugin_loader.hpp +index 93e6a5cc2e..dccf8ddf7a 100644 +--- a/src/frontends/common/src/plugin_loader.hpp ++++ b/src/frontends/common/src/plugin_loader.hpp +@@ -4,7 +4,12 @@ + + #pragma once + +-#include ++#include ++#include ++#include ++#include ++ ++#include "openvino/frontend/manager.hpp" + + #ifdef _WIN32 + static const char PathSeparator[] = ";"; +@@ -15,6 +20,9 @@ static const char PathSeparator[] = ":"; + namespace ov { + namespace frontend { + ++std::unordered_map>& get_shared_objects_map(); ++std::mutex& get_shared_objects_mutex(); ++ + /// \brief Internal data structure holding by each frontend. Includes library handle and extensions. + class FrontEndSharedData { + friend inline void add_extension_to_shared_data(std::shared_ptr& obj, +diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake +index 12b72d52a2..111eea7c28 100644 +--- a/thirdparty/dependencies.cmake ++++ b/thirdparty/dependencies.cmake +@@ -415,14 +415,14 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND + if(CMAKE_VERBOSE_MAKEFILE) + set(Protobuf_DEBUG ON) + endif() +- if(OV_VCPKG_BUILD) +- set(protobuf_config CONFIG) +- endif() + # try to find newer version first (major is changed) + # see https://protobuf.dev/support/version-support/ and + # https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa +- find_package(Protobuf 4.22.0 QUIET ${protobuf_config}) ++ find_package(Protobuf 4.22.0 QUIET CONFIG) + if(NOT Protobuf_FOUND) ++ if(OV_VCPKG_BUILD) ++ set(protobuf_config CONFIG) ++ endif() + # otherwise, fallback to existing default + find_package(Protobuf 3.20.3 REQUIRED ${protobuf_config}) + endif() diff --git a/ports/openvino/009-tensorflow-proto-odr.patch b/ports/openvino/009-tensorflow-proto-odr.patch new file mode 100644 index 00000000000000..5bd4ef8ec0c6b8 --- /dev/null +++ b/ports/openvino/009-tensorflow-proto-odr.patch @@ -0,0 +1,746 @@ +diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake +index df3586474b..ed603ca765 100644 +--- a/cmake/developer_package/frontends/frontends.cmake ++++ b/cmake/developer_package/frontends/frontends.cmake +@@ -125,19 +125,26 @@ macro(ov_add_frontend) + source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS}) + + # Generate protobuf file on build time for each '.proto' file in src/proto +- file(GLOB proto_files ${frontend_root_dir}/src/proto/*.proto) ++ set(protofiles_root_dir "${frontend_root_dir}/src/proto") ++ file(GLOB_RECURSE proto_files ${protofiles_root_dir}/*.proto) + +- foreach(INFILE IN LISTS proto_files) +- get_filename_component(FILE_DIR ${INFILE} DIRECTORY) +- get_filename_component(FILE_WE ${INFILE} NAME_WE) +- set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.cc) +- set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.h) +- set(GENERATED_PROTO ${INFILE}) ++ foreach(proto_file IN LISTS proto_files) ++ # filter out standard google proto files ++ if(proto_file MATCHES ".*google.*") ++ continue() ++ endif() ++ ++ file(RELATIVE_PATH proto_file_relative "${CMAKE_SOURCE_DIR}" "${proto_file}") ++ get_filename_component(FILE_WE ${proto_file} NAME_WE) ++ file(RELATIVE_PATH relative_path ${protofiles_root_dir} ${proto_file}) ++ get_filename_component(relative_path ${relative_path} DIRECTORY) ++ set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.cc) ++ set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) + add_custom_command( + OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" +- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto +- DEPENDS ${PROTOC_DEPENDENCY} ${GENERATED_PROTO} +- COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}" ++ COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} ++ DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} ++ COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" + VERBATIM + COMMAND_EXPAND_LISTS) + list(APPEND PROTO_SRCS "${OUTPUT_PB_SRC}") +diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp +index b51b8c91b3..f8a85bf4f5 100644 +--- a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp ++++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp +@@ -7,7 +7,7 @@ + #include "checkpoint_utils.hpp" + #include "openvino/frontend/exception.hpp" + #include "openvino/util/file_util.hpp" +-#include "saved_tensor_slice.pb.h" ++#include "ov_tensorflow/saved_tensor_slice.pb.h" + #include "tf_utils.hpp" + + #ifdef ENABLE_SNAPPY_COMPRESSION +diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp +index bfae3b139a..1171fd6a68 100644 +--- a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp ++++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp +@@ -12,9 +12,9 @@ + #include "checkpoint_utils.hpp" + #include "openvino/core/any.hpp" + #include "openvino/frontend/exception.hpp" +-#include "saved_tensor_slice.pb.h" +-#include "tensor_shape.pb.h" +-#include "types.pb.h" ++#include "ov_tensorflow/saved_tensor_slice.pb.h" ++#include "ov_tensorflow/tensor_shape.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_argdef.cpp b/src/frontends/tensorflow/src/decoder_argdef.cpp +index 3430bcbe5e..ce7fc44a91 100644 +--- a/src/frontends/tensorflow/src/decoder_argdef.cpp ++++ b/src/frontends/tensorflow/src/decoder_argdef.cpp +@@ -5,11 +5,11 @@ + #include "decoder_argdef.hpp" + + #include "decoder_proto.hpp" +-#include "op_def.pb.h" ++#include "ov_tensorflow/op_def.pb.h" + #include "openvino/frontend/tensorflow/node_context.hpp" + #include "openvino/frontend/tensorflow/special_types.hpp" + #include "tf_utils.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_proto.cpp b/src/frontends/tensorflow/src/decoder_proto.cpp +index 2488973c10..cf6049cdbc 100644 +--- a/src/frontends/tensorflow/src/decoder_proto.cpp ++++ b/src/frontends/tensorflow/src/decoder_proto.cpp +@@ -4,12 +4,12 @@ + + #include "decoder_proto.hpp" + +-#include "attr_value.pb.h" +-#include "node_def.pb.h" ++#include "ov_tensorflow/attr_value.pb.h" ++#include "ov_tensorflow/node_def.pb.h" + #include "openvino/frontend/tensorflow/node_context.hpp" + #include "openvino/frontend/tensorflow/special_types.hpp" + #include "tf_utils.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/decoder_proto.hpp b/src/frontends/tensorflow/src/decoder_proto.hpp +index 338bfdecce..9d22e273e1 100644 +--- a/src/frontends/tensorflow/src/decoder_proto.hpp ++++ b/src/frontends/tensorflow/src/decoder_proto.hpp +@@ -9,7 +9,7 @@ + + #include "openvino/core/type/element_type.hpp" + #include "openvino/frontend/tensorflow/decoder.hpp" +-#include "types.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace tensorflow { + class GraphDef; +diff --git a/src/frontends/tensorflow/src/graph_iterator_meta.cpp b/src/frontends/tensorflow/src/graph_iterator_meta.cpp +index 8bc41fbaef..06f2d31f38 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_meta.cpp ++++ b/src/frontends/tensorflow/src/graph_iterator_meta.cpp +@@ -10,8 +10,8 @@ + #include + + #include "openvino/core/type/element_type.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/graph_iterator_proto.hpp b/src/frontends/tensorflow/src/graph_iterator_proto.hpp +index 8b073b0837..85d9a3767a 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_proto.hpp ++++ b/src/frontends/tensorflow/src/graph_iterator_proto.hpp +@@ -10,7 +10,7 @@ + #include "checkpoint_v1_reader.hpp" + #include "decoder_argdef.hpp" + #include "decoder_proto.hpp" +-#include "graph.pb.h" ++#include "ov_tensorflow/graph.pb.h" + #include "openvino/frontend/exception.hpp" + #include "openvino/frontend/graph_iterator.hpp" + #include "openvino/frontend/tensorflow/decoder.hpp" +diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp +index ece0148d19..803e7d694b 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp ++++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp +@@ -10,8 +10,8 @@ + #include + + #include "openvino/core/type/element_type.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp +index 511f2a0a5b..4cb385e66f 100644 +--- a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp ++++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp +@@ -8,7 +8,7 @@ + + #include "graph_iterator_proto.hpp" + #include "openvino/util/file_util.hpp" +-#include "saved_model.pb.h" ++#include "ov_tensorflow/saved_model.pb.h" + #include "variables_index.hpp" + + namespace ov { +diff --git a/src/frontends/tensorflow/src/op/var_handle.cpp b/src/frontends/tensorflow/src/op/var_handle.cpp +index 50a5b73c44..0c86041440 100644 +--- a/src/frontends/tensorflow/src/op/var_handle.cpp ++++ b/src/frontends/tensorflow/src/op/var_handle.cpp +@@ -10,7 +10,7 @@ + #include "ngraph/runtime/shared_buffer.hpp" + #include "openvino/opsets/opset8.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "tensor_bundle.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" + + using namespace std; + using namespace ov::opset8; +diff --git a/src/frontends/tensorflow/src/proto/any.proto b/src/frontends/tensorflow/src/proto/google/protobuf/any.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/any.proto +rename to src/frontends/tensorflow/src/proto/google/protobuf/any.proto +diff --git a/src/frontends/tensorflow/src/proto/wrappers.proto b/src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/wrappers.proto +rename to src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto +diff --git a/src/frontends/tensorflow/src/proto/allocation_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/allocation_description.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto +diff --git a/src/frontends/tensorflow/src/proto/api_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/api_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +index 810aabc5a2..cbb581973d 100644 +--- a/src/frontends/tensorflow/src/proto/api_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto +@@ -21,7 +21,7 @@ option java_outer_classname = "ApiDefProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.framework"; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/api_def_go_proto"; +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + // Used to specify and override the default API & behavior in the + // generated code for client languages, from what you would get from +diff --git a/src/frontends/tensorflow/src/proto/attr_value.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/attr_value.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +index 3028176c02..b903c30cf9 100644 +--- a/src/frontends/tensorflow/src/proto/attr_value.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "AttrValueProtos"; +diff --git a/src/frontends/tensorflow/src/proto/cost_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/cost_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +index dad93a029b..8e4d9788f4 100644 +--- a/src/frontends/tensorflow/src/proto/cost_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "CostGraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/dataset_options.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/dataset_options.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto +diff --git a/src/frontends/tensorflow/src/proto/device_attributes.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/device_attributes.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto +diff --git a/src/frontends/tensorflow/src/proto/function.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/function.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +index 65a2acb3b9..9e84731c98 100644 +--- a/src/frontends/tensorflow/src/proto/function.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; +-import "node_def.proto"; +-import "op_def.proto"; ++import "ov_tensorflow/attr_value.proto"; ++import "ov_tensorflow/node_def.proto"; ++import "ov_tensorflow/op_def.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "FunctionProtos"; +diff --git a/src/frontends/tensorflow/src/proto/graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +similarity index 95% +rename from src/frontends/tensorflow/src/proto/graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +index c52e84022f..e047abeafe 100644 +--- a/src/frontends/tensorflow/src/proto/graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "function.proto"; +-import "node_def.proto"; +-import "versions.proto"; ++import "ov_tensorflow/function.proto"; ++import "ov_tensorflow/node_def.proto"; ++import "ov_tensorflow/versions.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "GraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/graph_transfer_info.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +index e42c135369..9e7d598e34 100644 +--- a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "types.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "GraphTransferInfoProto"; +diff --git a/src/frontends/tensorflow/src/proto/kernel_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/kernel_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +index 5e6b839d31..88142d3de9 100644 +--- a/src/frontends/tensorflow/src/proto/kernel_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "KernelDefProtos"; +diff --git a/src/frontends/tensorflow/src/proto/log_memory.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/log_memory.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +index 96dac4c9ca..62489f0e0b 100644 +--- a/src/frontends/tensorflow/src/proto/log_memory.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_description.proto"; ++import "ov_tensorflow/tensor_description.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "LogMemoryProtos"; +diff --git a/src/frontends/tensorflow/src/proto/meta_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/meta_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +index b6918fa853..255fb6efeb 100644 +--- a/src/frontends/tensorflow/src/proto/meta_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto +@@ -14,14 +14,14 @@ syntax = "proto3"; + + package tensorflow; + +-import "any.proto"; +-import "graph.proto"; +-import "op_def.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; +-import "saved_object_graph.proto"; +-import "saver.proto"; +-import "struct.proto"; ++import "google/protobuf/any.proto"; ++import "ov_tensorflow/graph.proto"; ++import "ov_tensorflow/op_def.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/saved_object_graph.proto"; ++import "ov_tensorflow/saver.proto"; ++import "ov_tensorflow/struct.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "MetaGraphProtos"; +diff --git a/src/frontends/tensorflow/src/proto/model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/model.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto +diff --git a/src/frontends/tensorflow/src/proto/node_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/node_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +index 573d0f901d..b8f3a017a3 100644 +--- a/src/frontends/tensorflow/src/proto/node_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "attr_value.proto"; ++import "ov_tensorflow/attr_value.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "NodeProto"; +diff --git a/src/frontends/tensorflow/src/proto/op_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/op_def.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +index 4d5c66c39e..31493fed26 100644 +--- a/src/frontends/tensorflow/src/proto/op_def.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto +@@ -18,9 +18,10 @@ option java_outer_classname = "OpDefProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.framework"; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/op_def_go_proto"; +-import "attr_value.proto"; +-import "types.proto"; +-import "resource_handle.proto"; ++ ++import "ov_tensorflow/attr_value.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/resource_handle.proto"; + + // Defines an operation. A NodeDef in a GraphDef specifies an Op by + // using the "op" field which should match the name of a OpDef. +diff --git a/src/frontends/tensorflow/src/proto/reader_base.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/reader_base.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto +diff --git a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +index abfcfdbec0..3b17878e12 100644 +--- a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "graph.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/graph.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "RemoteFusedGraphExecuteInfoProto"; +diff --git a/src/frontends/tensorflow/src/proto/resource_handle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/resource_handle.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +index 4d872b6d9d..19b4dcc3b8 100644 +--- a/src/frontends/tensorflow/src/proto/resource_handle.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "ResourceHandle"; +diff --git a/src/frontends/tensorflow/src/proto/saved_model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/saved_model.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +index 0034fdfd46..f866065522 100644 +--- a/src/frontends/tensorflow/src/proto/saved_model.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "meta_graph.proto"; ++import "ov_tensorflow/meta_graph.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "SavedModelProtos"; +diff --git a/src/frontends/tensorflow/src/proto/saved_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/saved_object_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +index 671441075c..d0b2170044 100644 +--- a/src/frontends/tensorflow/src/proto/saved_object_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto +@@ -14,13 +14,13 @@ syntax = "proto3"; + + package tensorflow; + +-import "any.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; +-import "variable.proto"; +-import "versions.proto"; +-import "struct.proto"; +-import "trackable_object_graph.proto"; ++import "google/protobuf/any.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/variable.proto"; ++import "ov_tensorflow/versions.proto"; ++import "ov_tensorflow/struct.proto"; ++import "ov_tensorflow/trackable_object_graph.proto"; + + option cc_enable_arenas = true; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; +diff --git a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/saved_tensor_slice.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +index 4645b2bdca..9e628752bb 100644 +--- a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto +@@ -35,11 +35,11 @@ option java_outer_classname = "SavedTensorSliceProtos"; + option java_multiple_files = true; + option java_package = "org.tensorflow.util"; + +-import "tensor_shape.proto"; +-import "tensor_slice.proto"; +-import "tensor.proto"; +-import "types.proto"; +-import "versions.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/tensor_slice.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/versions.proto"; + + // Metadata describing the set of slices of the same tensor saved in a + // checkpoint file. +diff --git a/src/frontends/tensorflow/src/proto/saver.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/saver.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto +diff --git a/src/frontends/tensorflow/src/proto/step_stats.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +similarity index 97% +rename from src/frontends/tensorflow/src/proto/step_stats.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +index 04e0864a5a..027a1d79ee 100644 +--- a/src/frontends/tensorflow/src/proto/step_stats.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto +@@ -14,8 +14,8 @@ syntax = "proto3"; + + package tensorflow; + +-import "allocation_description.proto"; +-import "tensor_description.proto"; ++import "ov_tensorflow/allocation_description.proto"; ++import "ov_tensorflow/tensor_description.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "StepStatsProtos"; +diff --git a/src/frontends/tensorflow/src/proto/struct.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/struct.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +index d03201b685..4126bd98c4 100644 +--- a/src/frontends/tensorflow/src/proto/struct.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/tensor.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; + +diff --git a/src/frontends/tensorflow/src/proto/summary.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +similarity index 99% +rename from src/frontends/tensorflow/src/proto/summary.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +index 9e4b95f4bc..ce32617694 100644 +--- a/src/frontends/tensorflow/src/proto/summary.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor.proto"; ++import "ov_tensorflow/tensor.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "SummaryProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +similarity index 96% +rename from src/frontends/tensorflow/src/proto/tensor.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +index c2e1fd7eb6..42f063536e 100644 +--- a/src/frontends/tensorflow/src/proto/tensor.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "resource_handle.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/resource_handle.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_bundle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +similarity index 94% +rename from src/frontends/tensorflow/src/proto/tensor_bundle.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +index 43fea749b4..21af38195c 100644 +--- a/src/frontends/tensorflow/src/proto/tensor_bundle.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto +@@ -14,10 +14,10 @@ syntax = "proto3"; + + package tensorflow; + +-import "tensor_shape.proto"; +-import "tensor_slice.proto"; +-import "types.proto"; +-import "versions.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/tensor_slice.proto"; ++import "ov_tensorflow/types.proto"; ++import "ov_tensorflow/versions.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorBundleProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +similarity index 90% +rename from src/frontends/tensorflow/src/proto/tensor_description.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +index 3ab9c310a6..c03e1311c1 100644 +--- a/src/frontends/tensorflow/src/proto/tensor_description.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto +@@ -14,9 +14,9 @@ syntax = "proto3"; + + package tensorflow; + +-import "allocation_description.proto"; +-import "tensor_shape.proto"; +-import "types.proto"; ++import "ov_tensorflow/allocation_description.proto"; ++import "ov_tensorflow/tensor_shape.proto"; ++import "ov_tensorflow/types.proto"; + + option cc_enable_arenas = true; + option java_outer_classname = "TensorDescriptionProtos"; +diff --git a/src/frontends/tensorflow/src/proto/tensor_shape.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/tensor_shape.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto +diff --git a/src/frontends/tensorflow/src/proto/tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/tensor_slice.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto +diff --git a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +similarity index 98% +rename from src/frontends/tensorflow/src/proto/trackable_object_graph.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +index f4a8e4da34..f0a9617432 100644 +--- a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto ++++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto +@@ -14,7 +14,7 @@ syntax = "proto3"; + + package tensorflow; + +-import "wrappers.proto"; ++import "google/protobuf/wrappers.proto"; + + option cc_enable_arenas = true; + option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; +diff --git a/src/frontends/tensorflow/src/proto/types.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/types.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto +diff --git a/src/frontends/tensorflow/src/proto/variable.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/variable.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto +diff --git a/src/frontends/tensorflow/src/proto/versions.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto +similarity index 100% +rename from src/frontends/tensorflow/src/proto/versions.proto +rename to src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto +diff --git a/src/frontends/tensorflow/src/tf_utils.hpp b/src/frontends/tensorflow/src/tf_utils.hpp +index a7a80a522b..5c4a97a5da 100644 +--- a/src/frontends/tensorflow/src/tf_utils.hpp ++++ b/src/frontends/tensorflow/src/tf_utils.hpp +@@ -4,8 +4,8 @@ + + #pragma once + +-#include "attr_value.pb.h" +-#include "node_def.pb.h" ++#include "ov_tensorflow/attr_value.pb.h" ++#include "ov_tensorflow/node_def.pb.h" + #include "openvino/core/node.hpp" + #include "openvino/core/partial_shape.hpp" + #include "openvino/core/runtime_attribute.hpp" +@@ -13,9 +13,9 @@ + #include "openvino/core/type/element_type.hpp" + #include "openvino/frontend/node_context.hpp" + #include "openvino/runtime/tensor.hpp" +-#include "tensor.pb.h" +-#include "tensor_shape.pb.h" +-#include "types.pb.h" ++#include "ov_tensorflow/tensor.pb.h" ++#include "ov_tensorflow/tensor_shape.pb.h" ++#include "ov_tensorflow/types.pb.h" + + namespace ov { + namespace frontend { +diff --git a/src/frontends/tensorflow/src/variables_index.cpp b/src/frontends/tensorflow/src/variables_index.cpp +index c24ffd8112..2dcf3faf9e 100644 +--- a/src/frontends/tensorflow/src/variables_index.cpp ++++ b/src/frontends/tensorflow/src/variables_index.cpp +@@ -11,8 +11,8 @@ + #include "graph_iterator_saved_model.hpp" + #include "openvino/core/type/element_type.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "tensor_bundle.pb.h" +-#include "trackable_object_graph.pb.h" ++#include "ov_tensorflow/tensor_bundle.pb.h" ++#include "ov_tensorflow/trackable_object_graph.pb.h" + + #ifdef ENABLE_SNAPPY_COMPRESSION + # include "snappy.h" +diff --git a/src/frontends/tensorflow/src/variables_index.hpp b/src/frontends/tensorflow/src/variables_index.hpp +index df852a6279..aa805b264b 100644 +--- a/src/frontends/tensorflow/src/variables_index.hpp ++++ b/src/frontends/tensorflow/src/variables_index.hpp +@@ -9,7 +9,7 @@ + #include "graph_iterator_proto.hpp" + #include "openvino/util/file_util.hpp" + #include "openvino/util/mmap_object.hpp" +-#include "saved_model.pb.h" ++#include "ov_tensorflow/saved_model.pb.h" + + namespace ov { + namespace frontend { diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index d1ad458ecea01d..3556c5d285c4d4 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -4,11 +4,22 @@ vcpkg_from_github( REF "${VERSION}" SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312 PATCHES + # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch + # from https://github.com/openvinotoolkit/openvino/pull/18359 003-fix-find-onnx.patch + # from https://github.com/openvinotoolkit/openvino/pull/19629 004-compilation-with-cpp17.patch + # from https://github.com/openvinotoolkit/openvino/pull/19599 005-tflite-search.patch - 007-macos-14.patch # from https://github.com/openvinotoolkit/openvino/pull/19946 + # # from https://github.com/openvinotoolkit/openvino/pull/19946 + 007-macos-14.patch + # from https://github.com/openvinotoolkit/openvino/pull/19758 + # and https://github.com/openvinotoolkit/openvino/pull/20612 + 008-dynamic-protubuf.patch + # from https://github.com/openvinotoolkit/openvino/pull/20588 + # and https://github.com/openvinotoolkit/openvino/pull/20636 + 009-tensorflow-proto-odr.patch HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index 226c63665fb24b..60d03bc889eccf 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", "version": "2023.1.0", - "port-version": 3, + "port-version": 4, "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -15,6 +15,7 @@ "homepage": "https://github.com/openvinotoolkit/openvino", "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ { "name": "pkgconf", diff --git a/versions/baseline.json b/versions/baseline.json index d90d8e5cfdeed8..8134c1a38a1f73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6254,7 +6254,7 @@ }, "openvino": { "baseline": "2023.1.0", - "port-version": 3 + "port-version": 4 }, "openvpn3": { "baseline": "3.7.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 07122fc74b6fe7..8f05d268811b47 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e33c2a6c920269c1564d88ac95d0933771763ca3", + "version": "2023.1.0", + "port-version": 4 + }, { "git-tree": "185f20b166701fdc9c255e0ca7e574a88c1a34d9", "version": "2023.1.0", From f7dc9c8f5e4f2545af02404069aad3aa238188f6 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Tue, 24 Oct 2023 19:20:24 +0300 Subject: [PATCH 0188/1039] [wil] Configure only in release mode. (#34686) * [wil] Configure only in release mode. * Update version database. --- ports/wil/portfile.cmake | 3 +++ ports/wil/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/w-/wil.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 5663f3cac51179..2a929e4b2cad4d 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -7,6 +7,9 @@ vcpkg_from_github( HEAD_REF master ) +# WIL is header-only, so we don't need to build it in both modes +set(VCPKG_BUILD_TYPE release) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index 7a2ef8c7557cef..ebd816c1b63586 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wil", "version-date": "2023-08-24", + "port-version": 1, "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8134c1a38a1f73..be51b102477f74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8886,7 +8886,7 @@ }, "wil": { "baseline": "2023-08-24", - "port-version": 0 + "port-version": 1 }, "wildmidi": { "baseline": "0.4.5", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 3d16548b460128..682f476c840a00 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1305125361ca7587fdcdd0caac7609c15a94e48f", + "version-date": "2023-08-24", + "port-version": 1 + }, { "git-tree": "ddb021c58bdc3c24a0440d2e6f808797cd698bf8", "version-date": "2023-08-24", From 46b3d5404d357d5dfa045b894d42c47b223de945 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 25 Oct 2023 02:05:02 +0800 Subject: [PATCH 0189/1039] [cpp-sort] add new port (#34677) * [cpp-sort] add new port * [cpp-sort] fix usage * [cpp-sort] add new port * [cpp-sort] fix usage * [cpp-sort] add new port --- ports/cpp-sort/portfile.cmake | 22 ++++++++++++++++++++++ ports/cpp-sort/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cpp-sort.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/cpp-sort/portfile.cmake create mode 100644 ports/cpp-sort/vcpkg.json create mode 100644 versions/c-/cpp-sort.json diff --git a/ports/cpp-sort/portfile.cmake b/ports/cpp-sort/portfile.cmake new file mode 100644 index 00000000000000..5799c213abcafd --- /dev/null +++ b/ports/cpp-sort/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Morwenn/cpp-sort + REF "${VERSION}" + SHA512 85d9f68ff64ff23769c66d28153273e2072b2c12f2f94bb058afebc1fb68d852734d3907a51704212d795bff71f327de3497232ba3619179bbaa141ab55b2452 + HEAD_REF 1.x.y-develop +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPPSORT_BUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/cpp-sort") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/cpp-sort/vcpkg.json b/ports/cpp-sort/vcpkg.json new file mode 100644 index 00000000000000..5c119d0dd8cd0c --- /dev/null +++ b/ports/cpp-sort/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-sort", + "version": "1.15.0", + "description": "Sorting algorithms & related tools for C++14", + "homepage": "https://github.com/Morwenn/cpp-sort/", + "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 be51b102477f74..3290e15aa79f2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1820,6 +1820,10 @@ "baseline": "4.3.1", "port-version": 5 }, + "cpp-sort": { + "baseline": "1.15.0", + "port-version": 0 + }, "cpp-taskflow": { "baseline": "2.6.0", "port-version": 2 diff --git a/versions/c-/cpp-sort.json b/versions/c-/cpp-sort.json new file mode 100644 index 00000000000000..cc906838854876 --- /dev/null +++ b/versions/c-/cpp-sort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b474d4009aeb5dd69f5024899bff6fbbb92a78f6", + "version": "1.15.0", + "port-version": 0 + } + ] +} From cf9fe9013828f0a125b378473e7192aac2ad6182 Mon Sep 17 00:00:00 2001 From: gerard-ryan-immersaview <64181775+gerard-ryan-immersaview@users.noreply.github.com> Date: Wed, 25 Oct 2023 05:52:45 +1100 Subject: [PATCH 0190/1039] [gstreamer] nvcodec feature (#34690) * Reverts hard-coded disable in https://github.com/microsoft/vcpkg/pull/34152 --- ports/gstreamer/portfile.cmake | 2 +- ports/gstreamer/vcpkg.json | 15 ++++++++++++++- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 9dd0b051d04631..099427ba6a2606 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -94,6 +94,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libde265 gst-plugins-bad:libde265 microdns gst-plugins-bad:microdns modplug gst-plugins-bad:modplug + nvcodec gst-plugins-bad:nvcodec openal gst-plugins-bad:openal openh264 gst-plugins-bad:openh264 openjpeg gst-plugins-bad:openjpeg @@ -249,7 +250,6 @@ vcpkg_configure_meson( -Dgst-plugins-bad:msdk=disabled -Dgst-plugins-bad:musepack=disabled -Dgst-plugins-bad:neon=disabled - -Dgst-plugins-bad:nvcodec=disabled -Dgst-plugins-bad:onnx=disabled # libonnxruntime not found -Dgst-plugins-bad:openaptx=disabled -Dgst-plugins-bad:opencv=disabled # opencv not found diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 837919b59252e1..4eeaa88aee41ec 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 3, + "port-version": 4, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -422,6 +422,19 @@ } ] }, + "nvcodec": { + "description": "Enable support for the NVCODEC encoders and decoders", + "supports": "!uwp", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, "ogg": { "description": "Enable support for the Ogg container format (commonly used by Vorbis, Theora and flac)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3290e15aa79f2d..68ff3da4a4f722 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3098,7 +3098,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 3 + "port-version": 4 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index f60db179491083..fc39a164bab852 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b18eecdb79cdeb95b0c5e003cf14ababd9bca7c9", + "version": "1.22.5", + "port-version": 4 + }, { "git-tree": "5bcd4e4f541fb90ffef24a354db74f5555f2ba6d", "version": "1.22.5", From 7a6f366cefd27210f6a8309aed10c31104436509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wegner?= Date: Tue, 24 Oct 2023 20:53:01 +0200 Subject: [PATCH 0191/1039] [ffmpeg] fix cross builds on windows host (#34657) Two issues: * we should get msys2 when building on windows, not targeting windows. * removed usage of LIBRARY_PATH since it is ignored when cross-compiling [1]. Tested building for android on windows and works fine. [1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html#index-LIBRARY_005fPATH --- ports/ffmpeg/portfile.cmake | 25 +++++++++++-------------- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1754fcbff6887a..b4f29767b61764 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -33,18 +33,9 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") vcpkg_add_to_path("${NASM_EXE_PATH}") endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - #We're assuming that if we're building for Windows we're using MSVC - set(INCLUDE_VAR "INCLUDE") - set(LIB_PATH_VAR "LIB") -else() - set(INCLUDE_VAR "CPATH") - set(LIB_PATH_VAR "LIBRARY_PATH") -endif() - set(OPTIONS "--enable-pic --disable-doc --enable-debug --enable-runtime-cpudetect --disable-autodetect") -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_HOST_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16) set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe") vcpkg_add_to_path("${MSYS_ROOT}/usr/share/automake-1.16") @@ -94,8 +85,6 @@ string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " -I \"${CURRENT_INSTALLED_DIR}/inc ## Setup vcpkg toolchain -set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}") - set(prog_env "") if(VCPKG_DETECTED_CMAKE_C_COMPILER) @@ -574,8 +563,12 @@ message(STATUS "Building Options: ${OPTIONS}") # Release build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if (VCPKG_DETECTED_MSVC) + set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/lib\"") + else() + set(OPTIONS_RELEASE "${OPTIONS_RELEASE} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/lib\"") + endif() message(STATUS "Building Release Options: ${OPTIONS_RELEASE}") - set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") message(STATUS "Building ${PORT} for Release") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -611,8 +604,12 @@ endif() # Debug build if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if (VCPKG_DETECTED_MSVC) + set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-libpath:\"${CURRENT_INSTALLED_DIR}/debug/lib\"") + else() + set(OPTIONS_DEBUG "${OPTIONS_DEBUG} --extra-ldflags=-L\"${CURRENT_INSTALLED_DIR}/debug/lib\"") + endif() message(STATUS "Building Debug Options: ${OPTIONS_DEBUG}") - set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/debug/lib${VCPKG_HOST_PATH_SEPARATOR}${ENV_LIB_PATH}") set(ENV{LDFLAGS} "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}") set(ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") message(STATUS "Building ${PORT} for Debug") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8abac6cd6a8bb7..1afb1c802817dc 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.0", - "port-version": 1, + "port-version": 2, "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 68ff3da4a4f722..24b2f890ac7e68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2566,7 +2566,7 @@ }, "ffmpeg": { "baseline": "6.0", - "port-version": 1 + "port-version": 2 }, "ffnvcodec": { "baseline": "11.1.5.2", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 13c40e2ea0c825..c38dd4d6e2f3c1 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f33fe16e3a4e278bc2eb92b24483d00b90e9f3a", + "version": "6.0", + "port-version": 2 + }, { "git-tree": "70c25989395c92bd79faf0b136fb4636e96d541c", "version": "6.0", From d6eb444c39697b458aa04d035b135da0d3660ff2 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 25 Oct 2023 16:09:43 +0200 Subject: [PATCH 0192/1039] [ngtcp2] Update to 1.0.1 (#34698) --- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index 624963c3b35913..09d022103e6154 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 eb05dfbdc0f3081acef68f9cd8f423c1c96bf1185153768dc38fea5506bbb5fff30ce51b2acd89299d9149f4fe89b00fdcc343dfa479b2eaac711688b3e5c6ff + SHA512 c76ede7546d0d7056281002149441e5722147c31c934266dbb50c821ba6c1c493c798e636c84b2d76e925a9cdf7f5b34dd7e9fa1f0ba674453ece26130acc9cf HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 09c75fa0de46ae..7c6281457e9c2c 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "1.0.0", + "version": "1.0.1", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 24b2f890ac7e68..b1836f3540d346 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5841,7 +5841,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "nifly": { diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index b8e3555c744d9d..304d661a0eae66 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2b2e40609c45b92b199a998590bb1074f1226d4", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "40104b5c6052054c49211e1a9098f833dba4a63d", "version": "1.0.0", From b31a9e4ff07e2ebf50e92365ac68c54630ea25e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 25 Oct 2023 16:10:23 +0200 Subject: [PATCH 0193/1039] [soundtouch] Update to 2.3.2 (#34697) --- ports/soundtouch/portfile.cmake | 7 ++++--- ports/soundtouch/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/soundtouch.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake index 0e2ad0626abe82..501094ddd2f3b9 100644 --- a/ports/soundtouch/portfile.cmake +++ b/ports/soundtouch/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH GITHUB_HOST https://codeberg.org REPO soundtouch/soundtouch - REF 2.3.1 - SHA512 c9d110b06cafb79968c94c4d206360b9ea9673d63eaf1470b097a39acf18b5b9cd53759f2656ff8963c6eee6a36fecdf1ea9aa7dc014fbf8bbee0dcfb8e4e438 + REF ${VERSION} + SHA512 93f757b2c1abe16be589e0d191e6c0416c5980843bd416cd5cb820b65a705d98081c0fc7ca0d9880af54b5343318262c77ba39a096bb240ceec084e93ceef964 HEAD_REF master ) @@ -31,5 +31,6 @@ if(SOUNDSTRETCH) vcpkg_copy_tools(TOOL_NAMES soundstretch AUTO_CLEAN) endif() -file(INSTALL "${SOURCE_PATH}/COPYING.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.TXT") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json index 645d9b39162f9b..8decad7f834b57 100644 --- a/ports/soundtouch/vcpkg.json +++ b/ports/soundtouch/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soundtouch", - "version": "2.3.1", - "port-version": 2, + "version": "2.3.2", "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", "homepage": "https://www.surina.net/soundtouch", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index b1836f3540d346..5931920383ecc0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7901,8 +7901,8 @@ "port-version": 2 }, "soundtouch": { - "baseline": "2.3.1", - "port-version": 2 + "baseline": "2.3.2", + "port-version": 0 }, "soxr": { "baseline": "0.1.3", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 5c37a47d71b5ae..07f765b229b83f 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50336df269c13ab5d50f840fdc02afbfda7244c", + "version": "2.3.2", + "port-version": 0 + }, { "git-tree": "f4f307065b40b131fd80ce953afcc121aba46f9f", "version": "2.3.1", From 213c01f8719e0f8bd48ec6285074a22a7fe5e5a3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:15:33 +0200 Subject: [PATCH 0194/1039] [azure-core-cpp] winhttp no uwp (#34704) --- ports/azure-core-cpp/vcpkg.json | 3 ++- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 3126e9b75aa69e..3433f153303027 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-core-cpp", "version-semver": "1.10.3", + "port-version": 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++." @@ -64,7 +65,7 @@ }, "winhttp": { "description": "WinHTTP HTTP transport implementation", - "supports": "windows", + "supports": "windows & !uwp", "dependencies": [ { "name": "azure-core-cpp", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index c88a7165ff2fd1..c0169902a36fbc 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f2e80c3e438f6738b7f0910f3122f21d52eb653", + "version-semver": "1.10.3", + "port-version": 1 + }, { "git-tree": "a6323331b6946093d5e0c3dd11e33d3e83203dc3", "version-semver": "1.10.3", diff --git a/versions/baseline.json b/versions/baseline.json index 5931920383ecc0..010f3d5b139a87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -422,7 +422,7 @@ }, "azure-core-cpp": { "baseline": "1.10.3", - "port-version": 0 + "port-version": 1 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", From fa4c4e2b425fce45e64a6d9cfed4401880d5684d Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:41:07 +0800 Subject: [PATCH 0195/1039] [minizip-ng] update to v4.0.1 (#34730) * [minizip-ng] update to v4.0.1 * [minizip-ng] remove the unnecessary options signing * [minizip-ng] fix wrong CONFIG_PATH * [minizip-ng] update versions --- ports/minizip-ng/portfile.cmake | 5 ++--- ports/minizip-ng/vcpkg.json | 17 +---------------- versions/baseline.json | 4 ++-- versions/m-/minizip-ng.json | 5 +++++ 4 files changed, 10 insertions(+), 21 deletions(-) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 4229529c0747c2..958d6ee79c20c3 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng REF "${VERSION}" - SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 + SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258 HEAD_REF master PATCHES fix_find_zstd.patch @@ -17,7 +17,6 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES pkcrypt MZ_PKCRYPT - signing MZ_SIGNING wzaes MZ_WZAES openssl MZ_OPENSSL bzip2 MZ_BZIP2 @@ -39,7 +38,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/minizip-ng) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 9ec1b4fe7d8c82..4f0ca912dbbe4a 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minizip-ng", - "version": "4.0.0", - "port-version": 4, + "version": "4.0.1", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", @@ -20,7 +19,6 @@ "bzip2", "lzma", "pkcrypt", - "signing", "wzaes", "zlib", "zstd" @@ -47,19 +45,6 @@ "pkcrypt": { "description": "Enables PKWARE traditional encryption" }, - "signing": { - "description": "Enables zip signing support", - "dependencies": [ - { - "name": "minizip-ng", - "default-features": false, - "features": [ - "openssl" - ], - "platform": "!windows & !osx" - } - ] - }, "wzaes": { "description": "Enables WinZIP AES encryption", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 010f3d5b139a87..205637544faf4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5509,8 +5509,8 @@ "port-version": 1 }, "minizip-ng": { - "baseline": "4.0.0", - "port-version": 4 + "baseline": "4.0.1", + "port-version": 0 }, "mio": { "baseline": "2023-03-03", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 008e44fdd91132..4ab34e020a0cad 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d77f713bae64d416bf60adb3395a3b295feccc9b", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "fb59eb8b735f74193a79326e33fb6f9abc66846a", "version": "4.0.0", From 0bc837a3fad5adf7ffdcf3a99d3b3fa4af59dcfb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 26 Oct 2023 10:42:25 -0700 Subject: [PATCH 0196/1039] [vcpkg baseline][libtins] Remove from ci.baseline.txt (#34613) Co-authored-by: vzhli17 From a7e4ad1363a31f0a2e3d7704282c4c9a5a07d76e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:15:55 +0200 Subject: [PATCH 0197/1039] [glslang] fix tools windows (#34700) --- ports/glslang/portfile.cmake | 5 ++++- ports/glslang/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glslang.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 7353c7d4afbfeb..ab346cf30d0f62 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -20,7 +20,7 @@ if (ENABLE_GLSLANG_BINARIES) vcpkg_add_to_path("${PYTHON_PATH}") endif () -if (WIN32) +if (VCPKG_TARGET_IS_WINDOWS) set(PLATFORM_OPTIONS "-DOVERRIDE_MSVCCRT=OFF") endif () @@ -46,6 +46,9 @@ vcpkg_copy_pdbs() if (ENABLE_GLSLANG_BINARIES) vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN) + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES glslang AUTO_CLEAN) + endif() endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 159c4240c61a63..432d78ae07de23 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glslang", "version": "13.0.0", + "port-version": 1, "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 205637544faf4f..186fb6c14e59c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2982,7 +2982,7 @@ }, "glslang": { "baseline": "13.0.0", - "port-version": 0 + "port-version": 1 }, "glui": { "baseline": "2019-11-30", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 98d60404ae19b0..9ae47f89067093 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6", + "version": "13.0.0", + "port-version": 1 + }, { "git-tree": "07a60a91ac63383677c203954125ba981d08f53b", "version": "13.0.0", From 915077e26e50c7c4b17a85bce6b376e8844c7c5e Mon Sep 17 00:00:00 2001 From: Andrew Kornilov Date: Fri, 27 Oct 2023 02:47:24 +0300 Subject: [PATCH 0198/1039] [proxsuite] add new port (#34722) * [proxsuite] add new port * [proxsuite] update version --- ports/proxsuite/portfile.cmake | 37 ++++++++++++++++++++++++++++++++++ ports/proxsuite/vcpkg.json | 18 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/p-/proxsuite.json | 9 +++++++++ 4 files changed, 68 insertions(+) create mode 100644 ports/proxsuite/portfile.cmake create mode 100644 ports/proxsuite/vcpkg.json create mode 100644 versions/p-/proxsuite.json diff --git a/ports/proxsuite/portfile.cmake b/ports/proxsuite/portfile.cmake new file mode 100644 index 00000000000000..fdc74aab66e41d --- /dev/null +++ b/ports/proxsuite/portfile.cmake @@ -0,0 +1,37 @@ +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Simple-Robotics/proxsuite + REF "v${VERSION}" + SHA512 ce9d20f689cabf7668f8bd801017613a83ed816c8cab0190ae7116b2dc4880d0b5fa31bf11053f653f326b68984e3e63cdb3b43d9fd50a345554777d3d801a1b + HEAD_REF main +) + +vcpkg_from_github( + OUT_SOURCE_PATH MODULES_SOURCE_PATH + REPO jrl-umi3218/jrl-cmakemodules + REF e1a71520cd2f0e6f2a611e1a70df4d8edf4d5a65 + SHA512 a9dec01a4b4b30b42bf7f6e07c7102d58242c431f59875dac6bfc296473266f927e2ac3b823dcfa9364dad5cdbf46532d94eb65c41aa7d1ddfd7ec5212466ffa + HEAD_REF master +) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake-module") +file(RENAME "${MODULES_SOURCE_PATH}" "${SOURCE_PATH}/cmake-module") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_WITH_VECTORIZATION_SUPPORT=OFF +) + +vcpkg_cmake_install() +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" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/proxsuite/vcpkg.json b/ports/proxsuite/vcpkg.json new file mode 100644 index 00000000000000..3c98ab88159edd --- /dev/null +++ b/ports/proxsuite/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "proxsuite", + "version": "0.5.0", + "description": "The Advanced Proximal Optimization Toolbox", + "homepage": "https://github.com/Simple-Robotics/proxsuite", + "license": "BSD-2-Clause", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 186fb6c14e59c8..3376442acd96b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6680,6 +6680,10 @@ "baseline": "1.7.1", "port-version": 0 }, + "proxsuite": { + "baseline": "0.5.0", + "port-version": 0 + }, "proxy": { "baseline": "1.1.1", "port-version": 0 diff --git a/versions/p-/proxsuite.json b/versions/p-/proxsuite.json new file mode 100644 index 00000000000000..193a49c45ecb8d --- /dev/null +++ b/versions/p-/proxsuite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d43b63f01c1240a12c85794fdde566064996b845", + "version": "0.5.0", + "port-version": 0 + } + ] +} From 3961f34cac5391fe10a7a28b0f9791c7ef541ffb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:48:16 +0200 Subject: [PATCH 0199/1039] [fastrtps] no uwp (#34702) --- ports/fastrtps/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/f-/fastrtps.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index a82d7a8c3c298f..130260655fd4d7 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,10 +1,11 @@ { "name": "fastrtps", "version": "2.7.0", - "port-version": 3, + "port-version": 4, "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", + "supports": "!uwp", "dependencies": [ "asio", "fastcdr", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 80672aedc5b881..bcfb122474842b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -309,10 +309,8 @@ evpp:arm64-android=fail evpp:x64-android=fail faiss:arm64-windows=fail fastrtps:arm-neon-android=fail -fastrtps:arm64-uwp=fail fastrtps:arm64-android=fail fastrtps:x64-android=fail -fastrtps:x64-uwp=fail fastrtps:x64-windows-static-md=fail fastrtps:x64-windows-static=fail fdk-aac:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3376442acd96b3..a7a8185b95a5da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2538,7 +2538,7 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 3 + "port-version": 4 }, "fawdlstty-libfv": { "baseline": "0.0.8", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index f00de7d937484a..3ddde31d11ae29 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b2c27c3a92da80b837e5f14641cd6ea2b5fc6f6", + "version": "2.7.0", + "port-version": 4 + }, { "git-tree": "75ba9fed16853532cfc26487e85e4309289b8dd2", "version": "2.7.0", From 27728bbae691c52cc261e839630a4e93d0e6c8e1 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:49:30 -0700 Subject: [PATCH 0200/1039] [libremidi] Fix install path of the lib file (#34718) * [libremidi] Fix install path of the lib file * update version --- ports/libremidi/fix-install.patch | 13 +++++++++++++ ports/libremidi/portfile.cmake | 5 +++-- ports/libremidi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libremidi.json | 5 +++++ 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 ports/libremidi/fix-install.patch diff --git a/ports/libremidi/fix-install.patch b/ports/libremidi/fix-install.patch new file mode 100644 index 00000000000000..6a6f38137761ed --- /dev/null +++ b/ports/libremidi/fix-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/libremidi.install.cmake b/cmake/libremidi.install.cmake +index 08e17f5..985e9a5 100644 +--- a/cmake/libremidi.install.cmake ++++ b/cmake/libremidi.install.cmake +@@ -1,7 +1,7 @@ + if(NOT LIBREMIDI_HEADER_ONLY) + install(TARGETS libremidi + EXPORT libremidi-targets +- ARCHIVE DESTINATION lib/static ++ ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ) diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake index 551fb1c85a5c06..16c90785245391 100644 --- a/ports/libremidi/portfile.cmake +++ b/ports/libremidi/portfile.cmake @@ -2,9 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jcelerier/libremidi REF "v${VERSION}" - SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b HEAD_REF master + PATCHES + fix-install.patch ) vcpkg_list(SET options) @@ -22,7 +23,7 @@ vcpkg_cmake_configure( -DLIBREMIDI_NO_JACK=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libremidi PACKAGE_NAME libremidi) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json index 74cf2c657483f6..103952cd13a855 100644 --- a/ports/libremidi/vcpkg.json +++ b/ports/libremidi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libremidi", "version": "4.2.3", - "port-version": 1, + "port-version": 2, "description": "A modern C++ MIDI real-time & file I/O library", "homepage": "https://github.com/jcelerier/libremidi", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a7a8185b95a5da..1831f948fbcb76 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4638,7 +4638,7 @@ }, "libremidi": { "baseline": "4.2.3", - "port-version": 1 + "port-version": 2 }, "libressl": { "baseline": "3.6.2", diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json index edccfbdbd829fd..08f47d60b1a070 100644 --- a/versions/l-/libremidi.json +++ b/versions/l-/libremidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4269a93684ffd5145f2b5a79421824b6efd87372", + "version": "4.2.3", + "port-version": 2 + }, { "git-tree": "4427d9259242a0dbc53753710b42b6531276f392", "version": "4.2.3", From 79be4be144f2fd07d85319c89800755bcbf83c4a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 27 Oct 2023 05:42:32 +0200 Subject: [PATCH 0201/1039] [gts] Enables osx and android, fixes, cleanup. (#34673) * [gts] Enable and fix osx * [gts] Update manifest * [gts] Fix version passing * [gts] Update usage * [gts] Simplify dll patching * [gts] Cleanup * [gts] android builds now * ignition-common1: fails on osx as on linux --- ports/gts/CMakeLists.txt | 16 ++++++++++------ ports/gts/fix-dllexport_2.patch | 13 ------------- ports/gts/fix_missing_extern.patch | 13 ------------- ports/gts/portfile.cmake | 17 ++++++----------- ports/gts/usage | 7 +++---- ports/gts/vcpkg.json | 6 +++--- scripts/ci.baseline.txt | 4 +--- versions/baseline.json | 2 +- versions/g-/gts.json | 5 +++++ 9 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 ports/gts/fix-dllexport_2.patch delete mode 100644 ports/gts/fix_missing_extern.patch diff --git a/ports/gts/CMakeLists.txt b/ports/gts/CMakeLists.txt index 295c0c6f7e31d5..b25af8fda8f8f8 100644 --- a/ports/gts/CMakeLists.txt +++ b/ports/gts/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.14) -project(gts C) +project(gts VERSION "${VERSION}" LANGUAGES C) find_package(PkgConfig REQUIRED) pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) @@ -8,17 +8,21 @@ pkg_check_modules(GLIB2 glib-2.0 IMPORTED_TARGET) if(WIN32) add_definitions(-DNATIVE_WIN32 -D_USE_MATH_DEFINES) else() - add_definitions(-DHAVE_FPU_CONTROL_H) + include(CheckIncludeFile) + check_include_file("fpu_control.h" HAVE_FPU_CONTROL_H) + if(HAVE_FPU_CONTROL_H) + add_definitions(-DHAVE_FPU_CONTROL_H) + endif() endif() add_definitions( -DGTS_COMPILATION - -DGTS_MAJOR_VERSION=0 - -DGTS_MINOR_VERSION=7 - -DGTS_MICRO_VERSION=6 + -DGTS_MAJOR_VERSION=${PROJECT_VERSION_MAJOR} + -DGTS_MINOR_VERSION=${PROJECT_VERSION_MINOR} + -DGTS_MICRO_VERSION=${PROJECT_VERSION_PATCH} -DGTS_INTERFACE_AGE=1 -DGTS_BINARY_AGE=1 - -DGTS_VERSION=${GTS_MAJOR_VERSION}.${GTS_MINOR_VERSION}.${GTS_MICRO_VERSION} + -DGTS_VERSION=${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) file(GLOB src src/*.c src/gts.def) diff --git a/ports/gts/fix-dllexport_2.patch b/ports/gts/fix-dllexport_2.patch deleted file mode 100644 index 52ad11cce6c983..00000000000000 --- a/ports/gts/fix-dllexport_2.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 0e798c48efbeda..00000000000000 --- a/ports/gts/fix_missing_extern.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 2f31dcd49af0ad..4695d9e8f777f8 100644 --- a/ports/gts/portfile.cmake +++ b/ports/gts/portfile.cmake @@ -1,16 +1,11 @@ -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(patches fix-dllexport.patch) -elseif(VCPKG_TARGET_IS_WINDOWS) - set(patches fix-dllexport_2.patch fix_missing_extern.patch) -endif() - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO gts/gts REF 0.7.6 FILENAME gts-0.7.6.tar.gz SHA512 645123b72dba3d04dad3c5d936d7e55947826be0fb25e84595368919b720deccddceb7c3b30865a5a40f2458254c2af793b7c014e6719cf07e7f8e6ff30890f8 - PATCHES ${patches} + PATCHES + fix-dllexport.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -21,14 +16,14 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + "-DVERSION=${VERSION}" ) vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/gts/usage b/ports/gts/usage index ccd803ef83d9b9..f3acd8605493f6 100644 --- a/ports/gts/usage +++ b/ports/gts/usage @@ -1,6 +1,5 @@ -The port gts supports consumption from CMake: +gts can be imported via CMake FindPkgConfig module: find_package(PkgConfig REQUIRED) - pkg_check_modules(GTS gts REQUIRED) - target_compile_options(main PRIVATE ${GTS_CFLAGS}) - target_link_libraries(main PRIVATE ${GTS_LDFLAGS}) + pkg_check_modules(GTS gts REQUIRED IMPORTED_TARGET) + target_link_libraries(main PRIVATE PkgConfig::GTS) diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json index 3b5549f3aa1e3e..8686fb09e7b255 100644 --- a/ports/gts/vcpkg.json +++ b/ports/gts/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gts", "version": "0.7.6", - "port-version": 7, + "port-version": 8, "description": "3D surfaces meshed with interconnected triangles", - "homepage": "http://gts.sourceforge.net/", - "supports": "!osx", + "homepage": "https://gts.sourceforge.net/", + "license": "LGPL-2.0-or-later", "dependencies": [ "glib", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bcfb122474842b..f479f3d607736a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -435,9 +435,6 @@ gstreamer:x64-android=fail gstreamer:x64-windows-static = skip gstreamer:x64-windows-static-md = skip gtk:x64-windows-static-md=fail -gts:arm-neon-android=fail -gts:arm64-android=fail -gts:x64-android=fail gul14:arm-neon-android=fail gul14:arm64-android=fail gul14:x64-android=fail @@ -464,6 +461,7 @@ iceoryx:x64-android=fail iceoryx:arm64-android=fail iceoryx:arm-neon-android=fail ignition-common1:x64-linux=fail +ignition-common1:x64-osx=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail ignition-msgs1:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 1831f948fbcb76..07a4420aa103fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3122,7 +3122,7 @@ }, "gts": { "baseline": "0.7.6", - "port-version": 7 + "port-version": 8 }, "gtsam": { "baseline": "4.2a9", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index dbd92b12773896..ed71a2901b6320 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c12aefc981ca389e3235cf1940883f881dddb4d", + "version": "0.7.6", + "port-version": 8 + }, { "git-tree": "1bce412085edcd46e3f358cca2c3bb1cffb25cfa", "version": "0.7.6", From eb7cb824c43ea2f722a555ba486b8ecdcbe3e6a9 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 27 Oct 2023 11:58:24 +0800 Subject: [PATCH 0202/1039] [mpark-patterns] add new port (#34679) * [mpark-patterns] add new port * [mpark-patterns] add new port * [mpark-patterns] add new port * [mpark-patterns] add new port --- ports/mpark-patterns/portfile.cmake | 23 +++++++++++++++++++++++ ports/mpark-patterns/usage | 5 +++++ ports/mpark-patterns/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/m-/mpark-patterns.json | 9 +++++++++ 5 files changed, 58 insertions(+) create mode 100644 ports/mpark-patterns/portfile.cmake create mode 100644 ports/mpark-patterns/usage create mode 100644 ports/mpark-patterns/vcpkg.json create mode 100644 versions/m-/mpark-patterns.json diff --git a/ports/mpark-patterns/portfile.cmake b/ports/mpark-patterns/portfile.cmake new file mode 100644 index 00000000000000..639fdceb58a3bb --- /dev/null +++ b/ports/mpark-patterns/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mpark/patterns + REF b3270e0dd7b6312f7a4fe8647e2333dbb86e355e + SHA512 ca8062b92cf0d5874aba7067615ff8cb089c22cb921d6131762a8dcb2f50d4f47d80c59b62b1c9b7e70dae2dfb68a44c2a4feeb78ab5e5473e0fbdd089538314 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE release) #header-only library + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME mpark_patterns CONFIG_PATH "lib/cmake/mpark_patterns") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mpark-patterns/usage b/ports/mpark-patterns/usage new file mode 100644 index 00000000000000..8e4f5d53613386 --- /dev/null +++ b/ports/mpark-patterns/usage @@ -0,0 +1,5 @@ +The package mpark-patterns provides CMake targets: + + find_package(mpark_patterns CONFIG REQUIRED) + target_link_libraries(main PRIVATE mpark_patterns) + diff --git a/ports/mpark-patterns/vcpkg.json b/ports/mpark-patterns/vcpkg.json new file mode 100644 index 00000000000000..a9619173b62797 --- /dev/null +++ b/ports/mpark-patterns/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mpark-patterns", + "version-date": "2019-10-03", + "description": "MPark.Patterns is an experimental pattern matching library for C++17.", + "homepage": "https://github.com/mpark/patterns", + "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 07a4420aa103fc..e399d3c94df95c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5592,6 +5592,10 @@ "baseline": "3.100", "port-version": 11 }, + "mpark-patterns": { + "baseline": "2019-10-03", + "port-version": 0 + }, "mpark-variant": { "baseline": "1.4.0", "port-version": 3 diff --git a/versions/m-/mpark-patterns.json b/versions/m-/mpark-patterns.json new file mode 100644 index 00000000000000..0c522ba9ec0e25 --- /dev/null +++ b/versions/m-/mpark-patterns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f8b22778a3c1393308468021303beb56ff392a03", + "version-date": "2019-10-03", + "port-version": 0 + } + ] +} From 820cf6afbd87244f1728d2dd7938a7ae38cf7ecf Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 27 Oct 2023 06:01:59 +0200 Subject: [PATCH 0203/1039] [sdl2-mixer-ext] uwp (#33774) --- ports/sdl2-mixer-ext/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sdl2-mixer-ext.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json index dd18c5a5d74eb3..bb60a677880c9f 100644 --- a/ports/sdl2-mixer-ext/vcpkg.json +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-mixer-ext", "version-date": "2023-05-04", + "port-version": 1, "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", @@ -100,7 +101,7 @@ }, "nativemidi": { "description": "Use Native MIDI Player to play MIDI audio format.", - "supports": "windows | osx" + "supports": "(windows & !uwp) | osx" }, "opusfile": { "description": "Use opusfile to play Opus audio format.", diff --git a/versions/baseline.json b/versions/baseline.json index e399d3c94df95c..c0edb4185396dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7626,7 +7626,7 @@ }, "sdl2-mixer-ext": { "baseline": "2023-05-04", - "port-version": 0 + "port-version": 1 }, "sdl2-net": { "baseline": "2.2.0", diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json index f12db451ffa7ff..9b2c960d29193e 100644 --- a/versions/s-/sdl2-mixer-ext.json +++ b/versions/s-/sdl2-mixer-ext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72599d1d3f046b10ba695a83a5de68a98bf86ec8", + "version-date": "2023-05-04", + "port-version": 1 + }, { "git-tree": "04312072ef4ea392cb39c240e579f06b4d62b955", "version-date": "2023-05-04", From 45f34d72b947e078be51cb33f0f9b9e8d5412983 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 27 Oct 2023 20:18:22 +0200 Subject: [PATCH 0204/1039] [Qt] Update to 6.6.0 (#34426) * [Qt] Update to 6.6.0 * fix patch in qtbase * add tmp port to get qtwebengine logs * remove dep in tmp port * Fix CMAKE_BUILD_TYPE being hijacked by qt scripts. * Fix qtwebengine build? * add another script to be fixed * remove path to cmake * fix qtgrpc * looks like the variable is defined somewhere. * avoid aliasing only if the target exists * try different aliasing fix * fix patch * Dep stuff * reenable atomics * reenable librt * remove tmp * v db * v db * add vulkan-header as a dependency * v db * also needs libs * v db * add a comment to remember me not to touch this again * v db --- ports/qt/vcpkg.json | 3 +- ports/qt3d/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/portfile.cmake | 1 + ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtbase/CVE-2023-43114-6.5.patch | 119 ---------------------- ports/qtbase/GLIB2-static.patch | 2 +- ports/qtbase/cmake/qt_port_data.cmake | 88 ++++++++-------- ports/qtbase/cmake/qt_port_details.cmake | 2 +- ports/qtbase/fix-host-aliasing.patch | 17 ++++ ports/qtbase/fix_cmake_build_type.patch | 24 +++++ ports/qtbase/portfile.cmake | 28 +++-- ports/qtbase/vcpkg.json | 8 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/portfile.cmake | 2 + ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/portfile.cmake | 1 + ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtgrpc/portfile.cmake | 3 +- ports/qtgrpc/protoc-host.patch | 23 +++++ ports/qtgrpc/vcpkg.json | 2 +- ports/qthttpserver/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 2 +- ports/qtlanguageserver/vcpkg.json | 2 +- ports/qtlocation/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/qtquick3dphysics/vcpkg.json | 2 +- ports/qtquickeffectmaker/vcpkg.json | 2 +- 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/qtspeech/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/portfile.cmake | 8 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 4 +- ports/qtwebengine/vcpkg.json | 2 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 92 ++++++++--------- versions/q-/qt.json | 5 + versions/q-/qt3d.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-/qtgrpc.json | 5 + versions/q-/qthttpserver.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/q-/qtlanguageserver.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-/qtquick3dphysics.json | 5 + versions/q-/qtquickeffectmaker.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-/qtspeech.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 + 105 files changed, 465 insertions(+), 271 deletions(-) delete mode 100644 ports/qtbase/CVE-2023-43114-6.5.patch create mode 100644 ports/qtbase/fix-host-aliasing.patch create mode 100644 ports/qtbase/fix_cmake_build_type.patch create mode 100644 ports/qtgrpc/protoc-host.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index d3f9901ec70039..eff8c4d1918456 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, @@ -52,6 +52,7 @@ "platform": "linux" }, "qtdoc", + "qtgrpc", { "name": "qtimageformats", "default-features": false, diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index cf1ad089464903..d21dbde26ab214 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index a821e2510fd659..339936014497fb 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.5.3", + "version": "6.6.0", "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 dfb26cc80a0254..56c39465851787 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.5.3", + "version": "6.6.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 7280aff8a30572..68686b02f3a0fb 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -29,6 +29,7 @@ qt_cmake_configure(${_opt} -DINPUT_libyaml=system -DFEATURE_am_system_libyaml=ON -DFEATURE_am_system_libarchive=ON + --trace-expand OPTIONS_DEBUG OPTIONS_RELEASE) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 375e7c50f6c5b5..597e0c5bd252ef 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/CVE-2023-43114-6.5.patch b/ports/qtbase/CVE-2023-43114-6.5.patch deleted file mode 100644 index 12b1c5005ccfb4..00000000000000 --- a/ports/qtbase/CVE-2023-43114-6.5.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp -index 44cc7fe63e..e44d85a3cb 100644 ---- a/src/gui/text/windows/qwindowsfontdatabase.cpp -+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp -@@ -873,36 +873,70 @@ QT_WARNING_POP - return fontEngine; - } - --static QList getTrueTypeFontOffsets(const uchar *fontData) -+static QList getTrueTypeFontOffsets(const uchar *fontData, const uchar *fileEndSentinel) - { - QList offsets; -- const quint32 headerTag = *reinterpret_cast(fontData); -+ if (fileEndSentinel - fontData < 12) { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; -+ return offsets; -+ } -+ -+ const quint32 headerTag = qFromUnaligned(fontData); - if (headerTag != MAKE_TAG('t', 't', 'c', 'f')) { - if (headerTag != MAKE_TAG(0, 1, 0, 0) - && headerTag != MAKE_TAG('O', 'T', 'T', 'O') - && headerTag != MAKE_TAG('t', 'r', 'u', 'e') -- && headerTag != MAKE_TAG('t', 'y', 'p', '1')) -+ && headerTag != MAKE_TAG('t', 'y', 'p', '1')) { - return offsets; -+ } - offsets << 0; - return offsets; - } -+ -+ const quint32 maximumNumFonts = 0xffff; - const quint32 numFonts = qFromBigEndian(fontData + 8); -- for (uint i = 0; i < numFonts; ++i) { -- offsets << qFromBigEndian(fontData + 12 + i * 4); -+ if (numFonts > maximumNumFonts) { -+ qCWarning(lcQpaFonts) << "Font collection of" << numFonts << "fonts is too large. Aborting."; -+ return offsets; -+ } -+ -+ if (quintptr(fileEndSentinel - fontData) > 12 + (numFonts - 1) * 4) { -+ for (quint32 i = 0; i < numFonts; ++i) -+ offsets << qFromBigEndian(fontData + 12 + i * 4); -+ } else { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; - } -+ - return offsets; - } - --static void getFontTable(const uchar *fileBegin, const uchar *data, quint32 tag, const uchar **table, quint32 *length) -+static void getFontTable(const uchar *fileBegin, const uchar *fileEndSentinel, const uchar *data, quint32 tag, const uchar **table, quint32 *length) - { -- const quint16 numTables = qFromBigEndian(data + 4); -- for (uint i = 0; i < numTables; ++i) { -- const quint32 offset = 12 + 16 * i; -- if (*reinterpret_cast(data + offset) == tag) { -- *table = fileBegin + qFromBigEndian(data + offset + 8); -- *length = qFromBigEndian(data + offset + 12); -- return; -+ if (fileEndSentinel - data >= 6) { -+ const quint16 numTables = qFromBigEndian(data + 4); -+ if (fileEndSentinel - data >= 28 + 16 * (numTables - 1)) { -+ for (quint32 i = 0; i < numTables; ++i) { -+ const quint32 offset = 12 + 16 * i; -+ if (qFromUnaligned(data + offset) == tag) { -+ const quint32 tableOffset = qFromBigEndian(data + offset + 8); -+ if (quintptr(fileEndSentinel - fileBegin) <= tableOffset) { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; -+ break; -+ } -+ *table = fileBegin + tableOffset; -+ *length = qFromBigEndian(data + offset + 12); -+ if (quintptr(fileEndSentinel - *table) < *length) { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; -+ break; -+ } -+ return; -+ } -+ } -+ } else { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; - } -+ } else { -+ qCWarning(lcQpaFonts) << "Corrupted font data detected"; - } - *table = 0; - *length = 0; -@@ -915,8 +949,9 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, - QList *values) - { - const uchar *data = reinterpret_cast(fontData.constData()); -+ const uchar *dataEndSentinel = data + fontData.size(); - -- QList offsets = getTrueTypeFontOffsets(data); -+ QList offsets = getTrueTypeFontOffsets(data, dataEndSentinel); - if (offsets.isEmpty()) - return; - -@@ -924,7 +959,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, - const uchar *font = data + offsets.at(i); - const uchar *table; - quint32 length; -- getFontTable(data, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); -+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('n', 'a', 'm', 'e'), &table, &length); - if (!table) - continue; - QFontNames names = qt_getCanonicalFontNames(table, length); -@@ -934,7 +969,7 @@ static void getFamiliesAndSignatures(const QByteArray &fontData, - families->append(std::move(names)); - - if (values || signatures) -- getFontTable(data, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); -+ getFontTable(data, dataEndSentinel, font, MAKE_TAG('O', 'S', '/', '2'), &table, &length); - - if (values) { - QFontValues fontValues; --- -2.27.0.windows.1 diff --git a/ports/qtbase/GLIB2-static.patch b/ports/qtbase/GLIB2-static.patch index 5bbcb289da4a03..0384482bbc94b3 100644 --- a/ports/qtbase/GLIB2-static.patch +++ b/ports/qtbase/GLIB2-static.patch @@ -98,6 +98,6 @@ index aef7f15..21b0c1d 100644 -qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE_NAME core QMAKE_LIB gio) +qt_find_package(GLIB2 OPTIONAL_COMPONENTS GOBJECT PROVIDED_TARGETS GLIB2::GOBJECT MODULE MODULE_NAME core QMAKE_LIB gobject) +qt_find_package(GLIB2 OPTIONAL_COMPONENTS GIO PROVIDED_TARGETS GLIB2::GIO MODULE MODULE_NAME core QMAKE_LIB gio) - + qt_find_package(WrapResolv PROVIDED_TARGETS WrapResolv::WrapResolv MODULE_NAME network QMAKE_LIB libresolv) #### Tests diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index fb36579085d46e..51a26c6f44f2e5 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,47 +1,47 @@ -set(qtbase_HASH "31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9") -set(qttools_HASH "7e383cdc575400d19051232dc563eaf330209605f28a93ac01f32921d0d966bc9a51bb5b56fb8f5c00ed4aab5fa2806b3bd0c8750aa2f49f5a04c85fa68fe30b") -set(qtdeclarative_HASH "d3fc2f01de9940cf8715cf525bc0c68555c5dc519b4a78952682c23bfc9c09249fb651c6e4dddac128b7e96f07e0371d3040b8f8c5480c8c3fccc4f3bfec2640") -set(qtsvg_HASH "d9391228f4bce041e7c36711cf3d787b373bb2e470b0d21c903d57ee5aeef672289caf8a7e4c57455db105a510d36536c611ceca4f64c823bf795d0638e6a0d4") -set(qt5compat_HASH "49146eb1591e89b1d62a3615d673a4a29db9d2540fac2b2d03eb29ad24ec77ba97f8209240e512252ff1d3083d21312d6142654993582e95a7e549c94e8bf45c") -set(qtshadertools_HASH "fab49d5c7609b9bf81b98562d21e29d05f001a27d446efddec569033eaa322ab336057076a5f2713ea1941f4e716694a471b5ae81be0913bc19668136d7a9b68") -set(qtquicktimeline_HASH "b177eecd5750dcc1ab29bfc4dd1aeb22a6b7e07dcb11683721abf18476da4ff740c9ea4c351aa5bf31e5c499b4c7da5be71b243cdd895a8f35df8178bb50bc93") -set(qtquick3d_HASH "85611eba47239c342159e704826cdcb7ec2cd79118aaad081d4924c5697b71eddf4307682e9dde23bf973641df2e90301e26f381aa29c023e386918e8d1f7f70") -set(qttranslations_HASH "d14d5c40fe93ba1ee29fe4150710a14122dafe91e5343d5461c7ed3157e3e220effd235cf894f75ec6c26a0e5ac81d75867faff4045456395d76221e70113004") -set(qtwayland_HASH "e516dd5158ed1aadc989b3f1bbaad87fa38b59872b44c7c92ec1c349e7e923a6b07b7fb3a3493312330eaf581b0d27aeaad2ec03629523ee28e3627b7c30ea89") -set(qtdoc_HASH "c8cb3a4f155bf697e9168d575f225ca3ab60d289c62c47db72997d01c81129e4c550f673edb60df02dededfa48028c43d5ee6723577db00e78fec188e1f32f22") -set(qtcoap_HASH "385b60c5fb24087bb87cf468303456338897f15cc32570290603312e491943ab00f4d1f013952f6b883d3deabcc870906628101b1ecbc390371544b676c423af") -set(qtopcua_HASH "e814a3acb00f2b0f17d92c8a5722aa47d3a5ee9863db294416eb0d42201ae7dab9c7bfa9a2c81531fb48f103b862bbee3f7000a889364241061543365986fd7a") -set(qtimageformats_HASH "66b8e7385a1b0db77f81730bd97f7e3488eec32a24829c3b21746e89e6ff179a3feacc4d023f1e4e6864a6a7aba46aeb7f66dca7e76836881829a20bb9afbad7") -set(qtmqtt_HASH "1d660864485540afdafde2b87ae6a27a39066201aedb61cde3d15af71f3325893d0a99ac9ac753182569b0fda21ba25d38478c46921e448050abec255f50a59c") -set(qtnetworkauth_HASH "73f04a144cb08048532aa6638dcaae01e9cee07afce10e5371bfa96ac0aac4fe941d84b888eaa4599304bcae58172665319d3eda43c460ab7df9f1b0e5e37f09") -set(qt3d_HASH "15fa46766ff8c8295bb2273dc528f1952a04d20c786ff62122594395a8f003a7bd07944928da472ec2463bed0e31d63af559391724f935bab70067f9009f1917") -set(qtactiveqt_HASH "3bfc52d8484e869a9ab1b489f7616f76ba48b9ac951d34a5a2b299d4c96dc9e3519c885dd86393578d1bbfdf39b59e6b1cba37a1ecb634bf66cf49264d59b621") -set(qtdatavis3d_HASH "4272007a13651d9bb38d8bee58a66ffe448a7e51be530f6d543e8bc688fd30143f426c5f5210ab6f5a8b1d3981b3570ca2ec13ecd4d0e27d039e1f094c6c1f20") -set(qtdeviceutilities_HASH "89a8198898fe928abe528d1967226daefacdde3c2ff59ce58ea3add38396a26ac75468a193ee42a089dbbde5457024aaecb8be3eb94f074c3aa0189d6c17c2c1") -set(qtlottie_HASH "a0e9cda4363ef72a74e4721472aed8266ac9810273ee6fbfdaf9ed5d82495de5e0471a4e521b33f784097694a3f7d42f0ce5a7d39d23781e2e270932230512e4") -set(qtscxml_HASH "f4aeb2f07a203ef448124b3e988735b46ef38d7800cd60ba3db9c0e0b8a9e9aca44bc07a6d72de2951134200c29d902709a80b52fd030713159c8f1711b60731") -set(qtvirtualkeyboard_HASH "f09d8f4c025a94768582d21598a6cc35647511439fa4136933d724954ddb1cab50335df5609a6e951593175faf03cfb233a8805c1bac90d7fda92cfe3f42b3f6") -set(qtcharts_HASH "ce37650c0e1bacc5432a6549fe6cfa8db19b1164c05172802638b51858e9cfcf68a56b401a84ab8d576fe2e1bf4fb08fc1f9c96cecd7f8251b8562defb647b68") -set(qtconnectivity_HASH "d0a8309143545689c7f6f545ae1aa8e1b4e516398bc6cc0d0f0ea3df6a414d6c933d32ae32451134d2a0d7d2c02078e8e46438b0aec59e938e4b8533d4da9457") -set(qtpositioning_HASH "af3ee341b57029ff10270602a23bde0b922b1f43e0e152b0f091e4447099d34df0410df582261935f6397c121f48bf944cc057772de9c063e679755fae7c5d11") -set(qtlocation_HASH "6633dedba335b8de4c96f98f4709a147e225e82fee1ed741938e15e1540421ad7c3140baec75914f0844a793433abcadaf3ce72d944662b62778327d65ff7348") -set(qtmultimedia_HASH "6b32e79f1fac21dba6a1ca9f82cfde8acdf9b33d1a65439d4a972f98ea23c919ecbd26ee4c08ecdb7d2743cab346437f27a701e45426e47fa89e55d913fe50bf") -set(qtremoteobjects_HASH "17cfc030c4d45b395ba20ff0cdc973d55ae75ba34ed200bd01c3fffb7650000c69b95f935bffb43930a3779c5f15cce09ecd716e2b1284f1e28768ce71dee969") -set(qtsensors_HASH "beb2c13855c42486dcbdb2e4885bbe931ded284dee755ecab539149113e2e8fec0b1c20859c36d9fc59b8188dffcfb8b1f4fc9495e04a33c80d425a0322f7f10") -set(qtserialbus_HASH "9806ad33b24f1798081bd88c2dcd821b62f7455826043586f37ad5b6f833eb8f82b2a5d3a5ac21df5e660b0097c58eaabad503f4c19f30acb511785335a7b147") -set(qtserialport_HASH "2a36851281dbe13317f559567dd3cd8f2c8cc73aad9df22de71883790bf7b1f685bd65dc353cff65b212398b6a72d1c517c2cf15e0b41b93be1d0ed7646d7a76") -set(qtwebchannel_HASH "cf9cf75b3df885676bbaa521b991dd176fba826a1cca8e3a524ea553df709ed5f4ccbdd8af19d952957b87bce2de4144c1f2222ab8fd4dbac04d240675b26e71") -set(qtwebengine_HASH "8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49") -set(qtwebsockets_HASH "0121865827101a73aa2957efa322fcd81bf80d9d9e92c2022fa5bdf94c782fb9997392e6da7523e65b51cfd38c255ee7eb87e2de0069016fc93c1383bd116345") -set(qtwebview_HASH "bedc21846e1dacbd8493dfae9d779e3aba5530b99e7d5ee4fd48e299a498b0cb135a8ad7ccebb95de52fd7608d7b5aa23fecec50a13c09f7308750a26f89bc3e") -set(qtinterfaceframework_REF 2bd16fa1d13f98bec2c4e559e1a0372d2948d832) -set(qtapplicationmanager_HASH "b50e7533208706013d32a06030a520e467a6f3968195810ba5c3277ef2da7c86f8c5321905700aa5cd7cc6412fd4f1c7634ad9ab8f7e81ec1a634d395493e7d9") -set(qtlanguageserver_HASH "7f67e645c176fb2addd7409a8e625d34cf06b1e798f26d1edaa3829a2c2491328b7736c78ec9388d4fc75fcc18718a064ad169e4a3981cd7b344f2337b1f28f5") -set(qthttpserver_HASH "49b8f732d57358c64ca07e7dad4a84c6205a3066939596493ad0bde333b339db84c0d73573a04319bb4954d0f48bdad22447bb50ff48ad2d72f982f1f4340be9") -set(qtquick3dphysics_HASH "dc2b19df44a182bf77d0e45250cb4a4485a2143bca8ca043965beb02678bf944fd1c0c34f7411048d69f25fbc496b190ae3d81010e43a7d4a7ee00c4e5cc622c") -set(qtspeech_HASH "d37c68cb9599e8d9a81ac070a87ed5a942e15e01401b5e179b4127aa0894a272023d717f0fc5f5c167e2ff299f79d6a19f3594172cf9779b400ac218d9587508") -set(qtgrpc_HASH "464bc51a597cbfcf1a4461a62453a7ce7bfa0e5744f88fd6a58904d2bc8bccef15fa7082407dcb51d322b9bb963d1d0238e2472e1b67629cc2d67e9c9543b200") -set(qtquickeffectmaker_HASH "514d60b52937e49737afbec018919bf86793600f423076996bfb5def9d75031590816fa17bd04fa48d884c7dc73e25b41e1bfa5348e43bb30711374c29d64bda") +set(qtbase_HASH "4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17") +set(qttools_HASH "42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652") +set(qtdeclarative_HASH "6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a") +set(qtsvg_HASH "3c62b0b1425815fbbeb1d46cc3599edbf5c3b07f1f28840801d34620c0fe81740ad4b70743b72e8a52bdabcb14d77378f1c3fabae4eae2d29e017c8f40923205") +set(qt5compat_HASH "d6eb6ab52281e8b78de2a28aeaa1c0f9107634b5ada9700a4bad4f6fa66e2983dad6566b99d030d0980dd9817395fa033ebee7b79960fa527882b9239e908ff7") +set(qtshadertools_HASH "2b34f596c04eb7d24c83bd09c5a1a10923c0a0e7e94af5443b58c5b41285067da46ff06686877431fa7d385e07e019a1617f15a0bb6a423849d7288bafb41c2e") +set(qtquicktimeline_HASH "a2f8c1d7075fdaf57d7d4fc5f087449ef1a78ea6b6ab4ae7801decdb2436b7f95aefadaf365ab7c2ad0ceaf1f066c3c0ea189f3e3a18d41b89e391e6e5f33940") +set(qtquick3d_HASH "309800ad6afc1959d83d7dba97af41954b813486740f99747df6d997a3420c3a9fcc97e52ae67a390b34885ca9bc683cdecea55dd2ab4b530e7594654fa13454") +set(qttranslations_HASH "99dfd8a2e13f7862a21f9bccde4aa719bca1136addcc3e144fed0632a7d2341b27a44432c36d96ea221e6b5a9b6135241c1f2deeec5be3cbd40e5257ce3f8b77") +set(qtwayland_HASH "e9cf63ccc71d4dc61b04a0f8a1a466e9ede09aa689c53c1ccc9db5233e324894bfd198c9204d8d93509c770a7a6612c8eb9981e0b3ee7428f8bf2dcbdc255109") +set(qtdoc_HASH "15593b8bc37c7e8f5082e0c201e6a99a7646feed52b44dffb46d41d555e7cb060185229c3e271631ec3730947df25af0294561304a8352022e5f5688167ee78d") +set(qtcoap_HASH "27f3f48d3e8e32672194ce2377dc02974d01d5714071104359bb8003999a9b9184170da0ee618449493724036305a9ed47cfdf12fd4a63dfd48671114b05d11b") +set(qtopcua_HASH "d019c8dfc077a725704923234a9ef86d9ce68fdfb1187d18ff3bd9c6a5cc53ac502a67bbf27b70fc20807e99e9eb7d5da094a19bd8cedc1a2e51cc679a7e478f") +set(qtimageformats_HASH "e68d945abfd6f099abeb29d97beff90dd4856c9ad05491e440536edfbf299d1aba32eefc519a87d7e61f9ffcb4cd142ecb4e9d3c2aa10f93b5033de99e8ad0d1") +set(qtmqtt_HASH "22727b04340adffdb0f260cce46b57181c721aab29a1676c42ee64ef4df330556804286357143f858853e10e94230158d7d245d374925c4bab1ab385a4698252") +set(qtnetworkauth_HASH "5954da0478459f217979f6feba067ab4c42333995a203c3245289fcd9b966d18d0824099ff673d9e8a954562ff26595076be727f13194b3318060b7dbcab6ce9") +set(qt3d_HASH "7339fc08173793949f28b117c610e42bd25094d186b93db0a244c429e5232d9f5918247c654ee6c6f66802943eeadd1a545261a98b83db71e20b7867f27d94a7") +set(qtactiveqt_HASH "8f5271ee72499a2965f040ba4f2f7604f23d3c37b828612d7482b6b799b12875da5b916899e80b572a0d7217ce4349389e1e72701438fb9855bc7dbbf1ef6dbd") +set(qtdatavis3d_HASH "fc65c9a0685973bc39d2d54a40d537d9be99c442922c8f60db2c02d7c5ed2e33e4aeaa4c4c76267c6660aa66b6bdd3544d1c371925de74657512a5961b558965") +set(qtdeviceutilities_HASH "26659891a2bb4773ccd9cff8cf8a4e69d3b3649842a1dadb5efb62bb5e7411fb0c9d6d41321d1c850668942999ec55fdc5b54b8fde82fd0571a30d90653bacbb") +set(qtlottie_HASH "d565095945ea18d8524c993f428bc279e755ee5860e4888e7bbd553187aaed0b979fe864f518a439fcdbc663a9176168eebf338d76656876c945e8a21e3ba5f2") +set(qtscxml_HASH "ccb4c04048d4c18625b890b6a84a4ccf12108df88c0af0dff2dfa64b504116802fd6061226f991a212016210ab468f520d44bf4299d3ae79e7fe873e4d10c120") +set(qtvirtualkeyboard_HASH "5bf8c8b892c5398bf78662be3f44fbeb2f7dc96bf4ee88739f778c6427e5c8fd9f3e80356b9bd0ebea8f8adb733de44de51e8aaa6009b7cc52f0d0b5bfd3658b") +set(qtcharts_HASH "87659269eebeb36558337f1e7a954d93f9a0d4b7783611fa47a562c1f7e60b4f228e58650f69aacc72c656f322d3a5763a662206228667aeb32b16242b912bd2") +set(qtconnectivity_HASH "f660edbfaa9aefebdb602bb44b2e62b8a5d8dceba4b8c3d73d0f9daf6c29ff5f8953c134dc5af79dfd90b888f97d99e44f91a8e0aee3a51b278747eee2d1c381") +set(qtpositioning_HASH "6e71563444b1d3102ba6ad4ad04541b7ea3f7ee8737ebab76f7c8f7df5ac8e57afa0612bf634b97da5b7a424f7b2dcf28d57f5e67b91266a5138cbd41de8a0f3") +set(qtlocation_HASH "e4e492229d961bc34630aaff030b46385708312de174c9c47f85a6010f1fcb74e198333920fd5c02153a8bbae770c83d8cd1777177d9c9d7a1d555b6619be8f2") +set(qtmultimedia_HASH "ccfdd1aaed76dfb06692e212405d9b2804aa3da924c903febf5ee3fde057f4543f76284a543c808f600d61b5eadfbfe2437932f5ff4a7d19941c9ab3eae2d8a0") +set(qtremoteobjects_HASH "ef1307247e8355bdc8fd38255d8d75d821bbcdd4098e11e04ff1d63dc11656c7a52a99d4398fd437efc6df782130a2d10820c697385bc8901bb2e182340e91d3") +set(qtsensors_HASH "d7aa9a9c06c3c2c090a7ea570a9f01914ff62775ae9b6c4e4f6296e0f891d5b45fd0bedd04cebf02e314f73e8ccb8997bffe05ef04c19421f66638a4781a4b7d") +set(qtserialbus_HASH "90ec1ebba16247781e294d482257314f681f668d0abea84862d4f64bc09bafdaea5081098a5df716f22c1d0098862aa3ea3d4eba167470e0c35c4181dbe8366b") +set(qtserialport_HASH "8fc91ed80a7a58b2126f746a1148f64d34812574180d9b8609629e93903ce6d026f279aac87e0acd90f995d57ba12290fe57294ca15482c035337566ffe51fc6") +set(qtwebchannel_HASH "bffa1aeaefc1b3b5e8d0f958a689b9debd37134ed705f029c2edbd0c483181a474648c251e4921fc8a3d32ce6c1632e82ddba51c55cfb49843cf022870f053f7") +set(qtwebengine_HASH "30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366") +set(qtwebsockets_HASH "c679be915ed3831778d527d29a8a7277cdfe3912dbfd3d813750006c41c9433786122306db658bb5c1c22e22da9cdc339794b53c4f6c36d4603e98ddff60f0ef") +set(qtwebview_HASH "f76a64a36388e8fc7376d045dde6a54cfefb13c2b72378d9f7d35cc7c91c8a02ed8973918b335e67fc326967ae64a07fe685c521f5e0b30494d5e0a931b27b74") +set(qtinterfaceframework_REF 27cb74bdf3e24400687881fbf873c404bff49f37) +set(qtapplicationmanager_HASH "5c0f8f9b73bc3531727af9cb0175c1cc6487f81cfdc8574b53e5ce88375d767cd8b4d912a39545eab0219465ff633d913fb769fc44fc9715702f90e168117d81") +set(qtlanguageserver_HASH "58bc24427f7f33772bebfd5a67c091315b4c913a3c8d6c48a151046543e2756c4c2b0fa03e64bc6b1c760b28849b19676e86b24c4242353fd0aff5b8fa6015d5") +set(qthttpserver_HASH "06e501042d4fb78f4ade4093fc05940373156cc2fedc11f0a3b2191cc975fd92e660921c0c88ebc124cf243457f0dfedf7a1f32d30cd24e7fc74397191edd79d") +set(qtquick3dphysics_HASH "aba0669499ccc4989d50d3bd00b591317a8f09d234767f6ae10c360989a002a7426dc867c19843701e7a7f14b526c18be50274d5a30638e74a80e4257c6490f8") +set(qtspeech_HASH "29fc5e2401ac0d184ca5931c86eba152d33433ef60e91e3c30fdce79438e13f89b9f7ea01452c528fabd24425a9396c6d6f18b8d7d085a002073f0d27ec2a56a") +set(qtgrpc_HASH "e839d7a79349c33460850384933317af61c77abe90682566d8d457470619ca0571190befa91f71c8ba358f5320c11ac0090dffd29b99145134702fa571bb2432") +set(qtquickeffectmaker_HASH "7f89c05cc421a90c0006f3411a9965f27ada45de149a0ce0ca0f9d3b6d0a05ab5409e3cc66aa7cf8563b4d0796c77eb17976c56c03d65bc0724f0451eb0b810b") # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index ca5012ffb14f58..8c47f7e09703c0 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.5.3) +set(QT_VERSION 6.6.0) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/fix-host-aliasing.patch b/ports/qtbase/fix-host-aliasing.patch new file mode 100644 index 00000000000000..1823a351d9631a --- /dev/null +++ b/ports/qtbase/fix-host-aliasing.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake +index 180ec33..a03e3b1 100644 +--- a/cmake/QtTargetHelpers.cmake ++++ b/cmake/QtTargetHelpers.cmake +@@ -281,10 +281,10 @@ function(qt_internal_add_target_aliases target) + set_target_properties("${target}" PROPERTIES _qt_versionfull_alias "${versionfull_alias}") + + get_target_property(type "${target}" TYPE) +- if (type STREQUAL EXECUTABLE) ++ if (type STREQUAL EXECUTABLE AND NOT TARGET "${versionfull_alias}") + add_executable("${versionless_alias}" ALIAS "${target}") + add_executable("${versionfull_alias}" ALIAS "${target}") +- else() ++ elseif(NOT type STREQUAL EXECUTABLE) + add_library("${versionless_alias}" ALIAS "${target}") + add_library("${versionfull_alias}" ALIAS "${target}") + endif() diff --git a/ports/qtbase/fix_cmake_build_type.patch b/ports/qtbase/fix_cmake_build_type.patch new file mode 100644 index 00000000000000..0f4946b4ab81b7 --- /dev/null +++ b/ports/qtbase/fix_cmake_build_type.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index 21c40f2..c212148 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -162,6 +162,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) + # STREQUAL check needs to be expanded variables because an undefined var is not equal to an + # empty defined var. + if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}" ++ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE} + 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) +diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake +index 762299f..f104479 100644 +--- a/cmake/QtSetup.cmake ++++ b/cmake/QtSetup.cmake +@@ -56,6 +56,7 @@ get_property(QT_GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CON + # See also qt_internal_force_set_cmake_build_type_conditionally which is used + # to set the build type when building other repos or tests. + if("${CMAKE_BUILD_TYPE}" STREQUAL "${CMAKE_BUILD_TYPE_INIT}" ++ AND NOT DEFINED CACHE{CMAKE_BUILD_TYPE} + AND NOT __qt_auto_detect_cmake_build_type_before_project_call + AND NOT __qt_build_internals_cmake_build_type + AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 9a96976ce01f88..41aa53d9c273a1 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -12,6 +12,7 @@ set(${PORT}_PATCHES allow_outside_prefix.patch config_install.patch fix_cmake_build.patch + fix_cmake_build_type.patch harfbuzz.patch fix_egl.patch fix_egl_2.patch @@ -19,7 +20,7 @@ set(${PORT}_PATCHES GLIB2-static.patch # alternative is to force pkg-config clang-cl_source_location.patch clang-cl_QGADGET_fix.diff - CVE-2023-43114-6.5.patch + fix-host-aliasing.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -118,6 +119,11 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON) +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapBacktrace:BOOL=ON) +#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapAtomic:BOOL=ON) # Cannot be disabled on x64 platforms +#list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapRt:BOOL=ON) # Cannot be disabled on osx +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) +list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) # Network features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS @@ -139,6 +145,7 @@ endif() list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libproxy:BOOL=ON) list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI:BOOL=ON) +list(APPEND FEATURE_NET_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_WrapResolv:BOOL=ON) # Gui features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS @@ -157,7 +164,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS "xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled. "xrender" FEATURE_xcb_native_painting # experimental "gles2" FEATURE_opengles2 - #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan + #Cannot be required since Qt will look in CONFIG mode first but is controlled via CMAKE_DISABLE_FIND_PACKAGE_Vulkan below + #"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_WrapVulkanHeaders "egl" FEATURE_egl #"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig #"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz @@ -240,7 +248,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS "sql-oci" CMAKE_DISABLE_FIND_PACKAGE_Oracle ) -set(DB_LIST DB2 Interbase) +set(DB_LIST DB2 Interbase Mimer) foreach(_db IN LISTS DB_LIST) list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) endforeach() @@ -318,15 +326,16 @@ file(COPY file(CONFIGURE OUTPUT "${CURRENT_PACKAGES_DIR}/share/${PORT}/port_status.cmake" CONTENT "set(qtbase_with_icu ${FEATURE_icu})\n") set(other_files qt-cmake - qt-cmake-private - qt-cmake-standalone-test - qt-configure-module - qt-internal-configure-tests + qt-cmake-private + qt-cmake-standalone-test + qt-configure-module + qt-internal-configure-tests + qt-cmake-create ) if(CMAKE_HOST_WIN32) - set(script_suffix .bat) + set(script_suffix ".bat") else() - set(script_suffix) + set(script_suffix "") endif() list(TRANSFORM other_files APPEND "${script_suffix}") @@ -364,6 +373,7 @@ foreach(_config debug release) string(REPLACE "../share/" "../../../share/" _contents "${_contents}") endif() string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}") + string(REGEX REPLACE "original_cmake_path=[^\n]+\n" "original_cmake_path=does-not-exist\n" _contents "${_contents}") file(WRITE "${target_file}" "${_contents}") endif() endforeach() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 64ec5f1d892011..c51ec7d5265f38 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.5.3", - "port-version": 1, + "version": "6.6.0", "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, @@ -391,7 +390,10 @@ "description": "Thread support; provides QThread and related classes." }, "vulkan": { - "description": "Enable Vulkan support" + "description": "Enable Vulkan support", + "dependencies": [ + "vulkan" + ] }, "widgets": { "description": "Qt Widgets", diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index caa6072db3d4ff..1d012678c47eb8 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.5.3", + "version": "6.6.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index f4716fe9a1fba2..cfc92f473990aa 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/portfile.cmake b/ports/qtconnectivity/portfile.cmake index 1a3a6f1bfedbd7..5eefc2decd92ad 100644 --- a/ports/qtconnectivity/portfile.cmake +++ b/ports/qtconnectivity/portfile.cmake @@ -5,6 +5,8 @@ set(${PORT}_PATCHES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_BlueZ:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_PCSCLITE:BOOL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 943d18899cc91d..69d7c4385021e8 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 2d65222649aa23..47391000fdc673 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 73ffd73b22fb78..3c9525d667c24e 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_buildpath_length_warning(44) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index d9a554c5c1d5fa..3bdfe496f30272 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.5.3", + "version": "6.6.0", "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 dae93a3e5bd980..9abee0d7ba74a6 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.5.3", + "version": "6.6.0", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 833ab24e603b6a..281d5d49a49b5e 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/portfile.cmake b/ports/qtgrpc/portfile.cmake index 142bb026d49347..4304d663909f52 100644 --- a/ports/qtgrpc/portfile.cmake +++ b/ports/qtgrpc/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) +set(${PORT}_PATCHES protoc-host.patch) set(TOOL_NAMES qtprotobufgen qtgrpcgen) # native_grpc ->grpc WrapgRPC # grp -> qt[network] @@ -10,6 +10,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + #--trace-expand CONFIGURE_OPTIONS_MAYBE_UNUSED QT_BUILD_EXAMPLES QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS diff --git a/ports/qtgrpc/protoc-host.patch b/ports/qtgrpc/protoc-host.patch new file mode 100644 index 00000000000000..a2d81fb5aff1df --- /dev/null +++ b/ports/qtgrpc/protoc-host.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/FindWrapProtoc.cmake b/cmake/FindWrapProtoc.cmake +index 82972c8f18..08335fa746 100644 +--- a/cmake/FindWrapProtoc.cmake ++++ b/cmake/FindWrapProtoc.cmake +@@ -13,7 +13,7 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY) + list(APPEND __WrapProtoc_find_package_args QUIET) + endif() + +-if(NOT CMAKE_CROSSCOMPILING) ++if(0) + if(NOT TARGET Threads::Threads) + find_package(Threads ${__WrapProtoc_find_package_args}) + endif() +@@ -52,8 +52,8 @@ if(NOT CMAKE_CROSSCOMPILING) + endif() + endif() + +-if(NOT __WrapProtoc_protoc_imported_location) ++if(1) + if(CMAKE_CROSSCOMPILING) + set(__WrapProtoc_extra_prefix_paths "${QT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH}") + endif() + find_program(__WrapProtoc_protoc_imported_location diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index 2873632dd3d7e3..3be3f3b2b6225c 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt framework based gRPC clients and services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index 41797f081046f3..bce13f6079fade 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 6ab9e61007ef77..11eb9fa646b3c1 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.5.3", + "version": "6.6.0", "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 3281e51538db04..f54bca2da36e10 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 2df617cfc70b3c..ff965c8f26e2f9 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.5.3", + "version": "6.6.0", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index a6069c88f39345..edf137ea97c518 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 7b9a070d74b029..cba7bfa18fb7d5 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.5.3", + "version": "6.6.0", "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 d8852b9eef7710..1fce03d4f2997e 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.5.3", + "version": "6.6.0", "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 9554d5ed822666..342bb4d634ba01 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index c49ed51ff77c07..c22616e600bf44 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.5.3", + "version": "6.6.0", "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 00b0f20972157f..17994f4a637018 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.5.3", + "version": "6.6.0", "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 159711fd8f2103..44783a6d5fe3c2 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index c206c46cfb6e53..052409d9f44cc2 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.5.3", + "version": "6.6.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 60d29d97dbe232..0dd9d0d9c20fc1 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.5.3", + "version": "6.6.0", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index 5b3202effbd21d..4d6e38c7220030 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 731a7574f0697e..4e304c5b09b6fe 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.5.3", + "version": "6.6.0", "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 868ecf1cf541a4..0998ed8efd0d27 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.5.3", + "version": "6.6.0", "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 e31be362de980e..8f035980fe47dc 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.5.3", + "version": "6.6.0", "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 1cbf295bac49ee..2abf26eb582719 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index bbac8197153c54..d2e22e0950abaa 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.5.3", + "version": "6.6.0", "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 308964714aeb99..d1123b8b089fb4 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.5.3", + "version": "6.6.0", "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 4b280b8724086c..a8cf9431553944 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.5.3", + "version": "6.6.0", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index 0029247b481d80..eff0b7a82c1c6c 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 5825b2f10e179b..049557c356936f 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 8d194de4212ef5..30a719ef56b8a8 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 56090e9e6c510f..ed2efc4144d5cd 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/portfile.cmake b/ports/qtvirtualkeyboard/portfile.cmake index 4c238e8e0aba14..555acfb953b9c4 100644 --- a/ports/qtvirtualkeyboard/portfile.cmake +++ b/ports/qtvirtualkeyboard/portfile.cmake @@ -14,7 +14,13 @@ endif() # list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=t9write) # and add t9write as a dependency. # -list(APPEND FEATURE_OPTIONS -DINPUT_vkb_handwriting=no) +list(APPEND FEATURE_OPTIONS + -DINPUT_vkb_handwriting=no + -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrAlphabetic:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CerenceHwrCjk:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CerenceXt9:BOOL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_MyScript:BOOL=ON +) qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 1b47282499fa2f..dad330298e131d 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.5.3", + "version": "6.6.0", "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 591593c74d16fb..dd57c6277413c9 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.5.3", + "version": "6.6.0", "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 83d8a62c7d7058..2679c9f4712eb8 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index a9a9f8b5d27314..e927ab4850e3fe 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -62,8 +62,7 @@ vcpkg_add_to_path(PREPEND "${FLEX_DIR}") get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${BISON_DIR}") -vcpkg_find_acquire_program(PYTHON3) -x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES html5lib OUT_PYTHON_VAR PYTHON3) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -105,6 +104,7 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} -DNodejs_EXECUTABLE=${NODEJS} + -DPython3_EXECUTABLE=${PYTHON3} -DQT_FEATURE_webengine_jumbo_build=0 OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 66491852070cfc..1eef09e754acbc 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.5.3", + "version": "6.6.0", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 2f3d85d1c67395..7161157463c092 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index bbe8e71abaef9d..3beaab346afb50 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.5.3", + "version": "6.6.0", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index c0edb4185396dd..b31d81b3861ae8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6793,7 +6793,7 @@ "port-version": 2 }, "qt": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qt-advanced-docking-system": { @@ -6801,7 +6801,7 @@ "port-version": 1 }, "qt3d": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qt5": { @@ -6977,63 +6977,63 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtbase": { - "baseline": "6.5.3", - "port-version": 1 + "baseline": "6.6.0", + "port-version": 0 }, "qtcharts": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtgrpc": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qthttpserver": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtkeychain": { @@ -7045,43 +7045,43 @@ "port-version": 0 }, "qtlanguageserver": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtlocation": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtpositioning": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtquickcontrols2": { @@ -7089,75 +7089,75 @@ "port-version": 0 }, "qtquickeffectmaker": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtspeech": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qttools": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.5.3", + "baseline": "6.6.0", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 4a47889bba0921..755d370f8a6383 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "766ab007c0d703f29b892b6496af3ae458aab9c0", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "9f70e09569f7a3dc11f7efe9acb2fe646e0354c9", "version": "6.5.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 7d8a3542a83c5a..bb90bf55b3191b 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3c2532ea0b16b01aeb17c7e1bcdb0e4c1d3ff0a", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "02baf17bff3c96ec6e5e2f79576528b095b6f6b8", "version": "6.5.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 53f64754fe0583..517509dd5c6f46 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1188f496b30f0e4a2ed309dca03300c2f02c983", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "796db01f88dcd7b21cc357eba90ed6b1ce6c1669", "version": "6.5.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 7968596115decb..0e4216389ab51c 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4e05b3e0a3ce481228324c480ac8106295a6cec", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "fb16d16a9320a29c3186de89a48d7407bcf00766", "version": "6.5.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index f682663f2231ce..6e7588b6bfda0a 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1baea015b866f295c1724220bf214796a8013d8a", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "df9800b840b0972676b0d95ef8b7e86986e5a24b", "version": "6.5.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 342be9a090205b..28f94cb4595aef 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb1e1a00df34c350c817ee3d9ab90d2c52ced194", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "348dbf9cdcda0559adb72c98c249e06f8a2e50e8", "version": "6.5.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 3aafba54fdb3e3..fce5f5d2f578cf 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da08464343df644146582857a4f560da79b76f06", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "84c40bfb820f201f6e431fff8298e82acd0e7951", "version": "6.5.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index e0e55af409be57..ac3ab0512fbb85 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d18fea1869e4a37cde80de8e31294da8aa38fe1", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "3c16003284dc1a246e17025e2831ec61e26ebde7", "version": "6.5.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 49d84b02f4fdbb..414091c2ff1ec7 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b130a6686447df20bc5ae96bd6153cbac5aa1977", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "09ef297e42457aa0c3bded1d834760d3fefb402a", "version": "6.5.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 65b8c2445b503f..e498084a2715c4 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "256b706e812d3da7b4eb279e79b04095dcadde98", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "18cd1d93b0a6560a076444c03d76e5339d17abee", "version": "6.5.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 800787c2a5b497..587cf2f18f038b 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1b753b4c94c95edf6c8ab7bac9c4577f060b9a4", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "8d65969f28fb847dbfcd93ae76a2bc3019c6ab81", "version": "6.5.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index a9315028ef67f9..74b5c7bfbd5247 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49d4c0efba0c96742ba85c1699c5c0a39ac0937d", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "766f2aba652da721ddec6c476ecd2f1481ad030b", "version": "6.5.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 4907c48b5cd036..5a2fb26b6ac081 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed7bf70cb4a5e21fb76e7f7cc89d234fffd3201e", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "de18f463e0a97321b9eb039e9ddb1674600b993f", "version": "6.5.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index 70e66556b53dbc..356f2527b9d4fc 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fd752fc052bc1cbf13d66417e9c6c1aedc238a", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a7dc614f31a77ea86fc407ecdd994ae597ac9e94", "version": "6.5.3", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index cb5d8ad9e583a0..f1c1c88641ef58 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06ae6f390b9ea2025c189ecdadbeddde662b4f6e", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a1bef888af2bc8f653336ee8c817e1e3ea9b514a", "version": "6.5.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 095fe8916e2a5a..eed40797f9de5d 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf58f188746291ad38bafa413affa145fe792ee7", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "102ca43cd0aa09e7c5ad522d983179e77bdb563e", "version": "6.5.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 2986d9ca61514c..cb584d94c8d23a 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aef598c3223519da2bbb08353d365661f8959856", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a9ea8f81cfcb1c6b58edb0ac0fc9301bb28500b8", "version": "6.5.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index e0b09bc97295a2..782f00d932c3ce 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8ae2fe1a207df127db279e437784cf63a1a2b7d", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "83bd9154b17ba720fb96ffa099ab841809f676ec", "version": "6.5.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index e68c58efbfd853..3663afa9b7d610 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f58c7ebb91f69f42a31504da406ece6d5d120593", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a84cfd1e4542f3a6f61d7b9f21090bc15c2e3ee5", "version": "6.5.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 7803785ee6480f..2c4b6834c6e9a5 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c6ada64395147597928ad9d5af7e4fd5e7b4f0e", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "3ac387660fd91aebf9fdbeb678d45fb7fc7fb68f", "version": "6.5.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index fc699f1a7076eb..af7c3fbf3d3eb4 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cb4cc198bfe6cec44ec059a9f2f516032edee04", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "400ebbcd072b0b19822683e9060078196e7fafc6", "version": "6.5.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 9cd4e1d95e1b7f..e1bab305fb0325 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c5671dd094e509c890955ee1f267b160bffa2c", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "620531e56bfde6f0c2f158222e6d3fe174e94e7d", "version": "6.5.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 7b2687e2bfa095..763397e7f52069 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca177a05c921704e599d85961e52d6ee25d6b862", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "843c419d80c9d87f46e8b9233ce9d4b8813ec173", "version": "6.5.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index d54c1eaeac5a88..fda8f9a5686d56 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ce50eb99dc427d5b17a01f839f70a3cc2d0cfea", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "87ddfbf3e66eebc33fb874c57a8a98644546f9c4", "version": "6.5.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 60df1502598f6e..38ab4bbf7f2a01 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80617e2f8e7186192365523150d3169d9b5a9061", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "59b3203201b5711114749a093647e1deb8f433d3", "version": "6.5.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 975aca6ea7f18f..e87476e146047d 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c54c8417690bd1ebe375cd71a48388c6bf1d5782", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "b91395b12a8c64d6622a18a54c1f92203c70d591", "version": "6.5.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index f29c6d84097784..053ecbcdb8fd99 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcb4cf2b1a80ff497ce7fafc885882aac775a6de", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "0cfacf9011d6a0ac51afade0fb3f560d8738c877", "version": "6.5.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index da651ba5fc6eba..08c88eaadf7c94 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4325f77bda6cdda94f1dea48423dbbff111c97ae", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a35495b91cd073de54bb5429d96c5e2f13bcef76", "version": "6.5.3", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 1aa86f5891c3c0..ed9a62b8be2631 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c089d10397f5bb8155b9e96fbbc1f7c1392b53f", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "45b571612589ee8327ee557fb23ebe6196de724a", "version": "6.5.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index d97ce51b90c7e5..f07e3590a477f1 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad083b7bdf871b65fa3f68cda2823f51e8cfe797", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "0326668fb829b020e66b53d8595e29fc2ac9d10d", "version": "6.5.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 3458b6b801bf5c..388d74903ddda9 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25674eaa881bd361a4a333903f72a16656ee8ce6", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "38f9e0bb70c3b510e0496dd9678ae8051b7086ef", "version": "6.5.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 3f7d53679ca6d4..01db8be962a915 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12ee32f418c15549486f21fd1fda55c629b01124", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a68065c7c255aa4e07c10f140cf539ddf9481ca9", "version": "6.5.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index ae44a62575b253..f84d6464210a0e 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d32539a07f99298f75e4006ff7c966a7d9e9f3ef", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "894d8e4754494932a42bc1e5be1fe3094af6e299", "version": "6.5.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 69a7c1e581e69d..06d56a864a39ad 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3224730e30748c1b7c57f6210cd375cd2a45f81", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "74930da655fbc25f2ca02eb8e069732f566dc1d9", "version": "6.5.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 984d9214f2a0cd..4a94b24675ec9a 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f84dd4728eb9792df16ff1b956ffdb806b04c016", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "0c3ce884f17ccc857975e2d0247c13d7f07e733c", "version": "6.5.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 732a267de332fe..63697e6794316c 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "328df565e4640e536a8f6dde383feed0105fffc8", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a6bb68e8f537cc9f201e30c56122b615fac0da48", "version": "6.5.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index c7665e465d3a7b..4dccb99adee4a7 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1fcfd06b00e6e9f71dbe6e83bb796e89d774228", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "5c69ed714c8ae47743eb654424d1bdac65b1ac07", "version": "6.5.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 5c4890ecd9a834..ce90b09b8cd3f6 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fabca872bf0e61547c64af674e33d557915d70c7", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "5481b3959bc7fbfc044326799d1c32f8ac42fc87", "version": "6.5.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index fc4978b6a1e808..e97e31acdb2ee0 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74986f47f213bebd33f07dbcc8a01c68719ac223", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "32afed31d843b9020943e27ce3ee3357d9f78ae5", "version": "6.5.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index bf3c8286a8095f..6223794c1de537 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c8dffb036b8e24cbfab8dc4fa4c49cdd02b4221", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "5be43c5f5cfe34aafe055afb69d844eedfcaf9e6", "version": "6.5.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 1d899f35816630..a946f348cf87c3 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bfb4cdda4d01946240acd3f5c2a16a4971f4f4d", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "568cb23f986ab02df124f82d9b9db980092f05fd", "version": "6.5.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 5df70352af8635..78894184fadbc1 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0c717f680978ecdd279354833ccc0ee99558f77", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "a7793967dcf8f178741f048ff03687f79ffbc894", "version": "6.5.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 3cd13c89c5673f..7087f455bff9e1 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4df86b328fb276cf0cc5e9803390da032bb79f8a", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "0b0b645beae52a3390e57bb7c51c0795dd46ab15", "version": "6.5.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 2ca8de2c11cbe7..2ec4d27575c907 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94038f6ef3143b15b2143e2521897b71d33c9750", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "864d67ee1194e13ff845a6ff17efc165c198fd55", "version": "6.5.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 9ccd885b27b45c..b11e225931025f 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bcd4ac467a6c0707c315f722457bd691adfcf83", + "version": "6.6.0", + "port-version": 0 + }, { "git-tree": "e442e9a131ddc682ac5adae8a16cafa801100583", "version": "6.5.3", From 7dc6a4e174cf331202cab0cd04f67aeef251c593 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 28 Oct 2023 02:24:01 +0800 Subject: [PATCH 0205/1039] [opentelemetry-cpp] update to 1.12.0 (#33983) * Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * update version * update to 1.11.0 * update version * update * update version * update version * update version * fix missing header file * update version * Fix feature otlp content * update version * update to 1.12.0 * update version * update version --- .../add-missing-include-file.patch | 24 ----------------- ports/opentelemetry-cpp/portfile.cmake | 10 +++---- .../use-default-cxx-version.patch | 26 ------------------- ports/opentelemetry-cpp/vcpkg.json | 12 ++++++--- .../fix_include_path.patch | 26 +++++++++++++++++++ ports/opentelemetry-fluentd/portfile.cmake | 2 ++ ports/opentelemetry-fluentd/vcpkg.json | 1 + versions/baseline.json | 6 ++--- versions/o-/opentelemetry-cpp.json | 5 ++++ versions/o-/opentelemetry-fluentd.json | 5 ++++ 10 files changed, 54 insertions(+), 63 deletions(-) delete mode 100644 ports/opentelemetry-cpp/add-missing-include-file.patch delete mode 100644 ports/opentelemetry-cpp/use-default-cxx-version.patch create mode 100644 ports/opentelemetry-fluentd/fix_include_path.patch diff --git a/ports/opentelemetry-cpp/add-missing-include-file.patch b/ports/opentelemetry-cpp/add-missing-include-file.patch deleted file mode 100644 index c23bc53468888b..00000000000000 --- a/ports/opentelemetry-cpp/add-missing-include-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/exporters/jaeger/src/TUDPTransport.cc b/exporters/jaeger/src/TUDPTransport.cc -index e411127..a5e08fa 100644 ---- a/exporters/jaeger/src/TUDPTransport.cc -+++ b/exporters/jaeger/src/TUDPTransport.cc -@@ -2,7 +2,9 @@ - // SPDX-License-Identifier: Apache-2.0 - - #include // std::stringstream -- -+#ifndef _MSC_VER -+#include -+#endif - #include "TUDPTransport.h" - #include "opentelemetry/sdk_config.h" - -@@ -48,7 +50,7 @@ void TUDPTransport::open() - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; - -- sprintf(port, "%d", port_); -+ snprintf(port, sizeof(port), "%d", port_); - - error = getaddrinfo(host_.c_str(), port, &hints, &server_addr_info_); - diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 24ae31aae2e197..8ed469db0860c7 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,19 +6,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62 + SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb HEAD_REF main PATCHES - # Use the compiler's default C++ version. Picking a version with - # CMAKE_CXX_STANDARD is not needed as the Abseil port already picked - # one and propagates that version across all its downstream deps. - use-default-cxx-version.patch # When compiling code generated by gRPC we need to link the gRPC library # too. add-missing-dependencies.patch # Missing find_dependency for Abseil add-missing-find-dependency.patch - add-missing-include-file.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,7 +23,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS prometheus WITH_PROMETHEUS elasticsearch WITH_ELASTICSEARCH jaeger WITH_JAEGER - otlp WITH_OTLP otlp-http WITH_OTLP_HTTP zpages WITH_ZPAGES otlp-grpc WITH_OTLP_GRPC @@ -63,6 +57,8 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES WITH_OTLP_GRPC + WITH_JAEGER + WITH_LOGS_PREVIEW ) vcpkg_cmake_install() diff --git a/ports/opentelemetry-cpp/use-default-cxx-version.patch b/ports/opentelemetry-cpp/use-default-cxx-version.patch deleted file mode 100644 index 53a31faf91b704..00000000000000 --- a/ports/opentelemetry-cpp/use-default-cxx-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4fa064..a868106 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,21 +126,6 @@ endif() - option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" - ${OPENTELEMETRY_INSTALL_default}) - --if(NOT DEFINED CMAKE_CXX_STANDARD) -- if(WITH_STL) -- # Require at least C++17. C++20 is needed to avoid gsl::span -- if(CMAKE_VERSION VERSION_GREATER 3.11.999) -- # Ask for 20, may get anything below -- set(CMAKE_CXX_STANDARD 20) -- else() -- # Ask for 17, may get anything below -- set(CMAKE_CXX_STANDARD 17) -- endif() -- else() -- set(CMAKE_CXX_STANDARD 11) -- endif() --endif() -- - if(WITH_STL) - # These definitions are needed for test projects that do not link against - # opentelemetry-api library directly. We ensure that variant implementation diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 3886f3ba29ce2d..fd5ddc26c63d55 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.9.1", - "port-version": 1, + "version-semver": "1.12.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." @@ -39,7 +38,14 @@ "otlp": { "description": "Whether to include the OpenTelemetry Protocol in the SDK", "dependencies": [ - "protobuf" + { + "name": "opentelemetry-cpp", + "default-features": false, + "features": [ + "otlp-grpc", + "otlp-http" + ] + } ] }, "otlp-grpc": { diff --git a/ports/opentelemetry-fluentd/fix_include_path.patch b/ports/opentelemetry-fluentd/fix_include_path.patch new file mode 100644 index 00000000000000..e162cf12ae994e --- /dev/null +++ b/ports/opentelemetry-fluentd/fix_include_path.patch @@ -0,0 +1,26 @@ +diff --git a/exporters/fluentd/src/log/recordable.cc b/exporters/fluentd/src/log/recordable.cc +index 5af84d8..1b124eb 100644 +--- a/exporters/fluentd/src/log/recordable.cc ++++ b/exporters/fluentd/src/log/recordable.cc +@@ -1,6 +1,9 @@ + /// Copyright The OpenTelemetry Authors + // SPDX-License-Identifier: Apache-2.0 + ++#include "opentelemetry/logs/severity.h" ++#include "opentelemetry/trace/span_id.h" ++#include "opentelemetry/trace/trace_id.h" + #include "opentelemetry/exporters/fluentd/log/recordable.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_common.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h" +diff --git a/exporters/fluentd/src/trace/recordable.cc b/exporters/fluentd/src/trace/recordable.cc +index 5c0a5ed..c24aa0c 100644 +--- a/exporters/fluentd/src/trace/recordable.cc ++++ b/exporters/fluentd/src/trace/recordable.cc +@@ -4,6 +4,7 @@ + #include "opentelemetry/exporters/fluentd/trace/recordable.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_common.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h" ++#include "opentelemetry/sdk/resource/resource.h" + + #include + #include diff --git a/ports/opentelemetry-fluentd/portfile.cmake b/ports/opentelemetry-fluentd/portfile.cmake index b2d0d687152c47..9c584d99da8054 100644 --- a/ports/opentelemetry-fluentd/portfile.cmake +++ b/ports/opentelemetry-fluentd/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff # Maps to 2.0.0 HEAD_REF main SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc + PATCHES + fix_include_path.patch ) vcpkg_cmake_configure( diff --git a/ports/opentelemetry-fluentd/vcpkg.json b/ports/opentelemetry-fluentd/vcpkg.json index ac5824dfdd945e..a34b5a812610f2 100644 --- a/ports/opentelemetry-fluentd/vcpkg.json +++ b/ports/opentelemetry-fluentd/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-fluentd", "version-semver": "2.0.0", + "port-version": 1, "description": "mdsd/fluentd exporter for OpenTelemetry C++", "homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b31d81b3861ae8..af7a4c3570018d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6241,12 +6241,12 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.9.1", - "port-version": 1 + "baseline": "1.12.0", + "port-version": 0 }, "opentelemetry-fluentd": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 0683b409a5db48..e38bfde60ebffe 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd8cacd9fd3aaa30b0ad133f2de052ba3ff869f", + "version-semver": "1.12.0", + "port-version": 0 + }, { "git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192", "version-semver": "1.9.1", diff --git a/versions/o-/opentelemetry-fluentd.json b/versions/o-/opentelemetry-fluentd.json index 80e61e7433242e..907fba1a594713 100644 --- a/versions/o-/opentelemetry-fluentd.json +++ b/versions/o-/opentelemetry-fluentd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9ffc101ca11ffd64b1a2bd73ae7e11bf7f28cfc", + "version-semver": "2.0.0", + "port-version": 1 + }, { "git-tree": "4c8cdb3314a3a35268d4ce9b786c6632c79e0f97", "version-semver": "2.0.0", From e712423c2de3604b945572d4e9cb4736513507e2 Mon Sep 17 00:00:00 2001 From: Martin Olivier Date: Fri, 27 Oct 2023 20:28:47 +0200 Subject: [PATCH 0206/1039] [dylib] New port (#34578) * [ports/dylib] New port Signed-off-by: Martin Olivier * fix: CPack installation Signed-off-by: Martin Olivier * fix: added version in baseline && manifest format Signed-off-by: Martin Olivier * fix: update version database * fix: removed redundant package_name Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix: cleanup Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix: newline at the end of portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix: cleanup * fix: hash --------- Signed-off-by: Martin Olivier Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/dylib/portfile.cmake | 21 +++++++++++++++++++++ ports/dylib/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/d-/dylib.json | 9 +++++++++ 4 files changed, 51 insertions(+) create mode 100644 ports/dylib/portfile.cmake create mode 100644 ports/dylib/vcpkg.json create mode 100644 versions/d-/dylib.json diff --git a/ports/dylib/portfile.cmake b/ports/dylib/portfile.cmake new file mode 100644 index 00000000000000..48985968d01b06 --- /dev/null +++ b/ports/dylib/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO martin-olivier/dylib + REF "v${VERSION}" + SHA512 8e691c1bc73f381ce8ec50d85165c122ba55167b050e696c8b26ccf1ba14999ca8129fb6c5b6c3320166f606acb2c21867d0786347c341d1267815580beb5c0a + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dylib) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/dylib/vcpkg.json b/ports/dylib/vcpkg.json new file mode 100644 index 00000000000000..0ae7f7b97c7f99 --- /dev/null +++ b/ports/dylib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "dylib", + "version-semver": "2.2.1", + "description": "C++ cross-platform wrapper around dynamic loading of shared libraries", + "homepage": "https://github.com/martin-olivier/dylib", + "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 af7a4c3570018d..c7e77300c81f0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2296,6 +2296,10 @@ "baseline": "11.31", "port-version": 3 }, + "dylib": { + "baseline": "2.2.1", + "port-version": 0 + }, "eabase": { "baseline": "2.09.12", "port-version": 3 diff --git a/versions/d-/dylib.json b/versions/d-/dylib.json new file mode 100644 index 00000000000000..19054b4d3858f9 --- /dev/null +++ b/versions/d-/dylib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5fcb0f058217dc6352d308f18015ef37b3f5f23c", + "version-semver": "2.2.1", + "port-version": 0 + } + ] +} From 98a562a04cd03728f399e79e1b37bcccb5a69b37 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 28 Oct 2023 02:30:01 +0800 Subject: [PATCH 0207/1039] [openssl] Update version to 3.1.4 (#34734) * [openssl] Update version to 3.1.4 * version --- ports/openssl/disable-install-docs.patch | 8 ++++---- ports/openssl/portfile.cmake | 2 +- ports/openssl/unix/move-openssldir.patch | 11 ++++++----- ports/openssl/unix/no-empty-dirs.patch | 10 +++++----- ports/openssl/unix/no-static-libs-for-shared.patch | 10 +++++----- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ports/openssl/disable-install-docs.patch b/ports/openssl/disable-install-docs.patch index 6e39790cec4ba2..cfeae0b10983ed 100644 --- a/ports/openssl/disable-install-docs.patch +++ b/ports/openssl/disable-install-docs.patch @@ -1,5 +1,5 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 110ba06..5b6b1c7 100644 +index a48fae5..c82c086 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime @@ -10,12 +10,12 @@ index 110ba06..5b6b1c7 100644 +install_docs: uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r $(DESTDIR)$(DOCDIR) + $(RM) -r "$(DESTDIR)$(DOCDIR)" diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl -index d054431..b5c1c88 100644 +index 9250b98..2b63c85 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl -@@ -487,7 +487,7 @@ install_sw: install_dev install_engines install_modules install_runtime +@@ -493,7 +493,7 @@ install_sw: install_dev install_engines install_modules install_runtime uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index e9209b4b7332d3..e03e4964c78e39 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -19,7 +19,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 248353b000ef6b9a3434bf808b147eb4672c82f36968b2995c159373680f80208183bb70c02effa36ae4a1705fe5a5e315960075e8899352c4e84069d6c651c2 + SHA512 04349ba554ddc5a9c26ff44714c1adca3c6431e98d11af5e7b6a5f58ed44e016da68c09cc53415716ab1936c6aaac04887ced470707dbc3f7816c04e06be69c1 PATCHES disable-apps.patch disable-install-docs.patch diff --git a/ports/openssl/unix/move-openssldir.patch b/ports/openssl/unix/move-openssldir.patch index 44e0183efec0d3..2a39bdbe745110 100644 --- a/ports/openssl/unix/move-openssldir.patch +++ b/ports/openssl/unix/move-openssldir.patch @@ -1,15 +1,16 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index dd96254..c4458ca 100644 +index c82c086..6c5402d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -689,6 +689,10 @@ install_ssldirs: - cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ - chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \ +@@ -690,6 +690,11 @@ install_ssldirs: + chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \ fi + + $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR) + for I in $(DESTDIR)$(OPENSSLDIR)/*; do \ + mv $$I $(DESTDIR)$(INSTALLTOP)$(OPENSSLDIR)/; \ + done - ++ install_dev: install_runtime_libs @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) + @$(ECHO) "*** Installing development files" diff --git a/ports/openssl/unix/no-empty-dirs.patch b/ports/openssl/unix/no-empty-dirs.patch index 4c59d9eaca33fd..7cf0cf05fa9273 100644 --- a/ports/openssl/unix/no-empty-dirs.patch +++ b/ports/openssl/unix/no-empty-dirs.patch @@ -1,21 +1,21 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 5b6b1c7..4c8c916 100644 +index 6c5402d..fc982df 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -818,7 +818,7 @@ _install_modules_deps: install_runtime_libs build_modules +@@ -823,7 +823,7 @@ _install_modules_deps: install_runtime_libs build_modules install_engines: _install_modules_deps @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) -- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ +- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)/" + @[ -z "$(INSTALL_ENGINES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @$(ECHO) "*** Installing engines" @set -e; for e in dummy $(INSTALL_ENGINES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ -@@ -842,7 +842,7 @@ uninstall_engines: +@@ -847,7 +847,7 @@ uninstall_engines: install_modules: _install_modules_deps @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) -- @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/ +- @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)/" + @[ -z "$(INSTALL_MODULES)" ] || $(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/ @$(ECHO) "*** Installing modules" @set -e; for e in dummy $(INSTALL_MODULES); do \ diff --git a/ports/openssl/unix/no-static-libs-for-shared.patch b/ports/openssl/unix/no-static-libs-for-shared.patch index 868e682a32146b..d6aa34cfe241e4 100644 --- a/ports/openssl/unix/no-static-libs-for-shared.patch +++ b/ports/openssl/unix/no-static-libs-for-shared.patch @@ -1,12 +1,12 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index 4c8c916..dd96254 100644 +index fc982df..10f1c54 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl -@@ -708,6 +708,7 @@ install_dev: install_runtime_libs +@@ -713,6 +713,7 @@ install_dev: install_runtime_libs done - @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir) + @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)" @set -e; for l in $(INSTALL_LIBS); do \ -+ if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \ ++ if [ -n "$(INSTALL_SHLIBS)" ] ; then continue ; fi ; \ fn=`basename $$l`; \ $(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \ - cp $$l $(DESTDIR)$(libdir)/$$fn.new; \ + cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \ diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index c5b8f43a5f29db..5d92de745da905 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openssl", - "version": "3.1.3", + "version": "3.1.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/versions/baseline.json b/versions/baseline.json index c7e77300c81f0f..0d081be46c48a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6225,7 +6225,7 @@ "port-version": 3 }, "openssl": { - "baseline": "3.1.3", + "baseline": "3.1.4", "port-version": 0 }, "openssl-unix": { diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 1a06bb6864f4c7..80f3672b2e43ea 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dc34c6428cc5a086a56695e0e0e8c2363e029b5", + "version": "3.1.4", + "port-version": 0 + }, { "git-tree": "e57c0f392fd8486892a91ca82b7bf2e34c59e374", "version": "3.1.3", From b86f18b286f86ef56963dd93cfccbfbe8514534e Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 28 Oct 2023 07:54:05 +0800 Subject: [PATCH 0208/1039] [mbedtls] update to 2.28.5 (#34744) * [mbedtls] update to 2.28.5 * [mbedtls] update to 2.28.5 --- ports/mbedtls/enable-pthread.patch | 26 +++++++++++++------------- ports/mbedtls/portfile.cmake | 4 ++-- ports/mbedtls/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mbedtls.json | 5 +++++ 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ports/mbedtls/enable-pthread.patch b/ports/mbedtls/enable-pthread.patch index 6353103769c327..55e742c1a81535 100755 --- a/ports/mbedtls/enable-pthread.patch +++ b/ports/mbedtls/enable-pthread.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8833246..f68ab02 100644 +index b001bb7..a5e0479 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,6 +28,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -44,6 +44,7 @@ set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library." OFF) - option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF) -+option(ENABLE_PTHREAD "Build mbed TLS with pthread" OFF) + option(USE_PKCS11_HELPER_LIBRARY "Build Mbed TLS with the pkcs11-helper library." OFF) + option(ENABLE_ZLIB_SUPPORT "Build Mbed TLS with zlib library." OFF) ++option(ENABLE_PTHREAD "Build Mbed TLS with pthread" OFF) - option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) + option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON) -@@ -231,6 +232,8 @@ else() +@@ -263,6 +264,8 @@ else() set(LIB_INSTALL_DIR lib) endif() @@ -19,7 +19,7 @@ index 8833246..f68ab02 100644 if(ENABLE_ZLIB_SUPPORT) find_package(ZLIB) -@@ -239,6 +242,17 @@ if(ENABLE_ZLIB_SUPPORT) +@@ -271,6 +274,17 @@ if(ENABLE_ZLIB_SUPPORT) endif(ZLIB_FOUND) endif(ENABLE_ZLIB_SUPPORT) @@ -38,11 +38,11 @@ index 8833246..f68ab02 100644 add_subdirectory(3rdparty) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 62c0f62..7923202 100644 +index 11b417b..5ca44c3 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,10 +1,14 @@ - option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) + option(INSTALL_MBEDTLS_HEADERS "Install Mbed TLS headers." ON) +configure_file(mbedtls/config_threading.h.in mbedtls/config_threading.h) + @@ -58,7 +58,7 @@ index 62c0f62..7923202 100644 DESTINATION include/mbedtls PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h -index 1e6e052..51c20da 100644 +index 7b1f38a..5f29ba5 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -24,6 +24,8 @@ @@ -84,10 +84,10 @@ index 0000000..9d5d42e +#endif \ No newline at end of file diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 33e2cfc..4b99331 100644 +index 8d88101..2ba764c 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt -@@ -137,7 +137,11 @@ if(ENABLE_ZLIB_SUPPORT) +@@ -149,7 +149,11 @@ if(ENABLE_ZLIB_SUPPORT) endif(ENABLE_ZLIB_SUPPORT) if(LINK_WITH_PTHREAD) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index e2aff063c9b9a2..efb1fcdf72deb8 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 v2.28.1 - SHA512 b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689 + REF "v${VERSION}" + SHA512 7b19dff013910b5300662d48be5adb0e7c4d2c54b79116992642e5c9850cd62a14aea69b121458d3441154e3f2a13fd9a33ad86a26f17e4d94a872970ea841e0 HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json index b0eb96bb46ea7e..9d0648eec6b0c0 100644 --- a/ports/mbedtls/vcpkg.json +++ b/ports/mbedtls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mbedtls", - "version": "2.28.1", + "version": "2.28.5", "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 0d081be46c48a1..e9f5f8e9a6d338 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5377,7 +5377,7 @@ "port-version": 2 }, "mbedtls": { - "baseline": "2.28.1", + "baseline": "2.28.5", "port-version": 0 }, "mchehab-zbar": { diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 161576939ba269..b40c8e93a207e4 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "909516904f06e3379f7ac434b967cb165d8020c2", + "version": "2.28.5", + "port-version": 0 + }, { "git-tree": "f6fd876a24f60e3034438c6793627be091ab6426", "version": "2.28.1", From 4b00fb593feba90e12f69798b12c4b24371a016e Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 28 Oct 2023 08:53:00 +0800 Subject: [PATCH 0209/1039] [gstreamer] Add correct support for feature nvcodec (#34751) * [gstreamer] Add correct support for feature nvcodec * version * add support * version --- ports/gstreamer/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 4eeaa88aee41ec..bbe5f43c3dfdcb 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 4, + "port-version": 5, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -424,7 +424,7 @@ }, "nvcodec": { "description": "Enable support for the NVCODEC encoders and decoders", - "supports": "!uwp", + "supports": "!osx & !ios & !android & !emscripten", "dependencies": [ { "name": "gstreamer", diff --git a/versions/baseline.json b/versions/baseline.json index e9f5f8e9a6d338..55d3f4f4330bbb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3102,7 +3102,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 4 + "port-version": 5 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index fc39a164bab852..d24e474933c0f2 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6339c24dbe60ed13ff8d6b5e646d11e192f4ec0", + "version": "1.22.5", + "port-version": 5 + }, { "git-tree": "b18eecdb79cdeb95b0c5e003cf14ababd9bca7c9", "version": "1.22.5", From cbb9d90a2ea64b7922658b0760793a8ebbfe1a2a Mon Sep 17 00:00:00 2001 From: Todor Prokopov Date: Sat, 28 Oct 2023 04:00:49 +0300 Subject: [PATCH 0210/1039] [libpq] Fix MinGW build (#34747) --- ports/libpq/portfile.cmake | 4 ++-- ports/libpq/unix/python.patch | 16 +++++++++++++--- ports/libpq/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 77abf18c278568..d700306b94a6e9 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -24,7 +24,6 @@ vcpkg_extract_source_archive( file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*") string(REGEX MATCH "python3\\.([0-9]+)" _python_version_tmp "${_py3_include_path}") set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_1}") -vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "python_version=3.REPLACEME" "python_version=3.${PYTHON_VERSION_MINOR}") if("client" IN_LIST FEATURES) set(HAS_TOOLS TRUE) @@ -89,7 +88,7 @@ else() file(COPY "${CMAKE_CURRENT_LIST_DIR}/Makefile" DESTINATION "${SOURCE_PATH}") vcpkg_list(SET BUILD_OPTS) - foreach(option IN ITEMS icu lz4 nls openssl python readline xml xslt zlib zstd) + foreach(option IN ITEMS icu lz4 nls openssl readline xml xslt zlib zstd) if(option IN_LIST FEATURES) list(APPEND BUILD_OPTS --with-${option}) else() @@ -103,6 +102,7 @@ else() endif() endif() if("python" IN_LIST FEATURES) + list(APPEND BUILD_OPTS --with-python=3.${PYTHON_VERSION_MINOR}) vcpkg_find_acquire_program(PYTHON3) list(APPEND BUILD_OPTS "PYTHON=${PYTHON3}") endif() diff --git a/ports/libpq/unix/python.patch b/ports/libpq/unix/python.patch index c83458025b455d..7d8f58d4af1970 100644 --- a/ports/libpq/unix/python.patch +++ b/ports/libpq/unix/python.patch @@ -1,14 +1,24 @@ diff --git a/configure.ac b/configure.ac -index a35395e..3c1b3e2 100644 +index 7f97248992..33b6c84fc4 100644 --- a/configure.ac +++ b/configure.ac -@@ -1176,7 +1176,19 @@ fi +@@ -891,7 +891,9 @@ AC_SUBST(with_perl) + # Optionally build Python modules (PL/Python) + # + AC_MSG_CHECKING([whether to build Python modules]) +-PGAC_ARG_BOOL(with, python, no, [build Python modules (PL/Python)]) ++PGAC_ARG_OPTARG(with, python, [PYTHON_VERSION], [build Python modules (PL/Python)], ++ [], ++ [python_version=$withval]) + AC_MSG_RESULT([$with_python]) + AC_SUBST(with_python) + +@@ -1214,7 +1216,18 @@ fi if test "$with_python" = yes; then PGAC_PATH_PYTHON - PGAC_CHECK_PYTHON_EMBED_SETUP + python_majorversion=3 -+ python_version=3.REPLACEME + PKG_CHECK_MODULES(PYTHON_EMBED, python-${python_version}-embed) + python_includespec="${PYTHON_EMBED_CFLAGS}" + python_libdir=[$(echo " ${PYTHON_EMBED_LIBS}" | sed -e 's/\( -L[^ ]*\).*/\1/' -e 's/^.* -L//')] diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 13e9e6d4b23b70..5cf4153e6ec6fb 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpq", "version": "16.0", + "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 55d3f4f4330bbb..1c9848874a8dba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4590,7 +4590,7 @@ }, "libpq": { "baseline": "16.0", - "port-version": 0 + "port-version": 1 }, "libpqxx": { "baseline": "7.8.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index c19c69f99241b9..5344e706af5f16 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f0007ec87e337d4f484164ecf589395b174d044", + "version": "16.0", + "port-version": 1 + }, { "git-tree": "cbd6314cbfd04132985a7a6412184d368c3cd0b6", "version": "16.0", From 1c00eae503c78c308f1d1a412d5530eea5d18a31 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sat, 28 Oct 2023 05:10:15 +0400 Subject: [PATCH 0211/1039] [opencv] added openvino support (#34727) * opencv: added openvino support * updated version database --- ports/opencv4/0021-static-openvino.patch | 25 ++++++++++++++++++++++++ ports/opencv4/portfile.cmake | 9 +++++++++ ports/opencv4/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 5 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ports/opencv4/0021-static-openvino.patch diff --git a/ports/opencv4/0021-static-openvino.patch b/ports/opencv4/0021-static-openvino.patch new file mode 100644 index 00000000000000..156aca2bcc90c0 --- /dev/null +++ b/ports/opencv4/0021-static-openvino.patch @@ -0,0 +1,25 @@ +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index 437042958e..a90eb5a5ab 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -1632,13 +1632,19 @@ function(ocv_add_external_target name inc link def) + endif() + endfunction() + ++set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "" CACHE INTERNAL "") + function(ocv_install_used_external_targets) + if(NOT BUILD_SHARED_LIBS + AND NOT (CMAKE_VERSION VERSION_LESS "3.13.0") # upgrade CMake: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2152 + ) + foreach(tgt in ${ARGN}) + if(tgt MATCHES "^ocv\.3rdparty\.") +- install(TARGETS ${tgt} EXPORT OpenCVModules) ++ list(FIND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}" _found) ++ if(_found EQUAL -1) # don't export target twice ++ install(TARGETS ${tgt} EXPORT OpenCVModules) ++ list(APPEND __OPENCV_EXPORTED_EXTERNAL_TARGETS "${tgt}") ++ set(__OPENCV_EXPORTED_EXTERNAL_TARGETS "${__OPENCV_EXPORTED_EXTERNAL_TARGETS}" CACHE INTERNAL "") ++ endif() + endif() + endforeach() + endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index d783f99fea4649..c7b20c6664c23d 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_from_github( 0017-fix-flatbuffers.patch 0019-missing-include.patch 0020-fix-compat-cuda12.2.patch + 0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963 "${ARM64_WINDOWS_FIX}" ) # Disallow accidental build of vendored copies @@ -85,9 +86,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) +set(WITH_OPENVINO OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) set(BUILD_opencv_dnn ON) + if(NOT VCPKG_TARGET_IS_UWP) + set(WITH_OPENVINO ON) + endif() else() message(WARNING "The dnn module cannot be enabled on Android") endif() @@ -446,6 +451,7 @@ vcpkg_cmake_configure( -DWITH_PROTOBUF=${BUILD_opencv_dnn} -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF + -DWITH_OPENVINO=${WITH_OPENVINO} -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF -DWITH_CPUFEATURES=OFF @@ -526,6 +532,9 @@ find_dependency(Tesseract)") if("lapack" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)") endif() + if(WITH_OPENVINO) + string(APPEND DEPS_STRING "\nfind_dependency(OpenVINO CONFIG)") + endif() if("openexr" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 28ceb72bba6221..858221b401124e 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 7, + "port-version": 8, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -109,6 +109,10 @@ "host": true, "default-features": false }, + { + "name": "openvino", + "platform": "!uwp" + }, "protobuf" ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 1c9848874a8dba..482a85d671a8a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6150,7 +6150,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 7 + "port-version": 8 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 8d1ade83c42779..a7aa4d6348c3bf 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c", + "version": "4.8.0", + "port-version": 8 + }, { "git-tree": "ef78c1958b122045e9d1e353150049431b3162fa", "version": "4.8.0", From 9ffbe6768deb8d493c7235a893b8130cd2bfc500 Mon Sep 17 00:00:00 2001 From: NewWheelTech <97138790+NewWheelTech@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:44:08 -0400 Subject: [PATCH 0212/1039] [libigl] Update to v2.5.0 (#34703) * [libigl] Upate to v2.5.0 * Add updated patches to libigl v2.5.0 * Add find_package for stb * Remove PNG from libigl * Update basline.json and libigl.json * Update libigl.json * Add stb to dependancies, remove unneeded patch * Fix formating * Update libigl.json version * Stb is case senstive on Linux * Update version git-tree --- ports/libigl/dependencies.patch | 45 ++--------------- ports/libigl/install-extra-targets.patch | 64 +++++++++++++----------- ports/libigl/portfile.cmake | 8 +-- ports/libigl/upstream_fixes.patch | 14 ------ ports/libigl/vcpkg.json | 17 +------ versions/baseline.json | 4 +- versions/l-/libigl.json | 5 ++ 7 files changed, 52 insertions(+), 105 deletions(-) delete mode 100644 ports/libigl/upstream_fixes.patch diff --git a/ports/libigl/dependencies.patch b/ports/libigl/dependencies.patch index 19091e5c96f8ba..9308057d8e3b19 100644 --- a/ports/libigl/dependencies.patch +++ b/ports/libigl/dependencies.patch @@ -1,29 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 232bc03..8143963 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,7 +64,7 @@ set(MATLAB_ADDITIONAL_VERSIONS - set(LIBIGL_DEFAULT_MATLAB ${LIBIGL_TOPLEVEL_PROJECT}) - set(LIBIGL_DEFAULT_MOSEK ${LIBIGL_TOPLEVEL_PROJECT}) - if(LIBIGL_TOPLEVEL_PROJECT) -- if(NOT WIN32) -+ if(0) - find_package(GMP QUIET) - find_package(MPFR QUIET) - if(NOT (TARGET gmp::gmp AND TARGET mpfr::mpfr)) -diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in -index 359e314..6e04af6 100644 ---- a/cmake/igl/libigl-config.cmake.in -+++ b/cmake/igl/libigl-config.cmake.in -@@ -1,3 +1,8 @@ - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+find_dependency(Eigen3) -+find_dependency(Threads) -+include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake") -+ - check_required_components(Libigl) diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake index f6abe8c..7ee7d84 100644 --- a/cmake/igl/modules/copyleft/cgal.cmake @@ -74,10 +48,10 @@ index 6f22319..de85066 100644 # 5. Unit tests diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake -index 151338e..f42d22a 100644 +index 79c2126..6d06775 100644 --- a/cmake/igl/modules/glfw.cmake +++ b/cmake/igl/modules/glfw.cmake -@@ -14,10 +14,10 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/*.cpp") +@@ -14,12 +14,12 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/opengl/glfw/*.cpp") igl_target_sources(igl_glfw ${INC_FILES} ${SRC_FILES}) # 4. Dependencies @@ -90,6 +64,8 @@ index 151338e..f42d22a 100644 - glfw::glfw + $ ) + + # 5. Unit tests diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake index d7ffb9d..f331854 100644 --- a/cmake/igl/modules/imgui.cmake @@ -124,19 +100,6 @@ index 4580c03..dfadb38 100644 find_package(OpenGL REQUIRED OPTIONAL_COMPONENTS OpenGL) target_link_libraries(igl_opengl ${IGL_SCOPE} igl::core -diff --git a/cmake/igl/modules/png.cmake b/cmake/igl/modules/png.cmake -index b267deb..8d8decc 100644 ---- a/cmake/igl/modules/png.cmake -+++ b/cmake/igl/modules/png.cmake -@@ -14,7 +14,7 @@ file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/include/igl/png/*.cpp") - igl_target_sources(igl_png ${INC_FILES} ${SRC_FILES}) - - # 4. Dependencies --include(stb) -+find_package(Stb REQUIRED) - igl_include(opengl) - target_link_libraries(igl_png ${IGL_SCOPE} - igl::core diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake index 3763b77..31ab979 100644 --- a/cmake/igl/modules/xml.cmake diff --git a/ports/libigl/install-extra-targets.patch b/ports/libigl/install-extra-targets.patch index f68ffe60d29965..ea8320c683d37f 100644 --- a/ports/libigl/install-extra-targets.patch +++ b/ports/libigl/install-extra-targets.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8143963..784ac50 100644 +index 4a98749..bc121a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -157,7 +157,7 @@ if(LIBIGL_INSTALL) +@@ -166,7 +166,7 @@ if(LIBIGL_INSTALL) set(version_config_file "${CMAKE_CURRENT_BINARY_DIR}/LibiglConfigVersion.cmake") set(export_dest_dir "${CMAKE_INSTALL_LIBDIR}/cmake/igl") @@ -12,12 +12,12 @@ index 8143963..784ac50 100644 DESTINATION ${export_dest_dir} NAMESPACE igl${suffix}:: diff --git a/cmake/igl/libigl-config.cmake.in b/cmake/igl/libigl-config.cmake.in -index 629896d..0b05692 100644 +index d3ff19f..60e50c7 100644 --- a/cmake/igl/libigl-config.cmake.in +++ b/cmake/igl/libigl-config.cmake.in -@@ -4,5 +4,30 @@ include(CMakeFindDependencyMacro) - find_dependency(Eigen3) - find_dependency(Threads) +@@ -4,4 +4,27 @@ include(CMakeFindDependencyMacro) + find_dependency(Eigen3 REQUIRED) + find_dependency(Threads REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/LibiglConfigTargets.cmake") +if(TARGET igl::igl_embree) + find_dependency(embree 3) @@ -33,9 +33,6 @@ index 629896d..0b05692 100644 + find_dependency(OpenGL) + find_dependency(glad) +endif() -+if(TARGET igl::igl_png) -+ find_dependency(Stb) -+endif() +if(TARGET igl::igl_xml) + find_dependency(tinyxml2) +endif() @@ -44,7 +41,7 @@ index 629896d..0b05692 100644 +if(TARGET igl_copyleft::igl_copyleft_cgal) + find_dependency(CGAL) +endif() - ++ check_required_components(Libigl) diff --git a/cmake/igl/modules/copyleft/cgal.cmake b/cmake/igl/modules/copyleft/cgal.cmake index 7ee7d84..d06c6ee 100644 @@ -99,10 +96,10 @@ index 137d30b..597c26b 100644 # 4. Install target & headers diff --git a/cmake/igl/modules/embree.cmake b/cmake/igl/modules/embree.cmake -index de85066..052fc76 100644 +index de85066..c54949c 100644 --- a/cmake/igl/modules/embree.cmake +++ b/cmake/igl/modules/embree.cmake -@@ -20,6 +20,9 @@ target_link_libraries(igl_embree ${IGL_SCOPE} +@@ -20,6 +20,8 @@ target_link_libraries(igl_embree ${IGL_SCOPE} $ ) @@ -111,47 +108,42 @@ index de85066..052fc76 100644 # 5. Unit tests file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/embree/*.cpp") igl_add_test(igl_embree ${SRC_FILES}) -+ diff --git a/cmake/igl/modules/glfw.cmake b/cmake/igl/modules/glfw.cmake -index f42d22a..e9930d8 100644 +index 6d06775..7126a23 100644 --- a/cmake/igl/modules/glfw.cmake +++ b/cmake/igl/modules/glfw.cmake -@@ -21,3 +21,5 @@ target_link_libraries(igl_glfw ${IGL_SCOPE} - igl::opengl +@@ -22,6 +22,9 @@ target_link_libraries(igl_glfw ${IGL_SCOPE} $ ) + + +igl_install(igl_glfw ${INC_FILES} ${SRC_FILES}) ++ + # 5. Unit tests + if(LIBIGL_GLFW_TESTS) + file(GLOB SRC_FILES "${libigl_SOURCE_DIR}/tests/include/igl/opengl/glfw/*.cpp") diff --git a/cmake/igl/modules/imgui.cmake b/cmake/igl/modules/imgui.cmake -index f331854..7ff9738 100644 +index f331854..6e0de4c 100644 --- a/cmake/igl/modules/imgui.cmake +++ b/cmake/igl/modules/imgui.cmake -@@ -23,3 +23,5 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} +@@ -23,3 +23,6 @@ target_link_libraries(igl_imgui ${IGL_SCOPE} imgui::imgui imguizmo::imguizmo ) + +igl_install(igl_imgui ${INC_FILES} ${SRC_FILES}) ++ diff --git a/cmake/igl/modules/opengl.cmake b/cmake/igl/modules/opengl.cmake -index dfadb38..185494b 100644 +index dfadb38..d3deaba 100644 --- a/cmake/igl/modules/opengl.cmake +++ b/cmake/igl/modules/opengl.cmake -@@ -22,3 +22,5 @@ target_link_libraries(igl_opengl ${IGL_SCOPE} +@@ -22,3 +22,6 @@ target_link_libraries(igl_opengl ${IGL_SCOPE} # Link against OpenGL::OpenGL if available, or fallback to OpenGL::GL $,OpenGL::OpenGL,OpenGL::GL> ) + +igl_install(igl_opengl ${INC_FILES} ${SRC_FILES}) -diff --git a/cmake/igl/modules/png.cmake b/cmake/igl/modules/png.cmake -index 8d8decc..293da91 100644 ---- a/cmake/igl/modules/png.cmake -+++ b/cmake/igl/modules/png.cmake -@@ -21,3 +21,5 @@ target_link_libraries(igl_png ${IGL_SCOPE} - igl::opengl - stb::stb - ) + -+igl_install(igl_png ${INC_FILES} ${SRC_FILES}) diff --git a/cmake/igl/modules/xml.cmake b/cmake/igl/modules/xml.cmake index 31ab979..815ea62 100644 --- a/cmake/igl/modules/xml.cmake @@ -162,3 +154,17 @@ index 31ab979..815ea62 100644 ) + +igl_install(igl_xml ${INC_FILES} ${SRC_FILES}) + +diff --git a/cmake/igl/modules/stb.cmake b/cmake/igl/modules/stb.cmake +index 20607ec..5bc3211 100644 +--- a/cmake/igl/modules/stb.cmake ++++ b/cmake/igl/modules/stb.cmake +@@ -21,7 +21,7 @@ endif() + igl_target_sources(igl_stb ${INC_FILES} ${SRC_FILES}) + + # 4. Dependencies +-include(stb) ++find_package(Stb REQUIRED) + target_link_libraries(igl_stb ${IGL_SCOPE} + igl::core + stb::stb diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index 14cdc319318c3b..4860e7021dbe1a 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libigl/libigl - REF 66b3ef2253e765d0ce0db74cec91bd706e5ba176 #2.4.0 - SHA512 7014ffdaa160bfa2509fc283cb7176d7994a37f51509c7374659292efad076c8fb594f9f6990bab1aa5562d1f66e93403ea35a5bf2a924436560a2d4669ffcfd + REF fdaac01bcc52888994f7afd029dcc045dd408484 #2.5.0 + SHA512 214f6af92026987d9ee3bad5e1849ef96d8455b1de38a03d068b7d7ab88b66a08f3a1f7c11b0cabc8d0744c19855ee2fdd544ac15ad826d117ef1ba97a318a2f HEAD_REF master PATCHES dependencies.patch - upstream_fixes.patch install-extra-targets.patch ) file(REMOVE @@ -27,6 +26,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/recipes/external/mpfr.cmake" "${SOURCE_PATH}/cmake/recipes/external/stb.cmake" "${SOURCE_PATH}/cmake/recipes/external/tinyxml2.cmake" + "${SOURCE_PATH}/cmake/recipes/external/spectra.cmake" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -36,7 +36,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS glfw LIBIGL_GLFW imgui LIBIGL_IMGUI opengl LIBIGL_OPENGL - png LIBIGL_PNG xml LIBIGL_XML # Features removed: missing binary libs / separate ports comiso LIBIGL_COPYLEFT_COMISO @@ -58,6 +57,7 @@ vcpkg_cmake_configure( -DLIBIGL_RESTRICTED_MOSEK=OFF -DLIBIGL_USE_STATIC_LIBRARY=OFF -DHUNTER_ENABLED=OFF + -DLIBIGL_SPECTRA=OFF ${ADDITIONAL_OPTIONS} ) diff --git a/ports/libigl/upstream_fixes.patch b/ports/libigl/upstream_fixes.patch deleted file mode 100644 index 5840b8075ca33e..00000000000000 --- a/ports/libigl/upstream_fixes.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git "a/include/igl/average_from_edges_onto_vertices.cpp" "b/include/igl/average_from_edges_onto_vertices.cpp" -index 12c54c58..ed2951c1 100644 ---- "a/include/igl/average_from_edges_onto_vertices.cpp" -+++ "b/include/igl/average_from_edges_onto_vertices.cpp" -@@ -62,7 +62,7 @@ igl::average_from_edges_onto_vertices( - - #ifdef IGL_STATIC_LIBRARY - // Explicit template instantiation --template void igl::average_from_edges_onto_vertices, Eigen::Matrix, Eigen::Matrix, Eigen::PartialReduxExpr, Eigen::internal::member_norm, 1>, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase, Eigen::internal::member_norm, 1> > const&, Eigen::PlainObjectBase >&); -+template void igl::average_from_edges_onto_vertices, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::PlainObjectBase >&); - template void igl::average_from_edges_onto_vertices, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::PlainObjectBase >&); - template void igl::average_from_edges_onto_vertices, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::MatrixBase > const&, Eigen::PlainObjectBase >&); --#endif -+#endif diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index 2c4a7d5ac79895..7404a9c2e7e204 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,12 +1,12 @@ { "name": "libigl", - "version": "2.4.0", - "port-version": 4, + "version": "2.5.0", "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", "license": null, "dependencies": [ "eigen3", + "stb", { "name": "vcpkg-cmake", "host": true @@ -77,19 +77,6 @@ "opengl" ] }, - "png": { - "description": "Install PNG support", - "dependencies": [ - { - "name": "libigl", - "default-features": false, - "features": [ - "opengl" - ] - }, - "stb" - ] - }, "xml": { "description": "Build with libxml", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 482a85d671a8a7..7468b3412f48b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4325,8 +4325,8 @@ "port-version": 3 }, "libigl": { - "baseline": "2.4.0", - "port-version": 4 + "baseline": "2.5.0", + "port-version": 0 }, "libilbc": { "baseline": "3.0.4", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index e84671efffe140..c6e149855befc2 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9b48cd75312e9e77df2c2e7307b063d8737f4ba", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "260c09078445cfce5ce800b1d3cfa47877f6f783", "version": "2.4.0", From 5db545950d273aa3af8f18a159d851a62274cc7c Mon Sep 17 00:00:00 2001 From: jreichel-nvidia <43646584+jreichel-nvidia@users.noreply.github.com> Date: Sat, 28 Oct 2023 03:54:58 +0200 Subject: [PATCH 0213/1039] [openimageio] Separate feature flags for tools and viewer (#34556) (#34699) * [openimageio] Separate feature flags for tools and viewer (#34556) Add feature flag "viewer" which controls building the viewer "iv". Drop feature flag "tools", build tools (excluding the viewer) unconditionally. * Re-add "tools" flag. Make "viewer" flag depend on "tools" flag. * Ensure that Qt does not get picked up by accident if the "viewer" flag is not selected. Make hidden dependency of theia on OpenImageIO::iv explicit. * Fix syntax error in USE_QT option. * Use ENABLE_IV instead of USE_QT. Remove explicit setting of -DUSE_QT=OFF. --- ports/openimageio/portfile.cmake | 11 +++++++++-- ports/openimageio/vcpkg.json | 13 +++++++++++-- ports/theia/vcpkg.json | 7 ++++++- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ versions/t-/theia.json | 5 +++++ 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index d56f4ed2bb25e9..ec4f38526e797e 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -40,7 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libheif USE_LIBHEIF pybind11 USE_PYTHON tools OIIO_BUILD_TOOLS - tools USE_QT + viewer ENABLE_IV ) vcpkg_cmake_configure( @@ -75,7 +75,14 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO) if("tools" IN_LIST FEATURES) vcpkg_copy_tools( - TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool iv + TOOL_NAMES iconvert idiff igrep iinfo maketx oiiotool + AUTO_CLEAN + ) +endif() + +if("viewer" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES iv AUTO_CLEAN ) endif() diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index a2b67d66495bdd..542742e24bc5fa 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.4.14.0", - "port-version": 2, + "port-version": 3, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", @@ -104,9 +104,18 @@ ] }, "tools": { - "description": "Build openimageio tools", + "description": "Build openimageio tools" + }, + "viewer": { + "description": "Build openimageio viewer", "dependencies": [ "opengl", + { + "name": "openimageio", + "features": [ + "tools" + ] + }, { "name": "qtbase", "default-features": false diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index 2ccb278665858a..19788cbb3fde04 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -20,7 +20,12 @@ "platform": "!osx" }, "glew", - "openimageio", + { + "name": "openimageio", + "features": [ + "viewer" + ] + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 7468b3412f48b0..c36319272da4b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6182,7 +6182,7 @@ }, "openimageio": { "baseline": "2.4.14.0", - "port-version": 2 + "port-version": 3 }, "openjpeg": { "baseline": "2.5.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 49da4aa3b11724..22f1419abef71a 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76cadb5ec79b57f840f2dae9dc39501b027f6a9f", + "version": "2.4.14.0", + "port-version": 3 + }, { "git-tree": "fed3a9ba9a7731e30376ded1d6bdaba3e41b1ec6", "version": "2.4.14.0", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index f0635cef394eeb..de8ab5f9cef438 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -3,6 +3,11 @@ { "git-tree": "244b1ee4928a23a5394691a642a1b56125198228", "version": "0.8", + "port-version": 10 + }, + { + "git-tree": "f33100aa143474a7207ee0f2ec7daf0fda3a74a5", + "version": "0.8", "port-version": 9 }, { From 73408b176978eceb51c096184bd6ea7b6b5dbb30 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 28 Oct 2023 04:22:45 +0200 Subject: [PATCH 0214/1039] [gz-cmake3] Fix export of static deps (#34667) * [gz-cmake3] Fix export of static deps * [gz-cmake3,gz-common5] Revise package import * [gz-common5] Disable tests by config * [gz-cmake3,gz-common5] Revise deps patching * [gz-common5] Take care of pkg-config * [gz-common5] Check installed components * Finish --- ports/gz-cmake3/dependencies.patch | 132 ++++++++++++++++++++---- ports/gz-cmake3/portfile.cmake | 2 +- ports/gz-cmake3/vcpkg.json | 2 +- ports/gz-cmake3/vcpkg/GTS.cmake | 3 + ports/gz-cmake3/vcpkg/TINYXML2.cmake | 3 + ports/gz-common5/fix_dependencies.patch | 89 ---------------- ports/gz-common5/portfile.cmake | 15 ++- ports/gz-common5/remove_tests.patch | 15 --- ports/gz-common5/vcpkg.json | 8 +- versions/baseline.json | 4 +- versions/g-/gz-cmake3.json | 5 + versions/g-/gz-common5.json | 5 + 12 files changed, 150 insertions(+), 133 deletions(-) create mode 100644 ports/gz-cmake3/vcpkg/GTS.cmake create mode 100644 ports/gz-cmake3/vcpkg/TINYXML2.cmake delete mode 100644 ports/gz-common5/fix_dependencies.patch delete mode 100644 ports/gz-common5/remove_tests.patch diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch index 169f24dd02b7f7..766d1a1ba42d55 100644 --- a/ports/gz-cmake3/dependencies.patch +++ b/ports/gz-cmake3/dependencies.patch @@ -1,22 +1,110 @@ -diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake ---- a/cmake/FindGzBullet.cmake -+++ b/cmake/FindGzBullet.cmake -@@ -30,16 +30,17 @@ - - # Bullet. Force MODULE mode to use the FindBullet.cmake file distributed with - # CMake. Otherwise, we may end up using the BulletConfig.cmake file distributed - # with Bullet, which uses relative paths and may break transitive dependencies. --find_package(Bullet MODULE ${gz_quiet_arg}) -+find_package(Bullet CONFIG REQUIRED) - - set(GzBullet_FOUND false) - # create Bullet target - if(BULLET_FOUND) - set(GzBullet_FOUND true) - - gz_import_target(GzBullet -+ INTERFACE - TARGET_NAME GzBullet::GzBullet - LIB_VAR BULLET_LIBRARIES - INCLUDE_VAR BULLET_INCLUDE_DIRS - ) +diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake +index 8a5836e..7f926cc 100644 +--- a/cmake/FindFreeImage.cmake ++++ b/cmake/FindFreeImage.cmake +@@ -23,7 +23,17 @@ set(minor_version ${FreeImage_FIND_VERSION_MINOR}) + # Set the full version number + set(full_version ${major_version}.${minor_version}) + +-if (NOT WIN32) ++if(FreeImage_FOUND) ++ # done ++elseif(1) ++ find_package(freeimage CONFIG) ++ if(freeimage_FOUND) ++ set(FreeImage_FOUND 1) ++ set(FreeImage_LIBRARIES freeimage::FreeImage) ++ include(GzImportTarget) ++ gz_import_target(FreeImage INTERFACE) ++ endif() ++elseif(0) + include(GzPkgConfig) + gz_pkg_config_library_entry(FreeImage freeimage) + +diff --git a/cmake/FindGTS.cmake b/cmake/FindGTS.cmake +index b400483..77f1247 100644 +--- a/cmake/FindGTS.cmake ++++ b/cmake/FindGTS.cmake +@@ -16,7 +16,7 @@ + ######################################## + # Find GNU Triangulation Surface Library + +-if (NOT WIN32) ++if (1) + # Configuration using pkg-config modules + include(GzPkgConfig) + gz_pkg_check_modules(GTS gts) +diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake +index 798d239..e7ee87c 100644 +--- a/cmake/FindGzBullet.cmake ++++ b/cmake/FindGzBullet.cmake +@@ -31,7 +31,7 @@ endif() + # Bullet. Force MODULE mode to use the FindBullet.cmake file distributed with + # CMake. Otherwise, we may end up using the BulletConfig.cmake file distributed + # with Bullet, which uses relative paths and may break transitive dependencies. +-find_package(Bullet MODULE ${gz_quiet_arg}) ++find_package(Bullet CONFIG REQUIRED) + + set(GzBullet_FOUND false) + # create Bullet target +@@ -39,6 +39,7 @@ if(BULLET_FOUND) + set(GzBullet_FOUND true) + + gz_import_target(GzBullet ++ INTERFACE + TARGET_NAME GzBullet::GzBullet + LIB_VAR BULLET_LIBRARIES + INCLUDE_VAR BULLET_INCLUDE_DIRS +diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake +index 5a5a147..68ba2a3 100644 +--- a/cmake/FindTINYXML2.cmake ++++ b/cmake/FindTINYXML2.cmake +@@ -18,11 +18,16 @@ + + include(GzPkgConfig) + +-# Use pkg_check_modules to start +-gz_pkg_check_modules_quiet(TINYXML2 tinyxml2) + + # If that failed, then fall back to manual detection (necessary for MacOS) + if(NOT TINYXML2_FOUND) ++ find_package(TINYXML2 NAMES tinyxml2) ++ if(TINYXML2_FOUND) ++ set(TINYXML2_LIBRARIES tinyxml2::tinyxml2) ++ include(GzImportTarget) ++ gz_import_target(TINYXML2 INTERFACE) ++ endif() ++elseif(0) + + if(NOT TINYXML2_FIND_QUIETLY) + message(STATUS "Attempting manual search for tinyxml2") +diff --git a/cmake/GzFindPackage.cmake b/cmake/GzFindPackage.cmake +index 4eb7a0d..11dae8a 100644 +--- a/cmake/GzFindPackage.cmake ++++ b/cmake/GzFindPackage.cmake +@@ -178,6 +178,7 @@ macro(gz_find_package PACKAGE_NAME_) + _gz_cmake_parse_arguments(gz_find_package "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + endif() + ++ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg/${PACKAGE_NAME}.cmake" OPTIONAL) + #------------------------------------ + # Construct the arguments to pass to find_package + set(${PACKAGE_NAME}_find_package_args ${PACKAGE_NAME}) +@@ -192,6 +193,8 @@ macro(gz_find_package PACKAGE_NAME_) + + if(gz_find_package_EXACT) + list(APPEND ${PACKAGE_NAME}_find_package_args EXACT) ++ elseif(gz_find_package_VERSION AND NOT gz_find_package_PKGCONFIG_VER_COMPARISON) ++ set(gz_find_package_PKGCONFIG_VER_COMPARISON >=) + endif() + + if(gz_find_package_CONFIG) +@@ -388,7 +391,7 @@ macro(gz_find_package PACKAGE_NAME_) + # ${component}_CMAKE_DEPENDENCIES variables that are specific to those + # componenets + foreach(component ${gz_find_package_REQUIRED_BY}) +- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) ++ if(NOT ${component}_${PACKAGE_NAME}_PRIVATE OR NOT BUILD_SHARED_LIBS) + gz_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") + endif() + endforeach() diff --git a/ports/gz-cmake3/portfile.cmake b/ports/gz-cmake3/portfile.cmake index 6694814e3cac04..c1665d6dd01292 100644 --- a/ports/gz-cmake3/portfile.cmake +++ b/ports/gz-cmake3/portfile.cmake @@ -9,5 +9,5 @@ ignition_modular_library( dependencies.patch ) -# Install custom usage +file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/gz-cmake3/cmake3") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index 37aa11321babc0..59c964b50320f8 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gz-cmake3", "version": "3.4.1", - "port-version": 1, + "port-version": 2, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-cmake3/vcpkg/GTS.cmake b/ports/gz-cmake3/vcpkg/GTS.cmake new file mode 100644 index 00000000000000..d4c2f02b4889cf --- /dev/null +++ b/ports/gz-cmake3/vcpkg/GTS.cmake @@ -0,0 +1,3 @@ +if(NOT gz_find_package_PKGCONFIG) + set(gz_find_package_PKGCONFIG gts) +endif() diff --git a/ports/gz-cmake3/vcpkg/TINYXML2.cmake b/ports/gz-cmake3/vcpkg/TINYXML2.cmake new file mode 100644 index 00000000000000..33b651e48f0c25 --- /dev/null +++ b/ports/gz-cmake3/vcpkg/TINYXML2.cmake @@ -0,0 +1,3 @@ +if(NOT gz_find_package_PKGCONFIG) + set(gz_find_package_PKGCONFIG tinyxml2) +endif() diff --git a/ports/gz-common5/fix_dependencies.patch b/ports/gz-common5/fix_dependencies.patch deleted file mode 100644 index 493408a5ef62cc..00000000000000 --- a/ports/gz-common5/fix_dependencies.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73920fe..8bee7fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) - #-------------------------------------- - # Find Tinyxml2 - if(USE_EXTERNAL_TINYXML2) -- gz_find_package(TINYXML2 PRETTY tinyxml2 -+ gz_find_package(tinyxml2 EXTRA_ARGS CONFIG - REQUIRED_BY graphics - PRIVATE_FOR graphics) - else() -@@ -70,13 +70,13 @@ if(NOT MSVC) - - #------------------------------------ - # Find uuid -- gz_find_package(UUID REQUIRED PRETTY uuid) -+ gz_find_package(UUID REQUIRED PRETTY uuid REQUIRED_BY graphics) - - endif() - - #------------------------------------ - # Find Freeimage --gz_find_package(FreeImage VERSION 3.9 -+gz_find_package(freeimage EXTRA_ARGS CONFIG - REQUIRED_BY graphics - PRIVATE_FOR graphics) - -@@ -84,6 +84,7 @@ ign_find_package(FreeImage VERSION 3.9 - # Find GNU Triangulation Surface Library - gz_find_package( - GTS PRETTY gts PURPOSE "GNU Triangulation Surface library" -+ BY_PKGCONFIG gts - REQUIRED_BY graphics - PRIVATE_FOR graphics) - -@@ -98,7 +98,7 @@ - #------------------------------------ - # Find GDAL --gz_find_package(GDAL VERSION 3.0 -+gz_find_package(GDAL - PKGCONFIG gdal - PRIVATE_FOR geospatial - REQUIRED_BY geospatial) - -diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt -index 000a0ce..f6e1831 100644 ---- a/graphics/src/CMakeLists.txt -+++ b/graphics/src/CMakeLists.txt -@@ -14,8 +14,10 @@ target_link_libraries(${graphics_target} - PUBLIC - gz-math${GZ_MATH_VER}::gz-math${GZ_MATH_VER} - gz-utils${GZ_UTILS_VER}::gz-utils${GZ_UTILS_VER} - PRIVATE - ${GzAssimp_LIBRARIES} - GTS::GTS -- FreeImage::FreeImage) -+ freeimage::FreeImage) -+ -+target_include_directories(${graphics_target} PRIVATE ${GTS_INCLUDE_DIRS}) - -@@ -42,14 +44,14 @@ if(USE_EXTERNAL_TINYXML2) - - # If we are using an external copy of tinyxml2, add its imported target - target_link_libraries(${graphics_target} - PRIVATE -- TINYXML2::TINYXML2) -+ tinyxml2::tinyxml2) - - # The collada exporter test uses tinyxml2, so we must link it if we're using - # an external copy. The graphics target considers tinyxml2 to be a private - # dependency, so it will not automatically get linked to this test. - if(TARGET UNIT_ColladaExporter_TEST) -- target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2) -+ target_link_libraries(UNIT_ColladaExporter_TEST tinyxml2::tinyxml2) - endif() - - else() -@@ -79,7 +81,7 @@ - # define of tinxml2 major version >= 6 - # https://github.com/gazebosim/gz-common/issues/28 --if (NOT TINYXML2_VERSION VERSION_LESS "6.0.0") -- message(STATUS "TINYXML2_VERSION ${TINYXML2_VERSION} >= 6.0.0") -+if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") -+ message(STATUS "TINYXML2_VERSION ${tinyxml2_VERSION} >= 6.0.0") - target_compile_definitions(${graphics_target} - PRIVATE "TINYXML2_MAJOR_VERSION_GE_6") - endif() diff --git a/ports/gz-common5/portfile.cmake b/ports/gz-common5/portfile.cmake index bcff46993b8b8a..186e67c69081c5 100644 --- a/ports/gz-common5/portfile.cmake +++ b/ports/gz-common5/portfile.cmake @@ -6,9 +6,20 @@ ignition_modular_library( VERSION ${VERSION} SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee OPTIONS + -DBUILD_TESTING=OFF -DUSE_EXTERNAL_TINYXML2=ON + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATCHES - fix_dependencies.patch - remove_tests.patch gz_remotery_vis.patch ) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gz-common5-graphics/gz-common5-graphics-config.cmake" "find_package(GTS " +"# Ensure that consumers get a pkg-config tool which is needed for GTS +set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg) +find_package(GTS ") + +foreach(component IN ITEMS av events geospatial graphics io profiler testing) + if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}-${component}/${PORT}-${component}-config.cmake") + message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.") + endif() +endforeach() diff --git a/ports/gz-common5/remove_tests.patch b/ports/gz-common5/remove_tests.patch deleted file mode 100644 index b03a81be68bccb..00000000000000 --- a/ports/gz-common5/remove_tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -41,4 +41,5 @@ -+if(0) - # Build the unit tests - gz_build_tests( - TYPE UNIT - SOURCES ${gtest_sources} -@@ -77,4 +78,5 @@ - message(STATUS "") - target_compile_definitions(UNIT_Filesystem_TEST PRIVATE GZ_BUILD_SYMLINK_TESTS_ON_WINDOWS) - endif() - endif() -+endif(0) diff --git a/ports/gz-common5/vcpkg.json b/ports/gz-common5/vcpkg.json index 805464eda39e2b..bddcc5b998461a 100644 --- a/ports/gz-common5/vcpkg.json +++ b/ports/gz-common5/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-common5", "version": "5.4.1", + "port-version": 1, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": "Apache-2.0", @@ -22,7 +23,12 @@ }, { "name": "libuuid", - "platform": "!windows & !uwp & !osx" + "platform": "!windows & !osx" + }, + { + "name": "pkgconf", + "host": true, + "default-features": false }, "tinyxml2" ] diff --git a/versions/baseline.json b/versions/baseline.json index c36319272da4b3..3382f8bc69b887 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3154,11 +3154,11 @@ }, "gz-cmake3": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "gz-common5": { "baseline": "5.4.1", - "port-version": 0 + "port-version": 1 }, "gz-fuel-tools8": { "baseline": "8.1.0", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index dd5779d88c0465..256d731bef48da 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0b0d35ac8f99280de71a64494d8597f09986362", + "version": "3.4.1", + "port-version": 2 + }, { "git-tree": "8d7ac07eb757d7a69f1df27ad7a1ef71c26957d4", "version": "3.4.1", diff --git a/versions/g-/gz-common5.json b/versions/g-/gz-common5.json index 611ae1f287d2cb..152a6d4e73aaf1 100644 --- a/versions/g-/gz-common5.json +++ b/versions/g-/gz-common5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15fd6996514765a386996566e63fd0fff58c3db4", + "version": "5.4.1", + "port-version": 1 + }, { "git-tree": "ecb88cbb8c52027d083348a8d28705ef7fe861ca", "version": "5.4.1", From e8539b06a13fe98e9b1f52cbbb325475dc2db1d3 Mon Sep 17 00:00:00 2001 From: talregev Date: Sat, 28 Oct 2023 05:24:15 +0300 Subject: [PATCH 0215/1039] [ogre-next] fix dependencies (#34617) * fix ogre-next dependencies * fix ogre-next --- ports/ogre-next/avoid-name-clashes.patch | 4 ++ ports/ogre-next/fix-dependencies.patch | 56 ++++++++++++--- ports/ogre-next/fix_find_package_sdl2.patch | 77 --------------------- ports/ogre-next/portfile.cmake | 8 --- ports/ogre-next/toolchain_fixes.patch | 29 -------- ports/ogre-next/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/ogre-next.json | 5 ++ 8 files changed, 58 insertions(+), 125 deletions(-) delete mode 100644 ports/ogre-next/fix_find_package_sdl2.patch diff --git a/ports/ogre-next/avoid-name-clashes.patch b/ports/ogre-next/avoid-name-clashes.patch index a1d167d1f3b0a6..300aa94cf8434d 100644 --- a/ports/ogre-next/avoid-name-clashes.patch +++ b/ports/ogre-next/avoid-name-clashes.patch @@ -1,3 +1,7 @@ +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 800e956..436c3d3 100644 --- a/CMakeLists.txt diff --git a/ports/ogre-next/fix-dependencies.patch b/ports/ogre-next/fix-dependencies.patch index 18de8b3ae8aa1e..3ef2fc8d057ba1 100644 --- a/ports/ogre-next/fix-dependencies.patch +++ b/ports/ogre-next/fix-dependencies.patch @@ -1,10 +1,7 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -73,23 +73,26 @@ - # Core dependencies - ####################################################################### - +@@ -76,17 +76,20 @@ # Find zlib -find_package(ZLIB) +find_package(ZLIB REQUIRED) @@ -29,15 +26,46 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +find_package(FREETYPE NAMES freetype REQUIRED) +set(FREETYPE_LIBRARIES freetype) macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") +@@ -107,3 +111,3 @@ + # Find rapidjson +-find_package(Rapidjson) ++find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED) + macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "") +@@ -257,3 +261,3 @@ + # ThreadingBuildingBlocks +-find_package(TBB) ++find_package(TBB CONFIG REQUIRED) + macro_log_feature(TBB_FOUND "tbb" "Threading Building Blocks" "http://www.threadingbuildingblocks.org/" FALSE "" "") +@@ -279,5 +283,5 @@ + # Find sdl2 +-find_package(SDL2) ++find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") - find_package(Vulkan) - macro_log_feature(Vulkan_FOUND "vulkan-sdk" "Vulkan SDK" "https://vulkan.lunarg.com/" FALSE "" "") + ####################################################################### diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt -@@ -43,14 +43,10 @@ +@@ -21,9 +21,7 @@ + + set(INST_FILES +- Packages/FindRapidjson.cmake + Packages/FindRemotery.cmake +- Packages/FindSDL2.cmake + Packages/FindOGRE.cmake + Utils/FindPkgMacros.cmake + Utils/MacroLogFeature.cmake + Utils/PreprocessorUtils.cmake +@@ -37,18 +35,12 @@ + if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco") + set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake) endif () +-if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "tbb") +- set(INST_FILES ${INST_FILES} Packages/FindTBB.cmake) +-endif () + ++ set(STATIC_INST_FILES Packages/FindDirectX.cmake - Packages/FindFreeImage.cmake @@ -48,8 +76,6 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt - Packages/FindZZip.cmake Packages/FindSoftimage.cmake ) - if (WIN32) - set(INST_FILES ${INST_FILES} diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake similarity index 100% rename from CMake/Packages/FindZLIB.cmake @@ -66,3 +92,15 @@ diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOT similarity index 100% rename from CMake/Packages/FindFreetype.cmake rename to CMake/Packages/FindFreetype_NOTUSE.cmake +diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindSDL2.cmake +rename to CMake/Packages/FindSDL2_NOTUSE.cmake +diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindTBB.cmake +rename to CMake/Packages/FindTBB_NOTUSE.cmake +diff --git a/CMake/Packages/FindRapidjson.cmake b/CMake/Packages/FindRapidjson_NOTUSE.cmake +similarity index 100% +rename from CMake/Packages/FindRapidjson.cmake +rename to CMake/Packages/FindRapidjson_NOTUSE.cmake diff --git a/ports/ogre-next/fix_find_package_sdl2.patch b/ports/ogre-next/fix_find_package_sdl2.patch deleted file mode 100644 index 47aa01afbd205c..00000000000000 --- a/ports/ogre-next/fix_find_package_sdl2.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 3f3e2d7..0cc9606 100644 ---- a/CMake/Dependencies.cmake -+++ b/CMake/Dependencies.cmake -@@ -267,7 +267,7 @@ endif() - ####################################################################### - - # Find sdl2 --find_package(SDL2) -+find_package(SDL2 CONFIG REQUIRED) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") - - ####################################################################### -diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake -index f98b358..e5eb9ed 100644 ---- a/CMake/InstallDependencies.cmake -+++ b/CMake/InstallDependencies.cmake -@@ -100,8 +100,6 @@ if (OGRE_INSTALL_DEPENDENCIES) - endif () - - if( OGRE_BUILD_SAMPLES2 ) -- install_debug(SDL2.dll) -- install_release(SDL2.dll) - install_debug(openvr_api.dll) - install_release(openvr_api.dll) - install_debug(openvr_api.pdb) -diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake -index 4b42a51..793eb71 100644 ---- a/CMake/Packages/FindSDL2.cmake -+++ b/CMake/Packages/FindSDL2.cmake -@@ -182,7 +182,7 @@ ENDIF(SDL2_LIBRARY_TEMP) - INCLUDE(FindPackageHandleStandardArgs) - - FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 -- REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) -+ REQUIRED_VARS SDL2::SDL2 SDL2_INCLUDE_DIR) - - if (WIN32) - set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll -@@ -201,6 +201,6 @@ IF(SDL2_STATIC) - if (UNIX AND NOT APPLE) - EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS) - STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}") -- SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS}) -+ SET(SDL2::SDL2 ${SDL2_LINK_FLAGS}) - ENDIF() - ENDIF(SDL2_STATIC) -diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt -index b21601e..4ef90bd 100644 ---- a/Samples/2.0/Common/CMakeLists.txt -+++ b/Samples/2.0/Common/CMakeLists.txt -@@ -49,4 +49,4 @@ add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES - - link_directories(${CMAKE_CURRENT_BINARY_DIR}) - --target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} OgreHlmsPbs OgreHlmsUnlit) -+target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 OgreHlmsPbs OgreHlmsUnlit) -diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -index 5e80709..3ba9b5a 100644 ---- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -+++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake -@@ -224,13 +224,13 @@ endif() - - if( NOT IOS ) - set( CMAKE_PREFIX_PATH "${OGRE_SOURCE}/Dependencies ${CMAKE_PREFIX_PATH}" ) -- find_package( SDL2 ) -+ find_package(SDL2 CONFIG REQUIRED) - if( NOT SDL2_FOUND ) - message( "Could not find SDL2. https://www.libsdl.org/" ) - else() - message( STATUS "Found SDL2" ) - include_directories( ${SDL2_INCLUDE_DIR} ) -- set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} ) -+ set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 ) - endif() - endif() - diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index d2963fffba0129..3a2995283ca888 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -15,17 +15,11 @@ vcpkg_from_github( HEAD_REF master PATCHES toolchain_fixes.patch - fix_find_package_sdl2.patch avoid-name-clashes.patch fix-error-c2039.patch fix-dependencies.patch ) -file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") -if(EXISTS "${SOURCE_PATH}/CMake/FeatureSummary.cmake") - file(RENAME "${SOURCE_PATH}/CMake/FeatureSummary.cmake" "${SOURCE_PATH}/CMake/OgreFeatureSummary.cmake") -endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(OGRE_STATIC ON) else() @@ -68,8 +62,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() - - file(GLOB REL_CFGS "${CURRENT_PACKAGES_DIR}/bin/*.cfg") if(REL_CFGS) file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index 334fab27553a6e..dc4eeb4343d04f 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -107,35 +107,6 @@ index 6b6d7fa..3667b8b 100644 +make_library_set(POCO_XML) findpkg_finish(POCO_XML) -diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake -index 4200aa0..35e4ea3 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/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake index 53111e0..8dffbbc 100644 --- a/CMake/Utils/FindPkgMacros.cmake diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 8f3b24d4e6aafd..e376b3840101ea 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version": "2.3.1", - "port-version": 3, + "port-version": 4, "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 3382f8bc69b887..1c631c4898c41c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6050,7 +6050,7 @@ }, "ogre-next": { "baseline": "2.3.1", - "port-version": 3 + "port-version": 4 }, "ois": { "baseline": "1.5.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 5bc87f64235ff6..73beda4bd59edc 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9005bf2b8f0d060493c44cd2c2f49d411faa2141", + "version": "2.3.1", + "port-version": 4 + }, { "git-tree": "c93cd3ebf7b2a50082e97f5f7a6f4ed1cf1f5c94", "version": "2.3.1", From ab567f88a44343ca049c35c8098f3ee688b3aaf8 Mon Sep 17 00:00:00 2001 From: ChenPi11 <102936596+ChenPi11@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:38:54 +0800 Subject: [PATCH 0216/1039] [cppp-reiconv] new port (#34263) * [cppp-reiconv] New port * [cppp-reiconv] Add Python required. * [cppp-reiconv] Fix a bug. * [cppp-reiconv] Avoid create binary directory when static build. * [cppp-reiconv] Update version database. * [cppp-reiconv] Update SHA of `git-tree` in version database. * [cppp-reiconv] Update SHA512. * [cppp-reiconv] Update version db SHA info. * [cppp-reiconv] Use `v${VERSION}` for version. * [cppp-reiconv] Use `vcpkg_extract_source_archive` instead of `vcpkg_extract_source_archive_ex`. * [cppp-reiconv] Update SHA of git-tree in version database. --- ports/cppp-reiconv/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/cppp-reiconv/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cppp-reiconv.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/cppp-reiconv/portfile.cmake create mode 100644 ports/cppp-reiconv/vcpkg.json create mode 100644 versions/c-/cppp-reiconv.json diff --git a/ports/cppp-reiconv/portfile.cmake b/ports/cppp-reiconv/portfile.cmake new file mode 100644 index 00000000000000..eae729b97a32c3 --- /dev/null +++ b/ports/cppp-reiconv/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/cppp-project/cppp-reiconv/releases/download/v${VERSION}/cppp-reiconv-v${VERSION}.zip" + FILENAME "cppp-reiconv-v${VERSION}.zip" + SHA512 56294d63a71818842ec3f4a513bdc022ea3f472b582e16d377ec61282005965e7a08d619b9620cc036feb391e5b2eab3bfb4a1a21dcc860df89234e847048678 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" +) + +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 -DENABLE_TEST=OFF -DENABLE_EXTRA=ON +) + +vcpkg_cmake_install() + +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_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/cppp-reiconv/vcpkg.json b/ports/cppp-reiconv/vcpkg.json new file mode 100644 index 00000000000000..ae359b26d2bda2 --- /dev/null +++ b/ports/cppp-reiconv/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "cppp-reiconv", + "version": "2.1.0", + "description": "cppp-reiconv: A character set conversion library based on GNU LIBICONV for The C++ Plus Project.", + "homepage": "https://github.com/cppp-project/cppp-reiconv", + "license": "LGPL-3.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1c631c4898c41c..8f2714b350fe17 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1872,6 +1872,10 @@ "baseline": "3.7.6", "port-version": 1 }, + "cppp-reiconv": { + "baseline": "2.1.0", + "port-version": 0 + }, "cpprestsdk": { "baseline": "2.10.18", "port-version": 4 diff --git a/versions/c-/cppp-reiconv.json b/versions/c-/cppp-reiconv.json new file mode 100644 index 00000000000000..546e9979ca0cd9 --- /dev/null +++ b/versions/c-/cppp-reiconv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "48b338ed3b71e8f573134ce0ddc26921c4f3ead7", + "version": "2.1.0", + "port-version": 0 + } + ] +} From 2b1fd46fb602cdf9ad4706dd4fe8c0eee10ed47e Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 28 Oct 2023 10:57:28 +0800 Subject: [PATCH 0217/1039] [bloomberg-quantum] add new port (#34682) * [quantum] add new port * fix deps * [bloomberg-quantum]:not work now * [quantum] add new port * [quantum] add new port * [quantum] add new port * fix deps * rename config file --- ports/bloomberg-quantum/portfile.cmake | 22 +++++++++ .../rename-config-file-and-namespace.patch | 46 +++++++++++++++++++ ports/bloomberg-quantum/vcpkg.json | 18 ++++++++ versions/b-/bloomberg-quantum.json | 9 ++++ versions/baseline.json | 4 ++ 5 files changed, 99 insertions(+) create mode 100644 ports/bloomberg-quantum/portfile.cmake create mode 100644 ports/bloomberg-quantum/rename-config-file-and-namespace.patch create mode 100644 ports/bloomberg-quantum/vcpkg.json create mode 100644 versions/b-/bloomberg-quantum.json diff --git a/ports/bloomberg-quantum/portfile.cmake b/ports/bloomberg-quantum/portfile.cmake new file mode 100644 index 00000000000000..ea943726e47142 --- /dev/null +++ b/ports/bloomberg-quantum/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bloomberg/quantum + REF f4b872f99480bc7f2ab60620d99823e8f2d3b0d6 + SHA512 c41930c8bb0a1b70fdd4123ef349a0e8e892e0ecd52b412a171b1ce05386323a9ed2376a792ac12cd69f7d5a97a257bc08c2b85ce8a5f16b6f4e75740823b53b + HEAD_REF master + PATCHES rename-config-file-and-namespace.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DQUANTUM_EXPORT_PKGCONFIG=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH "share/cmake/unofficial-${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/bloomberg-quantum/rename-config-file-and-namespace.patch b/ports/bloomberg-quantum/rename-config-file-and-namespace.patch new file mode 100644 index 00000000000000..b7a5f24d49e51c --- /dev/null +++ b/ports/bloomberg-quantum/rename-config-file-and-namespace.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5d22f0f..55d6f65 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,8 +33,9 @@ endif() + if (NOT QUANTUM_PKGCONFIG_DIR) + set(QUANTUM_PKGCONFIG_DIR share/pkgconfig) + endif() ++set(PROJECT_NAMESPACE_NAME unofficial-bloomberg-${PROJECT_NAME}) + if (NOT QUANTUM_CMAKE_CONFIG_DIR) +- set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAME}) ++ set(QUANTUM_CMAKE_CONFIG_DIR share/cmake/${PROJECT_NAMESPACE_NAME}) + endif() + + #Global options +diff --git a/cmake/QuantumConfig.cmake.in b/cmake/unofficial-bloomberg-QuantumConfig.cmake.in +similarity index 100% +rename from cmake/QuantumConfig.cmake.in +rename to cmake/unofficial-bloomberg-QuantumConfig.cmake.in +diff --git a/quantum/CMakeLists.txt b/quantum/CMakeLists.txt +index 1a721f9..1e93bc4 100644 +--- a/quantum/CMakeLists.txt ++++ b/quantum/CMakeLists.txt +@@ -21,10 +21,10 @@ make_quantum_header() + + set(PKG_DIR "${CMAKE_BINARY_DIR}/package") + set(PKGCONFIG_FILE "${PKG_DIR}/${PROJECT_TARGET_NAME}.pc") +-set(TARGET_CONFIG_FILE "${PKG_DIR}/${PROJECT_NAME}Config.cmake") +-set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAME}ConfigVersion.cmake") ++set(TARGET_CONFIG_FILE "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}Config.cmake") ++set(TARGET_VERSION_FILE "${PKG_DIR}/${PROJECT_NAMESPACE_NAME}ConfigVersion.cmake") + set(TARGET_EXPORT_NAME ${PROJECT_NAME}Targets) +-set(NAMESPACE "${PROJECT_NAME}::") ++set(NAMESPACE "${PROJECT_NAMESPACE_NAME}::") + + add_library(${PROJECT_TARGET_NAME} INTERFACE) + set(QUANTUM_DEPENDENCIES Boost::context pthread) +@@ -70,7 +70,7 @@ if (QUANTUM_EXPORT_CMAKE_CONFIG) + + # Generate CMAKE configuration file and exported targets + configure_package_config_file( +- "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in" ++ "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAMESPACE_NAME}Config.cmake.in" + "${TARGET_CONFIG_FILE}" + INSTALL_DESTINATION "${QUANTUM_CMAKE_CONFIG_DIR}" + PATH_VARS CMAKE_INSTALL_PREFIX CMAKE_INSTALL_INCLUDEDIR diff --git a/ports/bloomberg-quantum/vcpkg.json b/ports/bloomberg-quantum/vcpkg.json new file mode 100644 index 00000000000000..71182a149de0f7 --- /dev/null +++ b/ports/bloomberg-quantum/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "bloomberg-quantum", + "version-date": "2023-02-03", + "description": "Powerful multi-threaded coroutine dispatcher and parallel execution engine", + "homepage": "https://github.com/bloomberg/quantum/", + "license": "Apache-2.0", + "dependencies": [ + "boost-context", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/b-/bloomberg-quantum.json b/versions/b-/bloomberg-quantum.json new file mode 100644 index 00000000000000..2478e6fa9a1520 --- /dev/null +++ b/versions/b-/bloomberg-quantum.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9099d9be8e575f44a311cf7d5032ee5c9dcdc82f", + "version-date": "2023-02-03", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8f2714b350fe17..49424bcc63ce23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -660,6 +660,10 @@ "baseline": "2020-03-25", "port-version": 5 }, + "bloomberg-quantum": { + "baseline": "2023-02-03", + "port-version": 0 + }, "blosc": { "baseline": "1.21.5", "port-version": 0 From ff9b47f7c77a9a49a99c013a8895e60fca360467 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 28 Oct 2023 11:03:22 +0800 Subject: [PATCH 0218/1039] [rivers] add new port (#34701) * [rivers] add new port * versions * [rivers] add new port * [rivers] add new port * [rivers] add new port * [rivers] add new port * [rivers] add new port * [rivers] add new port * [rivers] delete default-features --- ports/rivers/add-install-configuration.patch | 76 ++++++++++++++++++++ ports/rivers/portfile.cmake | 28 ++++++++ ports/rivers/vcpkg.json | 25 +++++++ versions/baseline.json | 4 ++ versions/r-/rivers.json | 9 +++ 5 files changed, 142 insertions(+) create mode 100644 ports/rivers/add-install-configuration.patch create mode 100644 ports/rivers/portfile.cmake create mode 100644 ports/rivers/vcpkg.json create mode 100644 versions/r-/rivers.json diff --git a/ports/rivers/add-install-configuration.patch b/ports/rivers/add-install-configuration.patch new file mode 100644 index 00000000000000..aafe48824cfdf9 --- /dev/null +++ b/ports/rivers/add-install-configuration.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 981ef20..89c5a6e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,20 +9,45 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + + add_library(rivers INTERFACE) + add_library(rivers::rivers ALIAS rivers) +-target_include_directories(rivers INTERFACE include) ++target_include_directories(rivers ++ INTERFACE ++ $ ++ $ ++ ) + + option(RVR_IMPORT_FMT Off) + if(RVR_IMPORT_FMT) +- include(FetchContent) +- FetchContent_Declare( +- fmt +- GIT_REPOSITORY https://github.com/fmtlib/fmt.git +- GIT_TAG 713c7c7c62044329d26c19323ffa0e64d69d2d64 +- ) +- FetchContent_MakeAvailable(fmt) +- ++ find_package(fmt CONFIG REQUIRED) + target_link_libraries(rivers INTERFACE fmt::fmt) + endif() + +-add_subdirectory(bench) +-add_subdirectory(test) ++include(CMakePackageConfigHelpers) ++ ++configure_package_config_file( ++ cmake/unofficial-rivers-config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-config.cmake" ++ INSTALL_DESTINATION lib/cmake/unofficial-rivers/ ++ NO_CHECK_REQUIRED_COMPONENTS_MACRO) ++ ++ ++# Export. ++export( ++ TARGETS rivers ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-targets.cmake") ++ ++# Install. ++install(TARGETS rivers EXPORT unofficial-rivers) ++ ++install( ++ EXPORT unofficial-rivers ++ NAMESPACE unofficial-rivers:: ++ FILE unofficial-rivers-targets.cmake ++ DESTINATION lib/cmake/unofficial-rivers) ++ ++install(DIRECTORY include/rivers DESTINATION include) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/cmake/unofficial-rivers-config.cmake" ++ DESTINATION lib/cmake/unofficial-rivers) ++ +diff --git a/cmake/unofficial-rivers-config.cmake.in b/cmake/unofficial-rivers-config.cmake.in +new file mode 100644 +index 0000000..a347972 +--- /dev/null ++++ b/cmake/unofficial-rivers-config.cmake.in +@@ -0,0 +1,9 @@ ++ ++@PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) ++ ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-rivers-targets.cmake") ++if(@RVR_IMPORT_FMT@) ++ find_dependency(fmt CONFIG) ++endif() ++ diff --git a/ports/rivers/portfile.cmake b/ports/rivers/portfile.cmake new file mode 100644 index 00000000000000..c19b8243334c07 --- /dev/null +++ b/ports/rivers/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brevzin/rivers + REF cfbd4c3e0ca9fcde03075327d6dd628e57589342 + SHA512 4dfa4a1e657c6a12446abe6d7c54d5bc3d47d82e8639eb91f98c7120b3ca79a6cfa761a357dc2285027823177ee76be346adddc7861f0f213cd0bc7cde041ab8 + HEAD_REF main + PATCHES add-install-configuration.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + fmt RVR_IMPORT_FMT +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH "lib/cmake/unofficial-rivers") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/rivers/vcpkg.json b/ports/rivers/vcpkg.json new file mode 100644 index 00000000000000..78c88812b1229a --- /dev/null +++ b/ports/rivers/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "rivers", + "version-date": "2022-05-16", + "description": "A C++ internal iteration library based loosely on Java Streams", + "homepage": "https://github.com/brevzin/rivers/", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "fmt": { + "description": "Use fmt as rivers fommatter", + "dependencies": [ + "fmt" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 49424bcc63ce23..f7e35427b16807 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7400,6 +7400,10 @@ "baseline": "0.2.1", "port-version": 0 }, + "rivers": { + "baseline": "2022-05-16", + "port-version": 0 + }, "rkcommon": { "baseline": "1.10.0", "port-version": 0 diff --git a/versions/r-/rivers.json b/versions/r-/rivers.json new file mode 100644 index 00000000000000..aa284ec96bfbac --- /dev/null +++ b/versions/r-/rivers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9a0a33765347e8652eecf77097b57cfdbc7e4184", + "version-date": "2022-05-16", + "port-version": 0 + } + ] +} From 06c79a9afa6f99f02f44d20df9e0848b2a56bf1b Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 29 Oct 2023 09:01:42 +0800 Subject: [PATCH 0219/1039] [dyno] add new port (#34684) * [dyno] add new port * [dyno] add new port --- ports/dyno/fix-deps.patch | 30 ++++++++++++++++++++++++++++++ ports/dyno/portfile.cmake | 24 ++++++++++++++++++++++++ ports/dyno/usage | 5 +++++ ports/dyno/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/d-/dyno.json | 9 +++++++++ 6 files changed, 91 insertions(+) create mode 100644 ports/dyno/fix-deps.patch create mode 100644 ports/dyno/portfile.cmake create mode 100644 ports/dyno/usage create mode 100644 ports/dyno/vcpkg.json create mode 100644 versions/d-/dyno.json diff --git a/ports/dyno/fix-deps.patch b/ports/dyno/fix-deps.patch new file mode 100644 index 00000000000000..50368545fccf8b --- /dev/null +++ b/ports/dyno/fix-deps.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c7c421..1b8b2bc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,9 +14,8 @@ add_library(dyno INTERFACE) + add_library(Dyno::dyno ALIAS dyno) + target_compile_features(dyno INTERFACE cxx_std_17) + target_include_directories(dyno INTERFACE "$") +-find_package(Hana REQUIRED) +-find_package(CallableTraits REQUIRED) +-target_link_libraries(dyno INTERFACE hana callable_traits) ++find_package(Boost REQUIRED) ++target_link_libraries(dyno INTERFACE Boost::boost) + + include(CheckCXXCompilerFlag) + check_cxx_compiler_flag("-Wno-gnu-string-literal-operator-template" DYNO_HAS_WNO_GNU_STRING_UDL) +diff --git a/cmake/dyno-config.cmake b/cmake/dyno-config.cmake +index 8a1845b..57aa7a1 100644 +--- a/cmake/dyno-config.cmake ++++ b/cmake/dyno-config.cmake +@@ -3,8 +3,7 @@ + # (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) + + include(CMakeFindDependencyMacro) +-find_dependency(Hana REQUIRED) +-find_dependency(CallableTraits REQUIRED) ++find_dependency(Boost) + + if(NOT TARGET Dyno::dyno) + include("${CMAKE_CURRENT_LIST_DIR}/dyno-targets.cmake") diff --git a/ports/dyno/portfile.cmake b/ports/dyno/portfile.cmake new file mode 100644 index 00000000000000..f4ddf6c8459eeb --- /dev/null +++ b/ports/dyno/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ldionne/dyno + REF 56ced251f5751ef4e3fe66d4f28ccbc75b902d70 + SHA512 c3f34679d1e2f3cec3757f69662d4f5db602b9028a927ad9070e70813caf18bb2a512f148e69f14aaac35a3e13abb57e1aa8e4f369993e7a01d048d70050daa6 + HEAD_REF master + PATCHES fix-deps.patch +) + +set(VCPKG_BUILD_TYPE release) #header-only library + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME dyno CONFIG_PATH "lib/cmake/dyno") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/dyno/usage b/ports/dyno/usage new file mode 100644 index 00000000000000..9057f2a2ee00d0 --- /dev/null +++ b/ports/dyno/usage @@ -0,0 +1,5 @@ +The package dyno provides CMake targets: + + find_package(dyno CONFIG REQUIRED) + target_link_libraries(main PRIVATE Dyno::dyno) + diff --git a/ports/dyno/vcpkg.json b/ports/dyno/vcpkg.json new file mode 100644 index 00000000000000..e545451e8d6d93 --- /dev/null +++ b/ports/dyno/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "dyno", + "version-date": "2019-11-13", + "description": "Runtime polymorphism done right", + "homepage": "https://github.com/ldionne/dyno/", + "license": "BSL-1.0", + "dependencies": [ + "boost-callable-traits", + "boost-hana", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f7e35427b16807..ec0699888e2338 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2308,6 +2308,10 @@ "baseline": "2.2.1", "port-version": 0 }, + "dyno": { + "baseline": "2019-11-13", + "port-version": 0 + }, "eabase": { "baseline": "2.09.12", "port-version": 3 diff --git a/versions/d-/dyno.json b/versions/d-/dyno.json new file mode 100644 index 00000000000000..a305f30d7f0768 --- /dev/null +++ b/versions/d-/dyno.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3af5237e2f59d877c47c333a5c006eae66f9d00c", + "version-date": "2019-11-13", + "port-version": 0 + } + ] +} From 03cfa5889ed81beab6f63626fc3487dba5e6688e Mon Sep 17 00:00:00 2001 From: Nulldisk <48621230+llnulldisk@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:38:19 +0100 Subject: [PATCH 0220/1039] [tgbot-cpp] Update to v1.7.2 (#34771) --- ports/tgbot-cpp/portfile.cmake | 4 ++-- ports/tgbot-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tgbot-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/tgbot-cpp/portfile.cmake b/ports/tgbot-cpp/portfile.cmake index a3b08a4e185f10..f6af2c3ef6d879 100644 --- a/ports/tgbot-cpp/portfile.cmake +++ b/ports/tgbot-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO reo7sp/tgbot-cpp - REF v1.6 - SHA512 c7dd9efb1b0edfe34de06205ed26ad076d0e61a48be22df440290478ab55917c7d926af0ea7d1c76b82b5859f4f2454217feb6dc5b7c7680e6f6177f063242a0 + REF v1.7.2 + SHA512 44f16e2cef6ea6407f6a707885734cd0e850d89553a35c12b63c0864ea952377f07553c9cbf5ee464a1e8390723cd9fff867caafa725c97612a664d13ca87ec1 HEAD_REF master ) diff --git a/ports/tgbot-cpp/vcpkg.json b/ports/tgbot-cpp/vcpkg.json index 09dbdc6bb059d6..32e9c96378590b 100644 --- a/ports/tgbot-cpp/vcpkg.json +++ b/ports/tgbot-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tgbot-cpp", - "version": "1.6", + "version": "1.7.2", "description": "C++ library for Telegram bot API.", "homepage": "https://github.com/reo7sp/tgbot-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ec0699888e2338..7e755462895e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8265,7 +8265,7 @@ "port-version": 5 }, "tgbot-cpp": { - "baseline": "1.6", + "baseline": "1.7.2", "port-version": 0 }, "tgc": { diff --git a/versions/t-/tgbot-cpp.json b/versions/t-/tgbot-cpp.json index 7505193d6393ef..9bf1e7cb071e0f 100644 --- a/versions/t-/tgbot-cpp.json +++ b/versions/t-/tgbot-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5311977e1c6bfe3576ac072a57689bdde68a5960", + "version": "1.7.2", + "port-version": 0 + }, { "git-tree": "8cb6fd8b7ed9c7480680419be52d971cee278569", "version": "1.6", From 620eb4e790f8b505ce0c39d98c6b1ed846832c13 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 30 Oct 2023 22:41:04 +0100 Subject: [PATCH 0221/1039] asio-grpc: Update to 2.7.0 (#34768) --- ports/asio-grpc/portfile.cmake | 2 +- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index a03e22505553b5..f2cbb84a21f117 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc REF "v${VERSION}" - SHA512 3921e4893fbfe871fd2129a706ef7b09a3381e04ee5c798682de98ef3996dac720d69e472099a8fa672e9d08a6805934235b555f40d745cc752b138bf2ab9520 + SHA512 3ad088a090a506f12d73fdac1689d9aea0416f9d21762c7be1de9d5a278ac2e856541e7b433809077e5297d2953b55357380e5097d894bd511c652927ec5daba HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 860e77f1395de3..c32c28d79b9e47 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "2.6.0", + "version": "2.7.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 3968c3aeb64b53..eb416112d09a8d 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0650c5252b1fb7f0ec616bb3aa9ef7c51732698", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "bc957d3a72f3565dfa6511e3d18948f136c926d2", "version": "2.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7e755462895e73..a2fca767900914 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -253,7 +253,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "2.6.0", + "baseline": "2.7.0", "port-version": 0 }, "asiosdk": { From a069d6dcb828e72cc3bd39bb1368108e6a97b8bb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 31 Oct 2023 01:41:48 +0400 Subject: [PATCH 0222/1039] [onednn] update to 3.3 (#34765) * [onednn] update to 3.3 * updated version database --- ports/onednn/portfile.cmake | 4 ++-- ports/onednn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/onednn.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index eca06012bf1a81..fd526254bb628e 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 v3.1.1 - SHA512 0dae0ccff1e459ce24356694732bf4ee3c459469de70984863e1aed3bc965471793a110dedbb11f2baa762749cea7652a150d2f9a442c299d9ffa00febd87fec + REF "v${VERSION}" + SHA512 85f424403be4231e57929c77c6e30def3e6c6ae7e706b94585e4228cbebd625eb9f0440084315032310caed066c6746f4dbbbbd2f42660c0de5313d6bce34c1e HEAD_REF master ) diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 1a195221afe805..1156edf890d6ab 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onednn", - "version": "3.1.1", + "version": "3.3", "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a2fca767900914..579a1de832efdf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6081,7 +6081,7 @@ "port-version": 5 }, "onednn": { - "baseline": "3.1.1", + "baseline": "3.3", "port-version": 0 }, "oniguruma": { diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index 60f31ef9bc328a..00f5c2a6fa015d 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77f9320fe4e3c1452838c1fd098239b0a4c8e4b4", + "version": "3.3", + "port-version": 0 + }, { "git-tree": "151a4ce15e279a44a305bc438e5beed45c7054b9", "version": "3.1.1", From f17f0bffde36f357ba17661fa6414355747e7b8a Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Mon, 30 Oct 2023 23:42:44 +0200 Subject: [PATCH 0223/1039] [libmagic] Update to version 5.45. (#34763) * [libmagic] Update to version 5.45. * Update patches. * Update version database. --- .../0003-Fix-WIN32-macro-checks.patch | 8 ++-- ...ude-dirent.h-for-S_ISREG-and-S_ISDIR.patch | 9 +++-- .../0006-Remove-Wrap-POSIX-headers.patch | 2 +- ports/libmagic/0009-No-fcntl-in-magic.c.patch | 25 ------------ ...y-check-for-the-presence-of-bitmasks.patch | 2 +- ...ve-pipe-related-functions-in-funcs.c.patch | 12 +++--- .../0014-Define-POSIX-macros-if-missing.patch | 38 ------------------- .../0015-MSYS2-Remove-ioctl-call.patch | 8 ++-- .../0016-Fix-file_famagic-function.patch | 4 +- ports/libmagic/portfile.cmake | 6 +-- ports/libmagic/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libmagic.json | 5 +++ 13 files changed, 32 insertions(+), 94 deletions(-) delete mode 100644 ports/libmagic/0009-No-fcntl-in-magic.c.patch delete mode 100644 ports/libmagic/0014-Define-POSIX-macros-if-missing.patch diff --git a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch index eb0f7ebdaf5276..e90beb4d40975e 100644 --- a/ports/libmagic/0003-Fix-WIN32-macro-checks.patch +++ b/ports/libmagic/0003-Fix-WIN32-macro-checks.patch @@ -31,13 +31,13 @@ index 299ac0c..2c365a6 100644 #define PATHSEP ':' @@ -103,7 +103,7 @@ - #define private static + #define file_private static -#if HAVE_VISIBILITY && !defined(WIN32) +#if HAVE_VISIBILITY && !defined(_WIN32) - #define public __attribute__ ((__visibility__("default"))) - #ifndef protected - #define protected __attribute__ ((__visibility__("hidden"))) + #define file_public __attribute__ ((__visibility__("default"))) + #ifndef file_protected + #define file_protected __attribute__ ((__visibility__("hidden"))) -- 2.29.2.windows.2 diff --git a/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch b/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch index 76cbc1222c8bd0..afcb658d889019 100644 --- a/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch +++ b/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch @@ -11,14 +11,15 @@ diff --git a/src/file.h b/src/file.h index 0332506..4aa9f60 100644 --- a/src/file.h +++ b/src/file.h -@@ -88,6 +88,7 @@ +@@ -88,7 +88,8 @@ /* Do this here and now, because struct stat gets re-defined on solaris */ #include #include +#include - - #define ENABLE_CONDITIONALS - + #include + #if defined(HAVE_XLOCALE_H) + #include + #endif -- 2.29.2.windows.2 diff --git a/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch b/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch index 56efac2481577b..169561d243724a 100644 --- a/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch +++ b/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch @@ -161,7 +161,7 @@ index 3ab52d1..fc48d84 100644 --- a/src/pread.c +++ b/src/pread.c @@ -3,7 +3,9 @@ - FILE_RCSID("@(#)$File: pread.c,v 1.2 2013/04/02 16:23:07 christos Exp $") + FILE_RCSID("@(#)$File: pread.c,v 1.5 2022/09/24 20:30:13 christos Exp $") #endif /* lint */ #include +#ifdef HAVE_UNISTD_H diff --git a/ports/libmagic/0009-No-fcntl-in-magic.c.patch b/ports/libmagic/0009-No-fcntl-in-magic.c.patch deleted file mode 100644 index 47bf16165ef8f4..00000000000000 --- a/ports/libmagic/0009-No-fcntl-in-magic.c.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6d10bef865b69764f6e0ddd2b0f6a84e484cdb37 Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Sun, 9 May 2021 13:25:14 +0700 -Subject: [PATCH 09/14] No fcntl in magic.c - ---- - src/magic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/magic.c b/src/magic.c -index e9aeafa..382bd96 100644 ---- a/src/magic.c -+++ b/src/magic.c -@@ -462,7 +462,7 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd) - rv = 0; - goto done; - } --#if O_CLOEXEC == 0 -+#if O_CLOEXEC == 0 && !defined(_WIN32) - (void)fcntl(fd, F_SETFD, FD_CLOEXEC); - #endif - } --- -2.29.2.windows.2 - diff --git a/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch b/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch index f0d8738e465e51..e241f5e49c09d6 100644 --- a/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch +++ b/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch @@ -17,7 +17,7 @@ index 5204f20..7244841 100644 #undef HAVE_MAJOR -#ifdef S_IFLNK +#if S_IFLNK != 0 - private int + file_private int bad_link(struct magic_set *ms, int err, char *buf) { @@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) diff --git a/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch b/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch index ae2720ca3617f4..13c24faaca0b48 100644 --- a/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch +++ b/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch @@ -11,21 +11,19 @@ diff --git a/src/funcs.c b/src/funcs.c index b926625..b585486 100644 --- a/src/funcs.c +++ b/src/funcs.c -@@ -809,6 +809,7 @@ file_print_guid(char *str, size_t len, const uint64_t *guid) - g->data4[6], g->data4[7]); +@@ -888,5 +888,6 @@ } +#ifndef _WIN32 - protected int + file_protected int file_pipe_closexec(int *fds) { -@@ -827,6 +828,7 @@ protected int - file_clear_closexec(int fd) { - return fcntl(fd, F_SETFD, 0); +@@ -914,5 +915,6 @@ + #endif } +#endif - protected char * + file_protected char * file_strtrim(char *str) -- 2.29.2.windows.2 diff --git a/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch b/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch deleted file mode 100644 index 09ac7a11926e47..00000000000000 --- a/ports/libmagic/0014-Define-POSIX-macros-if-missing.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fa0e11f36bb0e322250e1e488ced9f2bf166874f Mon Sep 17 00:00:00 2001 -From: Long Nguyen -Date: Fri, 14 May 2021 18:11:39 +0700 -Subject: [PATCH 14/14] Define POSIX macros if missing - ---- - src/file.h | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/file.h b/src/file.h -index ccfe0da..98cd37b 100644 ---- a/src/file.h -+++ b/src/file.h -@@ -100,6 +100,21 @@ - #include - #include - -+#if !defined(S_IFBLK) -+#define S_IFBLK 0 -+#define S_ISBLK(mode) (((mode) & S_IFMT) == S_IFBLK) -+#endif -+ -+#if !defined(S_IFLNK) -+#define S_IFLNK 0 -+#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK) -+#endif -+ -+#if !defined(S_IFSOCK) -+#define S_IFSOCK 0 -+#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK) -+#endif -+ - #define ENABLE_CONDITIONALS - - #ifndef MAGIC --- -2.29.2.windows.2 - diff --git a/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch b/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch index da8ef79df29a4c..13fe3cf0c55080 100644 --- a/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch +++ b/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch @@ -7,20 +7,20 @@ diff --git a/src/compress.c b/src/compress.c index 33ce2bc..f172eda 100644 --- a/src/compress.c +++ b/src/compress.c -@@ -378,7 +378,7 @@ +@@ -407,7 +407,7 @@ sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__))) { ssize_t rv; --#ifdef FIONREAD +-#if defined(FIONREAD) && !defined(__MINGW32__) +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32) int t = 0; #endif size_t rn = n; -@@ -386,7 +386,7 @@ +@@ -418,7 +418,7 @@ if (fd == STDIN_FILENO) goto nocheck; --#ifdef FIONREAD +-#if defined(FIONREAD) && !defined(__MINGW32__) +#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32) if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) { #ifdef FD_ZERO diff --git a/ports/libmagic/0016-Fix-file_famagic-function.patch b/ports/libmagic/0016-Fix-file_famagic-function.patch index b3acf638c53805..5eaba925a589f4 100644 --- a/ports/libmagic/0016-Fix-file_famagic-function.patch +++ b/ports/libmagic/0016-Fix-file_famagic-function.patch @@ -2,13 +2,13 @@ diff --git a/src/fsmagic.c b/src/fsmagic.c index 7244841..2c553c1 100644 --- a/src/fsmagic.c +++ b/src/fsmagic.c -@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $") +@@ -66,7 +66,7 @@ # define major(dev) (((dev) >> 8) & 0xff) # define minor(dev) ((dev) & 0xff) #endif #undef HAVE_MAJOR -#if S_IFLNK != 0 +#if S_IFLNK != 0 && ! defined(_WIN32) - private int + file_private int bad_link(struct magic_set *ms, int err, char *buf) { @@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index 902be26aafe152..0d23dff826677a 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -8,12 +8,10 @@ if(VCPKG_TARGET_IS_WINDOWS) "0006-Remove-Wrap-POSIX-headers.patch" "0007-Substitute-unistd-macros-for-MSVC.patch" "0008-Add-FILENO-defines.patch" - "0009-No-fcntl-in-magic.c.patch" "0010-Properly-check-for-the-presence-of-bitmasks.patch" "0011-Remove-pipe-related-functions-in-funcs.c.patch" "0012-Convert-MSYS2-paths-to-Windows-paths.patch" "0013-Check-for-backslash-in-argv-0-on-Windows.patch" - "0014-Define-POSIX-macros-if-missing.patch" "0015-MSYS2-Remove-ioctl-call.patch" "0016-Fix-file_famagic-function.patch" ) @@ -22,8 +20,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO file/file - REF FILE5_40 - SHA512 d76bfe5326e1b40368e055c2e049a24b4ffdbd727371f4f3aa1dd3f53787d16b88550b3cc71ecf02151e2fb3e567eb2598e4707badab8c391eb71113c2dcc319 + REF FILE5_45 + SHA512 fdd4c5d13d5ea1d25686c76d8ebc3252c54040c4871e3f0f623c4548b3841795d4e36050292a9453eedf0fbf932573890e9d6ac9fa63ccf577215598ae84b9ea HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index a8984202158d33..8763f636b2d2b5 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmagic", - "version": "5.40", - "port-version": 3, + "version": "5.45", "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 579a1de832efdf..7ac9137948c69b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4421,8 +4421,8 @@ "port-version": 13 }, "libmagic": { - "baseline": "5.40", - "port-version": 3 + "baseline": "5.45", + "port-version": 0 }, "libmariadb": { "baseline": "3.3.1", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index d5b3517574d06b..6cdbcdc821d092 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30ebcd2ff5522b8c72ba5a5cadd840df34350382", + "version": "5.45", + "port-version": 0 + }, { "git-tree": "2bb05dd744d7eb83ad0a8d887ef589aaea37f6b3", "version": "5.40", From 68cf5f59b0ea4d9bf312f13015aa20728dbad610 Mon Sep 17 00:00:00 2001 From: "Craig Edwards (Brain)" Date: Mon, 30 Oct 2023 21:43:06 +0000 Subject: [PATCH 0224/1039] [bot] Update DPP to v10.0.27 (#34760) --- ports/dpp/portfile.cmake | 2 +- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index a97ecb58d71e46..a3730c8325fb33 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 5fa1e807eaeb8ecf53d55e537a804ae1135018008d7b6f4e42225ee21ca975b7f3662f60777527395f8f0672a66077f2a3e95c9a3074f819187921e114ac03f5 + SHA512 b26ac0aeff359737498394f832c1b5ac918e662b5a290ccc9a5e6131c743d85fa6f6cf3984c709381c97430195015399d530f29ce733b93a02e3c0ea36b8350b ) vcpkg_cmake_configure( diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 89c50689801038..31ca7f8bd5249c 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.26", + "version": "10.0.27", "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 7ac9137948c69b..71fba5de205cd1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2245,7 +2245,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.26", + "baseline": "10.0.27", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 67dd88adaa42ff..86794d25f0de04 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9ad04c95ab1097720e988a5879045b575d8eb18", + "version": "10.0.27", + "port-version": 0 + }, { "git-tree": "bb85393fcea63ff5e643c3bb0cf15bbdad6d8a2e", "version": "10.0.26", From 30650503fc2057be79b1ce2d352df654b6c05a96 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 30 Oct 2023 22:58:07 +0100 Subject: [PATCH 0225/1039] [zstd] fix tools feature (#34634) --- ports/zstd/portfile.cmake | 9 ++++++++- ports/zstd/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/z-/zstd.json | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 36fc1ea7e843e1..86c59cfb89e81b 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -24,10 +24,13 @@ vcpkg_cmake_configure( -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED} -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC} -DZSTD_LEGACY_SUPPORT=1 - -DZSTD_BUILD_PROGRAMS=${ZSTD_BUILD_PROGRAMS} -DZSTD_BUILD_TESTS=0 -DZSTD_BUILD_CONTRIB=0 -DZSTD_MULTITHREAD_SUPPORT=1 + OPTIONS_RELEASE + -DZSTD_BUILD_PROGRAMS=${ZSTD_BUILD_PROGRAMS} + OPTIONS_DEBUG + -DZSTD_BUILD_PROGRAMS=OFF ) vcpkg_cmake_install() @@ -51,6 +54,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endforeach() endif() +if(VCPKG_TARGET_IS_WINDOWS AND ZSTD_BUILD_PROGRAMS) + vcpkg_copy_tools(TOOL_NAMES zstd AUTO_CLEAN) +endif() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright( COMMENT "ZSTD is dual licensed under BSD and GPLv2." diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index b66f4ebe9d78e6..2baf0003b9329d 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zstd", "version": "1.5.5", - "port-version": 1, + "port-version": 2, "description": "Zstandard - Fast real-time compression algorithm", "homepage": "https://facebook.github.io/zstd/", "license": "BSD-3-Clause OR GPL-2.0-only", @@ -18,7 +18,7 @@ "features": { "tools": { "description": "Build zstd binary", - "supports": "!uwp" + "supports": "!uwp & static" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 71fba5de205cd1..bdc9a1be469264 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9274,7 +9274,7 @@ }, "zstd": { "baseline": "1.5.5", - "port-version": 1 + "port-version": 2 }, "zstr": { "baseline": "1.0.7", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 1de36099039f0f..42b93ffcb8502a 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "259dc461801ecb946995e13fd3d94b1381d02441", + "version": "1.5.5", + "port-version": 2 + }, { "git-tree": "44fdd2e1576b62ee75cdaab5ce74452ed08f84ce", "version": "1.5.5", From 0e6e77f854c462db107f2d917bebfae446c8a132 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 30 Oct 2023 23:00:51 +0100 Subject: [PATCH 0226/1039] [enkits] Fix config file name (#34487) --- ports/enkits/portfile.cmake | 1 + ports/enkits/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/enkits.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/enkits/portfile.cmake b/ports/enkits/portfile.cmake index c55f6279885fb2..7f0367dac0d1fe 100644 --- a/ports/enkits/portfile.cmake +++ b/ports/enkits/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Must specify args due to case sensitivity on some filesystems vcpkg_cmake_config_fixup(PACKAGE_NAME enkiTS CONFIG_PATH share/enkiTS) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTS-config.cmake" "${CURRENT_PACKAGES_DIR}/share/enkiTS/enkiTSConfig.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/enkits/vcpkg.json b/ports/enkits/vcpkg.json index 139253fec4b6a0..7a1e1c649f1d64 100644 --- a/ports/enkits/vcpkg.json +++ b/ports/enkits/vcpkg.json @@ -1,6 +1,7 @@ { "name": "enkits", "version": "1.11", + "port-version": 1, "description": "A permissively licensed C and C++ Task Scheduler for creating parallel programs.", "homepage": "https://github.com/dougbinks/enkiTS", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index bdc9a1be469264..665ff630635108 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2418,7 +2418,7 @@ }, "enkits": { "baseline": "1.11", - "port-version": 0 + "port-version": 1 }, "ensmallen": { "baseline": "2.19.1", diff --git a/versions/e-/enkits.json b/versions/e-/enkits.json index 6d2b78eef1e844..f40def58d4a440 100644 --- a/versions/e-/enkits.json +++ b/versions/e-/enkits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d83be5a37b104f4c67030a8184af78bfa248137c", + "version": "1.11", + "port-version": 1 + }, { "git-tree": "8fe0e538a1d8685844297f35b7e00f4984d4bb09", "version": "1.11", From b94fe49a537cf00247bcead54af3a8488e58b3e0 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 30 Oct 2023 23:01:58 +0100 Subject: [PATCH 0227/1039] [icu] Fix osx release only builds (#34539) * [icu] Fix osx release only builds * Use list --- ports/icu/portfile.cmake | 11 +++++++---- ports/icu/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index c622dfd708d266..e40106e8c10022 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -33,8 +33,11 @@ list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layout list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release) list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release) -set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) -set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) +set(CONFIG_TRIPLETS) +list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-rel) +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-dbg) +endif() if("tools" IN_LIST FEATURES) list(APPEND CONFIGURE_OPTIONS --enable-tools) @@ -89,7 +92,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() #31680: Fix @rpath in both debug and release build - foreach(CONFIG_TRIPLE IN ITEMS ${DEBUG_TRIPLET} ${RELEASE_TRIPLET}) + foreach(CONFIG_TRIPLE IN LISTS CONFIG_TRIPLETS) # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc) vcpkg_execute_build_process( @@ -178,7 +181,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/icu/debug") # To cross compile, we need some files at specific positions. So lets copy them -file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*") +file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config/icucross.*") file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config") file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll") diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 88a574b25a5f92..5ad88701fb3caf 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,6 +1,7 @@ { "name": "icu", "version": "73.1", + "port-version": 1, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/versions/baseline.json b/versions/baseline.json index 665ff630635108..7d8a15cf6a55b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3338,7 +3338,7 @@ }, "icu": { "baseline": "73.1", - "port-version": 0 + "port-version": 1 }, "ideviceinstaller": { "baseline": "2023-07-21", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 7cd3b924823572..d08559d00fe5c2 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24", + "version": "73.1", + "port-version": 1 + }, { "git-tree": "acc3cf9137af5fc8fdd3e8607377026cf88f144d", "version": "73.1", From 3715d743ac08146d9b7714085c1babdba9f262d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 30 Oct 2023 23:10:50 +0100 Subject: [PATCH 0228/1039] [vcpkg baseline][vcpkg-ci-msys2] Silence error from libcrypt delisting (#34772) * [vcpkg-ci-msys2] Improve var name * [vcpkg-ci-msys2] Handle known delisted --- scripts/test_ports/vcpkg-ci-msys2/portfile.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake index 61162aae0905c3..d3662b9fb5a2d1 100644 --- a/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-msys2/portfile.cmake @@ -6,10 +6,16 @@ set(mingw32_repo_url "https://mirror.msys2.org/mingw/mingw32") set(clangarm64_repo_url "https://mirror.msys2.org/mingw/clangarm64") # Ignore these updates (e.g. for known problems) -vcpkg_list(SET ignored_packages +vcpkg_list(SET ignored_updates https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst ) +# Known removals that shall not be reported as errors +# (Packages to be removed from vcpkg scripts ASAP.) +vcpkg_list(SET known_delisted + libcrypt +) + # Ignore these dependencies (e.g. interactive or effectively optional) vcpkg_list(SET ignored_dependencies autoconf2.13 autoconf2.69 @@ -183,7 +189,7 @@ function(analyze_package_list list_var script) set(found 1) set(current_url "${${repo}_repo_url}/${CMAKE_MATCH_1}") # Check the URL - if(NOT vcpkg_url STREQUAL current_url AND NOT current_url IN_LIST ignored_packages) + if(NOT vcpkg_url STREQUAL current_url AND NOT current_url IN_LIST ignored_updates) get_vcpkg_builddate(vcpkg_builddate "${name}") age_in_days(vcpkg_age "${vcpkg_builddate}") pretty_age(vcpkg_age_pretty "${vcpkg_age}") @@ -262,7 +268,7 @@ function(analyze_package_list list_var script) endif() endif() endforeach() - if(NOT found) + if(NOT found AND NOT name IN_LIST known_delisted) vcpkg_list(APPEND vanished "${name}") get_vcpkg_builddate(vcpkg_builddate "${name}") age_in_days(vcpkg_age "${vcpkg_builddate}") From 7474066ca4b993a2b55130076fb3fe5284d220a3 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 31 Oct 2023 19:56:04 +0100 Subject: [PATCH 0229/1039] [nghttp2] update to 1.58.0 (#34819) --- ports/nghttp2/portfile.cmake | 2 +- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 6a8ada7f171932..18566a0af0f96e 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 REF v${VERSION} - SHA512 fe71183df125a5ca83c28525bef66a41d63da7af02fb47e3837b97b13bf7707a64a7e1f634aee18c2dd4b824671a3f04dbb6475c7db2cd86a773c40c47632860 + SHA512 70d7b37b57494847dd6ce940361a4add2dbbd0f533253cafb926089bbf9ad2376d52bf6334427521a133517fae14b7f96ca4c052c434c28ebcfb1a66db884d1d HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 99750cf11f200c..7120fd0346b0f9 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.57.0", + "version": "1.58.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 7d8a15cf6a55b2..e27318e9c3e507 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5845,7 +5845,7 @@ "port-version": 4 }, "nghttp2": { - "baseline": "1.57.0", + "baseline": "1.58.0", "port-version": 0 }, "nghttp2-asio": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index ccd8edc4cdf77b..a49d512ebc3811 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8beb4b8f6dab88296ee6ef57f5eb0f60c9fff72d", + "version": "1.58.0", + "port-version": 0 + }, { "git-tree": "0a369a1a84bf659607d06fcfdcf2b38996c0f935", "version": "1.57.0", From edc5fc28587609eae0c266763b8060facb827363 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 31 Oct 2023 19:56:22 +0100 Subject: [PATCH 0230/1039] [ace] Upgrade to ACE/TAO 7.1.2 (#34818) * [ace] Upgrade to ACE/TAO 7.1.2 * Run vcpkg format-manifest ports/ace/vcpkg.json * ports/ace/vcpkg.json: * versions/a-/ace.json: * versions/baseline.json: * Update version * versions/a-/ace.json: * Correct hash * ports/ace/portfile.cmake: * Update git hash * versions/a-/ace.json: --- ports/ace/portfile.cmake | 4 ++-- ports/ace/vcpkg.json | 3 +-- versions/a-/ace.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 71052d5a09c95f..9f4227f5d776cb 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz" FILENAME "ACE-TAO-${VERSION}.tar.gz" - SHA512 ab1317e626f1b312cd72e6c10f7b51088e5de4db8fa3bca013a98b07aad4edfb5e1f42a4f58c970f968417852b305f298a34e0fde053a1f52754ebe3761f314c + SHA512 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29 ) else() # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz" FILENAME "ACE-src-${VERSION}.tar.gz" - SHA512 1605fdf7a78bfce090bc8b14137f9aafd23019712672f6cd041284656ce2bae0baff954124166aeb16a0565887e1d87b2d10dc2ec5981c4e38fc8d0b39a97934 + SHA512 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec ) endif() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 1dcb75fe4435df..49976044dee5ea 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ace", - "version": "7.1.1", - "port-version": 2, + "version": "7.1.2", "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 0ad073e7869912..eba36522fd04ee 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "696c1096e0de3cd394392720aa34e0ceceac52e7", + "version": "7.1.2", + "port-version": 0 + }, { "git-tree": "acebbd833daa493d4e2075ce547646719d8cd080", "version": "7.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index e27318e9c3e507..9a384c694338e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -25,8 +25,8 @@ "port-version": 3 }, "ace": { - "baseline": "7.1.1", - "port-version": 2 + "baseline": "7.1.2", + "port-version": 0 }, "acl": { "baseline": "2.3.1", From be7f163bf2985c965aa4757162ad20f799b88a21 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 31 Oct 2023 19:56:37 +0100 Subject: [PATCH 0231/1039] mqtt-cpp: Update to 13.2.1 (#34817) --- ports/mqtt-cpp/portfile.cmake | 4 ++-- ports/mqtt-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mqtt-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/mqtt-cpp/portfile.cmake b/ports/mqtt-cpp/portfile.cmake index dfd641f31b74ed..32e9885ea67de1 100644 --- a/ports/mqtt-cpp/portfile.cmake +++ b/ports/mqtt-cpp/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/mqtt_cpp - REF v13.1.0 + REF v${VERSION} SHA512 - 71907ba013d844d3b00c932b8598480067c0b2a2088ea95ae6d65a548145b851f6a25135f4e3c1e61cfc3831b024308e872f194bc9af7febe0036edc2e63b9d4 + 70da1f78a032db458b8744d1ed7c3eec97924ad78127ee5aa58cd4fb8e33351874f9d4b2f08aa94a202ee971d3f94d53167da307af3e82b9488aa89796f981e4 HEAD_REF master ) diff --git a/ports/mqtt-cpp/vcpkg.json b/ports/mqtt-cpp/vcpkg.json index 4572af3d7c693a..83ef57dbcbfa16 100644 --- a/ports/mqtt-cpp/vcpkg.json +++ b/ports/mqtt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mqtt-cpp", - "version-semver": "13.1.0", + "version-semver": "13.2.1", "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", "homepage": "https://github.com/redboltz/mqtt_cpp", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9a384c694338e8..7fb651562d0f72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5641,7 +5641,7 @@ "port-version": 0 }, "mqtt-cpp": { - "baseline": "13.1.0", + "baseline": "13.2.1", "port-version": 0 }, "ms-angle": { diff --git a/versions/m-/mqtt-cpp.json b/versions/m-/mqtt-cpp.json index 6dfe0ed74d91a8..3dbca25668ed1f 100644 --- a/versions/m-/mqtt-cpp.json +++ b/versions/m-/mqtt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8d3a5621c52680097b6b22266034c6999b43100", + "version-semver": "13.2.1", + "port-version": 0 + }, { "git-tree": "ad3936ccb89401e0752c0325604b80c2dc63ace8", "version-semver": "13.1.0", From 979ce0daecba17f904a40a1b74b04a0b3376a1c8 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:56:49 +0800 Subject: [PATCH 0232/1039] [mimalloc] update to 2.1.2 (#34816) * [mimalloc] update to 2.1.2 * [mimalloc] update to 2.1.2 --- ports/mimalloc/portfile.cmake | 2 +- ports/mimalloc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 6d2cb0901e3e1a..54f8e81ca2f9e0 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc REF "v${VERSION}" - SHA512 01c7bdfd001ebc34bb0918fe4ecff42a4ec316fbbd73d4dda52c93c31e5712595758a595ae7ea436f445ecc0ebbf7f9c63d9c572f1c1c5a9e96f51fc524a4875 + SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 HEAD_REF master PATCHES fix-cmake.patch diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 2a2836e7346112..3a71c9aa0263e0 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "2.1.1", + "version": "2.1.2", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7fb651562d0f72..fdfd3caaa31983 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5473,7 +5473,7 @@ "port-version": 6 }, "mimalloc": { - "baseline": "2.1.1", + "baseline": "2.1.2", "port-version": 0 }, "minc": { diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 702ceb4ec4b694..b8f82ea2484320 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bffb93e0abd806e613f2d6dbe35db0768368cae2", + "version": "2.1.2", + "port-version": 0 + }, { "git-tree": "f6055b5cb8a3a2d744cac4781fed65cf1da1064f", "version": "2.1.1", From 1fa7ecc297796f4ddc55de629d778c1d70582b14 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:57:04 +0800 Subject: [PATCH 0233/1039] [minizip-ng] update to 4.0.2 (#34813) * [minizip-ng] update to v4.0.2 * [minizip-ng] update versions --- ports/minizip-ng/fix-pkgconfig.patch | 43 ---------------------------- ports/minizip-ng/portfile.cmake | 3 +- ports/minizip-ng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/minizip-ng.json | 5 ++++ 5 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 ports/minizip-ng/fix-pkgconfig.patch diff --git a/ports/minizip-ng/fix-pkgconfig.patch b/ports/minizip-ng/fix-pkgconfig.patch deleted file mode 100644 index 08d0bbc03db1de..00000000000000 --- a/ports/minizip-ng/fix-pkgconfig.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ca7729e..9af0a7ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -128,6 +128,7 @@ set(MINIZIP_HDR - mz_zip_rw.h) - - set(PC_PRIVATE_LIBS) -+set(PC_PRIVATE_DEPS) - - # Check for system includes - check_include_file(stdint.h HAVE_STDINT_H) -@@ -184,7 +185,7 @@ if(MZ_ZLIB) - list(APPEND MINIZIP_LIB ${ZLIBNG_LIBRARIES}) - list(APPEND MINIZIP_LBD ${ZLIBNG_LIBRARY_DIRS}) - -- set(PC_PRIVATE_LIBS " -lz-ng") -+ set(PC_PRIVATE_DEPS "zlib-ng") - set(ZLIB_COMPAT OFF) - elseif(ZLIB_FOUND AND NOT MZ_FORCE_FETCH_LIBS) - message(STATUS "Using ZLIB ${ZLIB_VERSION}") -@@ -193,7 +194,7 @@ if(MZ_ZLIB) - list(APPEND MINIZIP_LIB ${ZLIB_LIBRARIES}) - list(APPEND MINIZIP_LBD ${ZLIB_LIBRARY_DIRS}) - -- set(PC_PRIVATE_LIBS " -lz") -+ set(PC_PRIVATE_DEPS "zlib") - set(ZLIB_COMPAT ON) - elseif(MZ_FETCH_LIBS) - clone_repo(zlib https://github.com/madler/zlib) -diff --git a/minizip.pc.cmakein b/minizip.pc.cmakein -index d8a0dd72..7aecd852 100644 ---- a/minizip.pc.cmakein -+++ b/minizip.pc.cmakein -@@ -8,7 +8,7 @@ Name: @MINIZIP_TARGET@ - Description: Zip manipulation library - Version: @VERSION@ - --Requires: zlib -+Requires.private: @PC_PRIVATE_DEPS@ - Libs: -L${libdir} -L${sharedlibdir} -l@MINIZIP_TARGET@ - Libs.private:@PC_PRIVATE_LIBS@ - Cflags: -I${includedir} diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 958d6ee79c20c3..3f11f83d8fb174 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -6,11 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/minizip-ng REF "${VERSION}" - SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258 + SHA512 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c HEAD_REF master PATCHES fix_find_zstd.patch - fix-pkgconfig.patch ) vcpkg_check_features( diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 4f0ca912dbbe4a..7ed35d7bd59e2b 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "minizip-ng", - "version": "4.0.1", + "version": "4.0.2", "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index fdfd3caaa31983..6ced5bf2bf11a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5525,7 +5525,7 @@ "port-version": 1 }, "minizip-ng": { - "baseline": "4.0.1", + "baseline": "4.0.2", "port-version": 0 }, "mio": { diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 4ab34e020a0cad..46fc6e0197b790 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33b696b13c4de3a5319c042daab76baa51945f8f", + "version": "4.0.2", + "port-version": 0 + }, { "git-tree": "d77f713bae64d416bf60adb3395a3b295feccc9b", "version": "4.0.1", From 763429b55bb3b014b88ae6613003b57da9052554 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Oct 2023 11:57:23 -0700 Subject: [PATCH 0234/1039] [libhv] update to 1.3.2 (#34811) * [libhv] update to 1.3.2 * update version --------- Co-authored-by: vzhli17 --- ports/libhv/portfile.cmake | 6 +++--- ports/libhv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libhv.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake index 13471aabfa5fe0..181eddb4282612 100644 --- a/ports/libhv/portfile.cmake +++ b/ports/libhv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v${VERSION} #v1.3.0 - SHA512 7d8f552947eb464a8dd644515b9543a7961631e427033de4e1f51f1e9d2b9ca1801553a478b0a20935b50dbc274632e38a6f0438732efed9fcbf0738738ddac5 + REF "v${VERSION}" + SHA512 9dffb6e844df8ba825df88ef984c280923fbf1d50edcbbbe0b36927172ad82c057d65b9b752163c3e2383eb44db0261fd4e3623e3630a55a3f8987088bef0bd7 HEAD_REF master ) @@ -30,4 +30,4 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json index 221571b989be13..b35e83431097fe 100644 --- a/ports/libhv/vcpkg.json +++ b/ports/libhv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libhv", - "version": "1.3.1", + "version": "1.3.2", "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 6ced5bf2bf11a5..9847685f3f5558 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4305,7 +4305,7 @@ "port-version": 0 }, "libhv": { - "baseline": "1.3.1", + "baseline": "1.3.2", "port-version": 0 }, "libhydrogen": { diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json index 11d00085ae6c6d..36960a2dfc5aab 100644 --- a/versions/l-/libhv.json +++ b/versions/l-/libhv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f76c5430e5899a88a85fa7366d046310882f9223", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "3cccf7a4fde6f5c23138ac228d6d581dba11a76b", "version": "1.3.1", From 1ad8ada839cc6d88ad4c623bfc48b721c93f9c74 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 31 Oct 2023 11:57:55 -0700 Subject: [PATCH 0235/1039] [libremidi] Update to 4.2.4 (#34810) * [libremidi] Update to 4.2.4 * update version --- ports/libremidi/fix-install.patch | 13 ------------- ports/libremidi/portfile.cmake | 4 +--- ports/libremidi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libremidi.json | 5 +++++ 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 ports/libremidi/fix-install.patch diff --git a/ports/libremidi/fix-install.patch b/ports/libremidi/fix-install.patch deleted file mode 100644 index 6a6f38137761ed..00000000000000 --- a/ports/libremidi/fix-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/libremidi.install.cmake b/cmake/libremidi.install.cmake -index 08e17f5..985e9a5 100644 ---- a/cmake/libremidi.install.cmake -+++ b/cmake/libremidi.install.cmake -@@ -1,7 +1,7 @@ - if(NOT LIBREMIDI_HEADER_ONLY) - install(TARGETS libremidi - EXPORT libremidi-targets -- ARCHIVE DESTINATION lib/static -+ ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ) diff --git a/ports/libremidi/portfile.cmake b/ports/libremidi/portfile.cmake index 16c90785245391..be5abfc1d51342 100644 --- a/ports/libremidi/portfile.cmake +++ b/ports/libremidi/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jcelerier/libremidi REF "v${VERSION}" - SHA512 de7092c70af6fc0a23c8e6018fbd9f380632ac9dec8794171726fda9a6e7ba45479a8e8317919ba7a8a0267524bab8d5430782a54bc50a914658cf277e18145b + SHA512 ed07f8553155fe7c643033e67e12f1eaf64c11240bb387d9dc2c7e5c54af95cf5b9a78472b2281c7f2f4ef27a8f06ae981705f1fa2321f1322842becc1406247 HEAD_REF master - PATCHES - fix-install.patch ) vcpkg_list(SET options) diff --git a/ports/libremidi/vcpkg.json b/ports/libremidi/vcpkg.json index 103952cd13a855..87c12491b26949 100644 --- a/ports/libremidi/vcpkg.json +++ b/ports/libremidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libremidi", - "version": "4.2.3", - "port-version": 2, + "version": "4.2.4", "description": "A modern C++ MIDI real-time & file I/O library", "homepage": "https://github.com/jcelerier/libremidi", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 9847685f3f5558..394dec4daa36ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4653,8 +4653,8 @@ "port-version": 1 }, "libremidi": { - "baseline": "4.2.3", - "port-version": 2 + "baseline": "4.2.4", + "port-version": 0 }, "libressl": { "baseline": "3.6.2", diff --git a/versions/l-/libremidi.json b/versions/l-/libremidi.json index 08f47d60b1a070..e7b67983bf4f52 100644 --- a/versions/l-/libremidi.json +++ b/versions/l-/libremidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f84b9c0ea6498dad5b9e184bc21f95c614a15625", + "version": "4.2.4", + "port-version": 0 + }, { "git-tree": "4269a93684ffd5145f2b5a79421824b6efd87372", "version": "4.2.3", From fe959628e4d27376520190244fa4cf5d3b7c0748 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:59:12 +0800 Subject: [PATCH 0236/1039] [libsigcpp] update to 3.6.0 (#34804) * [libsigcpp] update to 3.6.0 * [libsigcpp] update to 3.6.0 * fix eol --- .../disable_tests_enable_static_build.patch | 8 +++---- .../libsigcpp/fix-shared-windows-build.patch | 21 ++++--------------- ports/libsigcpp/fix_include_path.patch | 16 +++++++------- ports/libsigcpp/portfile.cmake | 2 +- ports/libsigcpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsigcpp.json | 5 +++++ 7 files changed, 24 insertions(+), 32 deletions(-) diff --git a/ports/libsigcpp/disable_tests_enable_static_build.patch b/ports/libsigcpp/disable_tests_enable_static_build.patch index 017a0ac1be30cf..c0e3acf679760a 100644 --- a/ports/libsigcpp/disable_tests_enable_static_build.patch +++ b/ports/libsigcpp/disable_tests_enable_static_build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1b28fe..b9a9d40 100644 +index c4b291c..2475881 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,13 +84,13 @@ install (FILES +@@ -86,13 +86,13 @@ install (FILES DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") @@ -20,10 +20,10 @@ index e1b28fe..b9a9d40 100644 set (PROJECT_CMAKE_NAME "${PROJECT_NAME}-3") diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt -index fa5a91a..86f1be7 100644 +index dd2d339..8480a5e 100644 --- a/sigc++/CMakeLists.txt +++ b/sigc++/CMakeLists.txt -@@ -23,7 +23,7 @@ set (SOURCE_FILES +@@ -24,7 +24,7 @@ set (SOURCE_FILES set (SIGCPP_LIB_NAME sigc-${SIGCXX_API_VERSION}) diff --git a/ports/libsigcpp/fix-shared-windows-build.patch b/ports/libsigcpp/fix-shared-windows-build.patch index 83cd2b9dc90ba6..f18fc1cedc8b41 100644 --- a/ports/libsigcpp/fix-shared-windows-build.patch +++ b/ports/libsigcpp/fix-shared-windows-build.patch @@ -1,32 +1,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e1b28fe..73990c4 100644 +index 2475881..3828a13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,6 +53,13 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") +@@ -54,6 +54,14 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") include_directories (${sigc++_SOURCE_DIR}) include_directories (${sigc++_BINARY_DIR}) +if (BUILD_SHARED_LIBS) -+ add_compile_options (-DBUILD_SHARED) + if (MSVC) + add_compile_options (-D_WINDLL) + endif() ++else() ++ add_compile_options (-DLIBSIGCXX_STATIC) +endif() + configure_file (sigc++config.h.cmake sigc++config.h) set (prefix ${CMAKE_INSTALL_PREFIX}) -diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake -index 74d348a..43a99c5 100644 ---- a/sigc++config.h.cmake -+++ b/sigc++config.h.cmake -@@ -16,7 +16,9 @@ - # if defined(_MSC_VER) - # define SIGC_MSC 1 - # define SIGC_WIN32 1 -+# ifdef BUILD_SHARED - # define SIGC_DLL 1 -+# endif - # elif defined(__CYGWIN__) - # define SIGC_CONFIGURE 1 - # elif defined(__MINGW32__) diff --git a/ports/libsigcpp/fix_include_path.patch b/ports/libsigcpp/fix_include_path.patch index 582eed59560a82..d0bdb85ed4497b 100644 --- a/ports/libsigcpp/fix_include_path.patch +++ b/ports/libsigcpp/fix_include_path.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73990c4..38424a2 100644 +index 3828a13..bc0a854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ add_custom_target(uninstall +@@ -87,7 +87,7 @@ endif() install (FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++config.h" DESTINATION @@ -11,7 +11,7 @@ index 73990c4..38424a2 100644 install (FILES "${CMAKE_CURRENT_BINARY_DIR}/sigc++-${SIGCXX_API_VERSION}.pc" -@@ -102,7 +102,7 @@ add_subdirectory (sigc++) +@@ -105,7 +105,7 @@ add_subdirectory (sigc++) set (PROJECT_CMAKE_NAME "${PROJECT_NAME}-3") set (VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CMAKE_NAME}ConfigVersion.cmake") @@ -21,20 +21,20 @@ index 73990c4..38424a2 100644 set (CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_CMAKE_NAME}") set (TARGETS_EXPORT_NAME "${PROJECT_CMAKE_NAME}Targets") diff --git a/sigc++.pc.in b/sigc++.pc.in -index 05de315..171b38d 100644 +index e162f2f..7e9b298 100644 --- a/sigc++.pc.in +++ b/sigc++.pc.in @@ -15,4 +15,4 @@ Description: Typesafe signal and callback system for C++ Version: @PACKAGE_VERSION@ URL: https://libsigcplusplus.github.io/libsigcplusplus/ Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@ --Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include -+Cflags: -I${includedir} +-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include @MSVC_STATIC_CXXFLAG@ ++Cflags: -I${includedir} @MSVC_STATIC_CXXFLAG@ diff --git a/sigc++/CMakeLists.txt b/sigc++/CMakeLists.txt -index 86f1be7..076959b 100644 +index 8480a5e..b51b023 100644 --- a/sigc++/CMakeLists.txt +++ b/sigc++/CMakeLists.txt -@@ -29,7 +29,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) +@@ -30,7 +30,7 @@ set_property (TARGET ${SIGCPP_LIB_NAME} PROPERTY VERSION ${PACKAGE_VERSION}) set_property(TARGET ${SIGCPP_LIB_NAME} PROPERTY SOVERSION ${LIBSIGCPP_SOVERSION}) target_compile_definitions( ${SIGCPP_LIB_NAME} PRIVATE -DSIGC_BUILD ) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index cc0705cdf64f74..8978888efeb0f4 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus REF "${VERSION}" - SHA512 8b80f0988daea4eb2c827be57de21167f54a9bf3e9704d64d17d12aef064d8ad87d00f95ce4b5add7666452561c5ca42aa45cf677e54068974a4ea813af3b235 + SHA512 0d22275995a1629ae73b0cc2b2f2598b18aa0ed6d35bd3f1735a50f54d356fb248dedc8d9b5f2794830866b04e0f58ce641048e2df7215ec2e6eac744de58a27 HEAD_REF master PATCHES disable_tests_enable_static_build.patch diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index 59583e62f10579..e70f6e3f6c5fa6 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsigcpp", - "version": "3.4.0", + "version": "3.6.0", "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 394dec4daa36ed..bdaaa17e95e77e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4701,7 +4701,7 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.4.0", + "baseline": "3.6.0", "port-version": 0 }, "libsigcpp-3": { diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index a0b40c0d36420d..32e1c709f51156 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1175893c04f864b29d4fd2052ab0daf7d83a3f7f", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "4aba60e7d2936fd4a786b50f14cbdd99dbf21805", "version": "3.4.0", From 0c5d26ffc2b4c35ac5b6d1077386dce5a406012d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:59:24 +0800 Subject: [PATCH 0237/1039] [librdkafka] update to 2.3.0 (#34798) * [librdkafka] update to 2.3.0 * [librdkafka] update to 2.3.0 --- ports/librdkafka/portfile.cmake | 2 +- ports/librdkafka/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/librdkafka.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 0c8ae081d035f9..44f116e2325bc1 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka REF "v${VERSION}" - SHA512 1a85b5864efdeece1327e461b62a378f24b73eb7174168f630aeff01d4a5074d6b2f15744bc267665fcfc6384e804df00c20b7271ecd85a98dca84746b86b4d9 + SHA512 a68b7382ec5a9afc0eb8513e97d8563c599021d774f7790a61af80565600678a497e4957dcdd823f8b9a426a19b9c5392cacd42d02d70493d993319f3343fe96 HEAD_REF master PATCHES lz4.patch diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 28b28119528e8f..c598545c58f0d7 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,6 +1,6 @@ { "name": "librdkafka", - "version": "2.2.0", + "version": "2.3.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 bdaaa17e95e77e..df8d0f43870691 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4645,7 +4645,7 @@ "port-version": 2 }, "librdkafka": { - "baseline": "2.2.0", + "baseline": "2.3.0", "port-version": 0 }, "libredwg": { diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index b101af03bb313a..1c518a29a68f78 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a84ea0202e606993c8377b34bdbea3c84e08d792", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "a9d47253bd654c0affeb4ec5798cfc390fe28d22", "version": "2.2.0", From 54b42ecea787ee1b0d41a2c09e856ae61ad06620 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:59:45 +0800 Subject: [PATCH 0238/1039] [brpc] update to 1.6.1 (#34795) * [brpc] update to 1.6.1 * [brpc] update to 1.6.1 --- ports/brpc/portfile.cmake | 2 +- ports/brpc/vcpkg.json | 2 +- versions/b-/brpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index 74b3f25cb9db7c..536bd724184e9d 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/incubator-brpc REF "${VERSION}" - SHA512 2c69a1eaaca26da494c1a10d4f6c67ca53c5cfe43243457263e4966101a77207dee5f29b7372895230978c729254b156b7e4223a41d8e909919fbdac6badc75c + SHA512 da0004b7b50cc48da018627c9361ae62b006bb7cd2af53a5cfa1601aab7ad31174d37778a42809bdf2e0f2021a860dcbb02e2c3c938eae6c02808267c3b85025 HEAD_REF master PATCHES fix-build.patch diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index f885e5b6f5e6b1..e89007ba8d643e 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brpc", - "version": "1.6.0", + "version": "1.6.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 217497cc684074..5c3b825a8041c2 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8671f4e4a1523a2f58b71e7413ad0b8dab7c1c4", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "a2cedfb3411d57def85e6337b08570e518c2f992", "version": "1.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index df8d0f43870691..f181776064c649 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1325,7 +1325,7 @@ "port-version": 1 }, "brpc": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "brunocodutra-metal": { From a015d67bca6249562b512e3999e6d29b81753eec Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 31 Oct 2023 20:00:19 +0100 Subject: [PATCH 0239/1039] [baresip-libre] update to version 3.5.1 (#34794) * baresip-libre: upgrade to version 3.5.1 * bump version --- ports/baresip-libre/portfile.cmake | 2 +- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index dd7e59ba327336..6c31345cc69c42 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 97ea35e4d4f36a9b3e47bb942497d495247e01106bcceef98fba4ab8e36061acaca88d12568990f9c8014b1061941ea5e2c6e8c0287e6dcd83a60a70400b083d + SHA512 08e92b223993ef13af3f4f8f019f33da762be8059099536fa3f1f6a9edd4c95bd35a91e4816bc761e227dc8e08e34e6b75421d18d4aa5dedd8bd5fe95547e214 HEAD_REF main PATCHES fix-static-library-build.patch diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 2b18d71d635312..18f9094ab6516d 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.4.0", + "version": "3.5.1", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 95c7390813a85a..c9da6a4ba52e76 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b000665b80ffaa20107836324b4360bad62861a7", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "db0ceb9ad55c2c774fac30663522efc247a1ce04", "version": "3.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index f181776064c649..798878bb459f63 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,7 +517,7 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.4.0", + "baseline": "3.5.1", "port-version": 0 }, "basisu": { From 21fd2501a08b28e5a1ad427c9820b6b81a6e8dba Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 1 Nov 2023 03:00:35 +0800 Subject: [PATCH 0240/1039] [matio] update to 1.5.24 (#34790) * [matio] update to v1.5.24 * [matio] update versions * [matio] port-version need be 0 * [matio] update versions --- ports/matio/portfile.cmake | 4 ++-- ports/matio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/matio.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index 9d9bd70db7de5c..a76dd929342bc0 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio - REF e9e063e08ef2a27fcc22b1e526258fea5a5de329 # v1.5.23 - SHA512 78b13f4796870158f5cf2b8234c0ab6dc8b449cba49608ce40c51a3f91994c33c29b8a6de1ceed94a81fc7faa798d8c3a45a275f3a3abba70a0cd7be731e1d9c + REF b07ee6c1512ab788f91e71910d07fc3ea954f812 # v1.5.24 + SHA512 b9a1abe88565bb01db9aa826248b63927e8576d4e9b72665dee53cc29e0baf6c7af232f298fb6a22b3b96d820cb692ff29f98e2d0d751edc22a5f1ee884fc2df HEAD_REF master PATCHES fix-dependencies.patch ) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index 5e6aa4d8ce3abb..ec2706791baddd 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "matio", - "version": "1.5.23", - "port-version": 3, + "version": "1.5.24", "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 798878bb459f63..615aa89b22f45d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5373,8 +5373,8 @@ "port-version": 5 }, "matio": { - "baseline": "1.5.23", - "port-version": 3 + "baseline": "1.5.24", + "port-version": 0 }, "matplotlib-cpp": { "baseline": "2020-08-27", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index f0f3fc82ed8103..5ee2918406788f 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08eada66141696ad861d881ac1639d41682916e1", + "version": "1.5.24", + "port-version": 0 + }, { "git-tree": "42d087530e333855d74225712aab7755d2eb6be2", "version": "1.5.23", From 4a5beaf42dc14465ff03ee1ea9df3f3fe993b675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Date: Tue, 31 Oct 2023 20:01:51 +0100 Subject: [PATCH 0241/1039] [pcapplusplus] update to 23.09 (#34767) * [pcapplusplus] update to 23.09 * vcpkg: run x-add-version --all * Update ports/pcapplusplus/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/pcapplusplus/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/pcapplusplus/vcpkg.json Co-authored-by: Kai Pastor * Fix version with leading zero * Update pcapplusplus.json * pcapplusplus: update with review * Update pcapplusplus.json --------- Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Kai Pastor --- ports/pcapplusplus/CMakeLists.txt | 113 ------------------------------ ports/pcapplusplus/portfile.cmake | 26 +++---- ports/pcapplusplus/vcpkg.json | 6 +- versions/baseline.json | 2 +- versions/p-/pcapplusplus.json | 5 ++ 5 files changed, 21 insertions(+), 131 deletions(-) delete mode 100644 ports/pcapplusplus/CMakeLists.txt diff --git a/ports/pcapplusplus/CMakeLists.txt b/ports/pcapplusplus/CMakeLists.txt deleted file mode 100644 index cec656d15100fc..00000000000000 --- a/ports/pcapplusplus/CMakeLists.txt +++ /dev/null @@ -1,113 +0,0 @@ -cmake_minimum_required(VERSION 3.12) - -project(pcapplusplus C CXX) - -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - -if (WIN32) - set(BUILD_SHARED_LIBS OFF) -endif() -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_EXTENSIONS ON) - -# dependencies -include(FindPackageHandleStandardArgs) -include(SelectLibraryConfigurations) -if (WIN32) - find_path(PCAP_INCLUDES NAMES pcap.h) - find_library(PCAP_LIBRARY_RELEASE NAMES wpcap PATH_SUFFIXES lib REQUIRED) - find_library(PCAP_LIBRARY_DEBUG NAMES wpcap PATH_SUFFIXES lib REQUIRED) - find_library(PACKET_LIBRARY_RELEASE NAMES Packet PATH_SUFFIXES lib REQUIRED) - find_library(PACKET_LIBRARY_DEBUG NAMES Packet PATH_SUFFIXES lib REQUIRED) - select_library_configurations(PCAP) - select_library_configurations(PACKET) - list(APPEND PCAP_LIBRARIES ${PACKET_LIBRARIES}) -else() - find_path(PCAP_INCLUDES NAMES pcap.h) - find_library(PCAP_LIBRARY_RELEASE NAMES pcap PATH_SUFFIXES lib REQUIRED) - find_library(PCAP_LIBRARY_DEBUG NAMES pcap PATH_SUFFIXES lib REQUIRED) - select_library_configurations(PCAP) -endif() - -find_package(Threads REQUIRED) - -# common++ -file(GLOB COMMONPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Common++/header/*.h") -file(GLOB COMMONPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Common++/src/*.cpp") - -add_library(commonpp ${COMMONPP_SOURCES}) - -target_include_directories(commonpp PUBLIC $ $ $) - -set_target_properties(commonpp PROPERTIES OUTPUT_NAME Common++) -if (WIN32) - target_compile_definitions(commonpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) -elseif (UNIX AND NOT APPLE) - target_compile_definitions(commonpp PRIVATE LINUX) -elseif (APPLE) - target_compile_definitions(commonpp PRIVATE MAC_OS_X) -endif() - -# packet++ -file(GLOB PACKETPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Packet++/header/*.h") -file(GLOB PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Packet++/src/*.cpp") -list(APPEND PACKETPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/hash-library/md5.cpp") - -add_library(packetpp ${PACKETPP_SOURCES}) - -target_include_directories(packetpp PUBLIC $ $ $) -target_link_libraries(packetpp PRIVATE commonpp) -set_target_properties(packetpp PROPERTIES OUTPUT_NAME Packet++) -if (WIN32) - target_compile_definitions(packetpp PRIVATE WPCAP HAVE_REMOTE _CRT_SECURE_NO_WARNINGS) -elseif (UNIX AND NOT APPLE) - target_compile_definitions(packetpp PRIVATE LINUX) -elseif (APPLE) - target_compile_definitions(packetpp PRIVATE MAC_OS_X) -endif() - -# pcap++ -file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") -file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") -file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.c") - -add_library(pcappp ${PCAPPP_SOURCES} ${LIGHTPCAPNG_SOURCES}) - -target_include_directories(pcappp PUBLIC $ $ "${PCAP_INCLUDES}" $) - -target_link_libraries(pcappp PUBLIC commonpp packetpp ${PCAP_LIBRARIES} Threads::Threads) - -if (WIN32) - target_link_libraries(pcappp PUBLIC ws2_32 iphlpapi) -elseif (APPLE) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) - target_link_libraries(pcappp PUBLIC ${COREFOUNDATION_LIBRARY} ${SYSTEMCONFIGURATION_LIBRARY}) -endif() - -if (WIN32) - target_compile_definitions(pcappp PRIVATE WPCAP HAVE_REMOTE HAVE_STRUCT_TIMESPEC _CRT_SECURE_NO_WARNINGS) -elseif (UNIX AND NOT APPLE) - target_compile_definitions(pcappp PRIVATE LINUX) -elseif (APPLE) - target_compile_definitions(pcappp PRIVATE MAC_OS_X) -endif() - -set_target_properties(pcappp PROPERTIES OUTPUT_NAME Pcap++) - -# Install -install(FILES ${PCAPPP_HEADERS} ${COMMONPP_HEADERS} ${PACKETPP_HEADERS} DESTINATION include) -install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION share/pcapplusplus) - -install( - TARGETS pcappp commonpp packetpp - EXPORT unofficial-pcapplusplus-config - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -install(EXPORT unofficial-pcapplusplus-config - NAMESPACE unofficial::pcapplusplus:: - DESTINATION share/unofficial-pcapplusplus -) diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake index 34c6676c020f4a..e52619655769a1 100644 --- a/ports/pcapplusplus/portfile.cmake +++ b/ports/pcapplusplus/portfile.cmake @@ -1,29 +1,31 @@ -if (VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() +# Convert PcapPlusPlus to add leading zero 23.9 => 23.09 +string(REGEX REPLACE "^([0-9]+)[.]([0-9])\$" "\\1.0\\2" PCAPPLUSPLUS_VERSION "${VERSION}") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO seladb/PcapPlusPlus - REF v22.11 - SHA512 41a507ce385d8549186eeec1a1ae138070ab2021d9ffd907829551b3b865ecb526fa05a0ff9ca01b41a2a2807a60a3cba016f62063d30d849282c83e17a2b6e1 + REF "v${PCAPPLUSPLUS_VERSION}" + SHA512 e7dc1dbd85c9f0d2f9c5d3e436456c2cd183fb508c869fa8fb83f46aac99b868a16283204e5d57a0bfd7587f6ac2582b3e14c6098683fad4501708c8fededd6a HEAD_REF master ) -file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPCAPPP_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/pcapplusplus) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(APPEND ${CURRENT_PACKAGES_DIR}/share/unofficial-pcapplusplus/unofficial-pcapplusplus-config.cmake " -include(CMakeFindDependencyMacro) -find_dependency(Threads)") - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-pcapplusplus) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" +) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index c54999db97f77b..963d22b6490eb8 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pcapplusplus", - "version": "22.11", + "version": "23.9", "port-version": 1, "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", @@ -10,10 +10,6 @@ "name": "libpcap", "platform": "!windows" }, - { - "name": "pthreads", - "platform": "windows" - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 615aa89b22f45d..ea05ed7666c34f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6409,7 +6409,7 @@ "port-version": 9 }, "pcapplusplus": { - "baseline": "22.11", + "baseline": "23.9", "port-version": 1 }, "pcg": { diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index 7ad837a0dffad1..8f030c1834d1d6 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51f8425ebc003224002c45c5f7454ebf2fb79a82", + "version": "23.9", + "port-version": 1 + }, { "git-tree": "3dc217621a6ef6ef4f4bd353a1e5088b15960428", "version": "22.11", From c82acfb32089c96b9aa1acd2199b133c32d8fe96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Tue, 31 Oct 2023 19:02:08 +0000 Subject: [PATCH 0242/1039] [asio] update 1.28.2 (#34755) * Update asio version * update database * fix sha hash * Update database --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 2 +- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 844cfe79254a40..7afa452b8c6410 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-28-1 - SHA512 4ba0944b203e18524016de2e21ffa0fa6325414af5f6cff6d02450c15e0d7111cec91f7f125ae78d3b3a6f76c6b2c7155738d1830b3250e98c68b5304328f345 + REF asio-1-28-2 + SHA512 435c13f6f14a35bde042c6d86965ec104ae33be0b6a3c156518b29f851ad2b69c67bf760a20932d847e3b171f571bedc541c6a0d0541980aee8558b09e70357f HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 727d1f2da5b8d4..86724d9c9deb70 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio", - "version": "1.28.1", + "version": "1.28.2", "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.28.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 7f6a47102d5d9e..bd0f8bc0928a5e 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c8d95a50172d0fd6bf736540379a37a4ec0a512", + "version": "1.28.2", + "port-version": 0 + }, { "git-tree": "c0b1256bf350481cdba09fb8586852ca0560e024", "version": "1.28.1", diff --git a/versions/baseline.json b/versions/baseline.json index ea05ed7666c34f..e5b8fa3a2b6c6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -249,7 +249,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.28.1", + "baseline": "1.28.2", "port-version": 0 }, "asio-grpc": { From 365d1e9a909d5a764e7e2dfae25f1dadb68854ae Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 1 Nov 2023 03:02:26 +0800 Subject: [PATCH 0243/1039] [sentencepiece] update to 0.1.99 (#34749) * update to 0.1.99 * update version --- ports/sentencepiece/portfile.cmake | 6 +++--- ports/sentencepiece/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sentencepiece.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index 7d6ab61de1626c..0ce7cd8eb63459 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/sentencepiece - REF 58f256cf6f01bb86e6fa634a5cc560de5bd1667d #v0.1.97 - SHA512 9abe21f76aa025d35a0210bc1a5b0c6f2bb2ab9f626ef9d59bcd8950442036af048ca3945db311d80ff378d41f984a941f39c206e2aa006f1ca0278426d03932 + REF "v${VERSION}" + SHA512 31dc4dc3f2ff4a7effc1ed2d6ad219bcd5d28c0bac89fdeae0336f23e93f954c597313788529e692a0d694d5fa7c3c285a485dfb84a96921efc4b49bcd465358 HEAD_REF master ) @@ -26,7 +26,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_BUILD_TYPE) file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib") endif() -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") vcpkg_copy_pdbs() diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index ff67cb31f8e9dc..8bb9f7f9a290d5 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sentencepiece", - "version": "0.1.97", - "port-version": 2, + "version": "0.1.99", "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", "license": "Apache-2.0", "supports": "!((windows | uwp) & !static)", diff --git a/versions/baseline.json b/versions/baseline.json index e5b8fa3a2b6c6d..f62ac455a7fcf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7681,8 +7681,8 @@ "port-version": 6 }, "sentencepiece": { - "baseline": "0.1.97", - "port-version": 2 + "baseline": "0.1.99", + "port-version": 0 }, "sentry-native": { "baseline": "0.6.6", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 4733c825141818..6a0fc3ea75fab6 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4113b95c56e98d9c59787730bdc69978d23e290", + "version": "0.1.99", + "port-version": 0 + }, { "git-tree": "301c8902039b2ebb65ede78d6d17174a2ca4e8f6", "version": "0.1.97", From 2d9a09dcb8c680b9666ef0e08666414e53afac7d Mon Sep 17 00:00:00 2001 From: Pravila Date: Tue, 31 Oct 2023 19:04:47 +0000 Subject: [PATCH 0244/1039] [kaitai-struct-cpp-stl-runtime] Update to 0.10.1 (#34256) * Update kaitai version * Add new version * Add option * Update git-tree version * Disable parallel configure * Update git-tree version * Modify cmake_configure * Update git-tree * Update port-version * Update port-version * Set up correct port-version * Add missing dependency * Restore vcpkg.json * Update version * Rerun CI * Remove GTest * Update REF commit hash * Update version * Change to version-date format * Add version-date version * Set kaitai version * Add version --------- Co-authored-by: Pablo Rodriguez Avila --- ports/kaitai-struct-cpp-stl-runtime/portfile.cmake | 7 +++---- ports/kaitai-struct-cpp-stl-runtime/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/k-/kaitai-struct-cpp-stl-runtime.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake b/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake index 48c3b807968c3f..f52641a69b9a97 100644 --- a/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake +++ b/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kaitai-io/kaitai_struct_cpp_stl_runtime - REF 0.10 - SHA512 27a0975edffe40a68784a3f5c639937fe70f634d97b7f3aae7d47db31ab4a81442c0707db562ac0775cf28012dc4172af52cc97bd02f2edecf713c57038f5b6d + REF ${VERSION} + SHA512 4efc2aa36662e35f6e23e2dbe300163c79740eb8b741742ee7c6a2510a4d5e1b336a711a59d6bac587456a031c4512155db5e311357fc49ad49cd5130761d2c0 HEAD_REF master ) @@ -17,6 +15,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSTRING_ENCODING_TYPE=${STRING_ENCODING_TYPE} + -DBUILD_TESTS=OFF ) vcpkg_cmake_install() diff --git a/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json b/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json index 896cb6f3e429cb..2e751ad1c21343 100644 --- a/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json +++ b/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json @@ -1,11 +1,10 @@ { "name": "kaitai-struct-cpp-stl-runtime", - "version": "0.10", + "version": "0.10.1", "description": "Kaitai Struct is a declarative language used for describe various binary data structures, laid out in files or in memory. This library implements Kaitai Struct API for C++ using STL", "homepage": "http://kaitai.io/", "documentation": "https://doc.kaitai.io/lang_cpp_stl.html", "license": "MIT", - "supports": "!staticcrt", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f62ac455a7fcf5..2c2ced9c3c5797 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3657,7 +3657,7 @@ "port-version": 6 }, "kaitai-struct-cpp-stl-runtime": { - "baseline": "0.10", + "baseline": "0.10.1", "port-version": 0 }, "kangaru": { diff --git a/versions/k-/kaitai-struct-cpp-stl-runtime.json b/versions/k-/kaitai-struct-cpp-stl-runtime.json index 24a228747ecb36..53d2b39b4853c6 100644 --- a/versions/k-/kaitai-struct-cpp-stl-runtime.json +++ b/versions/k-/kaitai-struct-cpp-stl-runtime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a70cdc32238d97c453f129e298c03bebdc2e7fd", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "217ac9f83467405995c7d1356604661f0edf9970", "version": "0.10", From edd68d8a949f769c6443dbe4a600adee9a09e233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 1 Nov 2023 03:08:20 +0800 Subject: [PATCH 0245/1039] [lensfun] Add new port (#34783) * [lensfun] Add new port * version * fix win build * ver * try to fix win build * try again * fix script tools installation * ver * INSTALL_HELPER_SCRIPTS -> OFF * ver * typo * ver * Apply suggestion * ver * Remove feature tool * ver --------- Co-authored-by: jyu49 --- ports/lensfun/fix_build.patch | 22 ++++++++++++++ ports/lensfun/portfile.cmake | 54 +++++++++++++++++++++++++++++++++++ ports/lensfun/vcpkg.json | 27 ++++++++++++++++++ versions/baseline.json | 4 +++ versions/l-/lensfun.json | 9 ++++++ 5 files changed, 116 insertions(+) create mode 100644 ports/lensfun/fix_build.patch create mode 100644 ports/lensfun/portfile.cmake create mode 100644 ports/lensfun/vcpkg.json create mode 100644 versions/l-/lensfun.json diff --git a/ports/lensfun/fix_build.patch b/ports/lensfun/fix_build.patch new file mode 100644 index 00000000000000..000cba86f10f31 --- /dev/null +++ b/ports/lensfun/fix_build.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 087928c..d1664ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -102,7 +102,7 @@ IF(BUILD_FOR_SSE2) + ENDIF() + ENDIF() + +-IF(WIN32) ++IF(0) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libs/getopt) + # base path for searching for glib on windows + IF(NOT GLIB2_BASE_DIR) +@@ -205,7 +205,7 @@ IF(BUILD_DOC) + ADD_SUBDIRECTORY(docs) + ENDIF() + +-IF(WIN32 AND NOT BUILD_STATIC) ++IF(0) + FIND_FILE(GLIB2_DLL + NAMES glib-2.0-0.dll glib-2.dll glib-2-vs9.dll + PATHS "${GLIB2_BASE_DIR}/bin" diff --git a/ports/lensfun/portfile.cmake b/ports/lensfun/portfile.cmake new file mode 100644 index 00000000000000..935133309f5775 --- /dev/null +++ b/ports/lensfun/portfile.cmake @@ -0,0 +1,54 @@ +#vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lensfun/lensfun + REF "v${VERSION}" + SHA512 4db9a08d51ba50c7c2ff528d380bb28e34698b2bb5c40e5f3deeaa5544c888ac7e0f638bbc3f33a4f75dbb67e0425ca36ce6d8cd1d8c043a4173a2df47de08c6 + HEAD_REF master + PATCHES fix_build.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LENSFUN_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LENSFUN_STATIC_CRT) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sse BUILD_FOR_SSE + sse2 BUILD_FOR_SSE2 +) + +set(LENSFUN_EXTRA_OPTS "") +if (VCPKG_TARGET_IS_WINDOWS) + list(APPEND LENSFUN_EXTRA_OPTS -DPLATFORM_WINDOWS=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${LENSFUN_EXTRA_OPTS} + -DBUILD_STATIC=${LENSFUN_STATIC_LIB} + -DBUILD_WITH_MSVC_STATIC_RUNTIME=${LENSFUN_STATIC_CRT} + -DBUILD_TESTS=OFF + -DBUILD_DOC=OFF + -DINSTALL_PYTHON_MODULE=ON + -DINSTALL_HELPER_SCRIPTS=OFF + -DBUILD_LENSTOOL=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if (LENSFUN_STATIC_LIB) + 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" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/gpl-3.0.txt" "${SOURCE_PATH}/docs/lgpl-3.0.txt") diff --git a/ports/lensfun/vcpkg.json b/ports/lensfun/vcpkg.json new file mode 100644 index 00000000000000..8291e2b5deea51 --- /dev/null +++ b/ports/lensfun/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "lensfun", + "version": "0.3.4", + "description": "Provide a open source database of photographic lenses and their characteristics", + "homepage": "https://scnlib.dev/", + "license": "LGPL-3.0 OR GPL-3.0", + "supports": "!arm", + "dependencies": [ + "glib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "sse": { + "description": "Build with support for SSE" + }, + "sse2": { + "description": "Build with support for SSE2" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 2c2ced9c3c5797..0d364f91fad0bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3952,6 +3952,10 @@ "baseline": "3.39.3", "port-version": 0 }, + "lensfun": { + "baseline": "0.3.4", + "port-version": 0 + }, "leptonica": { "baseline": "1.83.1", "port-version": 0 diff --git a/versions/l-/lensfun.json b/versions/l-/lensfun.json new file mode 100644 index 00000000000000..c0f68257041da2 --- /dev/null +++ b/versions/l-/lensfun.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1dd927cfac7033fe1aa1031d588ebe8295f7765c", + "version": "0.3.4", + "port-version": 0 + } + ] +} From 809e93f524b1f7eedffc0664cbed7f410ff3d3a2 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:31:57 -0400 Subject: [PATCH 0246/1039] [libdwarf] New port (#34382) * Try to add libdwarf * Has * fix * hash * fixes * hash * Fixes * bump hash * zlib fix * bump hash * fix * bump hash * fixes * Bump hash * fix * bump * x * bump * fix * bump * fix * bump * fix * bump * fix * bump * fix * bump * Try this * bump * cleanup * bump * Update patches * bump hash * fix whitespace * bump * Update usage * Bump * Update portfile and patches (#1) * Re-introduce off_t patch * Bump * Fix patch * Bump * Usage is now correct * Bump * Revert "Usage is now correct" This reverts commit 54b32d172de8abd916589f781065c87d3afaaaf2. * Bump --------- Co-authored-by: Kai Pastor --- ports/libdwarf/dependencies.diff | 46 ++++++++++++++++++++++++++++++++ ports/libdwarf/msvc-runtime.diff | 13 +++++++++ ports/libdwarf/no-suffix.diff | 24 +++++++++++++++++ ports/libdwarf/off_t.diff | 16 +++++++++++ ports/libdwarf/portfile.cmake | 37 +++++++++++++++++++++++++ ports/libdwarf/usage | 4 +++ ports/libdwarf/vcpkg.json | 19 +++++++++++++ versions/baseline.json | 4 +++ versions/l-/libdwarf.json | 9 +++++++ 9 files changed, 172 insertions(+) create mode 100644 ports/libdwarf/dependencies.diff create mode 100644 ports/libdwarf/msvc-runtime.diff create mode 100644 ports/libdwarf/no-suffix.diff create mode 100644 ports/libdwarf/off_t.diff create mode 100644 ports/libdwarf/portfile.cmake create mode 100644 ports/libdwarf/usage create mode 100644 ports/libdwarf/vcpkg.json create mode 100644 versions/l-/libdwarf.json diff --git a/ports/libdwarf/dependencies.diff b/ports/libdwarf/dependencies.diff new file mode 100644 index 00000000000000..b172105530f22d --- /dev/null +++ b/ports/libdwarf/dependencies.diff @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e9b75f..fd5fbe3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,6 +195,20 @@ check_c_source_compiles([=[ + }]=] HAVE_STDAFX_H) + #message(STATUS "Checking have windows stdafx.h... ${HAVE_STDAFX_H}") + ++find_package(ZLIB REQUIRED) ++add_library(z ALIAS ZLIB::ZLIB) ++set(HAVE_ZLIB 1) ++set(HAVE_ZLIB_H 1) ++ ++find_package(zstd CONFIG REQUIRED) ++if(TARGET zstd::libzstd_shared) ++ add_library(zstd ALIAS zstd::libzstd_shared) ++else() ++ add_library(zstd ALIAS zstd::libzstd_static) ++endif() ++set(HAVE_ZSTD 1) ++set(HAVE_ZSTD_H 1) ++ + set(CMAKE_REQUIRED_LIBRARIES z) + check_c_source_compiles( [=[ + #include "zlib.h" +diff --git a/src/lib/libdwarf/cmake/libdwarf-config.cmake b/src/lib/libdwarf/cmake/libdwarf-config.cmake +index 604c563..5362360 100644 +--- a/src/lib/libdwarf/cmake/libdwarf-config.cmake ++++ b/src/lib/libdwarf/cmake/libdwarf-config.cmake +@@ -1,3 +1,6 @@ ++include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++find_dependency(zstd CONFIG) + if (NOT TARGET libdwarf::libdwarf) + include(${CMAKE_CURRENT_LIST_DIR}/libdwarf-targets.cmake) + endif() +diff --git a/src/lib/libdwarf/libdwarf.pc.cmake b/src/lib/libdwarf/libdwarf.pc.cmake +index 6b18c77..5c97ce9 100644 +--- a/src/lib/libdwarf/libdwarf.pc.cmake ++++ b/src/lib/libdwarf/libdwarf.pc.cmake +@@ -9,4 +9,5 @@ Description: DWARF debug symbols library + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -ldwarf + Cflags: -I${includedir} ++Requires.private: zlib libzstd + diff --git a/ports/libdwarf/msvc-runtime.diff b/ports/libdwarf/msvc-runtime.diff new file mode 100644 index 00000000000000..3232921a88d034 --- /dev/null +++ b/ports/libdwarf/msvc-runtime.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28076ee..f9795dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,8 @@ endmacro() + set(LIBDWARF_CRT "MD" CACHE STRING "Either MT or MD, specifies whether to use the static or dynamic MSVCRT.") + + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++ set(LIBDWARF_CRT ignore) ++elseif(0) + # Use CMAKE_MSVC_RUNTIME in versions 3.15 and up + if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15") + cmake_policy(SET CMP0091 NEW) diff --git a/ports/libdwarf/no-suffix.diff b/ports/libdwarf/no-suffix.diff new file mode 100644 index 00000000000000..a9200e2c200ff8 --- /dev/null +++ b/ports/libdwarf/no-suffix.diff @@ -0,0 +1,24 @@ +diff --git a/src/bin/dwarfdump/CMakeLists.txt b/src/bin/dwarfdump/CMakeLists.txt +index 1b8aa3a..c77d2f0 100644 +--- a/src/bin/dwarfdump/CMakeLists.txt ++++ b/src/bin/dwarfdump/CMakeLists.txt +@@ -66,7 +66,6 @@ target_compile_options(dwarfdump PRIVATE ${DW_FWALL}) + target_link_libraries(dwarfdump PRIVATE ${dwarf-target} ${DW_FZLIB} ${DW_FZSTD} ) + + if(${CMAKE_SIZEOF_VOID_P} EQUAL 8) +- set(SUFFIX 64) + endif() + set(LIBDIR lib${SUFFIX}) + set(BINDIR bin${SUFFIX}) +diff --git a/src/lib/libdwarf/CMakeLists.txt b/src/lib/libdwarf/CMakeLists.txt +index 09908bb..91a1447 100644 +--- a/src/lib/libdwarf/CMakeLists.txt ++++ b/src/lib/libdwarf/CMakeLists.txt +@@ -109,7 +109,6 @@ foreach(i RANGE ${targetCount}) + + set_target_properties(${target} PROPERTIES OUTPUT_NAME dwarf) + +- set(SUFFIX $<$:64>) + set(LIBDIR lib${SUFFIX}) + set(BINDIR bin${SUFFIX}) + diff --git a/ports/libdwarf/off_t.diff b/ports/libdwarf/off_t.diff new file mode 100644 index 00000000000000..f7338a83166bd4 --- /dev/null +++ b/ports/libdwarf/off_t.diff @@ -0,0 +1,16 @@ +diff --git a/src/lib/libdwarf/libdwarf_private.h b/src/lib/libdwarf/libdwarf_private.h +index b37ae994..7fa89256 100644 +--- a/src/lib/libdwarf/libdwarf_private.h ++++ b/src/lib/libdwarf/libdwarf_private.h +@@ -26,11 +26,7 @@ + #ifdef _MSC_VER /* Macro to select VS compiler */ + #include + typedef SSIZE_T ssize_t; +-#ifdef _WIN64 +-typedef long long off_t; +-#else + typedef long off_t; +-#endif + #endif /* _MSC_VER */ + + #ifndef TRUE diff --git a/ports/libdwarf/portfile.cmake b/ports/libdwarf/portfile.cmake new file mode 100644 index 00000000000000..670b95731524fa --- /dev/null +++ b/ports/libdwarf/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO davea42/libdwarf-code + REF "v${VERSION}" + SHA512 3117c69cc77d5a1189aeb1ea7e74d917dedfb84e9e9e98e3df7fec930f8183d12f55bb12e4871ed3746cdb19a29aba924bc73d6334b23bbb6413a1f4be67d499 + HEAD_REF main + PATCHES + dependencies.diff + msvc-runtime.diff + no-suffix.diff + off_t.diff +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_NON_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_NON_SHARED=${BUILD_NON_SHARED} + -DBUILD_SHARED=${BUILD_SHARED} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdwarf") +vcpkg_fixup_pkgconfig() + +vcpkg_copy_tools(TOOL_NAMES dwarfdump AUTO_CLEAN) + +if(BUILD_SHARED) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdwarf/libdwarf.h" "ifndef LIBDWARF_STATIC" "if 1") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libdwarf/usage b/ports/libdwarf/usage new file mode 100644 index 00000000000000..e3dbb4f6fcd641 --- /dev/null +++ b/ports/libdwarf/usage @@ -0,0 +1,4 @@ +libdwarf provides CMake targets: + + find_package(libdwarf CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,libdwarf::dwarf-static,libdwarf::dwarf-shared>) diff --git a/ports/libdwarf/vcpkg.json b/ports/libdwarf/vcpkg.json new file mode 100644 index 00000000000000..81b93e50473fb9 --- /dev/null +++ b/ports/libdwarf/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libdwarf", + "version": "0.8.0", + "description": "A library for reading DWARF2 and later DWARF.", + "homepage": "https://github.com/davea42/libdwarf-code", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0d364f91fad0bb..aacb2811859f1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4148,6 +4148,10 @@ "baseline": "0.6.0", "port-version": 3 }, + "libdwarf": { + "baseline": "0.8.0", + "port-version": 0 + }, "libe57": { "baseline": "1.1.332", "port-version": 4 diff --git a/versions/l-/libdwarf.json b/versions/l-/libdwarf.json new file mode 100644 index 00000000000000..8ace935f69b463 --- /dev/null +++ b/versions/l-/libdwarf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8aa61f875f55fe903c05d51dc9ce4d0301e4ddbf", + "version": "0.8.0", + "port-version": 0 + } + ] +} From 71ab19baf4c0e57ac6c2cfb2c5115edfc5440bc5 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:39:05 -0400 Subject: [PATCH 0247/1039] [ed25519] New port (#34517) * [ports/ed25519] New port * [ports/ed25519/CMakeLists.txt] Export symbols corrected on shared libs on Windows * [ports/ed25519/CMakeLists.txt] Export one header ; work on correct DLL exposure for Windows --- ports/ed25519/CMakeLists.txt | 64 ++++++++++++++++++++++++++++++++++++ ports/ed25519/portfile.cmake | 30 +++++++++++++++++ ports/ed25519/usage | 3 ++ ports/ed25519/vcpkg.json | 17 ++++++++++ versions/baseline.json | 4 +++ versions/e-/ed25519.json | 9 +++++ 6 files changed, 127 insertions(+) create mode 100644 ports/ed25519/CMakeLists.txt create mode 100644 ports/ed25519/portfile.cmake create mode 100644 ports/ed25519/usage create mode 100644 ports/ed25519/vcpkg.json create mode 100644 versions/e-/ed25519.json diff --git a/ports/ed25519/CMakeLists.txt b/ports/ed25519/CMakeLists.txt new file mode 100644 index 00000000000000..c5b631346bb8c3 --- /dev/null +++ b/ports/ed25519/CMakeLists.txt @@ -0,0 +1,64 @@ +cmake_minimum_required(VERSION 3.19) +project(ed25519 LANGUAGES C) +set(PROJECT_VERSION "${VERSION}") + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ed25519.h" "#elif defined(ED25519_DLL)" "#elif 1") +endif() +set(Header_Files "src/ed25519.h" + "src/fe.h" + "src/fixedint.h" + "src/ge.h" + "src/precomp_data.h" + "src/sc.h" + "src/sha512.h") +set(Source_Files "src/add_scalar.c" + "src/fe.c" + "src/ge.c" + "src/key_exchange.c" + "src/keypair.c" + "src/sc.c" + "src/seed.c" + "src/sha512.c" + "src/sign.c" + "src/verify.c") + +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 "src/ed25519.h") + +install( + 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 "src/ed25519.h" 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}") + +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/ed25519/portfile.cmake b/ports/ed25519/portfile.cmake new file mode 100644 index 00000000000000..1156f93050205e --- /dev/null +++ b/ports/ed25519/portfile.cmake @@ -0,0 +1,30 @@ +if(WIN32) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO orlp/${PORT} + REF b1f19fab4aebe607805620d25a5e42566ce46a0e + SHA512 fcbeba58591543304dd93ae7c1b62a720d89c80c4c07c323eabb6e1f41b93562660181973bda345976e5361e925f243ba9abaec19fc8a05235011957367c6e7e + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "Zlib") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/ed25519/usage b/ports/ed25519/usage new file mode 100644 index 00000000000000..5d26eedb21b354 --- /dev/null +++ b/ports/ed25519/usage @@ -0,0 +1,3 @@ +ed25519 provides CMake targets: + find_package(unofficial-ed25519 CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::ed25519::ed25519) diff --git a/ports/ed25519/vcpkg.json b/ports/ed25519/vcpkg.json new file mode 100644 index 00000000000000..d547802a06869f --- /dev/null +++ b/ports/ed25519/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ed25519", + "version-date": "2017-02-10", + "description": "Portable C implementation of Ed25519, a high-speed high-security public-key signature system.", + "homepage": "https://github.com/orlp/ed25519", + "license": "Zlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index aacb2811859f1b..fbf567abb0fccd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2364,6 +2364,10 @@ "baseline": "1.0.7.15", "port-version": 5 }, + "ed25519": { + "baseline": "2017-02-10", + "port-version": 0 + }, "edflib": { "baseline": "1.24", "port-version": 0 diff --git a/versions/e-/ed25519.json b/versions/e-/ed25519.json new file mode 100644 index 00000000000000..3540c4705d4286 --- /dev/null +++ b/versions/e-/ed25519.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c62f7e2a6268b66c80e20287872725e8bc273032", + "version-date": "2017-02-10", + "port-version": 0 + } + ] +} From ec19a4a7906db96cf3031be0c4709896b796cc95 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 1 Nov 2023 03:42:23 +0800 Subject: [PATCH 0248/1039] [azure-core-cpp] Fix gcc13 compilation error (#34393) * Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * update version * Fix gcc13 compilation error * update version * update patch * update version * update verison * update version --- ports/azure-core-cpp/fix_gcc13.patch | 115 +++++++++++++++++++++++++++ ports/azure-core-cpp/portfile.cmake | 2 + ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 ++ versions/baseline.json | 2 +- 5 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 ports/azure-core-cpp/fix_gcc13.patch diff --git a/ports/azure-core-cpp/fix_gcc13.patch b/ports/azure-core-cpp/fix_gcc13.patch new file mode 100644 index 00000000000000..b283e1bdd3a718 --- /dev/null +++ b/ports/azure-core-cpp/fix_gcc13.patch @@ -0,0 +1,115 @@ +diff --git a/CMakePresets.json b/CMakePresets.json +index eb862b0..2331864 100644 +--- a/CMakePresets.json ++++ b/CMakePresets.json +@@ -370,6 +370,24 @@ + "rhs": "Linux" + } + }, ++ { ++ "name": "linux-basic-clang-13", ++ "displayName": "Linux clang-13", ++ "description": "Using compilers: C = /usr/bin/clang-13, CXX = /usr/bin/clang++-13", ++ "binaryDir": "${sourceDir}/out/build/${presetName}", ++ "generator": "Ninja", ++ "hidden": true, ++ "cacheVariables": { ++ "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", ++ "CMAKE_C_COMPILER": "/usr/bin/clang-13", ++ "CMAKE_CXX_COMPILER": "/usr/bin/clang++-13" ++ }, ++ "condition": { ++ "type": "equals", ++ "lhs": "${hostSystemName}", ++ "rhs": "Linux" ++ } ++ }, + { + "name": "linux-basic-g++", + "displayName": "Linux G++", +@@ -403,9 +421,19 @@ + "inherits": [ "linux-basic-clang-11", "debug-build" ] + }, + { +- "name": "linux-clang-11-debug-tests", +- "inherits": [ "linux-basic-clang-11", "debug-build", "enable-tests" ], +- "displayName": "Linux clang 11 Debug+Tests" ++ "name": "linux-clang-13-debug-tests", ++ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], ++ "displayName": "Linux clang 13 Debug+Tests" ++ }, ++ { ++ "name": "linux-clang-11-debug", ++ "displayName": "Linux clang 11 Debug", ++ "inherits": [ "linux-basic-clang-11", "debug-build" ] ++ }, ++ { ++ "name": "linux-clang-13-debug-tests", ++ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], ++ "displayName": "Linux clang 13 Debug+Tests" + }, + { + "name": "linux-g++-debug", +diff --git a/sdk/core/azure-core/inc/azure/core/base64.hpp b/sdk/core/azure-core/inc/azure/core/base64.hpp +index 97d01ce..97264cb 100644 +--- a/sdk/core/azure-core/inc/azure/core/base64.hpp ++++ b/sdk/core/azure-core/inc/azure/core/base64.hpp +@@ -10,8 +10,9 @@ + #pragma once + + #include +-#include ++#include // defines std::uint8_t + #include ++#include // deprecated, defines uint8_t in global namespace. TODO: Remove when uint8_t in the global namespace is removed. + #include + #include + +diff --git a/sdk/core/azure-core/inc/azure/core/uuid.hpp b/sdk/core/azure-core/inc/azure/core/uuid.hpp +index 1fe0788..d2acb48 100644 +--- a/sdk/core/azure-core/inc/azure/core/uuid.hpp ++++ b/sdk/core/azure-core/inc/azure/core/uuid.hpp +@@ -11,8 +11,9 @@ + #include "azure/core/platform.hpp" + + #include +-#include ++#include // defines std::uint8_t + #include ++#include // deprecated, defines uint8_t in global namespace. TODO: Remove in the future when references to uint8_t and friends are removed. + #include + + namespace Azure { namespace Core { +diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json +index e0ac5ae..af17184 100644 +--- a/eng/pipelines/templates/stages/platform-matrix.json ++++ b/eng/pipelines/templates/stages/platform-matrix.json +@@ -148,6 +148,16 @@ + "AptDependencies": "g++-9", + "CC": "/usr/bin/gcc-9", + "CXX": "/usr/bin/g++-9" ++ }, ++ "clang-13": { ++ "AptDependencies": "clang-13", ++ "CC": "/usr/bin/clang-13", ++ "CXX": "/usr/bin/clang++-13" ++ }, ++ "clang-15": { ++ "AptDependencies": "clang-15", ++ "CC": "/usr/bin/clang-15", ++ "CXX": "/usr/bin/clang++-15" + }, + "included_coverage": { + "AptDependencies": "gcovr lcov", +@@ -156,6 +166,11 @@ + "CODE_COVERAGE": "enabled", + "PublishMapFiles": "true" + }, ++ "included_debug": { ++ "CMAKE_BUILD_TYPE": "Debug", ++ "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", ++ "PublishMapFiles": "true" ++ }, + "included_release": { + "CMAKE_BUILD_TYPE": "Release", + "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 09167adbce06b4..7701007537d037 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-core_1.10.3 SHA512 b3705cf757a14693f65a5ea4a43cc3c5f8377b3156ef24869bd664e9e8b25797fd21107ad543db476335bbb2389687cc1ed8fb8fe1010bb9b5a0eb406f3c0d59 + PATCHES + fix_gcc13.patch ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 3433f153303027..f7d5e2da39c1fb 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-core-cpp", "version-semver": "1.10.3", - "port-version": 1, + "port-version": 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 c0169902a36fbc..aa128c4a14d975 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3de5ec61efe0f113131a5a7847a2964b930b8f88", + "version-semver": "1.10.3", + "port-version": 2 + }, { "git-tree": "0f2e80c3e438f6738b7f0910f3122f21d52eb653", "version-semver": "1.10.3", diff --git a/versions/baseline.json b/versions/baseline.json index fbf567abb0fccd..1cdb2bf9aa6028 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -422,7 +422,7 @@ }, "azure-core-cpp": { "baseline": "1.10.3", - "port-version": 1 + "port-version": 2 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", From 83a4bd802f4e80e47c4cc6b3b692d653b2081f94 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Wed, 1 Nov 2023 04:52:04 +0900 Subject: [PATCH 0249/1039] [kf5texteditor] Create a new port with v5.98.0 (#34378) * [kf5texteditor] create a port with v5.98.0 * [kf5texteditor] fix install errors * [kf5texteditor] update baseline * [kf5texteditor] fix windows build * [kf5texteditor] find gettext(host) tools * [kf5texteditor] update baseline * Update ports/kf5texteditor/vcpkg.json Co-authored-by: Kai Pastor * [kf5texteditor] use VCPKG_HOST_TRIPLET * [kf5parts] install .desktop to share/kservicetypes5 * [kf5service] install .desktop to share/kservicetypes5 * [kf5texteditor] use changed kf5ports, kf5services --------- Co-authored-by: Kai Pastor --- ports/kf5parts/portfile.cmake | 10 ++++++ ports/kf5parts/vcpkg.json | 1 + ports/kf5service/portfile.cmake | 10 ++++++ ports/kf5service/vcpkg.json | 1 + ports/kf5texteditor/portfile.cmake | 54 ++++++++++++++++++++++++++++++ ports/kf5texteditor/vcpkg.json | 33 ++++++++++++++++++ versions/baseline.json | 8 +++-- versions/k-/kf5parts.json | 5 +++ versions/k-/kf5service.json | 5 +++ versions/k-/kf5texteditor.json | 9 +++++ 10 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 ports/kf5texteditor/portfile.cmake create mode 100644 ports/kf5texteditor/vcpkg.json create mode 100644 versions/k-/kf5texteditor.json diff --git a/ports/kf5parts/portfile.cmake b/ports/kf5parts/portfile.cmake index 1f09bc00a2ceba..57122d2a0f009f 100644 --- a/ports/kf5parts/portfile.cmake +++ b/ports/kf5parts/portfile.cmake @@ -9,11 +9,21 @@ vcpkg_from_github( # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") +# See ECM/kde-modules/KDEInstallDirs5.cmake +# Relocate .desktop files for next ports +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND KDE_OPTIONS + -DKDE_INSTALL_KSERVICES5DIR="share/kservices5" + -DKDE_INSTALL_KSERVICETYPES5DIR="share/kservicetypes5" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} + ${KDE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/kf5parts/vcpkg.json b/ports/kf5parts/vcpkg.json index 2b0bea7de9abd6..101c88816e8cd4 100644 --- a/ports/kf5parts/vcpkg.json +++ b/ports/kf5parts/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5parts", "version": "5.98.0", + "port-version": 1, "description": "Plugin framework for user interface component", "homepage": "https://api.kde.org/frameworks/kparts/html/index.html", "license": "LGPL-2.0-or-later", diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 316d08c842020f..14e576dcabac3c 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -34,11 +34,21 @@ vcpkg_add_to_path(PREPEND "${BISON_DIR}") # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") +# See ECM/kde-modules/KDEInstallDirs5.cmake +# Relocate .desktop files for next ports +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND KDE_OPTIONS + -DKDE_INSTALL_KSERVICES5DIR="share/kservices5" + -DKDE_INSTALL_KSERVICETYPES5DIR="share/kservicetypes5" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON + ${KDE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index d2855ffc1af26f..b1e9f5308a92c5 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5service", "version": "5.98.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/kf5texteditor/portfile.cmake b/ports/kf5texteditor/portfile.cmake new file mode 100644 index 00000000000000..5d2b1e2277ec69 --- /dev/null +++ b/ports/kf5texteditor/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ktexteditor + REF v5.98.0 + SHA512 06aad3993cd2133b99ef9e8b510c8b89a844ce778a71351797122c6b05e31e6277d238a8563653a42aafe773457ec89842bbd6184277d471069969c177304696 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") + +# A trick for `kcoreaddons_desktop_to_json` (see KF5CoreAddonsMacros.cmake) to generate katepart.desktop +# The copied *.desktop files should be removed after vcpkg_cmake_install +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DATAROOT "bin/data") # maybe ADD_BIN_TO_PATH can work in this case... + elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(DATAROOT "share") + endif() + file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*") + file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/data") + file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/${DATAROOT}/kservicetypes5/*") +else() + file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*") + file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/share") + file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/share/kservicetypes5/*") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DENABLE_KAUTH_DEFAULT=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DVCPKG_HOST_TRIPLET=${VCPKG_HOST_TRIPLET} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5TextEditor CONFIG_PATH lib/cmake/KF5TextEditor) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + ${TEMP_DESKTOP_FILES_DBG} ${TEMP_DESKTOP_FILES_REL} +) + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5texteditor/vcpkg.json b/ports/kf5texteditor/vcpkg.json new file mode 100644 index 00000000000000..b8200b1cc33af5 --- /dev/null +++ b/ports/kf5texteditor/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "kf5texteditor", + "version": "5.98.0", + "description": "Full text editor component", + "homepage": "https://api.kde.org/frameworks/ktexteditor/html/", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gettext-libintl", + "kf5archive", + "kf5config", + "kf5guiaddons", + "kf5i18n", + "kf5kio", + "kf5parts", + "kf5sonnet", + "kf5syntaxhighlighting", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1cdb2bf9aa6028..aacdd48061e2a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3810,7 +3810,7 @@ }, "kf5parts": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5plotting": { "baseline": "5.98.0", @@ -3818,7 +3818,7 @@ }, "kf5service": { "baseline": "5.98.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.98.0", @@ -3832,6 +3832,10 @@ "baseline": "5.98.0", "port-version": 0 }, + "kf5texteditor": { + "baseline": "5.98.0", + "port-version": 0 + }, "kf5textwidgets": { "baseline": "5.98.0", "port-version": 0 diff --git a/versions/k-/kf5parts.json b/versions/k-/kf5parts.json index f03d4688a912cc..56b0526e4f3dce 100644 --- a/versions/k-/kf5parts.json +++ b/versions/k-/kf5parts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60bbc73ecd2ebcc910f7ea6c1553f79e33ccfb4f", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "6d66ab25d03620f9df39a90fd00d00b0d6271620", "version": "5.98.0", diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index cad8462d131256..89fc5b19d184fe 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f72425338783888d31486fed4fddd847e915f38", + "version": "5.98.0", + "port-version": 1 + }, { "git-tree": "70f03de0d90a7592d61c95a44b83894dfedb1dc2", "version": "5.98.0", diff --git a/versions/k-/kf5texteditor.json b/versions/k-/kf5texteditor.json new file mode 100644 index 00000000000000..6f7c4f11d00870 --- /dev/null +++ b/versions/k-/kf5texteditor.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "65e3187a9352f45ef33cc466b1c809eff7bc2bc4", + "version": "5.98.0", + "port-version": 0 + } + ] +} From 9083f6a5b23dda686897ee5a3bb52745d4c9c687 Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 31 Oct 2023 21:54:17 +0200 Subject: [PATCH 0250/1039] gz-physics6 (#34616) --- ports/gz-physics6/dependencies.patch | 21 +++++++++++++++++++++ ports/gz-physics6/portfile.cmake | 25 +++++++++++++++++++++++++ ports/gz-physics6/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gz-physics6.json | 9 +++++++++ 5 files changed, 81 insertions(+) create mode 100644 ports/gz-physics6/dependencies.patch create mode 100644 ports/gz-physics6/portfile.cmake create mode 100644 ports/gz-physics6/vcpkg.json create mode 100644 versions/g-/gz-physics6.json diff --git a/ports/gz-physics6/dependencies.patch b/ports/gz-physics6/dependencies.patch new file mode 100644 index 00000000000000..16cc09e3d2e4c8 --- /dev/null +++ b/ports/gz-physics6/dependencies.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,9 +73,8 @@ + collision-bullet + collision-ode + utils + utils-urdf + CONFIG + VERSION 6.9 + REQUIRED_BY dartsim +- PKGCONFIG dart + PKGCONFIG_VER_COMPARISON >=) +@@ -82,7 +82,6 @@ + #-------------------------------------- + # Find bullet for the bullet plugin wrapper + gz_find_package(GzBullet + VERSION 2.87 + REQUIRED_BY bullet bullet-featherstone +- PKGCONFIG bullet + PKGCONFIG_VER_COMPARISON >=) diff --git a/ports/gz-physics6/portfile.cmake b/ports/gz-physics6/portfile.cmake new file mode 100644 index 00000000000000..1b7f2ad4430e47 --- /dev/null +++ b/ports/gz-physics6/portfile.cmake @@ -0,0 +1,25 @@ +set(PACKAGE_NAME physics) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 c29594663509234e25c7d0a33848c0fe222c2b9471513978c18ea6873a17c66c43b4037c74e8849995fa6449c2dddc0f2ee669605893daf65119c277a17f39e1 + OPTIONS + PATCHES + dependencies.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-physics-6/engine-plugins/*.dll") + if (NOT plugins STREQUAL "") + file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/") + file(REMOVE ${plugins}) + endif() + + file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-physics-6/engine-plugins/*.dll") + if (NOT plugins_debug STREQUAL "") + file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/") + file(REMOVE ${plugins_debug}) + endif() +endif() diff --git a/ports/gz-physics6/vcpkg.json b/ports/gz-physics6/vcpkg.json new file mode 100644 index 00000000000000..6ec3970062fca3 --- /dev/null +++ b/ports/gz-physics6/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "gz-physics6", + "version": "6.5.1", + "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.", + "homepage": "https://gazebosim.org/libs/physics", + "license": "Apache-2.0", + "dependencies": [ + "bullet3", + "dartsim", + "eigen3", + "gz-cmake3", + "gz-common5", + "gz-math7", + "gz-plugin2", + "gz-utils2", + { + "name": "ignition-modularscripts", + "host": true + }, + "sdformat13" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index aacdd48061e2a8..1603a6a85cd745 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3188,6 +3188,10 @@ "baseline": "9.5.0", "port-version": 0 }, + "gz-physics6": { + "baseline": "6.5.1", + "port-version": 0 + }, "gz-plugin2": { "baseline": "2.0.1", "port-version": 0 diff --git a/versions/g-/gz-physics6.json b/versions/g-/gz-physics6.json new file mode 100644 index 00000000000000..fafcde192d89d0 --- /dev/null +++ b/versions/g-/gz-physics6.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9e84a89c5e37806e67295d51b6bd1ec565ccaede", + "version": "6.5.1", + "port-version": 0 + } + ] +} From 0e2a0e0ad1a370f85a637452be52e2ddf2dcac0b Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 31 Oct 2023 21:54:36 +0200 Subject: [PATCH 0251/1039] Add gz-rendering7 port (#34618) --- ports/gz-cmake3/dependencies.patch | 101 +++++++++++++++++++++ ports/gz-cmake3/vcpkg.json | 2 +- ports/gz-rendering7/fix-dependencies.patch | 47 ++++++++++ ports/gz-rendering7/portfile.cmake | 25 +++++ ports/gz-rendering7/vcpkg.json | 26 ++++++ versions/baseline.json | 6 +- versions/g-/gz-cmake3.json | 5 + versions/g-/gz-rendering7.json | 9 ++ 8 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 ports/gz-rendering7/fix-dependencies.patch create mode 100644 ports/gz-rendering7/portfile.cmake create mode 100644 ports/gz-rendering7/vcpkg.json create mode 100644 versions/g-/gz-rendering7.json diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch index 766d1a1ba42d55..0784d88c232f3b 100644 --- a/ports/gz-cmake3/dependencies.patch +++ b/ports/gz-cmake3/dependencies.patch @@ -108,3 +108,104 @@ index 4eb7a0d..11dae8a 100644 gz_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") endif() endforeach() +diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake +--- a/cmake/FindGzOGRE2.cmake ++++ b/cmake/FindGzOGRE2.cmake +@@ -143,11 +143,11 @@ + endif () + endmacro() + + find_package(PkgConfig QUIET) +-if (PkgConfig_FOUND) ++if (NOT WIN32) + set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH}) +- foreach (GZ_OGRE2_PROJECT_NAME "OGRE2" "OGRE-Next") ++ foreach (GZ_OGRE2_PROJECT_NAME "OGRE") + message(STATUS "Looking for OGRE using the name: ${GZ_OGRE2_PROJECT_NAME}") + if (GZ_OGRE2_PROJECT_NAME STREQUAL "OGRE2") + set(OGRE2_INSTALL_PATH "OGRE-2.${GzOGRE2_FIND_VERSION_MINOR}") + # For OGRE 2.3 debs built via OpenRobotics buildfarms, we use OgreNext +@@ -159,10 +159,10 @@ + set(OGRE2LIBNAME "Ogre") + endif() + else() + # This matches OGRE2.2 debs built in upstream Ubuntu +- set(OGRE2_INSTALL_PATH "OGRE-Next") +- set(OGRE2LIBNAME "OgreNext") ++ set(OGRE2_INSTALL_PATH "OGRE") ++ set(OGRE2LIBNAME "Ogre") + endif() + + # Note: OGRE2 installed from debs is named OGRE-2.2 while the version + # installed from source does not have the 2.2 suffix +@@ -172,8 +172,9 @@ + if (${GZ_OGRE2_PROJECT_NAME}_FOUND) + set(GZ_PKG_NAME ${OGRE2_INSTALL_PATH}) + set(OGRE2_FOUND ${${GZ_OGRE2_PROJECT_NAME}_FOUND}) # sync possible OGRE-Next to OGRE2 + fix_pkgconfig_prefix_jammy_bug("${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS}" OGRE2_LIBRARY_DIRS) ++ set(OGRE2_LIBRARY_DIRS ${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS}) + set(OGRE2_LIBRARIES ${${GZ_OGRE2_PROJECT_NAME}_LIBRARIES}) # sync possible Ogre-Next ot OGRE2 + else() + # look for OGRE2 installed from source + set(PKG_CONFIG_PATH_TMP ${PKG_CONFIG_PATH_ORIGINAL}) +@@ -308,8 +309,10 @@ + "${OGRE2LIBNAME}${component}_d.${OGRE2_VERSION}" + "${OGRE2LIBNAME}${component}_d" + "${OGRE2LIBNAME}${component}.${OGRE2_VERSION}" + "${OGRE2LIBNAME}${component}" ++ "${OGRE2LIBNAME}${component}Static" ++ "${OGRE2LIBNAME}${component}Static_d" + HINTS ${OGRE2_LIBRARY_DIRS}) + if (NOT "${OGRE2-${component}}" STREQUAL "OGRE2-${component}-NOTFOUND") + message(STATUS " + component ${component}: found") + # create a new target for each component +@@ -403,15 +406,24 @@ + set(OGRE2_SEARCH_VER "OGRE-${GzOGRE2_FIND_VERSION_MAJOR}.${GzOGRE2_FIND_VERSION_MINOR}") + set(OGRE2_PATHS "") + set(OGRE2_INC_PATHS "") + foreach(_rootPath ${VCPKG_CMAKE_FIND_ROOT_PATH}) +- list(APPEND OGRE2_PATHS "${_rootPath}/lib/${OGRE2_SEARCH_VER}/") +- list(APPEND OGRE2_PATHS "${_rootPath}/lib/${OGRE2_SEARCH_VER}/manual-link/") +- list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/${OGRE2_SEARCH_VER}") ++ get_filename_component(debug_dir "${_rootPath}" NAME) ++ if(debug_dir MATCHES "debug" AND CMAKE_BUILD_TYPE MATCHES Debug OR NOT debug_dir MATCHES "debug" AND CMAKE_BUILD_TYPE MATCHES Release) ++ list(APPEND OGRE2_PATHS "${_rootPath}/lib/") ++ list(APPEND OGRE2_PATHS "${_rootPath}/lib/manual-link/") ++ endif() ++ list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/OGRE") + endforeach() + ++ if(CMAKE_BUILD_TYPE MATCHES Debug) ++ set(OGRE_MAIN_LIB "OgreMain_d") ++ else() ++ set(OGRE_MAIN_LIB "OgreMain") ++ endif() ++ + find_library(OGRE2_LIBRARY +- NAMES "OgreMain" ++ NAMES "${OGRE_MAIN_LIB}" + HINTS ${OGRE2_PATHS} + NO_DEFAULT_PATH) + + find_path(OGRE2_INCLUDE +@@ -509,8 +521,9 @@ + + ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include) + ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include) + ogre_find_plugin(RenderSystem_Direct3D11 OgreD3D11RenderSystem.h RenderSystems/Direct3D11/include) ++ ogre_find_component(PlanarReflections OgrePlanarReflections.h PlanarReflections) + + foreach(component ${GzOGRE2_FIND_COMPONENTS}) + set(PREFIX OGRE2_${component}) + if(${PREFIX}_FOUND) +@@ -520,9 +533,9 @@ + string(FIND ${component} "Hlms" HLMS_POS) + if(${HLMS_POS} GREATER -1) + foreach (dir ${OGRE2_INCLUDE_DIRS}) + get_filename_component(dir_name "${dir}" NAME) +- if ("${dir_name}" STREQUAL "OGRE-${OGRE2_VERSION_MAJOR}.${OGRE2_VERSION_MINOR}") ++ if ("${dir_name}" STREQUAL "OGRE") + set(dir_include "${dir}/Hlms/Common") + if (EXISTS ${dir_include}) + list(APPEND component_INCLUDE_DIRS ${dir_include}) + endif() diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index 59c964b50320f8..f8a2c9ed000fc2 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gz-cmake3", "version": "3.4.1", - "port-version": 2, + "port-version": 3, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-rendering7/fix-dependencies.patch b/ports/gz-rendering7/fix-dependencies.patch new file mode 100644 index 00000000000000..79136c638aa2f9 --- /dev/null +++ b/ports/gz-rendering7/fix-dependencies.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,12 +65,12 @@ + + if (APPLE) + gz_find_package(OpenGL + REQUIRED_BY ogre ogre2 +- PKGCONFIG gl) ++ PKGCONFIG opengl) + else() + gz_find_package(OpenGL REQUIRED + COMPONENTS OpenGL + OPTIONAL_COMPONENTS EGL + REQUIRED_BY ogre ogre2 +- PKGCONFIG gl) ++ PKGCONFIG opengl) + endif() +@@ -81,5 +81,6 @@ + + #-------------------------------------- + # Find OGRE ++if(0) + list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging") + +@@ -97,5 +98,6 @@ + "The software might compile and even work but support from upstream" + "could be reduced to accepting patches for newer versions") + endif() + endif() ++endif() + +diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt +--- a/ogre2/src/terrain/Terra/CMakeLists.txt ++++ b/ogre2/src/terrain/Terra/CMakeLists.txt +@@ -34,8 +34,10 @@ + # we must add this one manually for this to build correctly + ${OGRE2_INCLUDE}/Hlms/Pbs + ${OGRE2_INCLUDE}/Hlms/Common + PUBLIC +- ${CMAKE_CURRENT_LIST_DIR}/include ++ $ ++ $ + ) + + target_link_libraries(${PROJECT_NAME} PRIVATE GzOGRE2::GzOGRE2) ++install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering7-ogre2) diff --git a/ports/gz-rendering7/portfile.cmake b/ports/gz-rendering7/portfile.cmake new file mode 100644 index 00000000000000..0797333d63a5e5 --- /dev/null +++ b/ports/gz-rendering7/portfile.cmake @@ -0,0 +1,25 @@ +set(PACKAGE_NAME rendering) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 7c14b268694600b8529fef21130b34f516b26baac771c019b4248a67f84420c40d655e0abedf0b36c53b7cdf19941b3f4f3494696c831a83070632d004b30678 + OPTIONS + PATCHES + fix-dependencies.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-rendering-7/engine-plugins/*.dll") + if (NOT plugins STREQUAL "") + file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/") + file(REMOVE ${plugins}) + endif() + + file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-rendering-7/engine-plugins/*.dll") + if (NOT plugins_debug STREQUAL "") + file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/") + file(REMOVE ${plugins_debug}) + endif() +endif() diff --git a/ports/gz-rendering7/vcpkg.json b/ports/gz-rendering7/vcpkg.json new file mode 100644 index 00000000000000..1e345181b6c0c6 --- /dev/null +++ b/ports/gz-rendering7/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "gz-rendering7", + "version": "7.4.1", + "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.", + "homepage": "https://gazebosim.org/libs/rendering", + "license": "Apache-2.0", + "dependencies": [ + "freeimage", + "gz-cmake3", + "gz-common5", + "gz-math7", + "gz-plugin2", + "gz-utils2", + { + "name": "ignition-modularscripts", + "host": true + }, + { + "name": "ogre-next", + "features": [ + "planar-reflections" + ] + }, + "opengl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1603a6a85cd745..da0ff6b3d9e6b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3170,7 +3170,7 @@ }, "gz-cmake3": { "baseline": "3.4.1", - "port-version": 2 + "port-version": 3 }, "gz-common5": { "baseline": "5.4.1", @@ -3196,6 +3196,10 @@ "baseline": "2.0.1", "port-version": 0 }, + "gz-rendering7": { + "baseline": "7.4.1", + "port-version": 0 + }, "gz-tools2": { "baseline": "2.0.0", "port-version": 1 diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index 256d731bef48da..f3d82c51941823 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ac0952f283b1e4a700a12c0d616066b36fdeff2", + "version": "3.4.1", + "port-version": 3 + }, { "git-tree": "f0b0d35ac8f99280de71a64494d8597f09986362", "version": "3.4.1", diff --git a/versions/g-/gz-rendering7.json b/versions/g-/gz-rendering7.json new file mode 100644 index 00000000000000..0d8daead9a2744 --- /dev/null +++ b/versions/g-/gz-rendering7.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5fa361453bcae9a0e8acee956057e9436f8d1377", + "version": "7.4.1", + "port-version": 0 + } + ] +} From 51b14cd4e1230dd51c11ffeff6f7d53c61cc5297 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Tue, 31 Oct 2023 18:48:06 -0700 Subject: [PATCH 0252/1039] [lensfun] Remove cpu features (#34832) * remove invalid cpu features * bump port version * oops * version db * build_for_sse=off * version db * sse2 = off * version db --- ports/lensfun/portfile.cmake | 8 ++------ ports/lensfun/vcpkg.json | 11 ++--------- versions/baseline.json | 2 +- versions/l-/lensfun.json | 5 +++++ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ports/lensfun/portfile.cmake b/ports/lensfun/portfile.cmake index 935133309f5775..fee3222bbc2fc2 100644 --- a/ports/lensfun/portfile.cmake +++ b/ports/lensfun/portfile.cmake @@ -12,11 +12,6 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LENSFUN_STATIC_LIB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LENSFUN_STATIC_CRT) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - sse BUILD_FOR_SSE - sse2 BUILD_FOR_SSE2 -) set(LENSFUN_EXTRA_OPTS "") if (VCPKG_TARGET_IS_WINDOWS) @@ -26,7 +21,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} ${LENSFUN_EXTRA_OPTS} -DBUILD_STATIC=${LENSFUN_STATIC_LIB} -DBUILD_WITH_MSVC_STATIC_RUNTIME=${LENSFUN_STATIC_CRT} @@ -35,6 +29,8 @@ vcpkg_cmake_configure( -DINSTALL_PYTHON_MODULE=ON -DINSTALL_HELPER_SCRIPTS=OFF -DBUILD_LENSTOOL=OFF + -DBUILD_FOR_SSE=OFF + -DBUILD_FOR_SSE2=OFF ) vcpkg_cmake_install() diff --git a/ports/lensfun/vcpkg.json b/ports/lensfun/vcpkg.json index 8291e2b5deea51..d4bdc39b842947 100644 --- a/ports/lensfun/vcpkg.json +++ b/ports/lensfun/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lensfun", "version": "0.3.4", + "port-version": 1, "description": "Provide a open source database of photographic lenses and their characteristics", "homepage": "https://scnlib.dev/", "license": "LGPL-3.0 OR GPL-3.0", @@ -15,13 +16,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "sse": { - "description": "Build with support for SSE" - }, - "sse2": { - "description": "Build with support for SSE2" - } - } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index da0ff6b3d9e6b8..3f8ca4c0a312a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3970,7 +3970,7 @@ }, "lensfun": { "baseline": "0.3.4", - "port-version": 0 + "port-version": 1 }, "leptonica": { "baseline": "1.83.1", diff --git a/versions/l-/lensfun.json b/versions/l-/lensfun.json index c0f68257041da2..e716e4d6240245 100644 --- a/versions/l-/lensfun.json +++ b/versions/l-/lensfun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a085269b70f184d8dbf07c595e37ce336bd79906", + "version": "0.3.4", + "port-version": 1 + }, { "git-tree": "1dd927cfac7033fe1aa1031d588ebe8295f7765c", "version": "0.3.4", From d2b53e3bcbd18913b3f992dc371e19cdbcaf2841 Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Wed, 1 Nov 2023 18:25:24 +0100 Subject: [PATCH 0253/1039] [shaderwriter] Update to version v2.7.0 (#34789) --- ports/shaderwriter/portfile.cmake | 2 +- ports/shaderwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index 6e1b1d70f9ff48..887bae8981c4ad 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter REF v${VERSION} HEAD_REF development - SHA512 7e7d5fec16998bf99225e01a990fcb29612eee8f59e32fbb4e9650a0d69ffc658588380fdfd9374cc5492bd4eac5c9c6dadeb583129c649e5d792346a2d1a743 + SHA512 58a9d5ca857a21283d359a3028d52a93dfa8161d2ba8052f674ecbab22750eebc0006d240d5f12779475ff5a2f8550f1c53a32e3a50ea2346ed8212e3c5775b2 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index 9d1a0d45b38036..7ffbd083684dee 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version": "2.6.0", + "version": "2.7.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 3f8ca4c0a312a7..b0718a46fe0ec4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7757,7 +7757,7 @@ "port-version": 4 }, "shaderwriter": { - "baseline": "2.6.0", + "baseline": "2.7.0", "port-version": 0 }, "shapelib": { diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index 7308371ebd4939..d637749b761d2d 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa83579d72d0cf7bc11c2bd264ad15e80536eb21", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "ab41ceb262232d4ccc5cccbdba599f2f40d7a241", "version": "2.6.0", From eb76636c04641cdb14e2e1a7ef3f877d0b851cc5 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 2 Nov 2023 02:45:44 +0800 Subject: [PATCH 0254/1039] [skia] Update version to 0.38.2 (#34787) * [skia] Update version to 0.38.2 * version * add dep wuffs * version * add support x86 MSVC build * version --- ports/skia/core-opengl32.patch | 13 +++++++------ ports/skia/disable-msvc-env-setup.patch | 12 ------------ ports/skia/portfile.cmake | 15 +++++++++++---- ports/skia/support-x86-MSVC-build.patch | 13 +++++++++++++ ports/skia/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/skia.json | 5 +++++ 7 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 ports/skia/disable-msvc-env-setup.patch create mode 100644 ports/skia/support-x86-MSVC-build.patch diff --git a/ports/skia/core-opengl32.patch b/ports/skia/core-opengl32.patch index b1eec1722440f9..7395837fe48061 100644 --- a/ports/skia/core-opengl32.patch +++ b/ports/skia/core-opengl32.patch @@ -1,14 +1,15 @@ diff --git a/BUILD.gn b/BUILD.gn -index 71d19dd..3691123 100644 +index 577dd00..07f9882 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -1393,6 +1393,9 @@ skia_component("skia") { - - defines = [ "SK_HAS_ANDROID_CODEC" ] +@@ -1478,6 +1478,10 @@ skia_component("skia") { + defines = [] libs = [] + + if (is_win && target_cpu != "arm64" && !skia_enable_winuwp) { + libs += [ "OpenGL32.lib" ] # for src/utils/win/SkWGL_win.cpp + } - ++ if (skia_enable_sksl) { - deps += [ ":dehydrate_sksl" ] + deps += [ ":minify_sksl" ] + sources += skia_sksl_sources diff --git a/ports/skia/disable-msvc-env-setup.patch b/ports/skia/disable-msvc-env-setup.patch deleted file mode 100644 index af4290baa7fa62..00000000000000 --- a/ports/skia/disable-msvc-env-setup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn -index ba85c3d..901ba99 100644 ---- a/gn/toolchain/BUILD.gn -+++ b/gn/toolchain/BUILD.gn -@@ -94,6 +94,7 @@ toolchain("msvc") { - # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory. - env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && " - } -+ env_setup = "" # overwrite - - cl_m32_flag = "" - diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 2f76ffcc662c6d..571a3d4b0d5414 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -1,14 +1,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/skia-functions.cmake") -vcpkg_from_git( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - URL https://github.com/google/skia - REF f86f242886692a18f5adc1cf9cbd6740cd0870fd + REPO google/skia + REF "canvaskit/${VERSION}" + SHA512 4672cfef8c92f37418e27df30a4e3fd6f7ca6273521e9d6b7755d9285800ad1ea6eff66639a17f591e6921ec8b78aa828500399a83295f9984ab58ebaff0ec24 PATCHES - disable-msvc-env-setup.patch uwp.patch core-opengl32.patch disable-dev-test.patch + support-x86-MSVC-build.patch ) # these following aren't available in vcpkg @@ -83,6 +84,11 @@ declare_external_from_git(vulkan-tools REF "d55c7aaf041af331bee8c22fb448a6ff4c797f73" LICENSE_FILE LICENSE.txt ) +declare_external_from_git(wuffs + URL "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + REF "e3f919ccfe3ef542cfc983a82146070258fb57f8" + LICENSE_FILE LICENSE +) declare_external_from_pkgconfig(expat) declare_external_from_pkgconfig(fontconfig PATH "third_party") @@ -135,6 +141,7 @@ set(required_externals piex sfntly zlib + wuffs ) if("fontconfig" IN_LIST FEATURES) diff --git a/ports/skia/support-x86-MSVC-build.patch b/ports/skia/support-x86-MSVC-build.patch new file mode 100644 index 00000000000000..a0683c659fe2d3 --- /dev/null +++ b/ports/skia/support-x86-MSVC-build.patch @@ -0,0 +1,13 @@ +diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn +index dcf79cc..599629a 100644 +--- a/gn/toolchain/BUILD.gn ++++ b/gn/toolchain/BUILD.gn +@@ -89,7 +89,7 @@ toolchain("msvc") { + if (target_cpu == "x86") { + # Toolchain asset includes a script that configures for x86 building. + # We don't support x86 builds with local MSVC installations. +- env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && " ++ env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x86\" && " + } else if (target_cpu == "arm64") { + # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory. + env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && " diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 67eb48c3fc11c9..9cc7507e4eeaf6 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "skia", - "version": "0.36.0", - "port-version": 10, + "version": "0.38.2", "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 b0718a46fe0ec4..30d8d07f079ca8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7849,8 +7849,8 @@ "port-version": 0 }, "skia": { - "baseline": "0.36.0", - "port-version": 10 + "baseline": "0.38.2", + "port-version": 0 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index b1cc162851005a..3303b6b7a9e684 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7376b3d299acc253980a36193079fbb42eea1b", + "version": "0.38.2", + "port-version": 0 + }, { "git-tree": "df5e0eb3dc6aa8ee9b5829caf01ce7876bc7c2fe", "version": "0.36.0", From 23d3731eae5156dde2f33d785621a14117f7c69a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 1 Nov 2023 20:06:07 +0100 Subject: [PATCH 0255/1039] [libmysql] Update to 8.0.34 (#34736) * [libmysql] Update to 8.0.34 * [libmysql] Fix deps * [libmysql] Fix deps, cont. * WIP * WIP * [libmysql] Don't wrap downstream Find modules Downstream Find modules are not standardized and cannot be wrapped reliably. By moving the legacy wrapper behaviour to a config module, we can catch those users which were relying on the old usage, and display the instructions for migrating to the canonical unofficial usage. * [libmysql] Cross build stuff * [libmysql] Cross build stuff * [libmysql] Cross build stuff --- .../Add-target-include-directories.patch | 20 --- ports/libmysql/cross-build.patch | 141 +++++++++++++++++ ports/libmysql/dependencies.patch | 140 +++++++++++++++++ ports/libmysql/export-cmake-targets.patch | 143 ------------------ ports/libmysql/homebrew.patch | 13 -- ports/libmysql/ignore-boost-version.patch | 13 -- ports/libmysql/install-exports.patch | 121 +++++++++++++++ ports/libmysql/libmysql-config.cmake | 6 + ports/libmysql/portfile.cmake | 139 +++++++---------- ports/libmysql/system-libs.patch | 76 ---------- ports/libmysql/usage | 6 +- ports/libmysql/vcpkg-cmake-wrapper.cmake | 9 -- ports/libmysql/vcpkg.json | 15 +- scripts/ci.baseline.txt | 4 - versions/baseline.json | 4 +- versions/l-/libmysql.json | 5 + 16 files changed, 483 insertions(+), 372 deletions(-) delete mode 100644 ports/libmysql/Add-target-include-directories.patch create mode 100644 ports/libmysql/cross-build.patch create mode 100644 ports/libmysql/dependencies.patch delete mode 100644 ports/libmysql/export-cmake-targets.patch delete mode 100644 ports/libmysql/homebrew.patch delete mode 100644 ports/libmysql/ignore-boost-version.patch create mode 100644 ports/libmysql/install-exports.patch create mode 100644 ports/libmysql/libmysql-config.cmake delete mode 100644 ports/libmysql/system-libs.patch delete mode 100644 ports/libmysql/vcpkg-cmake-wrapper.cmake diff --git a/ports/libmysql/Add-target-include-directories.patch b/ports/libmysql/Add-target-include-directories.patch deleted file mode 100644 index 355ca5314e2669..00000000000000 --- a/ports/libmysql/Add-target-include-directories.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index ae13a63dfdc..b450b3c2e4c 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -222,6 +222,7 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) - ADD_VERSION_INFO(${TARGET} SHARED SRC) - ENDIF() - ADD_LIBRARY(${TARGET} SHARED ${SRC}) -+ TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) - - IF(ARG_EXCLUDE_FROM_ALL) - IF(NOT ARG_SKIP_INSTALL) -@@ -361,6 +362,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) - CONFIGURE_FILE_CONTENT("${SOURCE_FILE_CONTENT}" "${SOURCE_FILE}") - - ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE}) -+ TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) - MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE) - IF(FPROFILE_USE AND HAS_MISSING_PROFILE) - ADD_COMPILE_FLAGS(${SOURCE_FILE} COMPILE_FLAGS ${HAS_MISSING_PROFILE}) diff --git a/ports/libmysql/cross-build.patch b/ports/libmysql/cross-build.patch new file mode 100644 index 00000000000000..000d7aebdf8afa --- /dev/null +++ b/ports/libmysql/cross-build.patch @@ -0,0 +1,141 @@ +diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt +index 8e224532..2b63413b 100644 +--- a/libmysql/CMakeLists.txt ++++ b/libmysql/CMakeLists.txt +@@ -259,6 +259,7 @@ ELSEIF(FREEBSD) + MESSAGE(STATUS "BSD built in DNS SRV APIs") + ELSE() + FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv) ++ FIND_LIBRARY(RESOLV_LIBRARY NAMES resolv PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH) + IF (RESOLV_LIBRARY) + LIST(APPEND LIBS_TO_LINK ${RESOLV_LIBRARY}) + SET(HAVE_UNIX_DNS_SRV 1 PARENT_SCOPE) +@@ -413,6 +414,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test + ${CMAKE_CURRENT_BINARY_DIR}/api_test.c + LINK_LIBRARIES libmysql ${LIBRT} + SKIP_INSTALL ++ EXCLUDE_FROM_ALL + ) + # Clang/UBSAN needs this on some platforms. + SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX) +@@ -439,6 +441,6 @@ ADD_CUSTOM_COMMAND( + COMMAND libmysql_api_test + > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out + ) +-MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL ++MY_ADD_CUSTOM_TARGET(run_libmysql_api_test + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out + ) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 8e933877..d971acbf 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND( + + # Add target for the above to be built + MY_ADD_CUSTOM_TARGET(GenFixPrivs +- ALL + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.h + ) + +diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt +index aaba3575..a0e52652 100644 +--- a/scripts/sys_schema/CMakeLists.txt ++++ b/scripts/sys_schema/CMakeLists.txt +@@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sql_commands.h) + + MY_ADD_CUSTOM_TARGET(GenSysSchemaC +- ALL + DEPENDS comp_sql sql_commands + COMMENT "Generating Sys Schema C code" + ) +diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt +index 28cde40e..be916cbc 100644 +--- a/share/CMakeLists.txt ++++ b/share/CMakeLists.txt +@@ -47,8 +47,12 @@ SET(dirs + ukrainian + ) + +-FOREACH (dir ${dirs}) +- INSTALL(DIRECTORY ${CMAKE_BINARY_DIR}/${INSTALL_MYSQLSHAREDIR}/${dir} ++ set(src_dir ${CMAKE_BINARY_DIR}/share/libmysql) ++ if(CMAKE_CROSSCOMPILING) ++ set(src_dir ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql) ++ endif() ++ FOREACH (dir ${dirs}) ++ INSTALL(DIRECTORY ${src_dir}/${dir} + DESTINATION ${INSTALL_MYSQLSHAREDIR} + COMPONENT Server + ) +diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt +index 665b35da..88f0743b 100644 +--- a/strings/CMakeLists.txt ++++ b/strings/CMakeLists.txt +@@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt) + SET(ZH_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_zh_tbls.cc) + SET(JA_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/ja_hans.txt) + SET(JA_HANS_DST_FILE ${CMAKE_BINARY_DIR}/strings/uca900_ja_tbls.cc) ++if(CMAKE_CROSSCOMPILING) ++ file(COPY ++ "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_zh_tbls.cc" ++ "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/uca900_ja_tbls.cc" ++ DESTINATION "${CMAKE_BINARY_DIR}/strings" ++ ) ++else() + ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE} + ${JA_HANS_DST_FILE} + COMMAND uca9dump zh +@@ -79,6 +86,8 @@ ADD_CUSTOM_COMMAND(OUTPUT ${ZH_HANS_DST_FILE} + --out_file=${JA_HANS_DST_FILE} + DEPENDS uca9dump ${ZH_HANS_SRC_FILE} ${JA_HANS_SRC_FILE} + ) ++install(FILES "${ZH_HANS_DST_FILE}" "${JA_HANS_DST_FILE}" DESTINATION "share/libmysql/${PROJECT_VERSION}") ++endif() + + SET_SOURCE_FILES_PROPERTIES( + ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE} +diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt +index da34524c..dc397dae 100644 +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err + SKIP_INSTALL + ) + ++if(CMAKE_CROSSCOMPILING) ++ file(COPY ++ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/include/mysql/mysqld_error.h ++ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqlclient_ername.h ++ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_ername.h ++ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/mysqld_errmsg.h ++ DESTINATION ${PROJECT_BINARY_DIR}/include ++ ) ++ file(COPY ++ ${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/share/libmysql/${PROJECT_VERSION}/errmsg.sys ++ DESTINATION ${PROJECT_BINARY_DIR}/share/libmysql/english ++ ) ++ add_custom_target(GenClientError) ++ add_custom_target(GenError) ++else() + ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h + COMMAND comp_client_err + --in_file=${PROJECT_SOURCE_DIR}/include/errmsg.h +@@ -97,6 +112,16 @@ MYSQL_ADD_EXECUTABLE(range_check_err + SKIP_INSTALL + ) + ++ install( ++ FILES ++ ${PROJECT_BINARY_DIR}/include/mysqlclient_ername.h ++ ${PROJECT_BINARY_DIR}/include/mysqld_ername.h ++ ${PROJECT_BINARY_DIR}/include/mysqld_errmsg.h ++ ${PROJECT_BINARY_DIR}/share/libmysql/english/errmsg.sys ++ DESTINATION share/libmysql/${PROJECT_VERSION} ++ ) ++endif() ++ + # Set InnoDB mutex type + ADD_DEFINITIONS(-DMUTEX_EVENT) + diff --git a/ports/libmysql/dependencies.patch b/ports/libmysql/dependencies.patch new file mode 100644 index 00000000000000..0129d71e9741fe --- /dev/null +++ b/ports/libmysql/dependencies.patch @@ -0,0 +1,140 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e17ec1d0..465e42f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -818,8 +818,12 @@ INCLUDE(fileutils) + INCLUDE(zlib) + INCLUDE(zstd) + INCLUDE(lz4) +-INCLUDE(icu) +-INCLUDE(libevent) ++macro(MYSQL_CHECK_ICU) ++endmacro() ++macro(MYSQL_CHECK_LIBEVENT) ++endmacro() ++macro(WARN_MISSING_SYSTEM_LIBEVENT) ++endmacro() + INCLUDE(ssl) + INCLUDE(sasl) + INCLUDE(ldap) +@@ -837,7 +841,8 @@ INCLUDE(curl) + INCLUDE(rapidjson) + INCLUDE(fprofile) + INCLUDE(gloves) +-INCLUDE(fido2) ++macro(MYSQL_CHECK_FIDO) ++endmacro() + INCLUDE(win_jemalloc) + + IF(UNIX) +@@ -1942,7 +1947,7 @@ MYSQL_CHECK_RAPIDJSON() + MYSQL_CHECK_FIDO() + MYSQL_CHECK_FIDO_DLLS() + +-IF(APPLE) ++IF(0) + GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY) + IF(EXISTS ${HOMEBREW_BASE}/include/boost) + FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO) +diff --git a/cmake/boost.cmake b/cmake/boost.cmake +index c979055c..53e55fcf 100644 +--- a/cmake/boost.cmake ++++ b/cmake/boost.cmake +@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) + COULD_NOT_FIND_BOOST() + ENDIF() + +-IF(NOT BOOST_MINOR_VERSION EQUAL 77) ++IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION) + MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " + "we need 77" + ) +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 7107f4bd..bb7f3733 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -534,7 +534,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) + + # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib + # must be merged into mysqlclient.lib +- IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") ++ IF(0) + SET(LINKER_EXTRA_FLAGS "") + FOREACH(LIB ${SSL_LIBRARIES}) + STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") +diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake +index 10e7e8c8..48772329 100644 +--- a/cmake/lz4.cmake ++++ b/cmake/lz4.cmake +@@ -46,7 +46,7 @@ FUNCTION(FIND_SYSTEM_LZ4) + FIND_PATH(LZ4_INCLUDE_DIR + NAMES lz4frame.h) + FIND_LIBRARY(LZ4_SYSTEM_LIBRARY +- NAMES lz4) ++ NAMES lz4d lz4 NAMES_PER_DIR) + IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY) + SET(SYSTEM_LZ4_FOUND 1 CACHE INTERNAL "") + ADD_LIBRARY(lz4_interface INTERFACE) +diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake +index 04e3af87..8ae52c82 100644 +--- a/cmake/ssl.cmake ++++ b/cmake/ssl.cmake +@@ -273,7 +273,18 @@ MACRO (MYSQL_CHECK_SSL) + FIND_ALTERNATIVE_SYSTEM_SSL() + ENDIF() + +- IF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL) ++ IF(WITH_SSL STREQUAL "system") ++ find_package(OpenSSL REQUIRED) ++ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") ++ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") ++ find_program(OPENSSL_EXECUTABLE openssl ++ DOC "path to the openssl executable") ++ set(SSL_DEFINES "-DHAVE_OPENSSL") ++ add_library(ext::openssl ALIAS OpenSSL::SSL) ++ set(SSL_LIBRARIES ext::openssl) ++ set(OPENSSL_APPLINK_C "${OPENSSL_APPLINK_SOURCE}") ++ include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR}) ++ ELSEIF(WITH_SSL STREQUAL "system" OR WITH_SSL_PATH OR ALTERNATIVE_SYSTEM_SSL) + IF((APPLE OR WIN32) AND WITH_SSL STREQUAL "system") + # FindOpenSSL.cmake knows about + # http://www.slproweb.com/products/Win32OpenSSL.html +diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake +index 3781fe09..ac312ad0 100644 +--- a/cmake/zlib.cmake ++++ b/cmake/zlib.cmake +@@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_ZLIB) + MESSAGE(FATAL_ERROR "WITH_ZLIB must be bundled or system") + ENDIF() + +- ADD_LIBRARY(ext::zlib ALIAS zlib_interface) ++ ADD_LIBRARY(ext::zlib ALIAS ZLIB::ZLIB) + + IF(ZLIB_VERSION VERSION_LESS MIN_ZLIB_VERSION_REQUIRED) + MESSAGE(FATAL_ERROR +diff --git a/cmake/zstd.cmake b/cmake/zstd.cmake +index 425426d1..0ae1a907 100644 +--- a/cmake/zstd.cmake ++++ b/cmake/zstd.cmake +@@ -90,15 +90,16 @@ MACRO (MYSQL_CHECK_ZSTD) + IF(WITH_ZSTD STREQUAL "bundled") + MYSQL_USE_BUNDLED_ZSTD() + ELSEIF(WITH_ZSTD STREQUAL "system") +- FIND_SYSTEM_ZSTD() +- IF (NOT SYSTEM_ZSTD_FOUND) +- MESSAGE(FATAL_ERROR "Cannot find system zstd libraries.") +- ENDIF() ++ find_package(ZSTD NAMES zstd REQUIRED) + ELSE() + MESSAGE(FATAL_ERROR "WITH_ZSTD must be bundled or system") + ENDIF() + +- ADD_LIBRARY(ext::zstd ALIAS zstd_interface) ++ if(TARGET zstd::libzstd_shared) ++ add_library(ext::zstd ALIAS zstd::libzstd_shared) ++ else() ++ add_library(ext::zstd ALIAS zstd::libzstd_static) ++ endif() + + IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED) + MESSAGE(FATAL_ERROR diff --git a/ports/libmysql/export-cmake-targets.patch b/ports/libmysql/export-cmake-targets.patch deleted file mode 100644 index 81d0d23e9fcb08..00000000000000 --- a/ports/libmysql/export-cmake-targets.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake -index 870c9f13732..98bc3ea15e4 100644 ---- a/cmake/install_macros.cmake -+++ b/cmake/install_macros.cmake -@@ -97,7 +97,7 @@ ENDFUNCTION() - FUNCTION(MYSQL_INSTALL_TARGET target_arg) - CMAKE_PARSE_ARGUMENTS(ARG - "NAMELINK_SKIP" -- "DESTINATION;COMPONENT" -+ "DESTINATION;COMPONENT;EXPORT" - "" - ${ARGN} - ) -@@ -113,10 +113,21 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg) - IF(ARG_NAMELINK_SKIP) - SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP) - ENDIF() -- INSTALL(TARGETS ${target} -- RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP} -- ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP} -- LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS}) -+ IF (ARG_EXPORT) -+ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake" -+"include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) -+find_dependency(OpenSSL) -+find_dependency(Threads) -+include(\"\${CMAKE_CURRENT_LIST_DIR}/${ARG_EXPORT}-targets.cmake\") -+") -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ARG_EXPORT}-config.cmake DESTINATION share/${ARG_EXPORT}) -+ set(EXPORT_ARGS EXPORT ${ARG_EXPORT}-targets) -+ ENDIF() -+ INSTALL(TARGETS ${target} ${EXPORT_ARGS} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ${COMP}) -+ IF (ARG_EXPORT) -+ INSTALL(${EXPORT_ARGS} DESTINATION share/${ARG_EXPORT}) -+ ENDIF() - SET(INSTALL_LOCATION ${ARG_DESTINATION} ) - INSTALL_DEBUG_SYMBOLS(${target}) - SET(INSTALL_LOCATION) -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index 23e60ad..cc969a8 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -298,8 +298,9 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) - IF(ARG_NAMELINK_SKIP) - SET(INSTALL_ARGS NAMELINK_SKIP) - ENDIF() -- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} -- ${INSTALL_ARGS}) -+ IF(NOT INSTALL_STATIC_LIBRARIES) -+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) -+ ENDIF() - ENDIF() - - IF(WIN32) -@@ -464,7 +465,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) - SET(COMP COMPONENT ${ARG_COMPONENT}) - ENDIF() - IF(INSTALL_STATIC_LIBRARIES) -- MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) -+ MYSQL_INSTALL_TARGET(${TARGET} EXPORT unofficial-libmysql DESTINATION "${INSTALL_LIBDIR}" ${COMP}) - ENDIF() - ENDIF() - ENDMACRO(MERGE_CONVENIENCE_LIBRARIES) -diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index 2ee26bfa284..46583f4f0a3 100644 ---- a/libmysql/CMakeLists.txt -+++ b/libmysql/CMakeLists.txt -@@ -277,6 +277,14 @@ ENDIF() - # LDAP authentication SASL client plug-in - ADD_SUBDIRECTORY(authentication_ldap) - -+IF (BUILD_SHARED_LIBS) -+ set(INSTALL_SHARED ) -+ set(INSTALL_STATIC SKIP_INSTALL) -+ELSE() -+ set(INSTALL_SHARED SKIP_INSTALL) -+ set(INSTALL_STATIC ) -+ENDIF() -+ - # FIDO authentication client plugin - ADD_SUBDIRECTORY(authentication_fido) - -@@ -287,7 +295,7 @@ ADD_SUBDIRECTORY(authentication_kerberos) - ADD_SUBDIRECTORY(authentication_oci_client) - - # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} ${INSTALL_STATIC} - COMPONENT Development - LINK_LIBRARIES ${LIBS_TO_LINK} - ) -@@ -403,6 +403,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CURRENT_BINARY_DIR}/api_test.c) - # from @CLIENT_API_FUNCTIONS@ are declared by . It will fail - # to run if not all of these symbols are exported by the library. - # -+IF (ENABLE_TESTING) - MYSQL_ADD_EXECUTABLE(libmysql_api_test - ${CMAKE_CURRENT_BINARY_DIR}/api_test.c - LINK_LIBRARIES libmysql ${LIBRT} -@@ -410,6 +411,7 @@ MYSQL_ADD_EXECUTABLE(libmysql_api_test - ) - # Clang/UBSAN needs this on some platforms. - SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX) -+ENDIF() - - IF(MY_COMPILER_IS_GNU) - ADD_COMPILE_FLAGS( -@@ -426,9 +428,11 @@ IF(HAS_WARN_FLAG) - ) - ENDIF() - -+IF (ENABLE_TESTING) - # Verify that libmysql_api_test runs OK - MY_ADD_CUSTOM_TARGET(run_libmysql_api_test ALL - DEPENDS libmysql_api_test - COMMAND libmysql_api_test - > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out - ) -+ENDIF() -\ No newline at end of file -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index a5fa18e..0f2e15c 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -329,13 +329,13 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^[ ]+" "" ${var} "${${var}}") - STRING(REGEX REPLACE "[ ]+$" "" ${var} "${${var}}") - ENDMACRO() -- -+IF (NOT BUILD_SHARED_LIBS) - EXTRACT_LINK_LIBRARIES(mysqlclient CLIENT_LIBS) -- --IF(MSVC) -+ENDIF() -+IF(MSVC AND NOT BUILD_SHARED_LIBS) - GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION) - GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME) --ELSE() -+ELSEIF(BUILD_SHARED_LIBS) - GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION) - GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME) - ENDIF() diff --git a/ports/libmysql/homebrew.patch b/ports/libmysql/homebrew.patch deleted file mode 100644 index a7358dc41f2d73..00000000000000 --- a/ports/libmysql/homebrew.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52d12a15190..6033494e4f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1929,7 +1929,7 @@ IF(APPLE) - GET_FILENAME_COMPONENT(HOMEBREW_BASE ${HOMEBREW_HOME} DIRECTORY) - IF(EXISTS ${HOMEBREW_BASE}/include/boost) - FOREACH(SYSTEM_LIB ICU LIBEVENT LZ4 PROTOBUF ZSTD FIDO) -- IF(WITH_${SYSTEM_LIB} STREQUAL "system") -+ IF(FALSE) - MESSAGE(FATAL_ERROR - "WITH_${SYSTEM_LIB}=system is not compatible with Homebrew boost\n" - "MySQL depends on ${BOOST_PACKAGE_NAME} with a set of patches.\n" diff --git a/ports/libmysql/ignore-boost-version.patch b/ports/libmysql/ignore-boost-version.patch deleted file mode 100644 index 757defccf68f14..00000000000000 --- a/ports/libmysql/ignore-boost-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/boost.cmake b/cmake/boost.cmake -index e879484a9d9..437b77ff49a 100644 ---- a/cmake/boost.cmake -+++ b/cmake/boost.cmake -@@ -301,7 +301,7 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10) - COULD_NOT_FIND_BOOST() - ENDIF() - --IF(NOT BOOST_MINOR_VERSION EQUAL 77) -+IF(NOT BOOST_MINOR_VERSION EQUAL 77 AND NOT IGNORE_BOOST_VERSION) - MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} " - "we need 77" - ) diff --git a/ports/libmysql/install-exports.patch b/ports/libmysql/install-exports.patch new file mode 100644 index 00000000000000..3cf34ed3be53f5 --- /dev/null +++ b/ports/libmysql/install-exports.patch @@ -0,0 +1,121 @@ +diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake +index baf49cd5..c45fda71 100644 +--- a/cmake/install_macros.cmake ++++ b/cmake/install_macros.cmake +@@ -113,8 +113,30 @@ FUNCTION(MYSQL_INSTALL_TARGET target_arg) + IF(ARG_NAMELINK_SKIP) + SET(LIBRARY_INSTALL_ARGS NAMELINK_SKIP) + ENDIF() ++ if(target STREQUAL "libmysql" OR target STREQUAL "mysqlclient") ++ target_include_directories(${target} INTERFACE $) ++ if(target STREQUAL "mysqlclient") ++ set_target_properties(${target} PROPERTIES EXPORT_NAME libmysql) # uniform ++ endif() ++ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" ++"include(CMakeFindDependencyMacro) ++find_dependency(OpenSSL) ++find_dependency(Threads) ++find_dependency(ZLIB) ++find_dependency(zstd CONFIG) ++include(\"\${CMAKE_CURRENT_LIST_DIR}/unofficial-libmysql-targets.cmake\") ++if(NOT TARGET ${target}) # legacy vcpkg ++ add_library(${target} INTERFACE IMPORTED) ++ set_target_properties(${target} PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::libmysql::libmysql) ++endif() ++") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmysql-config.cmake" DESTINATION "share/unofficial-libmysql") ++ install(EXPORT "unofficial-libmysql-targets" NAMESPACE unofficial::libmysql:: DESTINATION "share/unofficial-libmysql") ++ set(LIBRARY_EXPORT_ARGS EXPORT unofficial-libmysql-targets) ++ endif() + INSTALL(TARGETS ${target} +- RUNTIME DESTINATION ${ARG_DESTINATION} ${COMP} ++ ${LIBRARY_EXPORT_ARGS} ++ RUNTIME DESTINATION bin ${COMP} + ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP} + LIBRARY DESTINATION ${ARG_DESTINATION} ${COMP} ${LIBRARY_INSTALL_ARGS}) + SET(INSTALL_LOCATION ${ARG_DESTINATION} ) +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index a5333987..c954bfb1 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -385,8 +385,12 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG) + IF(ARG_NAMELINK_SKIP) + SET(INSTALL_ARGS NAMELINK_SKIP) + ENDIF() ++ if(INSTALL_STATIC_LIBRARIES) ++ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1) ++ else() + MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${DESTINATION}" ${COMP} + ${INSTALL_ARGS}) ++ endif() + ENDIF() + + IF(WIN32) +@@ -563,6 +567,8 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) + ENDIF() + IF(INSTALL_STATIC_LIBRARIES) + MYSQL_INSTALL_TARGET(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ++ else() ++ set_target_properties(${TARGET} PROPERTIES EXCLUDE_FROM_ALL 1) + ENDIF() + ENDIF() + ENDMACRO(MERGE_CONVENIENCE_LIBRARIES) +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index c4ef5694..8e933877 100644 +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -315,10 +315,14 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + FOREACH(lib ${TARGET_LIB_DEPENDS}) + IF (lib MATCHES "^\\-l") + SET(${var} "${${var}} ${lib} ") ++ elseif(lib MATCHES "^ext::(openssl|zlib|zstd)" AND NOT WIN32) ++ list(APPEND ext_targets "${CMAKE_MATCH_1}") + ELSEIF (lib MATCHES "^ext::") + STRING(REGEX MATCH "ext::([a-z]+)" MATCH_LIB "${lib}") + SET(SYSTEM_LIB ${CMAKE_MATCH_1}) + SET(${var} "${${var}} -l${SYSTEM_LIB} ") ++ elseif(TARGET "${lib}" AND NOT WIN32) ++ # merged or shared, not external + ELSEIF (lib MATCHES "^\\-L") + # Search directory. Test on FreeBSD: -L/usr/local/lib -lunwind + SET(${var} "${${var}} ${lib} ") +@@ -354,6 +358,7 @@ IF(MSVC) + GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION mysqlclient VERSION) + GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME mysqlclient OUTPUT_NAME) + ELSE() ++ EXTRACT_LINK_LIBRARIES(libmysql CLIENT_LIBS) + GET_TARGET_PROPERTY(LIBMYSQL_OS_SHLIB_VERSION libmysql VERSION) + GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME) + ENDIF() +@@ -373,6 +378,10 @@ IF (WITH_SSL STREQUAL "system") + "${CONFIG_LIBS_PRIVATE}") + ENDIF() + ENDIF() ++list(APPEND CONFIG_REQUIRES_PRIVATE ${ext_targets}) ++list(REMOVE_DUPLICATES CONFIG_REQUIRES_PRIVATE) ++list(JOIN CONFIG_REQUIRES_PRIVATE " " CONFIG_REQUIRES_PRIVATE) ++string(REPLACE "zstd" "libzstd" CONFIG_REQUIRES_PRIVATE "${CONFIG_REQUIRES_PRIVATE}" ) + + MESSAGE(STATUS "CONFIG_CLIENT_LIBS ${CONFIG_CLIENT_LIBS}") + MESSAGE(STATUS "CONFIG_LIBS_PRIVATE ${CONFIG_LIBS_PRIVATE}") +diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh +index 6e8520be..bf1a45af 100644 +--- a/scripts/mysql_config.sh ++++ b/scripts/mysql_config.sh +@@ -119,6 +119,16 @@ fi + # Create options + libs="-L$pkglibdir@RPATH_OPTION@" + libs="$libs -l@LIBMYSQL_OS_OUTPUT_NAME@ @CONFIG_CLIENT_LIBS@" ++if test -z "${PKG_CONFIG}" ; then ++ if pkg-config --version >/dev/null 2>&1 ; then ++ PKG_CONFIG=pkg-config ++ elif pkgconf --version >/dev/null 2>&1 ; then ++ PKG_CONFIG=pkgconf ++ else ++ PKG_CONFIG=false ++ fi ++fi ++libs="$libs $(${PKG_CONFIG} --libs @CONFIG_REQUIRES_PRIVATE@)" + + cflags="-I$pkgincludedir @CFLAGS@" + cxxflags="-I$pkgincludedir @CXXFLAGS@" diff --git a/ports/libmysql/libmysql-config.cmake b/ports/libmysql/libmysql-config.cmake new file mode 100644 index 00000000000000..e3af81d2743a18 --- /dev/null +++ b/ports/libmysql/libmysql-config.cmake @@ -0,0 +1,6 @@ +file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) +message(WARNING "find_package(libmysql) is deprecated.\n${usage}") +include(CMakeFindDependencyMacro) +find_dependency(unofficial-libmysql CONFIG REQUIRED) +set(libmysql_FOUND 1) +set(MYSQL_LIBRARIES unofficial::libmysql::libmysql) diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 3a08e3a253a5d0..a9ba39d3b60a9e 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -2,31 +2,21 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - message(WARNING "'autoconf-archive' must be installed via your system package manager (brew, apt, etc.).") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-server REF mysql-${VERSION} - SHA512 8b9f15b301b158e6ffc99dd916b9062968d36f6bdd7b898636fa61badfbe68f7328d4a39fa3b8b3ebef180d3aec1aee353bd2dac9ef1594e5772291390e17ac0 + SHA512 5df45c1ce1e2c620856b9274666cf56738d6a0308c33c9c96583b494c987fb0e862e676301109b9e4732070d54e6086596a62ad342f35adc59ca9f749e37b561 HEAD_REF master PATCHES - ignore-boost-version.patch - system-libs.patch - export-cmake-targets.patch - Add-target-include-directories.patch - homebrew.patch + dependencies.patch + install-exports.patch fix_dup_symbols.patch + cross-build.patch ) - -file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") - -set(STACK_DIRECTION "") -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(STACK_DIRECTION -DSTACK_DIRECTION=-1) -endif() +file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0") +list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit") +file(REMOVE_RECURSE ${third_party}) #Skip the version check for Visual Studio set(FORCE_UNSUPPORTED_COMPILER "") @@ -37,27 +27,56 @@ endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT_LINKAGE) +set(cross_options "") +if(VCPKG_CROSSCOMPILING) + list(APPEND cross_options + -DCMAKE_CROSSCOMPILING=1 + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} + # required, skip try_run + -DHAVE_RAPIDJSON_WITH_STD_REGEX=1 + ) + if(NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND cross_options + # optimistic, skip try_run + -DHAVE_CLOCK_GETTIME=1 + -DHAVE_CLOCK_REALTIME=1 + # pessimistic, skip try_run + -DHAVE_C_FLOATING_POINT_FUSED_MADD=1 + -DHAVE_CXX_FLOATING_POINT_FUSED_MADD=1 + -DHAVE_SETNS=0 + ) + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${cross_options} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_DOCDIR=share/${PORT}/doc + -DINSTALL_MANDIR=share/${PORT}/doc + -DINSTALL_INFODIR=share/${PORT}/doc + -DINSTALL_DOCREADMEDIR=share/${PORT} + -DINSTALL_SHAREDIR=share + -DINSTALL_MYSQLSHAREDIR=share/${PORT} -DWITHOUT_SERVER=ON -DWITH_BUILD_ID=OFF -DWITH_UNIT_TESTS=OFF -DENABLED_PROFILING=OFF - -DENABLE_TESTING=OFF -DWIX_DIR=OFF - ${STACK_DIRECTION} -DIGNORE_BOOST_VERSION=ON - -DWITH_SYSTEMD=OFF -DWITH_TEST_TRACE_PLUGIN=OFF -DMYSQL_MAINTAINER_MODE=OFF -DBUNDLE_RUNTIME_LIBRARIES=OFF -DDOWNLOAD_BOOST=OFF - -DWITH_SSL=system - -DWITH_ICU=system - -DWITH_LIBEVENT=system + -DWITH_CURL=none + -DWITH_EDITLINE=bundled # not in vcpkg -DWITH_LZ4=system + -DWITH_RAPIDJSON=system + -DWITH_SSL=system + -DWITH_SYSTEMD=OFF -DWITH_ZLIB=system + -DWITH_ZSTD=system -DFORCE_UNSUPPORTED_COMPILER=${FORCE_UNSUPPORTED_COMPILER} -DINSTALL_STATIC_LIBRARIES=${BUILD_STATIC_LIBS} -DLINK_STATIC_RUNTIME_LIBRARIES=${STATIC_CRT_LINKAGE} @@ -69,9 +88,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql) +vcpkg_fixup_pkgconfig() -list(APPEND MYSQL_TOOLS - comp_err +set(MYSQL_TOOLS my_print_defaults mysql mysql_config_editor @@ -90,7 +110,11 @@ list(APPEND MYSQL_TOOLS perror zlib_decompress ) - +if (NOT VCPKG_CROSSCOMPILING) + list(APPEND MYSQL_TOOLS + comp_err + ) +endif() if (VCPKG_TARGET_IS_WINDOWS) list(APPEND MYSQL_TOOLS echo @@ -103,72 +127,21 @@ endif() vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) -file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/${PORT}") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") -file(RENAME "${CURRENT_PACKAGES_DIR}/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -if(NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/${PORT}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/${PORT}" "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}") -endif() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmysql CONFIG_PATH share/${PORT}/unofficial-libmysql) - -# switch mysql into /mysql -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/mysql") - -## delete useless vcruntime/scripts/bin/msg file file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/debug/man" - "${CURRENT_PACKAGES_DIR}/docs" - "${CURRENT_PACKAGES_DIR}/debug/docs" "${CURRENT_PACKAGES_DIR}/lib/debug" - "${CURRENT_PACKAGES_DIR}/lib/plugin" - "${CURRENT_PACKAGES_DIR}/debug/lib/plugin" -) - -# delete dynamic dll on static build -if (BUILD_STATIC_LIBS) - # libmysql.dll - file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/debug/bin" - ) - file(REMOVE - "${CURRENT_PACKAGES_DIR}/lib/libmysql.lib" - "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.lib" - "${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb" - "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb" - ) -endif() - -## remove misc files -file(REMOVE - "${CURRENT_PACKAGES_DIR}/LICENSE" - "${CURRENT_PACKAGES_DIR}/README" - "${CURRENT_PACKAGES_DIR}/debug/LICENSE" - "${CURRENT_PACKAGES_DIR}/debug/README" ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "#include " "#include \"mysql/udf_registration_types.h\"") if (NOT VCPKG_TARGET_IS_WINDOWS) set(MYSQL_CONFIG_FILE "${CURRENT_PACKAGES_DIR}/tools/libmysql/mysql_config") - vcpkg_replace_string(${MYSQL_CONFIG_FILE} "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config") # try to get correct $basedir - vcpkg_replace_string(${MYSQL_CONFIG_FILE} "${CURRENT_PACKAGES_DIR}" "$basedir") # use $basedir to format paths - vcpkg_replace_string(${MYSQL_CONFIG_FILE} "-l\$\<\$\:${CURRENT_INSTALLED_DIR}/debug/lib/libz.a> " "") # remove debug version of libz - vcpkg_replace_string(${MYSQL_CONFIG_FILE} - "\$\<\$\\>:${CURRENT_INSTALLED_DIR}" - "`dirname $0`/../../../../installed/${TARGET_TRIPLET}") # correct path for release version of libz - vcpkg_replace_string(${MYSQL_CONFIG_FILE} "\> -l" " -l") # trailing > tag for previous item + vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "/bin/mysql_.*config" "/tools/libmysql/mysql_.*config") + vcpkg_replace_string("${MYSQL_CONFIG_FILE}" "'${CURRENT_PACKAGES_DIR}" "\"\$basedir\"\'") endif() -file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/libmysql-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -# copy license -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +set(libedit_copying "${SOURCE_PATH}/COPYING for libedit") +file(COPY_FILE "${SOURCE_PATH}/extra/libedit/libedit-20210910-3.1/COPYING" "${libedit_copying}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${libedit_copying}") diff --git a/ports/libmysql/system-libs.patch b/ports/libmysql/system-libs.patch deleted file mode 100644 index afcb2c3775e1e8..00000000000000 --- a/ports/libmysql/system-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/cmake/icu.cmake b/cmake/icu.cmake -index 3ac136dbfb4..c7bdbc8c47e 100644 ---- a/cmake/icu.cmake -+++ b/cmake/icu.cmake -@@ -68,6 +68,12 @@ ENDMACRO() - # install_root is either 'system' or is assumed to be a path. - # - MACRO (FIND_ICU install_root) -+ find_package(ICU REQUIRED COMPONENTS uc io dt in) -+ set(ICU_SYSTEM_LIBRARIES ICU::uc ICU::io ICU::dt ICU::in) -+ set(ICU_COMMON_DIR ${ICU_INCLUDE_DIR}) -+ SET(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) -+ENDMACRO() -+MACRO (FIND_ICU_OLD install_root) - IF("${install_root}" STREQUAL "system") - SET(EXTRA_FIND_LIB_ARGS) - SET(EXTRA_FIND_INC_ARGS) -diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake -index ae13a63dfdc..9604ad2fc2a 100644 ---- a/cmake/libutils.cmake -+++ b/cmake/libutils.cmake -@@ -441,19 +441,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES TARGET_ARG) - # On Windows, ssleay32.lib/libeay32.lib or libssl.lib/libcrypto.lib - # must be merged into mysqlclient.lib - IF(WIN32 AND ${TARGET} STREQUAL "mysqlclient") -- SET(LINKER_EXTRA_FLAGS "") -- FOREACH(LIB ${SSL_LIBRARIES}) -- STRING_APPEND(LINKER_EXTRA_FLAGS " ${LIB}") -- ENDFOREACH() -- -- # __NULL_IMPORT_DESCRIPTOR already defined, second definition ignored -- # Same symbol from both libssl and libcrypto -- # But: Lib.exe has no /IGNORE option, see -- # https://docs.microsoft.com/en-us/cpp/build/reference/running-lib?view=msvc-160 -- # STRING_APPEND(LINKER_EXTRA_FLAGS " /IGNORE:LNK4006") -- -- SET_TARGET_PROPERTIES(${TARGET} -- PROPERTIES STATIC_LIBRARY_FLAGS "${LINKER_EXTRA_FLAGS}") -+ TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ${SSL_LIBRARIES}) - ENDIF() - - IF(ARG_LINK_LIBRARIES) -diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake -index e7047412f9b..ffbc95b578d 100644 ---- a/cmake/lz4.cmake -+++ b/cmake/lz4.cmake -@@ -46,7 +46,7 @@ MACRO (FIND_SYSTEM_LZ4) - FIND_PATH(LZ4_INCLUDE_DIR - NAMES lz4frame.h) - FIND_LIBRARY(LZ4_SYSTEM_LIBRARY -- NAMES lz4) -+ NAMES lz4d lz4) - IF (LZ4_INCLUDE_DIR AND LZ4_SYSTEM_LIBRARY) - SET(SYSTEM_LZ4_FOUND 1) - SET(LZ4_LIBRARY ${LZ4_SYSTEM_LIBRARY}) -diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake -index 52feade..1e71bd7 100644 ---- a/cmake/ssl.cmake -+++ b/cmake/ssl.cmake -@@ -93,7 +93,16 @@ ENDMACRO() - # Provides the following configure options: - # WITH_SSL=[yes|system|] - MACRO (MYSQL_CHECK_SSL) -+ find_package(OpenSSL REQUIRED) -+ set(OPENSSL_LIBRARY OpenSSL::SSL CACHE STRING "") -+ set(CRYPTO_LIBRARY OpenSSL::Crypto CACHE STRING "") -+ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl -+ DOC "path to the openssl executable") -+ SET(SSL_DEFINES "-DHAVE_OPENSSL") -+ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) -+ENDMACRO() - -+MACRO (MYSQL_CHECK_SSL_OLD) - IF(NOT WITH_SSL) - SET(WITH_SSL "system" CACHE STRING ${WITH_SSL_DOC_STRING} FORCE) - ENDIF() diff --git a/ports/libmysql/usage b/ports/libmysql/usage index 8c2b814d282c46..09f1e0d68042b2 100644 --- a/ports/libmysql/usage +++ b/ports/libmysql/usage @@ -1,4 +1,4 @@ -The package libmysql provides CMake targets: +libmysql provides CMake targets: - find_package(libmysql REQUIRED) - target_link_libraries(main PRIVATE ${MYSQL_LIBRARIES}) + find_package(unofficial-libmysql REQUIRED) + target_link_libraries(main PRIVATE unofficial::libmysql::libmysql) diff --git a/ports/libmysql/vcpkg-cmake-wrapper.cmake b/ports/libmysql/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index d7f0e7560a8301..00000000000000 --- a/ports/libmysql/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,9 +0,0 @@ -find_package(unofficial-libmysql CONFIG REQUIRED) -if (TARGET mysqlclient) - set(MYSQL_LIBRARY mysqlclient) -elseif (TARGET libmysql) - set(MYSQL_LIBRARY libmysql) -endif() - -set(libmysql_FOUND 1) -set(MYSQL_LIBRARIES ${MYSQL_LIBRARY}) diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index d8995dbc1608c4..7ce4a307458a50 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,25 +1,27 @@ { "name": "libmysql", - "version": "8.0.32", - "port-version": 6, + "version": "8.0.34", "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 & !xbox", + "supports": "!android & !mingw & !uwp & !xbox", "dependencies": [ "boost-algorithm", "boost-functional", "boost-geometry", "boost-graph", "boost-optional", - "icu", - "libevent", + { + "name": "libmysql", + "host": true + }, "lz4", { "name": "ncurses", "platform": "!windows | mingw" }, "openssl", + "rapidjson", { "name": "vcpkg-cmake", "host": true @@ -28,6 +30,7 @@ "name": "vcpkg-cmake-config", "host": true }, - "zlib" + "zlib", + "zstd" ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f479f3d607736a..5eed0af1522b4f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -587,10 +587,6 @@ libmodman:x64-windows-static=fail libmpeg2:arm-neon-android=fail libmpeg2:arm64-android=fail libmpeg2:x64-android=fail -libmysql:arm-neon-android=fail -libmysql:arm64-android=fail -libmysql:x64-android=fail -libmysql:arm64-windows=fail libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 30d8d07f079ca8..e19bb97e58c547 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4513,8 +4513,8 @@ "port-version": 1 }, "libmysql": { - "baseline": "8.0.32", - "port-version": 6 + "baseline": "8.0.34", + "port-version": 0 }, "libnice": { "baseline": "0.1.21", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 3b5cc843d0898f..3e5a53b264da20 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91349aeb1e56c0b95d609361ae974a08abace26c", + "version": "8.0.34", + "port-version": 0 + }, { "git-tree": "5696eb818512a5f9375068dc057c3e074de4bc3d", "version": "8.0.32", From fa70b2dd4ced388a50cb69114470c572a8faffe6 Mon Sep 17 00:00:00 2001 From: Darren Bolduc Date: Wed, 1 Nov 2023 14:37:31 -0500 Subject: [PATCH 0256/1039] [google-cloud-cpp] update to v2.17.0#2 (#34641) * [google-cloud-cpp] update to v2.17.0#2 * disable compute on windows --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 39 ++------------------------- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 ++++ 4 files changed, 9 insertions(+), 39 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index ceec57ecdd10d3..1e8af355471f58 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -67,7 +67,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 rest_protobuf_internal dialogflow_cx dialogflow_es) +foreach(suffix common compute_protos googleapis grpc_utils iam_v2 logging_type rest_internal rest_protobuf_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 0fc6206bfaafe6..67ef87589a9ac7 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.17.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", @@ -322,6 +322,7 @@ }, "compute": { "description": "Compute Engine C++ Client Library", + "supports": "!windows", "dependencies": [ { "name": "google-cloud-cpp", @@ -490,18 +491,6 @@ } ] }, - "debugger": { - "description": "Stackdriver Debugger API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, "deploy": { "description": "Google Cloud Deploy API C++ Client Library", "dependencies": [ @@ -635,18 +624,6 @@ } ] }, - "gameservices": { - "description": "Game Services API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, "gkehub": { "description": "GKE Hub C++ Client Library", "dependencies": [ @@ -734,18 +711,6 @@ } ] }, - "iot": { - "description": "Cloud IoT API C++ Client Library", - "dependencies": [ - { - "name": "google-cloud-cpp", - "default-features": false, - "features": [ - "grpc-common" - ] - } - ] - }, "kms": { "description": "Cloud Key Management Service (KMS) API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e19bb97e58c547..f30470fc618f4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3030,7 +3030,7 @@ }, "google-cloud-cpp": { "baseline": "2.17.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 00e412cea04971..e5c8a14f2ab658 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a52d32521f59da4d2ecfe7beffe13bab448ea64", + "version": "2.17.0", + "port-version": 2 + }, { "git-tree": "eb4b2fd7eea450ced2e6f33dcd9af1237f2de3c2", "version": "2.17.0", From e9fba6ac4fb8eccd57a2dc0cbde77db201b89c21 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:40:17 +0100 Subject: [PATCH 0257/1039] [yaml-cpp] Update to 0.8.0 (#33223) * [yaml-cpp] Update to 0.8.0. - The config path has changed to `lib/cmake/yaml-cpp`. - pkg-config files are installed to `lib/pkgconfig`. - dll.h uses a new variable for control and should be patched outside of Windows. * [yaml-cpp] Backport CMake fixes from upstream. The patch is a shortened version from: https://github.com/jbeder/yaml-cpp/pull/1212 It fixes issues with downstream projects using the old target, and makes the CMake config more easily relocatable. The patch was rebased on the 0.8.0 release, and the CI and tests bits were omitted. * [yaml-cpp] Update baseline. --- ports/yaml-cpp/portfile.cmake | 23 ++++---- ports/yaml-cpp/vcpkg.json | 3 +- ports/yaml-cpp/yaml-cpp-pr-1212.patch | 77 +++++++++++++++++++++++++++ versions/baseline.json | 4 +- versions/y-/yaml-cpp.json | 5 ++ 5 files changed, 96 insertions(+), 16 deletions(-) create mode 100644 ports/yaml-cpp/yaml-cpp-pr-1212.patch diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index de519bd6018984..795d93e24e8eb4 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbeder/yaml-cpp - REF 0579ae3d976091d7d664aa9d2527e0d0cff25763 # yaml-cpp-0.7.0 - SHA512 930f13737c23faf06be3fa9821492d6c677359e532212ced495173367a8aec45f87fbf3a5da47d4d1b61a95c25e0101bc7f8d175752434c63b25e097186e1745 + REF "${VERSION}" + SHA512 aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e HEAD_REF master + PATCHES + "yaml-cpp-pr-1212.patch" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" YAML_BUILD_SHARED_LIBS) @@ -14,29 +16,26 @@ vcpkg_cmake_configure( -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=${YAML_BUILD_SHARED_LIBS} + -DYAML_CPP_INSTALL_CMAKEDIR=share/${PORT} ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_config_fixup() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yaml-cpp.pc" "-lyaml-cpp" "-lyaml-cppd") endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") vcpkg_fixup_pkgconfig() -# Remove debug include and pkgconfig files +# Remove debug include file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 1") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_STATIC_DEFINE" "#if 0") else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_STATIC_DEFINE" "#if 1") endif() # 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/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json index 039bcd47e6cb8f..6da03605e186e3 100644 --- a/ports/yaml-cpp/vcpkg.json +++ b/ports/yaml-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yaml-cpp", - "version-semver": "0.7.0", - "port-version": 1, + "version-semver": "0.8.0", "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", "homepage": "https://github.com/jbeder/yaml-cpp", "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", diff --git a/ports/yaml-cpp/yaml-cpp-pr-1212.patch b/ports/yaml-cpp/yaml-cpp-pr-1212.patch new file mode 100644 index 00000000000000..4044815a181177 --- /dev/null +++ b/ports/yaml-cpp/yaml-cpp-pr-1212.patch @@ -0,0 +1,77 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46dc180..5055c24 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,8 @@ cmake_dependent_option(YAML_CPP_BUILD_TESTS + cmake_dependent_option(YAML_MSVC_SHARED_RT + "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON + "CMAKE_SYSTEM_NAME MATCHES Windows" OFF) ++set(YAML_CPP_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp" ++ CACHE STRING "Path to install the CMake package to") + + if (YAML_CPP_FORMAT_SOURCE) + find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) +@@ -143,13 +145,12 @@ set_target_properties(yaml-cpp PROPERTIES + PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" + DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") + +-set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") +-set(EXPORT_TARGETS yaml-cpp) ++set(EXPORT_TARGETS yaml-cpp::yaml-cpp) + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" +- PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CONFIG_EXPORT_DIR YAML_BUILD_SHARED_LIBS) ++ INSTALL_DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}" ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR) + unset(EXPORT_TARGETS) + + write_basic_package_version_file( +@@ -169,15 +170,14 @@ if (YAML_CPP_INSTALL) + FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets + NAMESPACE yaml-cpp:: +- DESTINATION "${CONFIG_EXPORT_DIR}") ++ DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}") + install(FILES + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CONFIG_EXPORT_DIR}") ++ DESTINATION "${YAML_CPP_INSTALL_CMAKEDIR}") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() +-unset(CONFIG_EXPORT_DIR) + + if(YAML_CPP_BUILD_TESTS) + add_subdirectory(test) + +diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in +index 799b9b418..f71e13b8f 100644 +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -11,12 +11,20 @@ set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") + set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") + + # Are we building shared libraries? +-set(YAML_CPP_SHARED_LIBS_BUILT "@PACKAGE_YAML_BUILD_SHARED_LIBS@") ++set(YAML_CPP_SHARED_LIBS_BUILT @YAML_BUILD_SHARED_LIBS@) + + # Our library dependencies (contains definitions for IMPORTED targets) +-include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) ++include("${CMAKE_CURRENT_LIST_DIR}/yaml-cpp-targets.cmake") + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") + +-check_required_components(@EXPORT_TARGETS@) ++add_library(yaml-cpp INTERFACE IMPORTED) ++target_link_libraries(yaml-cpp INTERFACE yaml-cpp::yaml-cpp) ++if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17) ++ set_target_properties(yaml-cpp PROPERTIES ++ DEPRECATION "The target yaml-cpp is deprecated and will be removed in version 0.10.0. Use the yaml-cpp::yaml-cpp target instead." ++ ) ++endif() ++ ++check_required_components(yaml-cpp) diff --git a/versions/baseline.json b/versions/baseline.json index f30470fc618f4c..83e3907f1f771d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9197,8 +9197,8 @@ "port-version": 4 }, "yaml-cpp": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.8.0", + "port-version": 0 }, "yara": { "baseline": "4.3.2", diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json index 8d7170546f244f..52b16425e359fc 100644 --- a/versions/y-/yaml-cpp.json +++ b/versions/y-/yaml-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "595f95f94e93c518b99e8c0e83ef35ced9e7867a", + "version-semver": "0.8.0", + "port-version": 0 + }, { "git-tree": "a79d9c026aefee69214dbd39294da49398b07c7b", "version-semver": "0.7.0", From f3dc2f1e0c184b7380003eee0eae5b78445e0311 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 1 Nov 2023 20:52:04 +0100 Subject: [PATCH 0258/1039] [pocketfft] add new port (#34841) * [pocketfft] new port * v db --- ports/pocketfft/portfile.cmake | 13 +++++++++++++ ports/pocketfft/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/p-/pocketfft.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/pocketfft/portfile.cmake create mode 100644 ports/pocketfft/vcpkg.json create mode 100644 versions/p-/pocketfft.json diff --git a/ports/pocketfft/portfile.cmake b/ports/pocketfft/portfile.cmake new file mode 100644 index 00000000000000..6de420e2ea0c26 --- /dev/null +++ b/ports/pocketfft/portfile.cmake @@ -0,0 +1,13 @@ +vcpkg_from_github( + OUT_SOURCE_PATH src_path + REPO mreineck/pocketfft + REF 9efd4da52cf8d28d14531d14e43ad9d913807546 + SHA512 e8c2b65b23feb53f1077b3ae1e0e20d21d8f55601bd1216443af0fbc916638c3649527494ec2f23bed42d562341e0cf1fcde54c37068333161f289d23d8a9009 + HEAD_REF cpp +) + +set(VCPKG_BUILD_TYPE release) # header only + +file(COPY "${src_path}/pocketfft_hdronly.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${src_path}/LICENSE.md") diff --git a/ports/pocketfft/vcpkg.json b/ports/pocketfft/vcpkg.json new file mode 100644 index 00000000000000..90c455f6618ce6 --- /dev/null +++ b/ports/pocketfft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pocketfft", + "version-date": "2023-09-25", + "description": "This is a heavily modified implementation of FFTPack", + "homepage": "https://github.com/mreineck/pocketfft", + "license": "BSD-3-Clause" +} diff --git a/versions/baseline.json b/versions/baseline.json index 83e3907f1f771d..d36e10c5e3c1f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6604,6 +6604,10 @@ "baseline": "0.7.0", "port-version": 5 }, + "pocketfft": { + "baseline": "2023-09-25", + "port-version": 0 + }, "poco": { "baseline": "1.12.4", "port-version": 4 diff --git a/versions/p-/pocketfft.json b/versions/p-/pocketfft.json new file mode 100644 index 00000000000000..94cc10276c2637 --- /dev/null +++ b/versions/p-/pocketfft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "46ffdbd8c95362eee33d5cdf0dce36c77f332a7f", + "version-date": "2023-09-25", + "port-version": 0 + } + ] +} From a8ce0ae797365fa326be577b35ad8284134ede24 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 2 Nov 2023 03:55:08 +0800 Subject: [PATCH 0259/1039] [flagpp] Add a new port (#34822) * add new port * update version * delete LICENSE file * update version * delete LICENSE file * update version --- ports/flagpp/portfile.cmake | 15 +++++++++++++++ ports/flagpp/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++++ versions/f-/flagpp.json | 9 +++++++++ 4 files changed, 40 insertions(+) create mode 100644 ports/flagpp/portfile.cmake create mode 100644 ports/flagpp/vcpkg.json create mode 100644 versions/f-/flagpp.json diff --git a/ports/flagpp/portfile.cmake b/ports/flagpp/portfile.cmake new file mode 100644 index 00000000000000..84c492ce9d34cf --- /dev/null +++ b/ports/flagpp/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Curve/flagpp + REF "v${VERSION}" + SHA512 c0a9c63846075677b89af38aecd0536df430d7a2600115067644af58aefb6941f56a0e5bd13a4006b032cd96804cc0acde9be2725ddd79691c878f7e5ed04b92 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/flagpp/vcpkg.json b/ports/flagpp/vcpkg.json new file mode 100644 index 00000000000000..be0bb690f3d000 --- /dev/null +++ b/ports/flagpp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "flagpp", + "version": "2.1", + "description": "A C++20 library that provides (opt-in) bit-wise operations for arbitrary `enum class`es", + "homepage": "https://github.com/Curve/flagpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d36e10c5e3c1f3..3dd2ab596ceda3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2616,6 +2616,10 @@ "baseline": "2023.10.02.00", "port-version": 0 }, + "flagpp": { + "baseline": "2.1", + "port-version": 0 + }, "flann": { "baseline": "2019-04-07", "port-version": 7 diff --git a/versions/f-/flagpp.json b/versions/f-/flagpp.json new file mode 100644 index 00000000000000..325d9a9f0576b6 --- /dev/null +++ b/versions/f-/flagpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "faf42d8daa5b595fe7225a10072be86387a41947", + "version": "2.1", + "port-version": 0 + } + ] +} From b6d0c11ee6a2b00dd6d3adc26a6e256b01f4b4d9 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Thu, 2 Nov 2023 04:14:26 +0800 Subject: [PATCH 0260/1039] [zoe] Add new port (#34369) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. * [cpp-ipc] Update to v1.2.0 * [cpp-ipc] Update to v1.2.0 * Add new port named zoe. * Add zoe to baseline. * Add zeo.json * [zoe] Update REF * [zoe] Update version. * [zoe] Add port version. * [zoe] run x-add-version --all * [zoe] Remove port-version * [zoe] Update port-version * [zoe] Update version * [zoe] Update code ref. * [zoe] Update git-version. * [zoe] Update portfile.cmake * [zoe] overwrite-version * [zoe] Update ref. * [zoe] overwrite-version * [zoe] Update portfile. * [zoe] overwrite-version * [zoe] Not support android. * [zoe] Update zoe.json * [crashrpt-lite] Add new port. * Format manifest files * [crashrpt-lite] Instead deprecated functions. * add crashrpt-lite.json * [crashrpt-lite] update version. * Remvoe crashrpt-lite * Remvoe crashrpt-lite * [zoe] Export cmake config files. * [zoe] Export cmake config files. * [zoe] Update git-tree. * [zoe] Add usage and config fixup. * [zoe] Update git-tree * [zoe] remove usage. * [zoe] Update git-tree * use new function * vdb --------- Co-authored-by: FrankXie Co-authored-by: admin Co-authored-by: paipai Co-authored-by: Frank <1433351828@qq.com> --- ports/zoe/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/zoe/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/z-/zoe.json | 9 +++++++++ 4 files changed, 63 insertions(+) create mode 100644 ports/zoe/portfile.cmake create mode 100644 ports/zoe/vcpkg.json create mode 100644 versions/z-/zoe.json diff --git a/ports/zoe/portfile.cmake b/ports/zoe/portfile.cmake new file mode 100644 index 00000000000000..1ff3517cb41341 --- /dev/null +++ b/ports/zoe/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/zoe + HEAD_REF master + REF c4de5eef2139050dc6919170487bc5c5044c9fcf + SHA512 72e439b27405784878c1784fbac7308b021636231402e1fd88cfe3e850f0f539d726dc121278bbe3017aea613c6d4dff0a4034ad5488ebea06d681d81e4c8063 +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZOE_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ZOE_USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DZOE_BUILD_SHARED_LIBS:BOOL=${ZOE_BUILD_SHARED_LIBS} + -DZOE_USE_STATIC_CRT:BOOL=${ZOE_USE_STATIC_CRT} + -DZOE_BUILD_TESTS:BOOL=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/zoe) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() diff --git a/ports/zoe/vcpkg.json b/ports/zoe/vcpkg.json new file mode 100644 index 00000000000000..007ed9c2b827f0 --- /dev/null +++ b/ports/zoe/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "zoe", + "version": "3.0", + "maintainers": "winsoft666 ", + "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", + "homepage": "https://github.com/winsoft666/zoe", + "supports": "!osx & !uwp & !arm & !android", + "dependencies": [ + { + "name": "curl", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 3dd2ab596ceda3..053da751cd2031 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9288,6 +9288,10 @@ "baseline": "2023-08-12", "port-version": 0 }, + "zoe": { + "baseline": "3.0", + "port-version": 0 + }, "zookeeper": { "baseline": "3.5.6", "port-version": 1 diff --git a/versions/z-/zoe.json b/versions/z-/zoe.json new file mode 100644 index 00000000000000..162359527067bd --- /dev/null +++ b/versions/z-/zoe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef2391f6da7efe52725293a360d2d5f1611cf5d5", + "version": "3.0", + "port-version": 0 + } + ] +} From 85b031a170e86435d7654871a12ff0a75c33c669 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:19:29 -0700 Subject: [PATCH 0261/1039] [ace] Respect VCPKG_BUILD_TYPE (#34838) * respect VCPKG_BUILD_TYPE * update version * format * update git-tree --------- Co-authored-by: Monica --- ports/ace/portfile.cmake | 7 ++++++- ports/ace/vcpkg.json | 1 + versions/a-/ace.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 9f4227f5d776cb..cd660191b3111f 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -294,6 +294,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY) set(ENV{PWD} "${WORKING_DIR}") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" @@ -344,7 +345,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg ) endif() - +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" @@ -377,6 +380,8 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") +endif() + # Restore `PWD` environment variable set($ENV{PWD} _prev_env) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 49976044dee5ea..90a797bd9b013c 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ace", "version": "7.1.2", + "port-version": 1, "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index eba36522fd04ee..100465d944fc5f 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00c6b2eb50cad87d13e5a6a59f38e30cfa954651", + "version": "7.1.2", + "port-version": 1 + }, { "git-tree": "696c1096e0de3cd394392720aa34e0ceceac52e7", "version": "7.1.2", diff --git a/versions/baseline.json b/versions/baseline.json index 053da751cd2031..9b88b166a91096 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -26,7 +26,7 @@ }, "ace": { "baseline": "7.1.2", - "port-version": 0 + "port-version": 1 }, "acl": { "baseline": "2.3.1", From 2b609bab7ba952812e212dd4943a49854e846abb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Nov 2023 21:23:18 +0100 Subject: [PATCH 0262/1039] [ignition-common1] use supports expressions (#34781) --- ports/ignition-common1/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/i-/ignition-common1.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/ignition-common1/vcpkg.json b/ports/ignition-common1/vcpkg.json index bb85740f14822a..29ee146150b1e0 100644 --- a/ports/ignition-common1/vcpkg.json +++ b/ports/ignition-common1/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ignition-common1", "version": "1.1.1", - "port-version": 3, - "description": "Common libraries for robotics applications", + "port-version": 4, + "description": "Deprecated: Use ignition-common3. Common libraries for robotics applications", "license": null, + "supports": "windows", "dependencies": [ { "name": "dlfcn-win32", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5eed0af1522b4f..07c320ecc2dec5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -460,8 +460,6 @@ hyperscan:x64-android=fail iceoryx:x64-android=fail iceoryx:arm64-android=fail iceoryx:arm-neon-android=fail -ignition-common1:x64-linux=fail -ignition-common1:x64-osx=fail ignition-msgs1:arm-neon-android=fail ignition-msgs1:arm64-android=fail ignition-msgs1:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 9b88b166a91096..1e4e9094857c39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3386,7 +3386,7 @@ }, "ignition-common1": { "baseline": "1.1.1", - "port-version": 3 + "port-version": 4 }, "ignition-common3": { "baseline": "3.16.0", diff --git a/versions/i-/ignition-common1.json b/versions/i-/ignition-common1.json index 8ec4ff082e3300..0543274dcf43bf 100644 --- a/versions/i-/ignition-common1.json +++ b/versions/i-/ignition-common1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c41c38488af45c9721e56792886250ef144bc050", + "version": "1.1.1", + "port-version": 4 + }, { "git-tree": "7759642adcf3e61cc1ce5b55699db02d31a94591", "version": "1.1.1", From 6c83d489f2453111991f42d861006e3a5ba23f03 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Nov 2023 21:37:36 +0100 Subject: [PATCH 0263/1039] [magnum] use supports expressions (#34741) --- ports/corrade/portfile.cmake | 2 +- ports/corrade/vcpkg.json | 22 +++++++++++++++++- ports/magnum/portfile.cmake | 43 ++++++------------------------------ ports/magnum/vcpkg.json | 37 +++++++++++++++++++++++++++---- versions/baseline.json | 4 ++-- versions/c-/corrade.json | 5 +++++ versions/m-/magnum.json | 5 +++++ 7 files changed, 74 insertions(+), 44 deletions(-) diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 964212a69e1c40..0680233a268b69 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -20,7 +20,7 @@ foreach(_feature IN LISTS ALL_FEATURES) string(REPLACE "-" "_" _FEATURE "${_FEATURE}") # Final feature is empty, ignore it - if(_feature) + if(_feature AND NOT "${_feature}" STREQUAL "dynamic-pluginmanager") list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) endif() endforeach() diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index 60dd63aead3727..6bb6ed736f0519 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 7, + "port-version": 8, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "dependencies": [ @@ -26,11 +26,25 @@ "utility" ], "features": { + "dynamic-pluginmanager": { + "description": "PluginManager library with dynamic plugin support", + "supports": "!ios & !uwp & !android", + "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "pluginmanager" + ] + } + ] + }, "interconnect": { "description": "Interconnect library", "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "utility" ] @@ -42,7 +56,12 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ + { + "name": "dynamic-pluginmanager", + "platform": "!ios & !uwp & !android" + }, "utility" ] } @@ -53,6 +72,7 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "utility" ] diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 44b512d34e2b26..ee7f0710a2b91b 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -14,43 +14,16 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_PLUGINS_STATIC) -# Remove platform-specific feature that are not available -# on current target platform from all features. - -# For documentation on VCPKG_CMAKE_SYSTEM_NAME see -# https://github.com/microsoft/vcpkg/blob/master/docs/users/triplets.md#vcpkg_cmake_system_name - set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) -# Windows Desktop -if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "") - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES wglcontext windowlesswglapplication) -endif() - -# Universal Windows Platform -if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - # No UWP specific features -endif() - -# Mac OSX -if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cglcontext windowlesscglapplication) -endif() - -# Linux -if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glxcontext windowlessglxapplication) -endif() - -# WebAssembly / Linux -if(NOT "${VCPKG_CMAKE_SYSTEM_NAME}" MATCHES "(Emscripten|Linux)") - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES eglcontext windowlesseglapplication) -endif() # Head only features if(NOT VCPKG_USE_HEAD_VERSION) - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter - vk-info) - message(WARNING "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.") + foreach(_feature anyshaderconverter shadertools shaderconverter vk-info) + if("${_feature}" IN_LIST FEATURES) + message(FATAL_ERROR "Features anyshaderconverter, shadertools, shaderconverter and vk-info are not avaliable when building non-head version.") + endif() + endforeach() + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES anyshaderconverter shadertools shaderconverter vk-info) endif() set(_COMPONENTS "") @@ -97,9 +70,7 @@ set(_TOOLS imageconverter sceneconverter) if(VCPKG_USE_HEAD_VERSION) -list(APPEND _TOOLS - shaderconverter - vk-info) + list(APPEND _TOOLS shaderconverter vk-info) endif() foreach(_tool IN LISTS _TOOLS) if("${_tool}" IN_LIST FEATURES) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index 04d5b3a9282a77..cc3f4009feea17 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 14, + "port-version": 15, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, @@ -30,7 +30,6 @@ "anyimageimporter", "anysceneconverter", "anysceneimporter", - "anyshaderconverter", "debugtools", "gl", "meshtools", @@ -38,7 +37,6 @@ "scenegraph", "sdl2application", "shaders", - "shadertools", "text", "texturetools", "trade" @@ -61,6 +59,7 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "pluginmanager" ] @@ -142,6 +141,7 @@ }, "cglcontext": { "description": "CglContext library", + "supports": "osx", "dependencies": [ { "name": "magnum", @@ -157,6 +157,7 @@ }, "distancefieldconverter": { "description": "magnum-distancefieldconverter utility", + "supports": "!ios & !android", "dependencies": [ { "name": "magnum", @@ -171,6 +172,7 @@ }, "eglcontext": { "description": "EglContext library", + "supports": "!windows & !osx", "dependencies": [ { "name": "magnum", @@ -183,6 +185,7 @@ }, "fontconverter": { "description": "magnum-fontconverter utility", + "supports": "!ios & !android", "dependencies": [ { "name": "magnum", @@ -196,10 +199,12 @@ ] }, "gl": { - "description": "GL library" + "description": "GL library", + "supports": "!uwp" }, "gl-info": { "description": "gl-info utility", + "supports": "!ios", "dependencies": [ { "name": "magnum", @@ -218,6 +223,7 @@ }, "glxcontext": { "description": "GlxContext library", + "supports": "!windows & !osx", "dependencies": [ { "name": "magnum", @@ -231,6 +237,13 @@ "imageconverter": { "description": "magnum-imageconverter utility", "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "dynamic-pluginmanager" + ] + }, { "name": "magnum", "default-features": false, @@ -300,6 +313,7 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "testsuite" ] @@ -320,6 +334,7 @@ "name": "magnum", "default-features": false, "features": [ + "meshtools", "trade" ] } @@ -328,6 +343,13 @@ "sceneconverter": { "description": "magnum-sceneconverter utility", "dependencies": [ + { + "name": "corrade", + "default-features": false, + "features": [ + "dynamic-pluginmanager" + ] + }, { "name": "magnum", "default-features": false, @@ -379,6 +401,7 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "pluginmanager" ] @@ -431,6 +454,7 @@ "dependencies": [ { "name": "corrade", + "default-features": false, "features": [ "pluginmanager" ] @@ -469,6 +493,7 @@ }, "wglcontext": { "description": "WglContext library", + "supports": "windows & !uwp", "dependencies": [ { "name": "magnum", @@ -481,6 +506,7 @@ }, "windowlesscglapplication": { "description": "WindowlessCglApplication library", + "supports": "osx", "dependencies": [ { "name": "magnum", @@ -493,6 +519,7 @@ }, "windowlesseglapplication": { "description": "WindowlessEglApplication library", + "supports": "!windows & !osx & !ios", "dependencies": [ { "name": "magnum", @@ -505,6 +532,7 @@ }, "windowlessglxapplication": { "description": "WindowlessGlxApplication library", + "supports": "!windows & !osx & !ios", "dependencies": [ { "name": "magnum", @@ -517,6 +545,7 @@ }, "windowlesswglapplication": { "description": "WindowlessWglApplication library", + "supports": "windows & !uwp", "dependencies": [ { "name": "magnum", diff --git a/versions/baseline.json b/versions/baseline.json index 1e4e9094857c39..c14e85254ca348 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1790,7 +1790,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 7 + "port-version": 8 }, "cpp-async": { "baseline": "1.1.0", @@ -5318,7 +5318,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 14 + "port-version": 15 }, "magnum-extras": { "baseline": "2020.06", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index 95a5e4e46efc0f..f3b881e1cf5a59 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7c12fdbe3c15ad76eced6d157af6e09d49329e5", + "version-string": "2020.06", + "port-version": 8 + }, { "git-tree": "8630a6d00fec6c7462af2e03bd0e1946f6812069", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index e18468736123d2..cfb379a8d799e9 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1b8f84dd450902aec2b555eb577dfd2a0129592", + "version-string": "2020.06", + "port-version": 15 + }, { "git-tree": "9153bafdfb1c8f5ef113947611b1c916a3e472c3", "version-string": "2020.06", From 88818ef68cc59dd12e6a4f794203de73bc2d31dc Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:38:06 -0400 Subject: [PATCH 0264/1039] [cpptrace] New port (#34217) * Add cpptrace port * Add version entries * Update portfile * Update * Update * Update version number * Update version number * x * version * Update sha * Update sha * Cpptrace update * Cpptrace update * Try to resume work on adding cpptace. Incorporates feedback. * baselines * Update config path * Add a patch for 32-bit windows * Another patch * Fix patch * Fix patch again * Try to fix windows warnings * Try to fix static build * See if CI will run if I push again * Try to fix issue * Update patches * update port version * add prefixes back * Bump hash * Patch * Bump hash * Patch * Bump hash * Patch * Bump hash * Patch * Bump hash * Specify no UWP * Bump hash * Update description * Bump hash * Update ports/cpptrace/portfile.cmake Co-authored-by: Billy O'Neal * Update patches * Bump hash * Bump to cpptrace 0.2.1 * Bump hash * Add patch * Bump hash * Try to handle zlib better * Bump hash * Fix vcpkg.json * Bump hash * fix * Bump hash * Bump baseline * patch * Bump hash * Update patch and usage * Bump hash * fixes * Bump hash * update * Bump hash * Update ports/cpptrace/v0.2.1-patches.patch Co-authored-by: Kai Pastor * Try to use libdwarf via vcpkg * Bump * Fix * Bump * Update libdwarf target name * Bump * Try fix * Bump * Try fix * Bump * Add patches for libdwarf headers * bump * Split up patches * Bump * Trim patch * Bump --------- Co-authored-by: Billy O'Neal Co-authored-by: Kai Pastor --- ports/cpptrace/libdwarf_fixes.patch | 55 ++++++++++++++++++++++++ ports/cpptrace/portfile.cmake | 32 ++++++++++++++ ports/cpptrace/runtime_destination.patch | 22 ++++++++++ ports/cpptrace/uintptr_fix.patch | 13 ++++++ ports/cpptrace/usage | 4 ++ ports/cpptrace/vcpkg.json | 19 ++++++++ versions/baseline.json | 4 ++ versions/c-/cpptrace.json | 9 ++++ 8 files changed, 158 insertions(+) create mode 100644 ports/cpptrace/libdwarf_fixes.patch create mode 100644 ports/cpptrace/portfile.cmake create mode 100644 ports/cpptrace/runtime_destination.patch create mode 100644 ports/cpptrace/uintptr_fix.patch create mode 100644 ports/cpptrace/usage create mode 100644 ports/cpptrace/vcpkg.json create mode 100644 versions/c-/cpptrace.json diff --git a/ports/cpptrace/libdwarf_fixes.patch b/ports/cpptrace/libdwarf_fixes.patch new file mode 100644 index 00000000000000..9b2ec05aefecdf --- /dev/null +++ b/ports/cpptrace/libdwarf_fixes.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccc959e..d3e5d09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -297,8 +297,8 @@ + if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) + target_compile_definitions(cpptrace PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) + if(CPPTRACE_USE_SYSTEM_LIBDWARF) +- find_package(libdwarf REQUIRED) +- target_link_libraries(cpptrace PRIVATE libdwarf) ++ find_package(libdwarf CONFIG REQUIRED) ++ target_link_libraries(cpptrace PRIVATE $,libdwarf::dwarf-static,libdwarf::dwarf-shared>) + else() + add_subdirectory(bundled/libdwarf) + target_link_libraries(cpptrace PRIVATE dwarf) +@@ -379,7 +379,7 @@ + include(CMakePackageConfigHelpers) + + if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) +- set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace dwarf) ++ set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace) + else() + set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace) + endif() +diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp +index ce5dbcf..085a1aa 100644 +--- a/src/symbols/symbols_with_libdwarf.cpp ++++ b/src/symbols/symbols_with_libdwarf.cpp +@@ -20,8 +20,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + + // It's been tricky to piece together how to handle all this dwarf stuff. Some resources I've used are + // https://www.prevanders.net/libdwarf.pdf + +diff --git a/src/platform/dwarf.hpp b/src/platform/dwarf.hpp +index ce5dbcf..085a1aa 100644 +--- a/src/platform/dwarf.hpp ++++ b/src/platform/dwarf.hpp +@@ -9,8 +9,8 @@ + #include + #include + +-#include +-#include ++#include ++#include + + namespace cpptrace { + namespace detail { diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake new file mode 100644 index 00000000000000..20983cb7a63010 --- /dev/null +++ b/ports/cpptrace/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jeremy-rifkin/cpptrace + REF "v${VERSION}" + SHA512 207b01d8b9114806a98f04b769082ba9ef3c66bad11972279b337ec794a14839715aee9b1f22883208e42b23289f1c8b7c842f2ac1c9973d8e2de48621623760 + HEAD_REF main + PATCHES + libdwarf_fixes.patch + uintptr_fix.patch + runtime_destination.patch +) + +vcpkg_list(SET options -DCPPTRACE_USE_SYSTEM_LIBDWARF=On) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_list(APPEND options -DCPPTRACE_STATIC=On) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${options} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "cpptrace" + CONFIG_PATH "lib/cmake/cpptrace" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cpptrace/runtime_destination.patch b/ports/cpptrace/runtime_destination.patch new file mode 100644 index 00000000000000..c6c95c65e62b02 --- /dev/null +++ b/ports/cpptrace/runtime_destination.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccc959e..d3e5d09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -391,7 +391,7 @@ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION bin + ) + else() + install( +@@ -400,7 +400,7 @@ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION bin + ) + endif() + diff --git a/ports/cpptrace/uintptr_fix.patch b/ports/cpptrace/uintptr_fix.patch new file mode 100644 index 00000000000000..67a0f094f87fdd --- /dev/null +++ b/ports/cpptrace/uintptr_fix.patch @@ -0,0 +1,13 @@ +diff --git a/src/platform/utils.hpp b/src/platform/utils.hpp +index ccc959e..d3e5d09 100644 +--- a/src/platform/utils.hpp ++++ b/src/platform/utils.hpp +@@ -334,7 +334,7 @@ namespace detail { + return static_cast(t); + } + template +- unsigned long long to_uintptr(T t) { ++ uintptr_t to_uintptr(T t) { + return static_cast(t); + } + diff --git a/ports/cpptrace/usage b/ports/cpptrace/usage new file mode 100644 index 00000000000000..eeebe202f3f848 --- /dev/null +++ b/ports/cpptrace/usage @@ -0,0 +1,4 @@ +cpptrace provides CMake targets: + + find_package(cpptrace CONFIG REQUIRED) + target_link_libraries(main PRIVATE cpptrace::cpptrace) diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json new file mode 100644 index 00000000000000..9c25b596615fb6 --- /dev/null +++ b/ports/cpptrace/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "cpptrace", + "version": "0.2.1", + "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", + "homepage": "https://github.com/jeremy-rifkin/cpptrace", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "libdwarf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c14e85254ca348..648101a230a5d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1892,6 +1892,10 @@ "baseline": "0.1.1", "port-version": 4 }, + "cpptrace": { + "baseline": "0.2.1", + "port-version": 0 + }, "cppunit": { "baseline": "1.15.1", "port-version": 4 diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json new file mode 100644 index 00000000000000..7f106e46dc082e --- /dev/null +++ b/versions/c-/cpptrace.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7a8eab508d6690313d144800e08a7baadebebdb8", + "version": "0.2.1", + "port-version": 0 + } + ] +} From 0dc005fb66801c8a8266e81bd2cedb4d5501f30e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 1 Nov 2023 22:24:36 +0100 Subject: [PATCH 0265/1039] [llvm] fix clang rescource dir (#34801) * [llvm] fix clang rescource dir. * v db * fix core feature * v db --- ports/llvm/portfile.cmake | 8 ++++++-- ports/llvm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 51ed7d9b23579e..bf9397b6630693 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -103,7 +103,7 @@ if("clang" IN_LIST FEATURES OR "clang-tools-extra" IN_LIST FEATURES) # 1) LLVM/Clang tools are relocated from ./bin/ to ./tools/llvm/ (CLANG_TOOLS_INSTALL_DIR=tools/llvm) # 2) Clang resource files should be relocated from lib/clang/ to ../tools/llvm/lib/clang/ string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${VERSION}) - list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=../tools/llvm/lib/clang/${CLANG_VERSION_MAJOR}) + list(APPEND FEATURE_OPTIONS -DCLANG_RESOURCE_DIR=lib/clang/${CLANG_VERSION_MAJOR}) endif() if("clang-tools-extra" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_PROJECTS "clang-tools-extra") @@ -366,7 +366,11 @@ if(empty_dirs) endforeach() endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/lib" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib") +endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 03203dbb57af1d..31a2cd2a1e2544 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "llvm", "version": "17.0.2", + "port-version": 1, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 648101a230a5d4..0e43e283ec4817 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5182,7 +5182,7 @@ }, "llvm": { "baseline": "17.0.2", - "port-version": 0 + "port-version": 1 }, "lmdb": { "baseline": "0.9.31", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 91ea1f569bc6c9..1830c3f8048728 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d195e85c468428553d0aed0eeb76e3714231e3a", + "version": "17.0.2", + "port-version": 1 + }, { "git-tree": "7bbd8fe3bd9dd7f507ec0b0713c5de3109d312b5", "version": "17.0.2", From 354a05b99db8bec88347a8d35b46fbe7ef4c16da Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Nov 2023 23:13:50 +0100 Subject: [PATCH 0266/1039] [kaitai_struct_cpp_stl_runtime] fix hash (#34846) --- ports/kaitai-struct-cpp-stl-runtime/portfile.cmake | 2 +- ports/kaitai-struct-cpp-stl-runtime/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kaitai-struct-cpp-stl-runtime.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake b/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake index f52641a69b9a97..4c54b317690046 100644 --- a/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake +++ b/ports/kaitai-struct-cpp-stl-runtime/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kaitai-io/kaitai_struct_cpp_stl_runtime REF ${VERSION} - SHA512 4efc2aa36662e35f6e23e2dbe300163c79740eb8b741742ee7c6a2510a4d5e1b336a711a59d6bac587456a031c4512155db5e311357fc49ad49cd5130761d2c0 + SHA512 53b26627e281a12b6c1d217e8b439aba7dabf6fc55d3edc27e70f7757851f060f4039db3a16c48c5c60a715671b855b51e527f154df7d94547943f865c9d4b9a HEAD_REF master ) diff --git a/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json b/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json index 2e751ad1c21343..07264154c50ae8 100644 --- a/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json +++ b/ports/kaitai-struct-cpp-stl-runtime/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kaitai-struct-cpp-stl-runtime", "version": "0.10.1", + "port-version": 1, "description": "Kaitai Struct is a declarative language used for describe various binary data structures, laid out in files or in memory. This library implements Kaitai Struct API for C++ using STL", "homepage": "http://kaitai.io/", "documentation": "https://doc.kaitai.io/lang_cpp_stl.html", diff --git a/versions/baseline.json b/versions/baseline.json index 0e43e283ec4817..2bd55d130fd6bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "kaitai-struct-cpp-stl-runtime": { "baseline": "0.10.1", - "port-version": 0 + "port-version": 1 }, "kangaru": { "baseline": "4.3.1", diff --git a/versions/k-/kaitai-struct-cpp-stl-runtime.json b/versions/k-/kaitai-struct-cpp-stl-runtime.json index 53d2b39b4853c6..96824966b152f6 100644 --- a/versions/k-/kaitai-struct-cpp-stl-runtime.json +++ b/versions/k-/kaitai-struct-cpp-stl-runtime.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6955b0e08a1013a8e3fc43984ddd4a9455bec5ed", + "version": "0.10.1", + "port-version": 1 + }, { "git-tree": "5a70cdc32238d97c453f129e298c03bebdc2e7fd", "version": "0.10.1", From 6f054c7409eb4dd922e32aee641b711aeb6577de Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 2 Nov 2023 10:36:45 -0700 Subject: [PATCH 0267/1039] [directxmesh, directxtex, directxtk, uvatlas] Update for October 2023 releases (#34862) * [directxmesh, directxtex, directxtk, directxkt12] Update for October 2023 releases * Update baseline --- ports/directxmesh/portfile.cmake | 8 ++++---- ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 16 ++++++++-------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 10 +++++----- ports/directxtk/vcpkg.json | 3 +-- ports/directxtk12/portfile.cmake | 10 +++++----- ports/directxtk12/vcpkg.json | 3 +-- ports/uvatlas/portfile.cmake | 6 +++--- ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 14 +++++++------- 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 +++++ 16 files changed, 62 insertions(+), 39 deletions(-) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 62ba9ca07ae420..34e1059ea23e61 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXMESH_TAG jun2023) +set(DIRECTXMESH_TAG oct2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh REF ${DIRECTXMESH_TAG} - SHA512 01fd1fc43dd51c203b31b8f668a4ece731bad980c97b65481fdd86e2b458556fb46b7709444c1741568b3c5633b766c51cb3211e21f348f12278ad8b10044e7c + SHA512 e02471cc0d3a1f2f5c6effe23cea0909a6096b97011885af4b6436e070a11d5f5d5033f0df2c9103cef182b9666c7d17274c519e4f35099cb602a317a9e3bed5 HEAD_REF main ) @@ -40,7 +40,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe" - SHA512 0fca478527c9975776a6a52c0ada08aa4f8bfa169bac9d204295abd6a1a9357c703ae69eabade9c33bab46c25a7342bfc53910ce8ae3cc6a166f807b0e8a8e02 + SHA512 24385c74fa4b32c41bb2d6713ffe2fc78ef899d4f9f55bdb1a9d0a362858c019e6f59b932c03a7c66298362aed09b845f409dcd659dc79c05cb6e00c04db52ae ) file(INSTALL @@ -55,7 +55,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe" - SHA512 92515ec4f3acf0f6cf66e3e20ac709c2b525632d042569272e9208917560f22c15fbbb8066ae44573fcf9c4246daa673c06316641e9585efa873aa06e5efd681 + SHA512 32b64534f7dc7bbf41c5d7ad154d401dbfec2442ebb62969b2acef94595fe4f07e092e1e201aebb7596b47216904ee9e7647911c2a52efdc588d9abc1d691785 ) file(INSTALL diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index d01488f71e89d3..87f47889479550 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2023-06-13", + "version-date": "2023-10-28", "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 df4a022d24bf3c..b7ed4c0f7bca11 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTEX_TAG sept2023) +set(DIRECTXTEX_TAG oct2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 b72941496bcd3193409799905cd6b6d0ce79009b222a589257062f830c2ccc16a97166da92ea59a7954d0f60d1fcd704cdb2cb7449697009f9ddeb00e27c4fb8 + SHA512 4521d716bc903e9373c8d2929ff4fec04b3ae276a3005a06a744d5ee7044520faec6aa06e166b9c3bcc18f68c8e7553f23b21c227154eb3ef994a1c68b57da1a HEAD_REF main ) @@ -52,21 +52,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 30d607e0e0a47917731ef5acebb5d4d269b73bf21120cb976e7bf605f7f5941cb23f63a317fb3d4171f0dce1526f8dd4365e9c2f9b1a6503c320b1f88156acc4 + SHA512 e53548f8715f9ecfe7bd9904eec5fd2fe77d09e8fae78fa95a056a882d8856fe9311d01a703da47ef530e3878fdee8bc4a288617a81ffb61043d6b48acef5df0 ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 43103276b6a8be23c7b429f089f71df5338b8ef32a2f3fe20492d5294886ddbe9a170c6bc1ead7a2da2179ed8e4828262d7072f136b6586af31d2f3249dff97a + SHA512 ca1772650f7368917ea719d853eade2040ed189c45acb8cbaa1dec57e61ca429e041b411271a53e9ca9a11f7a5fc84df1e25c0d019886647b8208bdde93ff258 ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 915aa492b3db2a9787492c8e9ae1b51b175db81b38bca73cd5de2ab815308a5d4e63fb584d02f178939fb816c604996e5036b310b4555ecdc0d1e0640aef7ee0 + SHA512 baea51318adec86e7d0808c99c5ed8d529d9196073ce31c7df79fc12c7ff085169ab72d8876a47bc462d4eb6ec02e103af3f8b1ee0fdd762c2662c0453388e74 ) file(INSTALL @@ -85,21 +85,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 c2152d5644798c4f5fa929a889e68ae5b6545dfdb3251f066406c1f66c223756ace1744314ec459637ca1b39923ad8bfd34f0bf906c84b7e7d6d7114833b7a84 + SHA512 d11152bf4193ab83ab8cabae58ef517b05babec049f2fb1317a51b708d14ba4a93806ff4ebeb1004391c0692fc76b9bedd7a43dbea3d74a4d7548fb69c809f8b ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 15901617f1a2ac94f1eec3b287758e50bf0fad6532940345fd9d13c34372acd27d10f8ba3277f21163f991082dbff14506cb4d7068179b5807755d818f98e27d + SHA512 09f3bc8aebac8804644f6673d0f21d4ee21155f13383c5a0da8afcaef6df6a1186c9254679334247b638ec11b9f1080abed285e174716a1e7662fc46c103278d ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 cc110a34428a7a7694f890bae6f68d001c2e8bcb85edfe335d9cad299e0205ef2bd786392cd391681ca1f1c0043b869c424a705a182466230f6f683b77c47c3e + SHA512 d1ec122e9647d243349678b8d1d267d9b26a84a6a845728c0408f94a486fe6c43488b2f507a96035063fc245bcb670367c0f219626c627ddc31d1713a782a1fd ) file(INSTALL diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 38c9ac8f991edf..f13e462b4bb027 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2023-09-01", + "version-date": "2023-10-28", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index ac9625080e1b20..c4f2abc97eaa94 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG sept2023) +set(DIRECTXTK_TAG oct2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK REF ${DIRECTXTK_TAG} - SHA512 b5b9ea976b1318bbf29915a10cbb11368e0c16d19247bdb3c2da9e733ef6a3db50e530e59e7c5aa0191c372530f22b1edd3f67a1d0a3647e50c09784b9d1e93a + SHA512 3df7f26df2edfbfd8ba8ab2ff8b7f653c1df194145e89fd2bbe7c3f0581d4a11de2845091a6c7d27c2b7800d2b1e8770728fb357e6ab0ce57e714d8fcc0c3453 HEAD_REF main ) @@ -40,7 +40,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 1c4b282482e931c0b5b97bf7359e11889428f35458e65c751521240f15e04915400084d1a28693d8ffe5cd29bc8dd084a5818ecbff4e036de21368c119145d66 + SHA512 00a4c94d3f9b6607f652edfbe1ce0cc9c09437f3084e2b252462458e652ff2735bf94f028091739ec66edbf29c1ebeb813af5c9b68644ac02cebf8ab6833d8fa ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -55,7 +55,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 36e060b67390a1798cb5f96142d63b83051cfb60a9330932cd69a4b43f50d4e29fd5bbe6b036a7c64a8eb8c9018481ee406951f0777f30497672ff8eeba79498 + SHA512 2b60b1dedfe8803914d16c760b546aad82a05404eedff9740f56a1ca8e15d9b77bba3743a3b39adb2092d04afc90106c8a3c2dffc87392cf5dfe6686752c4d3d ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -68,7 +68,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 bd594dd0e172a7002e92abf6e01e2efe30fa1cae3ee5ae87254da4443c964aa4fb653c26f145004abcd91135adc4e19fe1b8a752e1a8acb675a8ddc42191e7d6 + SHA512 d0ff53fefedeba588ad583f99ab2c2420fe0b30a1efb88e4ce556436f1d5d8d76c69f28be7ca7209660212d017a1a404bcdb43349743a4142a7c3e88937ce1d3 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 50c7973a62aa74..98067de8a1ce58 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtk", - "version-date": "2023-09-01", - "port-version": 1, + "version-date": "2023-10-28", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 19b7b815791cea..76c507e143d488 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG sept2023) +set(DIRECTXTK_TAG oct2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 REF ${DIRECTXTK_TAG} - SHA512 1a191c945a0128d02f2a374defca30965d3fe064ef18c111cdb90a763333a69f4eefc5dbd6b8373b2f70276e5022f38e2b48a4f29675f7c10656388f833bca95 + SHA512 3a162ce9101ee8585470bb76f7ac13397f215e4c70fca5a9e0ec419ba114bd4d07da9922cf7022b00cfb3cff0e7016df082658fd3f1e32d230fa2fd0140a338f HEAD_REF main ) @@ -39,7 +39,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 1c4b282482e931c0b5b97bf7359e11889428f35458e65c751521240f15e04915400084d1a28693d8ffe5cd29bc8dd084a5818ecbff4e036de21368c119145d66 + SHA512 00a4c94d3f9b6607f652edfbe1ce0cc9c09437f3084e2b252462458e652ff2735bf94f028091739ec66edbf29c1ebeb813af5c9b68644ac02cebf8ab6833d8fa ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -54,7 +54,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 36e060b67390a1798cb5f96142d63b83051cfb60a9330932cd69a4b43f50d4e29fd5bbe6b036a7c64a8eb8c9018481ee406951f0777f30497672ff8eeba79498 + SHA512 2b60b1dedfe8803914d16c760b546aad82a05404eedff9740f56a1ca8e15d9b77bba3743a3b39adb2092d04afc90106c8a3c2dffc87392cf5dfe6686752c4d3d ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -67,7 +67,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 bd594dd0e172a7002e92abf6e01e2efe30fa1cae3ee5ae87254da4443c964aa4fb653c26f145004abcd91135adc4e19fe1b8a752e1a8acb675a8ddc42191e7d6 + SHA512 d0ff53fefedeba588ad583f99ab2c2420fe0b30a1efb88e4ce556436f1d5d8d76c69f28be7ca7209660212d017a1a404bcdb43349743a4142a7c3e88937ce1d3 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index c85ab776fadaa0..90c37b34ef05a7 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,7 +1,6 @@ { "name": "directxtk12", - "version-date": "2023-09-01", - "port-version": 1, + "version-date": "2023-10-28", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index bedf96f472665a..d87c6b2d639e27 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,4 +1,4 @@ -set(UVATLAS_TAG jun2023) +set(UVATLAS_TAG oct2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas REF ${UVATLAS_TAG} - SHA512 bd1ff3373871bb27872461c0211939f2f6d9b5b4927897bdb4668fdde4a862af74ee193a52434bf30a6cc0268d6fd084453bcedd2bd57c7abb2ca33e1643fced + SHA512 2ad831663a0db907c21cc13af766704ff9b037a55032bed0e99e71aae496df367e00a7ee146b4f2223fa1390c4ad3f050a79dd6ffdbc0f16982dbb3592da8912 HEAD_REF main PATCHES openexr.patch ) @@ -41,7 +41,7 @@ if("tools" IN_LIST FEATURES) UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe" FILENAME "uvatlastool-${UVATLAS_TAG}.exe" - SHA512 523e4a78709e52c418850369f9ce8fc1f4e03907015ad25a7cb098e622f8990b13f4996691602a8116b700397ac59e03bc1248da0c4fdd0b708ca1364bace6a7 + SHA512 66b773c97dc591785c7472557da7f9df0f682dd8b20a4751aa4e3ad97c3a0edc6080ce563ac49d21e3781a12ca0c748e1aa032b20839bcf06f6d21133e5cc8e1 ) file(INSTALL diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 32a4c66619d088..e1309e5765bdfb 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2023-06-13", + "version-date": "2023-10-31", "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 2bd55d130fd6bc..f040b74606dfd5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2169,7 +2169,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "2023-06-13", + "baseline": "2023-10-28", "port-version": 0 }, "directxsdk": { @@ -2177,16 +2177,16 @@ "port-version": 7 }, "directxtex": { - "baseline": "2023-09-01", + "baseline": "2023-10-28", "port-version": 0 }, "directxtk": { - "baseline": "2023-09-01", - "port-version": 1 + "baseline": "2023-10-28", + "port-version": 0 }, "directxtk12": { - "baseline": "2023-09-01", - "port-version": 1 + "baseline": "2023-10-28", + "port-version": 0 }, "dirent": { "baseline": "1.24", @@ -8689,7 +8689,7 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2023-06-13", + "baseline": "2023-10-31", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index bfee61f207e084..368244dbb909e7 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174e5777bf0c14a32b9182a55f29a4f6c23c2226", + "version-date": "2023-10-28", + "port-version": 0 + }, { "git-tree": "abb5d2c283eb23c36dc1e0f1330f4aa302d0de4d", "version-date": "2023-06-13", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 007165ed46832e..6cacdf4b18e0cb 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7721548fe4f3648dae608b765e757f69db31fe02", + "version-date": "2023-10-28", + "port-version": 0 + }, { "git-tree": "f6f049027d47e20e719f6a0f3f888509b63befad", "version-date": "2023-09-01", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 269e9ec692571a..881328b3d45ad6 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f18ff4afb77acfd3b6383375fd2016746b192d2", + "version-date": "2023-10-28", + "port-version": 0 + }, { "git-tree": "67b1d9a329c9e9d8d067359c18bb997148f4e84e", "version-date": "2023-09-01", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index bf25258ba68a16..b11b88517435cf 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "753353fa24f0d2c86cb75b0c6a881b621835a572", + "version-date": "2023-10-28", + "port-version": 0 + }, { "git-tree": "981fd27befe2b9d8afaab87f1b66c1f8c6f31c18", "version-date": "2023-09-01", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 42f51d9731abdd..ded0661e08b70d 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b19700b61aeb3ea159f83d6f2184708142ebae73", + "version-date": "2023-10-31", + "port-version": 0 + }, { "git-tree": "1f28e65ddac26fdd4f5de13a5b31a3f460c7da37", "version-date": "2023-06-13", From 2a019b987cdcaa70253d95c9203cc102a789a83a Mon Sep 17 00:00:00 2001 From: Kered13 Date: Thu, 2 Nov 2023 13:37:17 -0400 Subject: [PATCH 0268/1039] Update CppSlippi to 1.2.3.14 (#34861) --- ports/cppslippi/portfile.cmake | 2 +- ports/cppslippi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppslippi.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cppslippi/portfile.cmake b/ports/cppslippi/portfile.cmake index fbfde4911790cb..91b1a5613b3903 100644 --- a/ports/cppslippi/portfile.cmake +++ b/ports/cppslippi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO cppslippi FILENAME "CppSlippi-${VERSION}.zip" - SHA512 b23f7794f1fc5ec56bba1b48882588ce0dc68985edc673108f3c8b1504f61f9e5769baa01af056df527826b66ba4cbaf3767c8117d626ec99832ecab3c5b840c + SHA512 454a905ea5b053c2000c158939d7bbcdbe5f2af2e1ef6d4d79c233e00889508260f20b0e0adff8be64904aabd525b79c59d18e5205ba86a905d4703d19115d04 NO_REMOVE_ONE_LEVEL ) diff --git a/ports/cppslippi/vcpkg.json b/ports/cppslippi/vcpkg.json index 4e91eb216f39da..047ea93617d596 100644 --- a/ports/cppslippi/vcpkg.json +++ b/ports/cppslippi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppslippi", - "version": "1.1.3.14", + "version": "1.2.3.14", "description": "C++ Slippi replay file parser.", "homepage": "https://sourceforge.net/projects/cppslippi/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f040b74606dfd5..9caead13e7b552 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1885,7 +1885,7 @@ "port-version": 4 }, "cppslippi": { - "baseline": "1.1.3.14", + "baseline": "1.2.3.14", "port-version": 0 }, "cpptoml": { diff --git a/versions/c-/cppslippi.json b/versions/c-/cppslippi.json index bd601ad30d9a13..fd72b394b291c0 100644 --- a/versions/c-/cppslippi.json +++ b/versions/c-/cppslippi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdb4a9aadefc971d10cb8c37bd13570e3c7fab0e", + "version": "1.2.3.14", + "port-version": 0 + }, { "git-tree": "0534d15dbe06459887eeddf859ebab443701c6d7", "version": "1.1.3.14", From 5a1a65b5445c051f7a064dcae3c3a85bd422f5bb Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:37:35 +0800 Subject: [PATCH 0269/1039] [aws-lambda-cpp] Update version to 0.2.9 (#34859) * [aws-lambda-cpp] Update version to 0.2.9 * vdb --- ports/aws-lambda-cpp/portfile.cmake | 4 ++-- ports/aws-lambda-cpp/vcpkg.json | 3 +-- versions/a-/aws-lambda-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake index 64d60be17f9568..409897ef0ea302 100644 --- a/ports/aws-lambda-cpp/portfile.cmake +++ b/ports/aws-lambda-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-lambda-cpp - REF "v${VERSION}" - SHA512 842bada21427c9c85442b8a33228bae7b347214418fcd0681154f1bd384633217d724cab53cddf372a59dfa5de01cca59118a316b0fd58fe9f2403b3b62163f6 + REF "${VERSION}" + SHA512 c8dddadac3dddb69188d97781040c7af389f6954923b50bac8ff25554c478f9685601d47348bb96343f7f4d20762618f8bbbf74b740ace3d02963c5ef3272ac5 HEAD_REF master ) diff --git a/ports/aws-lambda-cpp/vcpkg.json b/ports/aws-lambda-cpp/vcpkg.json index 62463d0ebeffa0..ea52151cedea4f 100644 --- a/ports/aws-lambda-cpp/vcpkg.json +++ b/ports/aws-lambda-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-lambda-cpp", - "version": "0.2.8", - "port-version": 1, + "version": "0.2.9", "description": "C++ Runtime for AWS Lambda.", "license": "Apache-2.0", "supports": "linux", diff --git a/versions/a-/aws-lambda-cpp.json b/versions/a-/aws-lambda-cpp.json index 0b7b5dab233b3d..4df13a4a867fdb 100644 --- a/versions/a-/aws-lambda-cpp.json +++ b/versions/a-/aws-lambda-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cc6fdf7e7744d5aef38bee127751f62367f72d4", + "version": "0.2.9", + "port-version": 0 + }, { "git-tree": "f1bca88dcd24c6f64b69e49c99bc76db2e4f91bb", "version": "0.2.8", diff --git a/versions/baseline.json b/versions/baseline.json index 9caead13e7b552..a19fe22355ce64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -401,8 +401,8 @@ "port-version": 0 }, "aws-lambda-cpp": { - "baseline": "0.2.8", - "port-version": 1 + "baseline": "0.2.9", + "port-version": 0 }, "aws-sdk-cpp": { "baseline": "1.11.169", From d70aa311270aa0807114bda5a1fb628f43c9113c Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Thu, 2 Nov 2023 11:37:58 -0600 Subject: [PATCH 0270/1039] [wolfssl] update to 5.6.4 (#34856) --- ports/wolfssl/fix-windows-build.patch | 49 ------------------------- ports/wolfssl/portfile.cmake | 6 +-- ports/wolfssl/vcpkg.json | 3 +- ports/wolfssl/warning-and-include.patch | 29 --------------- versions/baseline.json | 4 +- versions/w-/wolfssl.json | 5 +++ 6 files changed, 10 insertions(+), 86 deletions(-) delete mode 100644 ports/wolfssl/fix-windows-build.patch delete mode 100644 ports/wolfssl/warning-and-include.patch diff --git a/ports/wolfssl/fix-windows-build.patch b/ports/wolfssl/fix-windows-build.patch deleted file mode 100644 index 5355c414cfea60..00000000000000 --- a/ports/wolfssl/fix-windows-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/wolfcrypt/src/chacha20_poly1305.c b/wolfcrypt/src/chacha20_poly1305.c -index e4ebd10165f..0c37de747af 100644 ---- a/wolfcrypt/src/chacha20_poly1305.c -+++ b/wolfcrypt/src/chacha20_poly1305.c -@@ -355,9 +355,9 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot( - int isEncrypt) - { - int ret; -- ssize_t dst_len = isEncrypt ? -- (ssize_t)src_len + POLY1305_DIGEST_SIZE : -- (ssize_t)src_len - POLY1305_DIGEST_SIZE; -+ long int dst_len = isEncrypt ? -+ (long int)src_len + POLY1305_DIGEST_SIZE : -+ (long int)src_len - POLY1305_DIGEST_SIZE; - const byte *src_i; - byte *dst_i; - size_t src_len_rem; -@@ -375,7 +375,7 @@ static WC_INLINE int wc_XChaCha20Poly1305_crypt_oneshot( - goto out; - } - -- if ((ssize_t)dst_space < dst_len) { -+ if ((long int)dst_space < dst_len) { - ret = BUFFER_E; - goto out; - } -diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h -index 47e3b7363af..feeefe4a2ce 100644 ---- a/wolfssl/wolfcrypt/settings.h -+++ b/wolfssl/wolfcrypt/settings.h -@@ -1876,11 +1876,13 @@ extern void uITRON4_free(void *p) ; - #endif - #endif - --#ifdef _MSC_VER -- #ifndef HAVE_SSIZE_T -- #include -- typedef SSIZE_T ssize_t; -- #endif -+#if defined(NO_WC_SSIZE_TYPE) || defined(ssize_t) -+ /* ssize_t comes from system headers or user_settings.h */ -+#elif defined(WC_SSIZE_TYPE) -+ typedef WC_SSIZE_TYPE ssize_t; -+#elif defined(_MSC_VER) -+ #include -+ typedef SSIZE_T ssize_t; - #endif - - /* If DCP is used without SINGLE_THREADED, enforce WOLFSSL_CRYPT_HW_MUTEX */ diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 67a6cb7f3115bb..090830006179e4 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,12 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.6.3-stable - SHA512 7c3b5c06ade7826031db089d50ec45c36970555499b6be94d1939b3002369fc98e503418128c6b2e253df7e92f86a71647d37f2cd27d57ac201e5aba32b879dc + REF v5.6.4-stable + SHA512 12d9dd264e005f04854d71ded629b20b9563a42b04bfbfd2879c4e3b121902edf2ac4349de27498cddd75d4d9fd742e8f78b82cd319c240485f69b4828e2c80c HEAD_REF master PATCHES - warning-and-include.patch - fix-windows-build.patch # From https://github.com/wolfSSL/wolfssl/pull/6509 ) vcpkg_cmake_configure( diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 08728dfae6ddd5..0abb5cc8898c67 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wolfssl", - "version": "5.6.3", - "port-version": 1, + "version": "5.6.4", "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolfssl/warning-and-include.patch b/ports/wolfssl/warning-and-include.patch deleted file mode 100644 index e71d2f8549f1fa..00000000000000 --- a/ports/wolfssl/warning-and-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c -index 96f27928d90..51e6205cf9d 100644 ---- a/wolfcrypt/src/asn.c -+++ b/wolfcrypt/src/asn.c -@@ -30431,9 +30431,9 @@ int wc_SetCustomExtension(Cert *cert, int critical, const char *oid, - - ext = &cert->customCertExt[cert->customCertExtCount]; - -- ext->oid = oid; -+ ext->oid = (char*)oid; - ext->crit = (critical == 0) ? 0 : 1; -- ext->val = der; -+ ext->val = (byte*)der; - ext->valSz = derSz; - - cert->customCertExtCount++; -diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h -index 8c323840584..a7d70e01fbf 100644 ---- a/wolfssl/wolfio.h -+++ b/wolfssl/wolfio.h -@@ -26,6 +26,8 @@ - #ifndef WOLFSSL_IO_H - #define WOLFSSL_IO_H - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/versions/baseline.json b/versions/baseline.json index a19fe22355ce64..6fba63005dd96d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9005,8 +9005,8 @@ "port-version": 0 }, "wolfssl": { - "baseline": "5.6.3", - "port-version": 1 + "baseline": "5.6.4", + "port-version": 0 }, "wolftpm": { "baseline": "2.7.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index 3d586e4d21c33f..8579506cea69df 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65cc018a18a436969ef0fa7ff531d83994326f43", + "version": "5.6.4", + "port-version": 0 + }, { "git-tree": "b1ed14c731f84f9a8f885e9bf40898c318bd4986", "version": "5.6.3", From 3c2e4c93ed7e5f0596c1e5b932d102e41bc9ec46 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:38:18 +0800 Subject: [PATCH 0271/1039] [libunibreak] update to 5.1 (#34854) * [libunibreak] update to 5.1 * [libunibreak] update to 5.1 --- ports/libunibreak/portfile.cmake | 4 ++-- ports/libunibreak/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libunibreak.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libunibreak/portfile.cmake b/ports/libunibreak/portfile.cmake index c73851614fccd5..db55dfc87ad661 100644 --- a/ports/libunibreak/portfile.cmake +++ b/ports/libunibreak/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adah1972/libunibreak - REF libunibreak_5_0 # libunibreak_5_0 - SHA512 909c12cf5df92f0374050fc7a0ef9e91bc1efe6a5dc5a80f4e2c81a507f1228ecaba417c3ee001e11b2422024bea68cc14eb66e08360ae69f830cdaa18764484 + REF libunibreak_5_1 + SHA512 c47d6445cab36febb214b31aeb48585a4d3685714588079e84be87019f6e6ffb752e0e0e527232e2d164b1efeeeea64b8b4b21e605ebc60f10fb5a169edc2ed0 HEAD_REF master ) diff --git a/ports/libunibreak/vcpkg.json b/ports/libunibreak/vcpkg.json index 3c4a6f438ebec9..63501324ea705d 100644 --- a/ports/libunibreak/vcpkg.json +++ b/ports/libunibreak/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libunibreak", - "version": "5.0", - "port-version": 1, + "version": "5.1", "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", "homepage": "https://github.com/adah1972/libunibreak", "license": "zlib-acknowledgement", diff --git a/versions/baseline.json b/versions/baseline.json index 6fba63005dd96d..2d86828fc6580a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4893,8 +4893,8 @@ "port-version": 3 }, "libunibreak": { - "baseline": "5.0", - "port-version": 1 + "baseline": "5.1", + "port-version": 0 }, "libunifex": { "baseline": "0.3.0", diff --git a/versions/l-/libunibreak.json b/versions/l-/libunibreak.json index 364e54e6a65ce5..2bca3c35f5bce1 100644 --- a/versions/l-/libunibreak.json +++ b/versions/l-/libunibreak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82fb16a307e33e75cbdbd3726f4b7bbcea42eb23", + "version": "5.1", + "port-version": 0 + }, { "git-tree": "724f588851a5f81f6ddd8eb1fc01a45bedfa5517", "version": "5.0", From 6717592fcf83f2273bebf48f1e44aaa8a65ea435 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:38:45 +0800 Subject: [PATCH 0272/1039] [libtommath] update to 1.2.1 (#34853) * [libtommath] update to 1.2.1 * [libtommath] update to 1.2.1 --- ports/libtommath/portfile.cmake | 4 ++-- ports/libtommath/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libtommath.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libtommath/portfile.cmake b/ports/libtommath/portfile.cmake index 746ead44943f1a..b01e62e69b5c70 100644 --- a/ports/libtommath/portfile.cmake +++ b/ports/libtommath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtom/libtommath - REF v1.2.0 - SHA512 500bce4467d6cdb0b014e6c66d3b994a8d63b51475db6c3cd77c15c8368fbab4e3b5c458fcd5b35838b74c457a33c15b42d2356964f5ef2a0bd31fd544735c9a + REF "v${VERSION}" + SHA512 8da4a935913e8a44a24ba7d8c2bc4926398bdc9aea0cd4975418771979c2b7667c2ee04e8a7e38f04cc87abe5bb369fcbf9167ab662ad747602fc840cb3788e6 HEAD_REF develop ) diff --git a/ports/libtommath/vcpkg.json b/ports/libtommath/vcpkg.json index c8efdf584872e9..aa0312f7fb834d 100644 --- a/ports/libtommath/vcpkg.json +++ b/ports/libtommath/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libtommath", - "version": "1.2.0", - "port-version": 3, + "version": "1.2.1", "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.", "homepage": "https://www.libtom.net/LibTomMath/" } diff --git a/versions/baseline.json b/versions/baseline.json index 2d86828fc6580a..099380483b392a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4853,8 +4853,8 @@ "port-version": 3 }, "libtommath": { - "baseline": "1.2.0", - "port-version": 3 + "baseline": "1.2.1", + "port-version": 0 }, "libtorch": { "baseline": "1.12.1", diff --git a/versions/l-/libtommath.json b/versions/l-/libtommath.json index 1cd44665e7617b..1616c91b6a1a63 100644 --- a/versions/l-/libtommath.json +++ b/versions/l-/libtommath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc02d14942e13f536bc7d8d08d9af160f8bbd387", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "70acf033d012ad744340243d73cdd40b07501f0e", "version": "1.2.0", From d44882136b6e82ddb063c58fdf8408c92615f29b Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:39:03 +0800 Subject: [PATCH 0273/1039] [librsync] update to 2.3.4 (#34852) * [librsync] update to 2.3.4 * [librsync] update to 2.3.4 --- ports/librsync/portfile.cmake | 4 ++-- ports/librsync/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/librsync.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake index a0a07bad3d4d01..663e47b1d2cc0a 100644 --- a/ports/librsync/portfile.cmake +++ b/ports/librsync/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO librsync/librsync - REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2 - SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c + REF "v${VERSION}" + SHA512 ac01413b875e774db9fec3888210a4b9a5f3d32c081f1ed5f2cf9dc29cfae6ecedf6eac42062631e6dcf188853313fce4520430549768a0f68993419b07e58d9 HEAD_REF master ) diff --git a/ports/librsync/vcpkg.json b/ports/librsync/vcpkg.json index 7fda0a64de099b..0287ac3c258d16 100644 --- a/ports/librsync/vcpkg.json +++ b/ports/librsync/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librsync", - "version-semver": "2.3.2", - "port-version": 1, + "version-semver": "2.3.4", "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.", "homepage": "http://librsync.sourcefrog.net/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 099380483b392a..ac7539ce5f0f4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4697,8 +4697,8 @@ "port-version": 10 }, "librsync": { - "baseline": "2.3.2", - "port-version": 1 + "baseline": "2.3.4", + "port-version": 0 }, "librtmp": { "baseline": "2019-11-11", diff --git a/versions/l-/librsync.json b/versions/l-/librsync.json index 6ea83e07fbf430..5fde3f12aed3d4 100644 --- a/versions/l-/librsync.json +++ b/versions/l-/librsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28eb3afb0d9fb4a4e84c59fb829f206f3e409152", + "version-semver": "2.3.4", + "port-version": 0 + }, { "git-tree": "1d252092a8f0d2ecbf57a4113324b363d4c43db1", "version-semver": "2.3.2", From 3670bd30ef075234da812ea072aa4fd1543617ff Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:39:26 +0800 Subject: [PATCH 0274/1039] [avro-c] update to 1.11.3 (#34851) * [avro-c] update to 1.11.3 * [avro-c] update to 1.11.3 --- ports/avro-c/portfile.cmake | 4 ++-- ports/avro-c/vcpkg.json | 3 +-- versions/a-/avro-c.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index ac0742680b3f08..94c61be6cadf56 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/avro - REF 4e1fefca493029ace961b7ef8889a3722458565a #release-1.11.0 - SHA512 6e787983d68bc6ecffd14ca585917f695bc1ae554de9146a436d342f32321c3e7878cdfa32989742e682ac12a6eb914b3e3b515ca3164f386c0281c8b50b53ad + REF "release-${VERSION}" + SHA512 728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed HEAD_REF master PATCHES avro.patch # Private vcpkg build fixes diff --git a/ports/avro-c/vcpkg.json b/ports/avro-c/vcpkg.json index 888afb3ba21e9f..5c5c70cc1c12a2 100644 --- a/ports/avro-c/vcpkg.json +++ b/ports/avro-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avro-c", - "version": "1.11.0", - "port-version": 3, + "version": "1.11.3", "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", "license": "Apache-2.0", diff --git a/versions/a-/avro-c.json b/versions/a-/avro-c.json index 35574415d95701..0805932df22e40 100644 --- a/versions/a-/avro-c.json +++ b/versions/a-/avro-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76ef10758076c92faaae286e1d38c1770dc4f23c", + "version": "1.11.3", + "port-version": 0 + }, { "git-tree": "7b07da3abd56565c8d2e75942aab468ece0f3115", "version": "1.11.0", diff --git a/versions/baseline.json b/versions/baseline.json index ac7539ce5f0f4a..a87919a8768cb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -345,8 +345,8 @@ "port-version": 2 }, "avro-c": { - "baseline": "1.11.0", - "port-version": 3 + "baseline": "1.11.3", + "port-version": 0 }, "avro-cpp": { "baseline": "1.11.3", From 106fd5cf49d8384811830bc4c1bed1b5f09a6dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Thu, 2 Nov 2023 17:39:50 +0000 Subject: [PATCH 0275/1039] [Glaze] version 1.5.6 (#34849) * Update glaze * Update database --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index e63098bb3b21e7..d5479e2e23ac79 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 c4f89aa0fd28a821f977a7b363985ba6a88b54a22d76beea27d2750d3d912a46092ed436b010f679237a83f6375d2fba7c4e54cbf4650f2ba1e7bdf7b1804c59 + SHA512 88bf8f152d0dbce38e97160a9fa0a5b1f708213d8b80e2c771ce981e6abfeecf4daa09d79b582b3b7c3ba6f932ff5fada9965a4db5d30db956f7d6152686f002 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 3be32bbcc849a9..046cb2b2cde844 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.5.4", + "version": "1.5.6", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a87919a8768cb9..00f29532fb4022 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2961,7 +2961,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.5.4", + "baseline": "1.5.6", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 68abcd04c10b0d..cd9499ab047ddd 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4146e402c56c4d3678ccf0fc30a303fe4a628bcb", + "version": "1.5.6", + "port-version": 0 + }, { "git-tree": "c4b6e2335f681c7d5183776b595718244791df78", "version": "1.5.4", From 99ff9a28d926485e3df46a4b56ee7d04f44b6c89 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Thu, 2 Nov 2023 18:40:09 +0100 Subject: [PATCH 0276/1039] [baresip-libre] update to version 3.6.0 (#34845) * baresip-libre: update to version 3.6.0 * bump version --- ports/baresip-libre/portfile.cmake | 3 +-- ports/baresip-libre/use-c11.patch | 15 --------------- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 ports/baresip-libre/use-c11.patch diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index 6c31345cc69c42..f12363af7df727 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,11 +6,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 08e92b223993ef13af3f4f8f019f33da762be8059099536fa3f1f6a9edd4c95bd35a91e4816bc761e227dc8e08e34e6b75421d18d4aa5dedd8bd5fe95547e214 + SHA512 054227c3cbd41d8801d1d0aed38029adb63d52e33e8becafbdba3e973d55863e40e9be0463b6a2d91b34b3b2aea7d80e9d7ec7adadd5e63ca844e416f4d6c411 HEAD_REF main PATCHES fix-static-library-build.patch - use-c11.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBRE_BUILD_SHARED) diff --git a/ports/baresip-libre/use-c11.patch b/ports/baresip-libre/use-c11.patch deleted file mode 100644 index ec03b519c4ce4a..00000000000000 --- a/ports/baresip-libre/use-c11.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b364219..fd662d4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,6 +32,10 @@ else() - set(PROJECT_VERSION_FULL ${PROJECT_VERSION}) - endif() - -+if(WIN32 AND NOT MINGW) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std:c11" ) -+endif() -+ - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) - - ############################################################################## diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 18f9094ab6516d..179965277df84b 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.5.1", + "version": "3.6.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index c9da6a4ba52e76..ba045299788b10 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00dc0e14dfa16f98420ac3a15b9b158af7cf87f8", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "b000665b80ffaa20107836324b4360bad62861a7", "version": "3.5.1", diff --git a/versions/baseline.json b/versions/baseline.json index 00f29532fb4022..0ab2749b9a37ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,7 +517,7 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.5.1", + "baseline": "3.6.0", "port-version": 0 }, "basisu": { From 9fb19afa2616e461d851db4dee39ba890450ed25 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 2 Nov 2023 20:41:36 +0300 Subject: [PATCH 0277/1039] [fribidi] Update to 1.0.13 (#34802) * [fribidi] Update to 1.0.13 * Fix preprocessor --- ports/fribidi/portfile.cmake | 10 ++++------ ports/fribidi/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fribidi.json | 5 +++++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 1fc220d3712822..ce8ef58694d3ec 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fribidi/fribidi - REF v1.0.12 - SHA512 a3a63e1dde1cffb097376df0b34522700cff600da61bdafd6f4f50db6937383b9f73a82081cb1a7f2e1946ba07fea13e2880a4250b1508850bffa500046a7fa5 + REF v${VERSION} + SHA512 246c904f8e6cc7eee61c03162b42dd0e0ed2163ef02d9d15b8168f0084ccdd9b625b83092915fa42f301106247e3159ad6aee0af42c37643253f7c47d0a520ef HEAD_REF master PATCHES meson-crosscompile.patch ) @@ -30,13 +30,11 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() # Define static macro -file(READ "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" FRIBIDI_COMMON_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 0" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 0") else() - string(REPLACE "#ifndef FRIBIDI_LIB_STATIC" "#if 1" FRIBIDI_COMMON_H "${FRIBIDI_COMMON_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "# elif defined(_WIN32) && ! defined(FRIBIDI_LIB_STATIC)" "# elif defined(_WIN32) && 1") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/fribidi/fribidi-common.h" "${FRIBIDI_COMMON_H}") if(VCPKG_CROSSCOMPILING) file( diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json index 48cebd04e73285..9428b3659b9ad3 100644 --- a/ports/fribidi/vcpkg.json +++ b/ports/fribidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fribidi", - "version": "1.0.12", - "port-version": 1, + "version": "1.0.13", "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", "license": "LGPL-2.1-or-later", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 0ab2749b9a37ca..01d70f61dec5d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2777,8 +2777,8 @@ "port-version": 0 }, "fribidi": { - "baseline": "1.0.12", - "port-version": 1 + "baseline": "1.0.13", + "port-version": 0 }, "frozen": { "baseline": "1.1.1", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index 75e2892abbeca7..07f33557ecdc6e 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a946b16fa88c02cd11e2e3011fe9ca61e31214b6", + "version": "1.0.13", + "port-version": 0 + }, { "git-tree": "b611119763d80fa18b07cf2e3c99c02069b0ec55", "version": "1.0.12", From 521995e6527aa2cea44bdf14f0da7ef3d4e21741 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 2 Nov 2023 18:42:20 +0100 Subject: [PATCH 0278/1039] [tacopie] Fix build for mingw (#34850) Signed-off-by: Vitalii Koshura --- ports/tacopie/fix-mingw-build.patch | 11 +++++++++++ ports/tacopie/portfile.cmake | 1 + ports/tacopie/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tacopie.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/tacopie/fix-mingw-build.patch diff --git a/ports/tacopie/fix-mingw-build.patch b/ports/tacopie/fix-mingw-build.patch new file mode 100644 index 00000000000000..a7b5bd4ecb295c --- /dev/null +++ b/ports/tacopie/fix-mingw-build.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ project(${PROJECT} CXX) + ### + # compilation options + ### +-IF (WIN32) ++IF (MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /O2 /bigobj") + + # was causing conflics with gtest build diff --git a/ports/tacopie/portfile.cmake b/ports/tacopie/portfile.cmake index 6a6c4a625db1aa..1dc96736557f0e 100644 --- a/ports/tacopie/portfile.cmake +++ b/ports/tacopie/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-cmakelists.patch fix-export.patch + fix-mingw-build.patch ) if(VCPKG_CRT_LINKAGE STREQUAL dynamic) diff --git a/ports/tacopie/vcpkg.json b/ports/tacopie/vcpkg.json index a726fe575c1202..6dc38391a05290 100644 --- a/ports/tacopie/vcpkg.json +++ b/ports/tacopie/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tacopie", "version": "3.2.0", - "port-version": 5, + "port-version": 6, "description": "Tacopie is a TCP Client & Server C++11 library", "homepage": "https://github.com/cpp-redis/tacopie", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 01d70f61dec5d5..53f5286b706f81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8222,7 +8222,7 @@ }, "tacopie": { "baseline": "3.2.0", - "port-version": 5 + "port-version": 6 }, "taglib": { "baseline": "1.13.1", diff --git a/versions/t-/tacopie.json b/versions/t-/tacopie.json index 9e510ac84ffe97..163c0e0eafaa2d 100644 --- a/versions/t-/tacopie.json +++ b/versions/t-/tacopie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc2035636502588b6cdac9c4d58c5f7b6c03c76a", + "version": "3.2.0", + "port-version": 6 + }, { "git-tree": "e9f280c1d8b799fd2b5617955348dd299b246c86", "version": "3.2.0", From a0dcd708623c3a6a292a9c1d18354f67197be114 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 3 Nov 2023 01:48:21 +0800 Subject: [PATCH 0279/1039] [thorvg] Add usage and update version (#34839) * add feature * update version * update version * fix feature * update version * fix feature * update version * update to 0.11.3 * update version * update * fix patch * update version * delete patch * update version --- ports/thorvg/portfile.cmake | 10 +++++----- ports/thorvg/usage | 5 +++++ ports/thorvg/vcpkg.json | 2 +- ports/thorvg/windows-build-option.patch | 12 ------------ versions/baseline.json | 2 +- versions/t-/thorvg.json | 5 +++++ 6 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 ports/thorvg/usage delete mode 100644 ports/thorvg/windows-build-option.patch diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index e1657571c6a098..c5ae01319543aa 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg - REF v0.11.1 - SHA512 388c3d8bd5099c1e35911dc75ffa6aafc6ea9f1219845ea29dbef91db8c75b2e22b091df4340acc2b44d948cb18fcf8f3a511045ce6ff959a078b350c9a13756 + REF "v${VERSION}" + SHA512 cc73f7e01755141a245eecd1dc8fa6754e21b342e3734f1200e859c2360474fc9931a934eb49968c65b15c537812b81fa1f3f82ac12f9e00e3959748cf1e286f HEAD_REF master - PATCHES - windows-build-option.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -30,6 +28,7 @@ vcpkg_configure_meson( -Dbindings=capi -Dtests=false -Dexamples=false + -Dstrip=false OPTIONS_DEBUG -Dlog=true -Dbindir=${CURRENT_PACKAGES_DIR}/debug/bin @@ -44,5 +43,6 @@ if ("tools" IN_LIST FEATURES) endif() 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) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/thorvg/usage b/ports/thorvg/usage new file mode 100644 index 00000000000000..f6354eb337a326 --- /dev/null +++ b/ports/thorvg/usage @@ -0,0 +1,5 @@ +The package thorvg can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(thorvg REQUIRED IMPORTED_TARGET thorvg) + target_link_libraries(main PRIVATE PkgConfig::thorvg) diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index 8bfed0d78db5c4..cc45c146ae301e 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "thorvg", - "version": "0.11.1", + "version": "0.11.3", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", diff --git a/ports/thorvg/windows-build-option.patch b/ports/thorvg/windows-build-option.patch deleted file mode 100644 index db0bc171e9af07..00000000000000 --- a/ports/thorvg/windows-build-option.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 363b8c3b..a3cc862d 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('thorvg', - 'cpp', -- default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14', 'strip=true'], -+ default_options : ['buildtype=debugoptimized', 'b_sanitize=none', 'werror=false', 'optimization=s', 'cpp_std=c++14'], - version : '0.11.1', - license : 'MIT') - diff --git a/versions/baseline.json b/versions/baseline.json index 53f5286b706f81..4ec4314be6c303 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8329,7 +8329,7 @@ "port-version": 0 }, "thorvg": { - "baseline": "0.11.1", + "baseline": "0.11.3", "port-version": 0 }, "threadpool": { diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index 468a9568e336c8..a04fb4389cf406 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1d0212fb939be388b501f845991c03a56213ef8", + "version": "0.11.3", + "port-version": 0 + }, { "git-tree": "46f0b52581895d5c9deeaa582387fcc32c25fa15", "version": "0.11.1", From 51aa787313829fa060607cbf4c569962391fce9b Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 2 Nov 2023 22:50:40 +0200 Subject: [PATCH 0280/1039] gz-sensors7 (#34831) --- ports/gz-sensors7/portfile.cmake | 10 ++++++++++ ports/gz-sensors7/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gz-sensors7.json | 9 +++++++++ 4 files changed, 44 insertions(+) create mode 100644 ports/gz-sensors7/portfile.cmake create mode 100644 ports/gz-sensors7/vcpkg.json create mode 100644 versions/g-/gz-sensors7.json diff --git a/ports/gz-sensors7/portfile.cmake b/ports/gz-sensors7/portfile.cmake new file mode 100644 index 00000000000000..babdef77c8d08c --- /dev/null +++ b/ports/gz-sensors7/portfile.cmake @@ -0,0 +1,10 @@ +set(PACKAGE_NAME sensors) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 968aab8d623c1716c4d0e164e70442e02ebe34f9277bcc48739c620124c80ba4896a846f9d052ac6d9b32b4d8805aee30b4f9c1248f75790de85718f659b6ff6 + OPTIONS + PATCHES +) diff --git a/ports/gz-sensors7/vcpkg.json b/ports/gz-sensors7/vcpkg.json new file mode 100644 index 00000000000000..ccf330ba3fb4a3 --- /dev/null +++ b/ports/gz-sensors7/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "gz-sensors7", + "version": "7.3.0", + "description": "Component of Gazebo, provides numerous sensor models designed to generate realistic data from simulation environments.", + "homepage": "https://gazebosim.org/libs/sensors", + "license": "Apache-2.0", + "dependencies": [ + "gz-cmake3", + "gz-common5", + "gz-math7", + "gz-msgs9", + "gz-rendering7", + "gz-transport12", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf", + "sdformat13" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4ec4314be6c303..11bd329e076dfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3208,6 +3208,10 @@ "baseline": "7.4.1", "port-version": 0 }, + "gz-sensors7": { + "baseline": "7.3.0", + "port-version": 0 + }, "gz-tools2": { "baseline": "2.0.0", "port-version": 1 diff --git a/versions/g-/gz-sensors7.json b/versions/g-/gz-sensors7.json new file mode 100644 index 00000000000000..fe5d9eadbfcdda --- /dev/null +++ b/versions/g-/gz-sensors7.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "30989166a9bafd435a3344a388265a26f3aa9492", + "version": "7.3.0", + "port-version": 0 + } + ] +} From 9f03078bdcbab3ad8c1e3927c40c3fb48e42501f Mon Sep 17 00:00:00 2001 From: Victor Nivet <9706342+flmmkch@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:01:20 +0100 Subject: [PATCH 0281/1039] =?UTF-8?q?[vcpkg=5Fconfigure=5Fmake]=20fix=20ca?= =?UTF-8?q?se=20sensitive=20comparison=20in=20PATH=20system=20d=E2=80=A6?= =?UTF-8?q?=20(#34791)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [vcpkg_configure_make] fix case sensitive comparison in PATH system dir search * Fixes after code review --------- Co-authored-by: Victor NIVET --- scripts/cmake/vcpkg_configure_make.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 67a935ee4422bb..6d6867da0f509c 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -236,19 +236,12 @@ function(vcpkg_configure_make) cmake_path(CONVERT "$ENV{SystemRoot}" TO_CMAKE_PATH_LIST system_root NORMALIZE) cmake_path(CONVERT "$ENV{LOCALAPPDATA}" TO_CMAKE_PATH_LIST local_app_data NORMALIZE) file(REAL_PATH "${system_root}" system_root) - string(TOUPPER "${system_root}" system_root_upper) message(DEBUG "path_list:${path_list}") # Just to have --trace-expand output vcpkg_list(SET find_system_dirs - "${system_root}/system32" "${system_root}/System32" - "${system_root}/system32/" "${system_root}/System32/" - "${system_root_upper}/system32" - "${system_root_upper}/System32" - "${system_root_upper}/system32/" - "${system_root_upper}/System32/" "${local_app_data}/Microsoft/WindowsApps" "${local_app_data}/Microsoft/WindowsApps/" ) @@ -258,7 +251,8 @@ function(vcpkg_configure_make) set(index 0) set(appending TRUE) foreach(item IN LISTS path_list) - if(item IN_LIST find_system_dirs OR item IN_LIST find_system_dirs_upper) + string(TOUPPER "${item}" item_upper) + if(item_upper IN_LIST find_system_dirs_upper) set(appending FALSE) break() endif() From 83cdde6707f468be39f201ce8d496b2aef47ba63 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:58:30 +0800 Subject: [PATCH 0282/1039] [reproc] Fix gcc 13 build error (#34885) * [reproc] Fix gcc 13 build error * Add comment --- ports/reproc/fix-gcc13-build-error.patch | 28 ++++++++++++++++++++++++ ports/reproc/portfile.cmake | 10 ++++----- ports/reproc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/reproc.json | 5 +++++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 ports/reproc/fix-gcc13-build-error.patch diff --git a/ports/reproc/fix-gcc13-build-error.patch b/ports/reproc/fix-gcc13-build-error.patch new file mode 100644 index 00000000000000..cf464b531b5c32 --- /dev/null +++ b/ports/reproc/fix-gcc13-build-error.patch @@ -0,0 +1,28 @@ +diff --git a/reproc++/include/reproc++/reproc.hpp b/reproc++/include/reproc++/reproc.hpp +index ab6f139..d4b370f 100644 +--- a/reproc++/include/reproc++/reproc.hpp ++++ b/reproc++/include/reproc++/reproc.hpp +@@ -88,18 +88,18 @@ struct redirect { + + struct options { + struct { +- env::type behavior; ++ reproc::env::type behavior; + /*! Implicitly converts from any STL container of string pairs to the + environment format expected by `reproc_start`. */ +- class env extra; ++ reproc::env extra; + } env = {}; + + const char *working_directory = nullptr; + + struct { +- redirect in; +- redirect out; +- redirect err; ++ struct redirect in; ++ struct redirect out; ++ struct redirect err; + bool parent; + bool discard; + FILE *file; diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index 572cce5fbd8d81..c8c9f384571d95 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc - REF v14.2.4 + REF "v${VERSION}" SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675 HEAD_REF main + PATCHES + fix-gcc13-build-error.patch #Please remove it in the next release version ) vcpkg_cmake_configure( @@ -24,8 +26,4 @@ foreach(TARGET reproc reproc++) ) endforeach() -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/reproc/vcpkg.json b/ports/reproc/vcpkg.json index 7c499935597c2b..4326597ed8e4bc 100644 --- a/ports/reproc/vcpkg.json +++ b/ports/reproc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "reproc", "version": "14.2.4", - "port-version": 1, + "port-version": 2, "description": "Cross-platform (C99/C++11) process library", "homepage": "https://github.com/DaanDeMeyer/reproc", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 11bd329e076dfc..f122664e13a5ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7398,7 +7398,7 @@ }, "reproc": { "baseline": "14.2.4", - "port-version": 1 + "port-version": 2 }, "rest-rpc": { "baseline": "0.07", diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index b90be37891c183..f733405338dc24 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fc63b3c029742441d22a288db9f37f5e016abbe", + "version": "14.2.4", + "port-version": 2 + }, { "git-tree": "eeac14685480439ee52ac05ec68faebb2cbaffad", "version": "14.2.4", From b7e73175bf0c0c6823d7efd5ba553e68a6915af6 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:58:57 +0800 Subject: [PATCH 0283/1039] [poco] update to 1.12.5 (#34882) * [poco] update to 1.12.5 * Use ${VERSION} * Update hash --- ports/poco/portfile.cmake | 6 +++--- ports/poco/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/poco.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 9657d24d8792a1..b16f6bdad5a8e9 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF 1211613642269b7d53bea58b02de7fcd25ece3b9 # poco-1.12.4-release - SHA512 bf390f7c8d7c4f0d7602afa434a933b429274944d12560159761b0f984316c76abfdb49ad422c869e02d88041058a04d66e7b5ae05142819a4f583870cc00f44 + REF "poco-${VERSION}-release" + SHA512 dfb7bc3241c78216ebd9eeacd6d091c069a342a7f92e73b348b07ff817997a16c8452fdb954954a182f65140567fc2e910036efb50d55d327a4de8063bac005b HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode @@ -120,4 +120,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index f61665e46ec785..c756717df3a693 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,7 +1,6 @@ { "name": "poco", - "version": "1.12.4", - "port-version": 4, + "version": "1.12.5", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index f122664e13a5ed..3aaca8bfd4f695 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6621,8 +6621,8 @@ "port-version": 0 }, "poco": { - "baseline": "1.12.4", - "port-version": 4 + "baseline": "1.12.5", + "port-version": 0 }, "podofo": { "baseline": "0.10.1", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 48bf2fe10b9b22..523a588c280652 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "baaee315b717f3b0a819aed2f78b8a2059cb1726", + "version": "1.12.5", + "port-version": 0 + }, { "git-tree": "5fb22214a00901cbf3697a76442f5f360cbc74ef", "version": "1.12.4", From 06f19b68bd86969a1dec0ac6efdb8760c36c7db5 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sun, 5 Nov 2023 08:59:20 -0800 Subject: [PATCH 0284/1039] [tesseract] Update to 5.3.3 (#34868) * [tesseract] Update to 5.3.3 * update version --- .../fix-aarch64-mfpu-not-available.patch | 25 ------------------- ports/tesseract/fix-link-include-path.patch | 14 +++++++++++ ports/tesseract/portfile.cmake | 4 +-- ports/tesseract/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tesseract.json | 5 ++++ 6 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 ports/tesseract/fix-aarch64-mfpu-not-available.patch create mode 100644 ports/tesseract/fix-link-include-path.patch diff --git a/ports/tesseract/fix-aarch64-mfpu-not-available.patch b/ports/tesseract/fix-aarch64-mfpu-not-available.patch deleted file mode 100644 index 0c76ebcf4f0d64..00000000000000 --- a/ports/tesseract/fix-aarch64-mfpu-not-available.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index db4c39d5..276c65f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -257,7 +257,11 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*") - set(HAVE_AVX512F FALSE) - set(HAVE_FMA FALSE) - set(HAVE_SSE4_1 FALSE) -+ - check_cxx_compiler_flag("-mfpu=neon" HAVE_NEON) -+ if(HAVE_NEON) -+ set(NEON_COMPILE_FLAGS "-mfpu=neon") -+ endif(HAVE_NEON) - - else() - -@@ -271,7 +275,6 @@ else() - endif(CMAKE_SYSTEM_PROCESSOR MATCHES "x86|x86_64|AMD64|amd64|i386|i686") - - if(HAVE_NEON) -- set(NEON_COMPILE_FLAGS "-mfpu=neon") - message(STATUS "LTO build is not supported on arm/RBPi.") - set(ENABLE_LTO FALSE) # enable LTO cause fatal error on arm/RBPi - endif() - \ No newline at end of file diff --git a/ports/tesseract/fix-link-include-path.patch b/ports/tesseract/fix-link-include-path.patch new file mode 100644 index 00000000000000..14154943436aee --- /dev/null +++ b/ports/tesseract/fix-link-include-path.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 68da6c5..781fb97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -820,7 +820,8 @@ target_include_directories( + $ + $ + $ +- $) ++ $ ++ $) + if(BUILD_SHARED_LIBS) + target_compile_definitions( + libtesseract diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 2b9a242a9e2c78..1253d83b2dcaa1 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -6,11 +6,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract REF "${VERSION}" - SHA512 92db2a513f00b931a0207cc705020bee9fea4ff7fa93c57a6f446b5777713864cce19121b316ef8b78b6bd625ee7e6fd473352515f98c4a2187569cbd0a9713a + SHA512 c04ae68ac4ecf85243c54feb4233e282cd420522588fd4b3eaa87619cb236a575052e3667a806c2f56de06dc013b88926c2dbea4cb4ee02f0119c032598169f2 PATCHES ${tesseract_patch} fix_static_link_icu.patch - fix-aarch64-mfpu-not-available.patch + fix-link-include-path.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 68480240fcec0a..37001b2e5c4eb0 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tesseract", - "version": "5.3.2", + "version": "5.3.3", "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3aaca8bfd4f695..22852307a324cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8297,7 +8297,7 @@ "port-version": 0 }, "tesseract": { - "baseline": "5.3.2", + "baseline": "5.3.3", "port-version": 0 }, "tfhe": { diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index d73eacce060e73..ac7d728e38c6eb 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f806a1d29bd65196abb77d6db253305d82e0c94", + "version": "5.3.3", + "port-version": 0 + }, { "git-tree": "894841bddec08acc323ddaf3f10f6dfdee9a92c6", "version": "5.3.2", From 8acbab7a13ce364d6ee48243d43899dc03ba5cfb Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Sun, 5 Nov 2023 09:02:05 -0800 Subject: [PATCH 0285/1039] [azure-storage-common-cpp] Fix compilation when using Clang on Windows (#34883) Co-authored-by: Anton Kolesnyk --- .../fix-clang-on-windows.patch | 13 +++++++++++++ ports/azure-storage-common-cpp/portfile.cmake | 2 ++ ports/azure-storage-common-cpp/vcpkg.json | 2 +- versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/azure-storage-common-cpp/fix-clang-on-windows.patch diff --git a/ports/azure-storage-common-cpp/fix-clang-on-windows.patch b/ports/azure-storage-common-cpp/fix-clang-on-windows.patch new file mode 100644 index 00000000000000..2babe34280b746 --- /dev/null +++ b/ports/azure-storage-common-cpp/fix-clang-on-windows.patch @@ -0,0 +1,13 @@ +diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt +index 9e419922..ba77ab26 100644 +--- a/sdk/storage/azure-storage-common/CMakeLists.txt ++++ b/sdk/storage/azure-storage-common/CMakeLists.txt +@@ -97,8 +97,6 @@ target_link_libraries(azure-storage-common PUBLIC Azure::azure-core) + + if(WIN32) + target_link_libraries(azure-storage-common PRIVATE bcrypt webservices) +- # C28020 and C28204 are introduced by nlohmann/json +- target_compile_options(azure-storage-common PUBLIC /wd28204 /wd28020) + else() + find_package(LibXml2 REQUIRED) + target_include_directories(azure-storage-common SYSTEM PRIVATE ${LIBXML2_INCLUDE_DIRS}) diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index bc1ef6918562fe..e89fddc12d43bd 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-storage-common_12.4.0 SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd + PATCHES + fix-clang-on-windows.patch ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 3040c4efb2a1bf..a15b3debe9bb7a 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-common-cpp", "version-semver": "12.4.0", - "port-version": 1, + "port-version": 2, "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index ad6670f7c6b01c..c054c896a18907 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a12fa7967664e0823c8ab1be3ef80ba4faf9245", + "version-semver": "12.4.0", + "port-version": 2 + }, { "git-tree": "973a9aaaa49d33f6afdac2337795bd2ee26bbf7e", "version-semver": "12.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 22852307a324cd..e45629b7d9b9ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -478,7 +478,7 @@ }, "azure-storage-common-cpp": { "baseline": "12.4.0", - "port-version": 1 + "port-version": 2 }, "azure-storage-cpp": { "baseline": "7.5.0", From a85d30769f4cfe6fb3fb0dbdd84e2ffde28c49c7 Mon Sep 17 00:00:00 2001 From: Silver Zachara Date: Sun, 5 Nov 2023 18:16:23 +0100 Subject: [PATCH 0286/1039] [tinyorm] added initial port TinyORM v0.36.5 (#34640) * [tinyorm] added initial port TinyORM v0.36.5 * [tinyorm] updated to v0.36.5 Updated version database for TinyORM v0.36.5. --- ports/tinyorm/portfile.cmake | 39 +++++++++++++ ports/tinyorm/vcpkg.json | 106 +++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++ versions/t-/tinyorm.json | 9 +++ 4 files changed, 158 insertions(+) create mode 100644 ports/tinyorm/portfile.cmake create mode 100644 ports/tinyorm/vcpkg.json create mode 100644 versions/t-/tinyorm.json diff --git a/ports/tinyorm/portfile.cmake b/ports/tinyorm/portfile.cmake new file mode 100644 index 00000000000000..eeb21ca3a2ec2b --- /dev/null +++ b/ports/tinyorm/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO silverqx/TinyORM + REF v0.36.5 + SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183 + HEAD_REF main +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + PREFIX TINYORM + FEATURES + disable-thread-local DISABLE_THREAD_LOCAL + inline-constants INLINE_CONSTANTS + mysql-ping MYSQL_PING + orm ORM + strict-mode STRICT_MODE + tom TOM + tom-example TOM_EXAMPLE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_EXPORT_PACKAGE_REGISTRY:BOOL=OFF + -DBUILD_TESTS:BOOL=OFF + -DTINY_PORT:STRING=${PORT} + -DTINY_VCPKG:BOOL=ON + -DVERBOSE_CONFIGURE:BOOL=ON + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +if(TINYORM_TOM_EXAMPLE) + vcpkg_copy_tools(TOOL_NAMES tom AUTO_CLEAN) +endif() diff --git a/ports/tinyorm/vcpkg.json b/ports/tinyorm/vcpkg.json new file mode 100644 index 00000000000000..281f79ec679a28 --- /dev/null +++ b/ports/tinyorm/vcpkg.json @@ -0,0 +1,106 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "tinyorm", + "version-semver": "0.36.5", + "maintainers": "Silver Zachara ", + "description": "Modern C++ ORM library for Qt framework", + "homepage": "https://github.com/silverqx/TinyORM", + "documentation": "https://www.tinyorm.org", + "license": "MIT", + "supports": "!(uwp | arm | android | emscripten | osx | ios | xbox | freebsd | openbsd | wasm32)", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + }, + "range-v3", + "tabulate", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "orm", + "sql-sqlite", + "tom" + ], + "features": { + "disable-thread-local": { + "description": "Remove all thread_local storage duration specifiers (disables multi-threading support)" + }, + "inline-constants": { + "description": "Use inline constants instead of extern constants in shared builds" + }, + "mysql-ping": { + "description": "Install MySQL C client library (libmysql) to support the mysql_ping()", + "dependencies": [ + "libmysql" + ] + }, + "orm": { + "description": "Enable ORM-related source code (without it only the query builder is compiled)" + }, + "sql-mysql": { + "description": "Build Qt SQL Driver for MySQL", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql-mysql" + ] + } + ] + }, + "sql-psql": { + "description": "Build Qt SQL Driver for PostgreSQL", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql-psql" + ] + } + ] + }, + "sql-sqlite": { + "description": "Build Qt SQL Driver for SQLite", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql-sqlite" + ] + } + ] + }, + "strict-mode": { + "description": "Propagate strict compiler/linker options and Qt definitions" + }, + "tom": { + "description": "Enable Tom-related source code (command-line interface)" + }, + "tom-example": { + "description": "Build Tom command-line application example", + "dependencies": [ + { + "name": "tinyorm", + "default-features": false, + "features": [ + "tom" + ] + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index e45629b7d9b9ad..8fac3be9b1fbef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8420,6 +8420,10 @@ "baseline": "2.0.0-rc9", "port-version": 0 }, + "tinyorm": { + "baseline": "0.36.5", + "port-version": 0 + }, "tinyply": { "baseline": "2.3.4", "port-version": 0 diff --git a/versions/t-/tinyorm.json b/versions/t-/tinyorm.json new file mode 100644 index 00000000000000..257131a6367370 --- /dev/null +++ b/versions/t-/tinyorm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b21b31342cfe5d58cce629fab598e6f968e5118e", + "version-semver": "0.36.5", + "port-version": 0 + } + ] +} From 795111ff31e2b9f87fa4fecf689d4ca16a616188 Mon Sep 17 00:00:00 2001 From: Evgeny Karpov Date: Sun, 5 Nov 2023 18:34:01 +0100 Subject: [PATCH 0287/1039] [OpenSSL] Enabling Arm64 assembly on Windows by using clang (#34711) * * Enable Arm64 assembly optimization on Windows by using clang * * find and add clang folder to the patch * * update version * * refactor based on the review * * update version * * fix arm64_uwp build * * update version * * fix arm64_uwp build * * update version * * refactoring * * update version * * use clang c_flags only for clang on Arm64 * * update version * * update version --- ports/openssl/vcpkg.json | 1 + ports/openssl/windows/portfile.cmake | 34 +++++++++++++++++++++++----- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 ++++ 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 5d92de745da905..d4ec96caa43bef 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.1.4", + "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 c1ce2774536a36..d992bc28766770 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(OPENSSL_ARCH VC-WIN32) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") @@ -13,7 +16,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(OPENSSL_ARCH VC-WIN32-ARM) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(OPENSSL_ARCH VC-WIN64-ARM) + if(VCPKG_TARGET_IS_UWP) + set(OPENSSL_ARCH VC-WIN64-ARM) + elseif(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang") + set(OPENSSL_ARCH VC-CLANG-WIN64-CLANGASM-ARM) + else() + set(OPENSSL_ARCH VC-WIN64-CLANGASM-ARM) + endif() else() message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() @@ -33,17 +42,30 @@ endif() cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native) -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") - # Clang always uses /Z7; Patching /Zi /Fd out of openssl requires more work. set(OPENSSL_BUILD_MAKES_PDBS ON) if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(OPENSSL_BUILD_MAKES_PDBS OFF) endif() -cmake_path(NATIVE_PATH NASM NORMALIZE as) -cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND NOT VCPKG_TARGET_IS_UWP) + vcpkg_find_acquire_program(CLANG) + set(clang "${CLANG}") + cmake_path(GET clang PARENT_PATH clang_path) + vcpkg_add_to_path("${clang_path}") + + set(as clang-cl) + + vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc") + if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang") + string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " --target=aarch64-win32-msvc") + string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " --target=aarch64-win32-msvc") + endif() +else() + cmake_path(NATIVE_PATH NASM NORMALIZE as) + cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc) +endif() + cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_AR NORMALIZE ar) cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_LINKER NORMALIZE ld) diff --git a/versions/baseline.json b/versions/baseline.json index 8fac3be9b1fbef..71edf80f223efd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6274,7 +6274,7 @@ }, "openssl": { "baseline": "3.1.4", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 80f3672b2e43ea..f1a26dbda41b3e 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ee74387a1dd212dc9754c614809ff86bd0638fa", + "version": "3.1.4", + "port-version": 1 + }, { "git-tree": "3dc34c6428cc5a086a56695e0e0e8c2363e029b5", "version": "3.1.4", From 0f0fa15383f4ef0437940b1be287d4e217400db2 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 6 Nov 2023 01:41:32 +0800 Subject: [PATCH 0288/1039] [tomlplusplus] update to 3.4.0 (#34920) * [tomlplusplus] update to 3.4.0 * [tomlplusplus] update to 3.4.0 --- ports/tomlplusplus/fix-android-fileapi.patch | 4 ++-- ports/tomlplusplus/portfile.cmake | 2 +- ports/tomlplusplus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tomlplusplus.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/tomlplusplus/fix-android-fileapi.patch b/ports/tomlplusplus/fix-android-fileapi.patch index 43f526e7c21b71..7d78bf7244a5fc 100644 --- a/ports/tomlplusplus/fix-android-fileapi.patch +++ b/ports/tomlplusplus/fix-android-fileapi.patch @@ -1,9 +1,9 @@ diff --git a/include/toml++/impl/parser.inl b/include/toml++/impl/parser.inl -index 27de2b0..bb2fb46 100644 +index 6f0136f..be37f0d 100644 --- a/include/toml++/impl/parser.inl +++ b/include/toml++/impl/parser.inl @@ -23,6 +23,12 @@ - #include "unicode.h" + #include "unicode.hpp" TOML_DISABLE_WARNINGS; #include + diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index 2cce3ab5dea488..25cb4544c60b55 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus REF "v${VERSION}" - SHA512 6ab2de83b7fc44de40e58a47c28a9507bf7c50fa9b08925b5a6d48958868a86e6790aff684d29ceb50ad18905e3832840719e1b7bfec3b8a0c00b15bb0f70f38 + SHA512 c227fc8147c9459b29ad24002aaf6ab2c42fac22ea04c1c52b283a0172581ccd4527b33c1931e0ef0d1db6b6a53f9e9882c6d4231c7f3494cf070d0220741aa5 HEAD_REF master PATCHES fix-android-fileapi.patch diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json index 73673a29c196e3..bdde65521ad65a 100644 --- a/ports/tomlplusplus/vcpkg.json +++ b/ports/tomlplusplus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tomlplusplus", - "version": "3.3.0", + "version": "3.4.0", "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 71edf80f223efd..5a460703d8d8aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8493,7 +8493,7 @@ "port-version": 0 }, "tomlplusplus": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "torch-th": { diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index 04996f96f9e48b..98b0f86af7a6b2 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9866e66fa79aa1addd508e672062392313fc6085", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "e5d2f60be4fafc9cf2f8a9fbf5b69c8001e7f461", "version": "3.3.0", From 0a5f2f028f2a7625bcbca41b5f74fcf3c1207400 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 6 Nov 2023 01:42:41 +0800 Subject: [PATCH 0289/1039] [materialx] update to 1.38.8 (#34919) * [materialx] update to 1.38.8 * [materialx] update to 1.38.8 --- ports/materialx/portfile.cmake | 4 ++-- ports/materialx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/materialx.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/materialx/portfile.cmake b/ports/materialx/portfile.cmake index da56e07be004d4..f4e619f15aec69 100644 --- a/ports/materialx/portfile.cmake +++ b/ports/materialx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/MaterialX - REF b1ba83b312576fc58f02a6a7db40b18ddbe4f87f # 1.38.4 - SHA512 3988c42d487e391f9f0f3ab5f34eaa26c7f450079695d96954b871e078eecfe692daa9917279560ba3f10bf771685df3da6e26273d575a23a11c3d17fb897c62 + REF "v${VERSION}" + SHA512 64d5b989fdddfd9d1b21f9dccf914d2674a23c9fd9d24f121ff451ab333e359dc8ab253f72827d68cd2ed59b0c03a51818cc71aa2adf5adfe74eabe0fd58c682 HEAD_REF main ) diff --git a/ports/materialx/vcpkg.json b/ports/materialx/vcpkg.json index 60fc20236cf118..cdeb95db34a558 100644 --- a/ports/materialx/vcpkg.json +++ b/ports/materialx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "materialx", - "version": "1.38.4", + "version": "1.38.8", "description": "MaterialX is an open standard for the exchange of rich material and look-development content across applications and renderers.", "homepage": "https://www.materialx.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5a460703d8d8aa..ca1bff82f5549b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5397,7 +5397,7 @@ "port-version": 0 }, "materialx": { - "baseline": "1.38.4", + "baseline": "1.38.8", "port-version": 0 }, "mathc": { diff --git a/versions/m-/materialx.json b/versions/m-/materialx.json index b2b5b234626189..4d6eb2c12beca4 100644 --- a/versions/m-/materialx.json +++ b/versions/m-/materialx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8895aa1059cf4106a82265c242871ae6db5b815", + "version": "1.38.8", + "port-version": 0 + }, { "git-tree": "f0dc3a4ac664a5b4fe18a946a35965b519c148e7", "version": "1.38.4", From 9739a8874bbed50036d0c25f13690b771d62da33 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 6 Nov 2023 01:44:17 +0800 Subject: [PATCH 0290/1039] [maddy] update to 1.3.0 (#34916) * [maddy] update to 1.3.0 * [maddy] update to 1.3.0 --- ports/maddy/portfile.cmake | 2 +- ports/maddy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/maddy.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/maddy/portfile.cmake b/ports/maddy/portfile.cmake index ff17336386ff24..ea622127c8c93f 100644 --- a/ports/maddy/portfile.cmake +++ b/ports/maddy/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO progsource/maddy REF "${VERSION}" - SHA512 a99d0d5db1ada9d6238b714d90d9146fbb49f76ef150f180ea19e554eb15463ca4dfbece289cff501a48e72445757059a6cc4629a20ac3c7756ac10fc93d097d + SHA512 7c8b7570fcb73901f605f1c33bd3459ab1775e375a013cf1d92c8e8381880bfaeb895c7eac244429f67953cc039999d07c4c0fb6c3a5edfe8af32ef0d89ed294 HEAD_REF master ) diff --git a/ports/maddy/vcpkg.json b/ports/maddy/vcpkg.json index 40154169e9f3a6..244caf04975390 100644 --- a/ports/maddy/vcpkg.json +++ b/ports/maddy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "maddy", - "version": "1.2.0", + "version": "1.3.0", "description": "C++ Markdown to HTML header-only parser library", "homepage": "https://github.com/progsource/maddy", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ca1bff82f5549b..18b25ec79546e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5313,7 +5313,7 @@ "port-version": 2 }, "maddy": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "magic-enum": { diff --git a/versions/m-/maddy.json b/versions/m-/maddy.json index 2d3e2858376e58..6a4236c56031a2 100644 --- a/versions/m-/maddy.json +++ b/versions/m-/maddy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0cc952f85939e4547be6e9c020903940e282fa1", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "a66b84dc2bc83f2e84ff78021584ca8d7291c258", "version": "1.2.0", From d8079ecd674fe5632277d78d761333467955adb1 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 6 Nov 2023 01:45:05 +0800 Subject: [PATCH 0291/1039] [llhttp] update to 9.1.3 (#34915) * [llhttp] update to 9.1.3 * [llhttp] update to 9.1.3 --- ports/llhttp/portfile.cmake | 2 +- ports/llhttp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llhttp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/llhttp/portfile.cmake b/ports/llhttp/portfile.cmake index 96925d8eeae10d..0e85e7e3972a06 100644 --- a/ports/llhttp/portfile.cmake +++ b/ports/llhttp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/llhttp REF refs/tags/release/v${VERSION} - SHA512 d3e2c45f631e8bbc5b4b72f931a1af3e7b4f9d2851856a3c797577a3c261c7da15606efe41ff6b4f26713274f44eb3086019711461cb6bbe04e561b20af40a6f + SHA512 971ec2cb403942bc43e4b67a6dd392bca10d4233a25f453550d9f2bfbcb9572df309bde77af030e94e2af840aec1d96de164df0cbb1183bb2f5623e8fcf3162c PATCHES fix-usage.patch ) diff --git a/ports/llhttp/vcpkg.json b/ports/llhttp/vcpkg.json index f1822b1146b2e3..af11772150263a 100644 --- a/ports/llhttp/vcpkg.json +++ b/ports/llhttp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "llhttp", - "version": "9.1.2", + "version": "9.1.3", "description": "Port of http_parser to llparse.", "homepage": "https://github.com/nodejs/llhttp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 18b25ec79546e7..c5f4b4bb8e324f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5181,7 +5181,7 @@ "port-version": 0 }, "llhttp": { - "baseline": "9.1.2", + "baseline": "9.1.3", "port-version": 0 }, "llvm": { diff --git a/versions/l-/llhttp.json b/versions/l-/llhttp.json index f41cef35e11ea2..1a12b26f0f4842 100644 --- a/versions/l-/llhttp.json +++ b/versions/l-/llhttp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3422384dc0ec7e58827c138826bb666efe850eaa", + "version": "9.1.3", + "port-version": 0 + }, { "git-tree": "3a46d3c8233039a700b07997705cc2a49d832e15", "version": "9.1.2", From 97fff3d9ff0edee7a48f7b3e4ade79bea288e859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 6 Nov 2023 18:38:28 +0100 Subject: [PATCH 0292/1039] [quill] Update to 3.4.0 (#34921) * [quill] Update to 3.4.0 * [quill] Update version files * [quill] Fix version tag * [quill] Update version files * [quill] Enable android build * [quill] Update version files * [quill] Disable thread name support on android build * [quill] Update version files --- ports/quill/portfile.cmake | 10 +++++++++- ports/quill/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index d88fe8a352bd84..8353285c6b247d 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,14 +4,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 b59316c4c2f0544ce88059440950f1457522eebe2efe2eed1ad1b3000e5016dd641a3157fbd2491ba7d558dc281d52f6f6e30892fa87e7a2716c86e1e17387d2 + SHA512 bd42bdb9a377a02aa9d807f26c38d560ae75faca76314cf9c18baeca354e09a5ac4e81ab854ffd7f4715828b39a7e6aef3c67d0d425f983e38b80254b0eeeede HEAD_REF master ) +if(VCPKG_TARGET_IS_ANDROID) + set(ADDITIONAL_OPTIONS -DQUILL_NO_THREAD_NAME_SUPPORT=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DQUILL_FMT_EXTERNAL=ON + ${ADDITIONAL_OPTIONS} ) vcpkg_cmake_install() @@ -28,6 +33,9 @@ endif() vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_NO_THREAD_NAME_SUPPORT" "#define QUILL_NO_THREAD_NAME_SUPPORT") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 2a057aac3be2ae..8203610053cc14 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,10 +1,9 @@ { "name": "quill", - "version": "3.3.1", + "version": "3.4.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", - "supports": "!android", "dependencies": [ "fmt", { diff --git a/versions/baseline.json b/versions/baseline.json index c5f4b4bb8e324f..d8fe00d01f678e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7241,7 +7241,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.3.1", + "baseline": "3.4.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 91eded3def1744..b734ba490a73ea 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97fc8d7f2a2d08df4f1f8b9d69a9e1d28e66aecc", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "06ce851a1057845ec0b0eb879eb49e208a2c319e", "version": "3.3.1", From b182703f4ca6fa6cfcb5bfe9a9f5ff0e948f0b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Mon, 6 Nov 2023 17:38:52 +0000 Subject: [PATCH 0293/1039] [Glaze] Update 1.5.7 (#34895) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Glaze update 1.5.7 * Update database --------- Co-authored-by: Ómar Högni Guðmarsson --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index d5479e2e23ac79..69af319aa7ef37 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 88bf8f152d0dbce38e97160a9fa0a5b1f708213d8b80e2c771ce981e6abfeecf4daa09d79b582b3b7c3ba6f932ff5fada9965a4db5d30db956f7d6152686f002 + SHA512 4b9fb73790892cb7543ee94e773ff706f9fad46cd95c472b68d1f535413bc2b46c2d36970cbe31858444a5463ec19215ef50f4c37e8efe5f4f23c61acf7a53ed ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 046cb2b2cde844..1fb63116ca7981 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.5.6", + "version": "1.5.7", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d8fe00d01f678e..fafad438202d61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2961,7 +2961,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.5.6", + "baseline": "1.5.7", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index cd9499ab047ddd..0d453eb2fe926d 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50a00a801ec368382628caa2da7c8a0f09815456", + "version": "1.5.7", + "port-version": 0 + }, { "git-tree": "4146e402c56c4d3678ccf0fc30a303fe4a628bcb", "version": "1.5.6", From 3cfc04290525e107d4e9b550c75def1c4b5bb244 Mon Sep 17 00:00:00 2001 From: sean <43609023+spnda@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:54:39 +0100 Subject: [PATCH 0294/1039] [fastgltf] Update to 0.6.1 (#34833) * [fastgltf] Update to 0.6.1 * Versions --- ports/fastgltf/portfile.cmake | 2 +- ports/fastgltf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fastgltf.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fastgltf/portfile.cmake b/ports/fastgltf/portfile.cmake index 4572e199a003db..2e4ebee6db1b56 100644 --- a/ports/fastgltf/portfile.cmake +++ b/ports/fastgltf/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO spnda/fastgltf REF "v${VERSION}" - SHA512 85b946f9ea849bcbbb77ff5d4dc8196d3348757cf6a940be1a50923158a31aa7b43aebed2799256cb3d303a81fa28e5eaeb000b6ecca3ab15f6a7a20908d8e8f + SHA512 6cda7e50d7fe01428e0a03d3f590fe7b680bfa4b6fcdbd1c6a118ac01c925099e63b34380b053adc323e2aaaaead42bda450d1eaf66b60af6ad2aafb68828d01 HEAD_REF main PATCHES find_package.patch ) diff --git a/ports/fastgltf/vcpkg.json b/ports/fastgltf/vcpkg.json index 7030e916ab0c1e..0f1bc1fce8bb75 100644 --- a/ports/fastgltf/vcpkg.json +++ b/ports/fastgltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastgltf", - "version": "0.5.0", + "version": "0.6.1", "port-version": 1, "description": "Blazing fast C++17 glTF 2.0 loader powered by SIMD", "homepage": "https://github.com/spnda/fastgltf", diff --git a/versions/baseline.json b/versions/baseline.json index fafad438202d61..ad79397b73c51d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2545,7 +2545,7 @@ "port-version": 4 }, "fastgltf": { - "baseline": "0.5.0", + "baseline": "0.6.1", "port-version": 1 }, "fastio": { diff --git a/versions/f-/fastgltf.json b/versions/f-/fastgltf.json index 68de5d225b8b5e..12206cd57e9e5f 100644 --- a/versions/f-/fastgltf.json +++ b/versions/f-/fastgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b098e0b272a75e2c12b898a54b6b83a49f981599", + "version": "0.6.1", + "port-version": 1 + }, { "git-tree": "28cc725ac91ea72117083d152661ba131f8bca94", "version": "0.5.0", From 21fb5a698c73a483baa0b5ec3f9fcaa34ce97097 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:22:30 +0100 Subject: [PATCH 0295/1039] [magnum] remove empty dirs (#34900) --- ports/magnum/portfile.cmake | 12 ++++++++++++ ports/magnum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magnum.json | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index ee7f0710a2b91b..8039763b62f01c 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -142,6 +142,18 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters") + + # remove maybe empty dirs + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/importers/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/importers") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/importers") + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d") + endif() + endif() endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum") diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index cc3f4009feea17..b6f94bc1ffa0c3 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 15, + "port-version": 16, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index ad79397b73c51d..61df89894f075a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5326,7 +5326,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 15 + "port-version": 16 }, "magnum-extras": { "baseline": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index cfb379a8d799e9..8377599b6ac4b0 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d923e5792a77042485ffd4b32afecca23f18c7d9", + "version-string": "2020.06", + "port-version": 16 + }, { "git-tree": "b1b8f84dd450902aec2b555eb577dfd2a0129592", "version-string": "2020.06", From 7f2b751214f4b43e7bcc2c23cce57736c2cf9675 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 7 Nov 2023 02:24:23 +0800 Subject: [PATCH 0296/1039] [mailio] update to 0.23.0 (#34917) * [mailio] update to 0.23.0 * [mailio] update to 0.23.0 * [mailio] add post valid * fix lib type * fix version * remove boost-test deps * remove boost-test deps * fix portfile patch name --- ...rary-type-and-remove-boost-test-deps.patch | 22 +++++++++++++++++++ ports/mailio/portfile.cmake | 7 ++++-- ports/mailio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/mailio.json | 5 +++++ 5 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 ports/mailio/fix-library-type-and-remove-boost-test-deps.patch diff --git a/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch b/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch new file mode 100644 index 00000000000000..b6df34610a7884 --- /dev/null +++ b/ports/mailio/fix-library-type-and-remove-boost-test-deps.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3b30fd..3828816 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,7 @@ if(WIN32) + set(Boost_USE_STATIC_LIBS ON) + endif(WIN32) + +-find_package(Boost REQUIRED COMPONENTS system date_time regex unit_test_framework) ++find_package(Boost REQUIRED COMPONENTS system date_time regex) + find_package(OpenSSL) + set(CMAKE_THREAD_PREFER_PTHREAD) + # "Use of both the imported target as well as this switch is highly recommended for new code." +@@ -123,7 +123,7 @@ if (MAILIO_BUILD_SHARED_LIBRARY) + else() + set(LIBRARY_TYPE "STATIC") + endif() +-add_library(${PROJECT_NAME} ${LIBRARY_TYPE} ${project_sources} ${project_headers}) ++add_library(${PROJECT_NAME} ${project_sources} ${project_headers}) + + + # pkg-config support diff --git a/ports/mailio/portfile.cmake b/ports/mailio/portfile.cmake index 9171b35eae0449..9c8390f6175644 100644 --- a/ports/mailio/portfile.cmake +++ b/ports/mailio/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO karastojko/mailio - REF cc887a7808d9c55e07c8a7503c7ae2e2d7485120 # version_0-21-0 - SHA512 7125bfe4274e1e126e335b2e4b5743ef54d5dc0b6fd83f0c10e7578b57924d3e398af6b3865fdee3de587e2e2d7c33d95dbe017b1966649e68cf52f2dd268ee5 + REF "${VERSION}" + SHA512 e1eee9f5b80dab16017af475b8c13f8278fa3d73e1c446e507dc122cb3df5b984b41c04d753e36cf848dd15029524f95cf48e050cee265c8933b0be1ea500a5d HEAD_REF master + PATCHES fix-library-type-and-remove-boost-test-deps.patch ) vcpkg_cmake_configure( @@ -11,6 +12,7 @@ vcpkg_cmake_configure( OPTIONS -DMAILIO_BUILD_DOCUMENTATION=OFF -DMAILIO_BUILD_EXAMPLES=OFF + -DMAILIO_BUILD_TESTS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup( @@ -20,4 +22,5 @@ vcpkg_cmake_config_fixup( vcpkg_fixup_pkgconfig() 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/mailio/vcpkg.json b/ports/mailio/vcpkg.json index c2f639f9e8c6d0..8a0b1000ebf003 100644 --- a/ports/mailio/vcpkg.json +++ b/ports/mailio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mailio", - "version": "0.21.0", - "port-version": 2, + "version": "0.23.0", "maintainers": "Tomislav Karastojković ", "description": "mailio is a cross platform C++ library for MIME format and SMTP, POP3 and IMAP protocols. It is based on the standard C++ 17 and Boost library.", "homepage": "https://github.com/karastojko/mailio", diff --git a/versions/baseline.json b/versions/baseline.json index 61df89894f075a..7b7e42d73bee96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5341,8 +5341,8 @@ "port-version": 11 }, "mailio": { - "baseline": "0.21.0", - "port-version": 2 + "baseline": "0.23.0", + "port-version": 0 }, "makeid": { "baseline": "1.0.3", diff --git a/versions/m-/mailio.json b/versions/m-/mailio.json index 50519329663047..6f3b93064c32da 100644 --- a/versions/m-/mailio.json +++ b/versions/m-/mailio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33d20bc50f33f690863c4b8cce28d16123762ab7", + "version": "0.23.0", + "port-version": 0 + }, { "git-tree": "a9f20b309b2d9f68c5e10eb193ef19c3c51a3faa", "version": "0.21.0", From 7e9a45fb489492f7ed4409665634e6e6ac460c31 Mon Sep 17 00:00:00 2001 From: Ahsan <34895037+ahsanabbas123@users.noreply.github.com> Date: Mon, 6 Nov 2023 18:27:19 +0000 Subject: [PATCH 0297/1039] [rmqcpp] Add port for rmqcpp - a C++ RabbitMQ Client Library (#34797) * Add rmqcpp port * Add rmqcpp versions metadata * Update REF to latest * Update git-tree --- ports/rmqcpp/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/rmqcpp/usage | 4 ++++ ports/rmqcpp/vcpkg.json | 36 ++++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rmqcpp.json | 9 +++++++++ 5 files changed, 82 insertions(+) create mode 100644 ports/rmqcpp/portfile.cmake create mode 100644 ports/rmqcpp/usage create mode 100644 ports/rmqcpp/vcpkg.json create mode 100644 versions/r-/rmqcpp.json diff --git a/ports/rmqcpp/portfile.cmake b/ports/rmqcpp/portfile.cmake new file mode 100644 index 00000000000000..2e8b3e4c711812 --- /dev/null +++ b/ports/rmqcpp/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bloomberg/rmqcpp + REF 52e583c2eb3f06707ce5fde7f29089b17428f6b2 + SHA512 c4232f37e7bc61d0cc77c52a1283fefc1a7925b4ef8cfbe9b404393540c773feabdc2ad3adc263beb06fe079cbf22010bf1551e15eb2f55b1347f6d8c8f35f8b + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBDE_BUILD_TARGET_CPP17=ON + -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD_REQUIRED=ON + -DBDE_BUILD_TARGET_SAFE=ON + -DCMAKE_INSTALL_LIBDIR=lib64 +) + +vcpkg_cmake_build() + +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/rmqcpp/usage b/ports/rmqcpp/usage new file mode 100644 index 00000000000000..23f17565a077e3 --- /dev/null +++ b/ports/rmqcpp/usage @@ -0,0 +1,4 @@ +rmqcpp provides CMake targets: + + find_package(rmqcpp REQUIRED) + target_link_libraries(main PRIVATE rmqcpp::rmq) diff --git a/ports/rmqcpp/vcpkg.json b/ports/rmqcpp/vcpkg.json new file mode 100644 index 00000000000000..3cf1f4f184a20d --- /dev/null +++ b/ports/rmqcpp/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "rmqcpp", + "version": "1.0.0", + "description": "rmqcpp - A C++ library for RabbitMQ.", + "dependencies": [ + { + "name": "bde", + "host": true, + "version>=": "3.123.0.0" + }, + { + "name": "boost-asio", + "host": true + }, + { + "name": "boost-iostreams", + "host": true + }, + { + "name": "gtest", + "host": true + }, + { + "name": "openssl", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7b7e42d73bee96..b53b807594c073 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7456,6 +7456,10 @@ "baseline": "5.1", "port-version": 0 }, + "rmqcpp": { + "baseline": "1.0.0", + "port-version": 0 + }, "roaring": { "baseline": "0.9.6", "port-version": 0 diff --git a/versions/r-/rmqcpp.json b/versions/r-/rmqcpp.json new file mode 100644 index 00000000000000..8b38d63717ccba --- /dev/null +++ b/versions/r-/rmqcpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "version": "1.0.0", + "port-version": 0, + "git-tree": "3ad0bdbdcfd0050a646feb6586d8c13931f8e602" + } + ] +} From 431168e0f0411cb9d75450d88f9d72ff721de989 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Mon, 6 Nov 2023 19:28:56 +0100 Subject: [PATCH 0298/1039] [sciter-js] Update to 5.0.3.0 (#34759) * Update sciter-js to 5.0.2.26 * Update sciter-js to 5.0.2.26 * Update sciter-js to 5.0.3.0 --- ports/sciter-js/portfile.cmake | 4 ++-- ports/sciter-js/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sciter-js.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake index 6039e537449bd8..a8e0a0d88f5042 100644 --- a/ports/sciter-js/portfile.cmake +++ b/ports/sciter-js/portfile.cmake @@ -6,8 +6,8 @@ endif() set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION c039754b11eb3b3b39024ba3257a28a63d581c7e) -set(SCITER_SHA 77314cb55a01ceca39f00382e78ba65507d439b9302e97dae6f5bf10d7bc308df64d440dc97c9f90c06176121710102a75767d706972700f5b4f968e9740dc96) +set(SCITER_REVISION 6f18e8725a8d14b8ba44b2c0d00ca126f119ed21) +set(SCITER_SHA 93fdc1046b325ba7bf705665cb09f9adab3c198d4e8cb40febd4ccffe48077760907440c8eb7d7d44e1f619184bc070835c5c3d5aada363eb70528b8259aa74f) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json index 0809bc5b400f96..a03197a14f4ab3 100644 --- a/ports/sciter-js/vcpkg.json +++ b/ports/sciter-js/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sciter-js", - "version": "5.0.2.17", + "version": "5.0.3.0", "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", "homepage": "https://gitlab.com/sciter-engine/sciter-js-sdk", "supports": "!uwp & !arm & !static", diff --git a/versions/baseline.json b/versions/baseline.json index b53b807594c073..b1a9468be4146e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7617,7 +7617,7 @@ "port-version": 1 }, "sciter-js": { - "baseline": "5.0.2.17", + "baseline": "5.0.3.0", "port-version": 0 }, "scnlib": { diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json index 8eba0c9ca205a6..6e98787a287122 100644 --- a/versions/s-/sciter-js.json +++ b/versions/s-/sciter-js.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae9c6653c9c58a2fa2a2e8023206029bf0d90805", + "version": "5.0.3.0", + "port-version": 0 + }, { "git-tree": "ba302b640aa47ee3768bae1daa0ac5477081e52a", "version": "5.0.2.17", From 472c17c838797829b59a063994fb7d349af28512 Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 6 Nov 2023 20:36:32 +0200 Subject: [PATCH 0299/1039] [ogre next] update to 2.3.2 (#34902) * update ogre-next to 2.3.2 * fix gz-cmake3 for windows * Fix pc static * fix RenderSystems include * remove conflict with ogre --- ports/gz-cmake3/dependencies.patch | 36 +++++++++++++-------------- ports/gz-cmake3/vcpkg.json | 2 +- ports/ogre-next/fix-pc-file.patch | 21 ++++++++++++++++ ports/ogre-next/portfile.cmake | 21 +++++++--------- ports/ogre-next/toolchain_fixes.patch | 27 ++++++++++++-------- ports/ogre-next/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 11 -------- versions/baseline.json | 6 ++--- versions/g-/gz-cmake3.json | 5 ++++ versions/o-/ogre-next.json | 5 ++++ 10 files changed, 79 insertions(+), 58 deletions(-) create mode 100644 ports/ogre-next/fix-pc-file.patch diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch index 0784d88c232f3b..f00a50741a03b9 100644 --- a/ports/gz-cmake3/dependencies.patch +++ b/ports/gz-cmake3/dependencies.patch @@ -120,24 +120,11 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake +if (NOT WIN32) set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH}) - foreach (GZ_OGRE2_PROJECT_NAME "OGRE2" "OGRE-Next") -+ foreach (GZ_OGRE2_PROJECT_NAME "OGRE") ++ foreach (GZ_OGRE2_PROJECT_NAME "OGRE-Next") message(STATUS "Looking for OGRE using the name: ${GZ_OGRE2_PROJECT_NAME}") if (GZ_OGRE2_PROJECT_NAME STREQUAL "OGRE2") set(OGRE2_INSTALL_PATH "OGRE-2.${GzOGRE2_FIND_VERSION_MINOR}") # For OGRE 2.3 debs built via OpenRobotics buildfarms, we use OgreNext -@@ -159,10 +159,10 @@ - set(OGRE2LIBNAME "Ogre") - endif() - else() - # This matches OGRE2.2 debs built in upstream Ubuntu -- set(OGRE2_INSTALL_PATH "OGRE-Next") -- set(OGRE2LIBNAME "OgreNext") -+ set(OGRE2_INSTALL_PATH "OGRE") -+ set(OGRE2LIBNAME "Ogre") - endif() - - # Note: OGRE2 installed from debs is named OGRE-2.2 while the version - # installed from source does not have the 2.2 suffix @@ -172,8 +172,9 @@ if (${GZ_OGRE2_PROJECT_NAME}_FOUND) set(GZ_PKG_NAME ${OGRE2_INSTALL_PATH}) @@ -172,13 +159,13 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake + list(APPEND OGRE2_PATHS "${_rootPath}/lib/") + list(APPEND OGRE2_PATHS "${_rootPath}/lib/manual-link/") + endif() -+ list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/OGRE") ++ list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/OGRE-Next") endforeach() + if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(OGRE_MAIN_LIB "OgreMain_d") ++ set(OGRE_MAIN_LIB "OgreNextMain_d") + else() -+ set(OGRE_MAIN_LIB "OgreMain") ++ set(OGRE_MAIN_LIB "OgreNextMain") + endif() + find_library(OGRE2_LIBRARY @@ -188,6 +175,19 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake NO_DEFAULT_PATH) find_path(OGRE2_INCLUDE +@@ -449,10 +461,10 @@ + ${PATH_HINTS} ${COMPONENT} ${OGRE2_SEARCH_VER}/${COMPONENT}) + + find_library(${PREFIX}_LIBRARY + NAMES +- "Ogre${COMPONENT}" +- "Ogre${COMPONENT}_d" ++ "OgreNext${COMPONENT}" ++ "OgreNext${COMPONENT}_d" + HINTS + ${OGRE2_LIBRARY_DIRS} + NO_DEFAULT_PATH) + @@ -509,8 +521,9 @@ ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include) @@ -204,7 +204,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake foreach (dir ${OGRE2_INCLUDE_DIRS}) get_filename_component(dir_name "${dir}" NAME) - if ("${dir_name}" STREQUAL "OGRE-${OGRE2_VERSION_MAJOR}.${OGRE2_VERSION_MINOR}") -+ if ("${dir_name}" STREQUAL "OGRE") ++ if ("${dir_name}" STREQUAL "OGRE-Next") set(dir_include "${dir}/Hlms/Common") if (EXISTS ${dir_include}) list(APPEND component_INCLUDE_DIRS ${dir_include}) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index f8a2c9ed000fc2..8e43122d8b43e0 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gz-cmake3", "version": "3.4.1", - "port-version": 3, + "port-version": 4, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/ogre-next/fix-pc-file.patch b/ports/ogre-next/fix-pc-file.patch new file mode 100644 index 00000000000000..42a18f3882fce3 --- /dev/null +++ b/ports/ogre-next/fix-pc-file.patch @@ -0,0 +1,21 @@ +diff --git a/CMake/Templates/OGREStatic.pc.in b/CMake/Templates/OGREStatic.pc.in +--- a/CMake/Templates/OGREStatic.pc.in ++++ b/CMake/Templates/OGREStatic.pc.in +@@ -1,13 +1,13 @@ + prefix=@OGRE_PREFIX_PATH@ + exec_prefix=${prefix} + libdir=${prefix}/@OGRE_LIB_DIRECTORY@ + includedir=${prefix}/include +-plugindir=${libdir}/OGRE ++plugindir=${libdir}/@OGRE_NEXT_PREFIX@ + +-Name: OGRE (static lib) ++Name: @OGRE_NEXT_PREFIX@ (static lib) + Description: Object-Oriented Graphics Rendering Engine + Version: @OGRE_VERSION@ + URL: http://www.ogre3d.org + Requires: freetype2, zziplib, x11, xt, xaw7, gl +-Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ +-Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@ ++Libs: -L${libdir} -L${plugindir} -l@OGRE_NEXT@Main@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ ++Cflags: -I${includedir} -I${includedir}/@OGRE_NEXT_PREFIX@ @OGRE_CFLAGS@ diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 3a2995283ca888..f394ca1e1d5ed7 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -1,8 +1,3 @@ -# This portfile is based (shamelessly copied and adapted a bit) on 'ogre' portfile. -if (EXISTS "${CURRENT_INSTALLED_DIR}/Media/HLMS/Blendfunctions_piece_fs.glslt") - message(FATAL_ERROR "FATAL ERROR: ogre-next and ogre are incompatible.") -endif() - 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() @@ -11,13 +6,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next REF v${VERSION} - SHA512 62c721680ed77e74b6e1649ab7324bd49fc3c7c2e60ad76a62ec5f899f327d65a140462d75300eac4f41567a8903a748d07a760dc376eddcadf0aeea5a3ca5a7 + SHA512 fbc1969244db07d013118fbce12b319e83cdae93a822cb2d90bbd12108ac3ce48d1f5437b4375b3daf5640b9ec6f1764daeef742161a101f77c3e25ccaf4b154 HEAD_REF master PATCHES toolchain_fixes.patch avoid-name-clashes.patch fix-error-c2039.patch fix-dependencies.patch + fix-pc-file.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -56,6 +52,7 @@ vcpkg_cmake_configure( -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DOGRE_CMAKE_DIR=share/ogre-next + -DOGRE_USE_NEW_PROJECT_NAME=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -78,15 +75,15 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -#Remove OgreMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol +#Remove OgreNextMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol #manual-link subfolder is here to the rescue! if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMain.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMain.lib") else() - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreMainStatic.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMainStatic.lib") endif() file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*") file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*") @@ -97,9 +94,9 @@ if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMain_d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMain_d.lib") else() - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreMainStatic_d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMainStatic_d.lib") endif() file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*") file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*") @@ -111,7 +108,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) file(READ "${SHARE_FILE}" _contents) - string(REPLACE "lib/OgreMain" "lib/manual-link/OgreMain" _contents "${_contents}") + string(REPLACE "lib/OgreNextMain" "lib/manual-link/OgreNextMain" _contents "${_contents}") file(WRITE "${SHARE_FILE}" "${_contents}") endforeach() endif() diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index dc4eeb4343d04f..fdd1c4a784a5ef 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -1,24 +1,21 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index f3a62f2..b53df6f 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt -@@ -13,10 +13,12 @@ +@@ -13,8 +13,10 @@ # 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") +- set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/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") ++ set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake") + endif() endif() - - set(INST_FILES diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake index dd4b179..6f158fc 100644 --- a/CMake/Packages/FindGLSLOptimizer.cmake @@ -156,15 +153,23 @@ index 48af55b..b18ac57 100644 string(REGEX REPLACE "(\r?\n)+$" "" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") else() diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt -index 0424ebb..b019269 100644 --- a/OgreMain/CMakeLists.txt +++ b/OgreMain/CMakeLists.txt -@@ -434,8 +434,6 @@ if (APPLE) - set_target_properties(OgreMain PROPERTIES +@@ -438,7 +438,5 @@ if (APPLE) + set_target_properties(${OGRE_NEXT}Main PROPERTIES LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" ) - - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") - add_custom_command(TARGET OgreMain POST_BUILD - COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading + add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD +diff --git a/RenderSystems/Direct3D11/CMakeLists.txt b/RenderSystems/Direct3D11/CMakeLists.txt +--- a/RenderSystems/Direct3D11/CMakeLists.txt ++++ b/RenderSystems/Direct3D11/CMakeLists.txt +@@ -60,5 +60,5 @@ + target_link_libraries(RenderSystem_Direct3D11 ${AMDAGS_LIBRARIES}) + endif() + + ogre_config_plugin(RenderSystem_Direct3D11) +-install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Direct3D11) ++install(FILES ${HEADER_FILES} DESTINATION include/${OGRE_NEXT_PREFIX}/RenderSystems/Direct3D11) diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index e376b3840101ea..c82432ec448896 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ogre-next", - "version": "2.3.1", - "port-version": 4, + "version": "2.3.2", "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/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 07c320ecc2dec5..bd501e00a067f7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -814,17 +814,6 @@ offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-android=fail ogre:arm64-osx=fail -# Conflicts with ogre -ogre-next:arm64-windows = skip -ogre-next:arm64-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 -ogre-next:x64-windows-static = skip -ogre-next:x64-windows-static-md=skip -ogre-next:x86-windows = skip ois:x64-android=fail # ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency # does not resolve the issue diff --git a/versions/baseline.json b/versions/baseline.json index b1a9468be4146e..66d15196ae4472 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3178,7 +3178,7 @@ }, "gz-cmake3": { "baseline": "3.4.1", - "port-version": 3 + "port-version": 4 }, "gz-common5": { "baseline": "5.4.1", @@ -6097,8 +6097,8 @@ "port-version": 2 }, "ogre-next": { - "baseline": "2.3.1", - "port-version": 4 + "baseline": "2.3.2", + "port-version": 0 }, "ois": { "baseline": "1.5.1", diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index f3d82c51941823..e787660ed87fe1 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0238546ece05d52d030eb6dd62373ae4b65d1503", + "version": "3.4.1", + "port-version": 4 + }, { "git-tree": "5ac0952f283b1e4a700a12c0d616066b36fdeff2", "version": "3.4.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 73beda4bd59edc..52bcb60e289dad 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e79346cd0f83209b8d6b14b8d486971918013ce9", + "version": "2.3.2", + "port-version": 0 + }, { "git-tree": "9005bf2b8f0d060493c44cd2c2f49d411faa2141", "version": "2.3.1", From 1802d3943623b04c02ddb633255897cf66c0ef6f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:59:04 +0100 Subject: [PATCH 0300/1039] [python3] adjust sysconfig include dir to match vcpkg layout (#34888) * [python3] modify sysconfig include dir for vcpkg layout * v db --- .../python3/0018-fix-sysconfig-include.patch | 27 +++++++++++++++++++ ports/python3/portfile.cmake | 1 + ports/python3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/python3.json | 5 ++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 ports/python3/0018-fix-sysconfig-include.patch diff --git a/ports/python3/0018-fix-sysconfig-include.patch b/ports/python3/0018-fix-sysconfig-include.patch new file mode 100644 index 00000000000000..56f3406ab56979 --- /dev/null +++ b/ports/python3/0018-fix-sysconfig-include.patch @@ -0,0 +1,27 @@ +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index ebe371182..e351df7da 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -30,9 +30,9 @@ + 'purelib': '{base}/lib/python{py_version_short}/site-packages', + 'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages', + 'include': +- '{installed_base}/include/python{py_version_short}{abiflags}', ++ '{installed_base}/../../include/python{py_version_short}{abiflags}', + 'platinclude': +- '{installed_platbase}/include/python{py_version_short}{abiflags}', ++ '{installed_platbase}/../../include/python{py_version_short}{abiflags}', + 'scripts': '{base}/bin', + 'data': '{base}', + }, +@@ -51,8 +51,8 @@ + 'platstdlib': '{base}/Lib', + 'purelib': '{base}/Lib/site-packages', + 'platlib': '{base}/Lib/site-packages', +- 'include': '{installed_base}/Include', +- 'platinclude': '{installed_base}/Include', ++ 'include': '{installed_base}/../../include/python{py_version_short}{abiflags}', ++ 'platinclude': '{installed_base}/../../include/python{py_version_short}{abiflags}', + 'scripts': '{base}/Scripts', + 'data': '{base}', + }, diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index cb7472d42a64e0..c7e23e7b61bf54 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,6 +18,7 @@ set(PATCHES 0012-force-disable-curses.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch + 0018-fix-sysconfig-include.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 3d0df6b2310b66..ffe9e3cb152f9c 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version": "3.11.5", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 66d15196ae4472..ac8cd4654f4fca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6806,7 +6806,7 @@ }, "python3": { "baseline": "3.11.5", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index fff69b431aaf5c..01105eabc45e5a 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35", + "version": "3.11.5", + "port-version": 1 + }, { "git-tree": "52f5c3a91d997108f5acebea1748176156dbefc9", "version": "3.11.5", From 8320c3855b99bff793d138809fe26293577b3a39 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 7 Nov 2023 00:31:44 +0400 Subject: [PATCH 0301/1039] [opencv] turn openvino dependency as optional feature (#34889) * [opencv] turn openvino dependency as optional feature * updated version database --- ports/opencv4/portfile.cmake | 5 +---- ports/opencv4/vcpkg.json | 37 +++++++++++++++++++++++++++++++----- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index c7b20c6664c23d..49a609ae9b0642 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -71,6 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "jpeg" WITH_JPEG "lapack" WITH_LAPACK "nonfree" OPENCV_ENABLE_NONFREE + "openvino" WITH_OPENVINO "openexr" WITH_OPENEXR "opengl" WITH_OPENGL "ovis" CMAKE_REQUIRE_FIND_PACKAGE_OGRE @@ -86,13 +87,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) -set(WITH_OPENVINO OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) set(BUILD_opencv_dnn ON) - if(NOT VCPKG_TARGET_IS_UWP) - set(WITH_OPENVINO ON) - endif() else() message(WARNING "The dnn module cannot be enabled on Android") endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 858221b401124e..f09786b801057c 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 8, + "port-version": 9, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -109,10 +109,6 @@ "host": true, "default-features": false }, - { - "name": "openvino", - "platform": "!uwp" - }, "protobuf" ] }, @@ -247,6 +243,37 @@ "openmp": { "description": "Enable openmp support for opencv" }, + "openvino": { + "description": "OpenVINO support for OpenCV DNN", + "supports": "!uwp", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn" + ] + }, + { + "name": "openvino", + "default-features": false, + "features": [ + "auto", + "cpu", + "hetero" + ], + "platform": "!uwp" + }, + { + "name": "openvino", + "default-features": false, + "features": [ + "gpu" + ], + "platform": "x64 & !(osx | uwp) & !static" + } + ] + }, "ovis": { "description": "opencv_ovis module", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ac8cd4654f4fca..e4836082d3bd1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6198,7 +6198,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 8 + "port-version": 9 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index a7aa4d6348c3bf..5c58f663244772 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10", + "version": "4.8.0", + "port-version": 9 + }, { "git-tree": "48c97b54fceaef9a96d374693f47e3ea91383f3c", "version": "4.8.0", From 01acfdfde3ed99280d3883a8fccd5fa4408f5214 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 6 Nov 2023 21:34:58 +0100 Subject: [PATCH 0302/1039] [websocketpp] fix cpp20.patch (#34898) cpp20.patch backports the patch [0] from the upstream repo but is incomplete as it left out the part for websocketpp/roles/server_endpoint.hpp. [0] https://github.com/zaphoyd/websocketpp/commit/3197a520eb4c1e4754860441918a5930160373eb --- ports/websocketpp/cxx20.patch | 27 +++++++++++++++++++++++++++ ports/websocketpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/websocketpp.json | 5 +++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ports/websocketpp/cxx20.patch b/ports/websocketpp/cxx20.patch index 34283e2b18dc37..f70919d6dd75e0 100644 --- a/ports/websocketpp/cxx20.patch +++ b/ports/websocketpp/cxx20.patch @@ -64,3 +64,30 @@ index 8451413..4c9d836 100644 : m_static_channels(other.m_static_channels) , m_dynamic_channels(other.m_dynamic_channels) , m_out(other.m_out) +diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp +index 4a5865eff..04fee18f9 100644 +--- a/websocketpp/roles/server_endpoint.hpp ++++ b/websocketpp/roles/server_endpoint.hpp +@@ -75,11 +75,11 @@ class server : public endpoint,config> { + } + + /// Destructor +- ~server() {} ++ ~server() {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no copy constructor because endpoints are not copyable +- server(server &) = delete; ++ server(server &) = delete; + + // no copy assignment operator because endpoints are not copyable + server & operator=(server const &) = delete; +@@ -87,7 +87,7 @@ class server : public endpoint,config> { + + #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_ + /// Move constructor +- server(server && o) : endpoint,config>(std::move(o)) {} ++ server(server && o) : endpoint,config>(std::move(o)) {} + + #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_ + // no move assignment operator because of const member variables diff --git a/ports/websocketpp/vcpkg.json b/ports/websocketpp/vcpkg.json index daa7f5cf6be18a..4bb358f37373d4 100644 --- a/ports/websocketpp/vcpkg.json +++ b/ports/websocketpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "websocketpp", "version": "0.8.2", - "port-version": 2, + "port-version": 3, "description": "Library that implements RFC6455 The WebSocket Protocol", "homepage": "https://github.com/zaphoyd/websocketpp", "documentation": "http://docs.websocketpp.org/", diff --git a/versions/baseline.json b/versions/baseline.json index e4836082d3bd1f..117e5a48f4a880 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8946,7 +8946,7 @@ }, "websocketpp": { "baseline": "0.8.2", - "port-version": 2 + "port-version": 3 }, "webview2": { "baseline": "1.0.2088.41", diff --git a/versions/w-/websocketpp.json b/versions/w-/websocketpp.json index d040079dc7d90f..9e6fad9147a6ff 100644 --- a/versions/w-/websocketpp.json +++ b/versions/w-/websocketpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb46cff6f9a23caefbc56ac8089d1fbee523e13e", + "version": "0.8.2", + "port-version": 3 + }, { "git-tree": "70d3b037559f580fa52bc50bb2dc26e58f5107d9", "version": "0.8.2", From 89c800612bd613d2de31ce40d51242fb450be1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 7 Nov 2023 12:31:51 -0500 Subject: [PATCH 0303/1039] [arrow] Update to 14.0.0 (#34944) * [arrow] Update to 14.0.0 * Update versions --- ports/arrow/portfile.cmake | 2 +- ports/arrow/vcpkg.json | 2 +- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index eed1698ce57ffa..ed6abdf5f40045 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 3314d79ef20ac2cfc63f2c16fafb30c3f6187c10c6f5ea6ff036f6db766621d7c65401d85bf1e979bd0ecf831fbb0a785467642792d6bf77016f9807243c064e + SHA512 9e1f8179e37279a47baa3587c66d8b385362478d998601b5f0a8bb2f360ec8cdb954705f397dac413ac1411e72d4dd740e3785823cc063ca35eb80585d2eedf2 ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index e2432e5d37cdeb..bc2c5ada6d22e2 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "13.0.0", + "version": "14.0.0", "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index adedd7fa682bbf..f72542292b16a6 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1c1beba87b3d9ac5ffc73764c62622cbd31eace", + "version": "14.0.0", + "port-version": 1 + }, { "git-tree": "58708e6a9ecca81874ff79869e9006d42ca2bbfe", "version": "13.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 117e5a48f4a880..02390cf3ce097d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -237,7 +237,7 @@ "port-version": 5 }, "arrow": { - "baseline": "13.0.0", + "baseline": "14.0.0", "port-version": 1 }, "arsenalgear": { From cf89d998a747bd437e04e48296f7ed47a8deaaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 7 Nov 2023 18:33:16 +0100 Subject: [PATCH 0304/1039] [utfcpp] Update to 4.0.2 (#34933) * [utfcpp] Update to 4.0.2 * [utfcpp] Update version files --- ports/assimp/build_fixes.patch | 11 ++++++----- ports/assimp/vcpkg.json | 2 +- ports/utfcpp/fix-include-path.patch | 21 +++++++++++++++++++++ ports/utfcpp/portfile.cmake | 15 +++------------ ports/utfcpp/vcpkg.json | 2 +- versions/a-/assimp.json | 5 +++++ versions/baseline.json | 4 ++-- versions/u-/utfcpp.json | 5 +++++ 8 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 ports/utfcpp/fix-include-path.patch diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index a58ff88da38535..f3bab0ed7c98e5 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -171,7 +171,7 @@ index ca37ba1..2ce7bdd 100644 # include #else -# include "../contrib/utf8cpp/source/utf8.h" -+# include ++# include #endif #include @@ -184,7 +184,7 @@ index 7b66afa..5adbe1d 100644 #include #else -#include "../contrib/utf8cpp/source/utf8.h" -+#include ++#include #endif #include #include @@ -197,7 +197,7 @@ index d4456e6..812f29b 100644 # include #else -# include -+# include ++# include #endif #include @@ -390,7 +390,8 @@ index 5339454..45e07c0 100644 - RapidJSON::rapidjson + ZLIB::ZLIB + rapidjson - utf8cpp +- utf8cpp ++ utf8cpp::utf8cpp + PUBLIC pugixml - stb::stb @@ -500,7 +501,7 @@ index 383300e..03fdd9a 100644 #include #else -#include "../contrib/utf8cpp/source/utf8.h" -+#include ++#include #endif // ------------------------------------------------------------------------------------------------ diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 0ff10c38c4ebd1..1325d13b37bb9e 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "assimp", "version": "5.3.1", - "port-version": 2, + "port-version": 3, "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", "license": "BSD-3-Clause", diff --git a/ports/utfcpp/fix-include-path.patch b/ports/utfcpp/fix-include-path.patch new file mode 100644 index 00000000000000..6dbaf759175601 --- /dev/null +++ b/ports/utfcpp/fix-include-path.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2ca50a6..d707dc7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,7 +10,7 @@ include(GNUInstallDirs) + + target_include_directories(utf8cpp INTERFACE + "$" +- $ ++ $ + ) + + include(CMakePackageConfigHelpers) +@@ -44,5 +44,5 @@ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake) + +-install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include) +-install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include) ++install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp) ++install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include/utf8cpp) diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index 33475c0023014b..a955feddbc8e58 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -4,25 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp REF "v${VERSION}" - SHA512 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090 + SHA512 e02c10c7e9c8c6ee8b8d45bb7521997106be1bf6778d964d4c66a4f025b6ce46df43be12dc74b03639be9f99db8aa4d8c22a65880a057aeb0e76a90bb87c760c HEAD_REF master + PATCHES fix-include-path.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DUTF8_INSTALL=ON - -DUTF8_SAMPLES=OFF - -DUTF8_TESTS=OFF ) vcpkg_cmake_install() - -if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH cmake) -else() - vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH lib/cmake/utf8cpp) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH share/utf8cpp/cmake) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json index c701c870c83c1d..5c88be2dd4a5a9 100644 --- a/ports/utfcpp/vcpkg.json +++ b/ports/utfcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utfcpp", - "version": "3.2.5", + "version": "4.0.2", "description": "UTF-8 with C++ in a Portable Way", "homepage": "https://github.com/nemtrif/utfcpp", "license": "BSL-1.0", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index 550bb0594cf119..82d2e6d531671e 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76ae4b01818ee27c5beac4d0b18cb566f94f27ec", + "version": "5.3.1", + "port-version": 3 + }, { "git-tree": "a825878e38726e638f29d4defeadb9108ac20697", "version": "5.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index 02390cf3ce097d..fedbd41ce09fe0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -270,7 +270,7 @@ }, "assimp": { "baseline": "5.3.1", - "port-version": 2 + "port-version": 3 }, "async-mqtt": { "baseline": "2.0.0", @@ -8685,7 +8685,7 @@ "port-version": 1 }, "utfcpp": { - "baseline": "3.2.5", + "baseline": "4.0.2", "port-version": 0 }, "utfz": { diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index c2a0319d906f5c..367b9b61749684 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ceee3e19b95edf9e59c813da7764a68145bfd1", + "version": "4.0.2", + "port-version": 0 + }, { "git-tree": "323b2ffdbd38cf8e756a5ae5714ef2169c0cd6b3", "version": "3.2.5", From 3487177624e2387774068d5ccb8005f67675c7a9 Mon Sep 17 00:00:00 2001 From: "Craig Edwards (Brain)" Date: Tue, 7 Nov 2023 17:34:21 +0000 Subject: [PATCH 0305/1039] [bot] Update DPP to v10.0.28 (#34942) --- ports/dpp/portfile.cmake | 2 +- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index a3730c8325fb33..a938b304e46382 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 b26ac0aeff359737498394f832c1b5ac918e662b5a290ccc9a5e6131c743d85fa6f6cf3984c709381c97430195015399d530f29ce733b93a02e3c0ea36b8350b + SHA512 497451c880c92356aa7884bcd7a89a8642ab54a8141fb0b24de85a46d6d00c74e7f24cc09bd5ad9b9faff58f7837825486b261d75b63e630bf114fde5813d1e1 ) vcpkg_cmake_configure( diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 31ca7f8bd5249c..1cd8b635a415a2 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.27", + "version": "10.0.28", "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 fedbd41ce09fe0..909631a0181da9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2249,7 +2249,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.27", + "baseline": "10.0.28", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 86794d25f0de04..eb38d3509eee5c 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9104c5be5bad205d3b5210b5ba79dfe577e51de", + "version": "10.0.28", + "port-version": 0 + }, { "git-tree": "c9ad04c95ab1097720e988a5879045b575d8eb18", "version": "10.0.27", From a429a35bb5d9467aa8d22ca00e747445eb893414 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:35:32 -0500 Subject: [PATCH 0306/1039] Updating the necessary files. (#34943) --- ports/discordcoreapi/portfile.cmake | 2 +- ports/discordcoreapi/vcpkg.json | 2 +- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 58c50c6eb75dc6..1d772dd10a8d9b 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 57a8389718cd0f03a6e7a53e39d5ee267140cb4696c89abf6ac424d78f69516d6dc12f24ac19bc07533f9509459b987e2d2c1d7426d2f727ea124f5fcb649512 + SHA512 678f2cf892139582cf5d77a33d4f03cfb2d264d5f0af3912ffd378ab05ee40f27703c9ad5496a72af68fb8ea2ab66192701f911b0d1bfff53542fd1d7e9ec65e HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 7781e56fa1e2b1..4c3039947111b3 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.1", + "version": "2.0.2", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 1556a53bc03da2..55ef21df964c0f 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 1e51b64a802437674d87a6a61396b2e3878fece954be8560b6ef8fc58a6180c82c3e0f7d922c77c881dd3029f83866842fa146501f961faff3aa3072dadd5e1b + SHA512 e2611b116cd6d73426b32fea11b3b52527466e7e59d8e8c842ccca9dac2b42679457d7ad77e11512c15fb319e650c74bbee0dce3ae7d24c127b756790eebf020 HEAD_REF main ) diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 6038fd9b901e13..d976f62cbc560e 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.9", + "version": "0.9.91", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 909631a0181da9..63462433efa01b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2201,7 +2201,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0.1", + "baseline": "2.0.2", "port-version": 0 }, "discount": { @@ -3665,7 +3665,7 @@ "port-version": 1 }, "jsonifier": { - "baseline": "0.9.9", + "baseline": "0.9.91", "port-version": 0 }, "jsonnet": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index fb065baf9e7da2..ed78b31e2593f6 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4105594f2f8aef84bb0aa20917d473727e0d9700", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "3b4e38bd8dd9683ee4923d31a64426a01e8b3466", "version": "2.0.1", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 62aa5f801e2186..923e5f2614c11c 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8901c8d3fee5951e101c1b8a3b64de58c6ebeed", + "version": "0.9.91", + "port-version": 0 + }, { "git-tree": "9e89f30157ff02233bb4ec6661f40356e6a94260", "version": "0.9.9", From 53219b7c4ebfbcb6269fc1a0f01de128240fba7a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 9 Nov 2023 01:36:24 +0800 Subject: [PATCH 0307/1039] [saucer] update to 2.1.0 (#34732) * add feature * update version * del webview2 * update version * del feature * update version * update to 2.0.0 * udpare version * update verison * update version * update to 2.1.0 * update version * add dependency * update version * delete version * update to 2.6 * update version --- ports/ereignis/portfile.cmake | 4 +- ports/ereignis/vcpkg.json | 2 +- ports/lockpp/portfile.cmake | 4 +- ports/lockpp/vcpkg.json | 2 +- ports/saucer/fix-source-generation.patch | 21 ----- ports/saucer/fix_findpkg.patch | 100 +++++++++++++++++++++++ ports/saucer/portfile.cmake | 17 ++-- ports/saucer/unofficial-webview2.patch | 15 ---- ports/saucer/vcpkg.json | 10 +-- versions/baseline.json | 8 +- versions/e-/ereignis.json | 5 ++ versions/l-/lockpp.json | 5 ++ versions/s-/saucer.json | 5 ++ 13 files changed, 135 insertions(+), 63 deletions(-) delete mode 100644 ports/saucer/fix-source-generation.patch create mode 100644 ports/saucer/fix_findpkg.patch delete mode 100644 ports/saucer/unofficial-webview2.patch diff --git a/ports/ereignis/portfile.cmake b/ports/ereignis/portfile.cmake index 42aea9b4ed77c8..8840c2d6bafeb7 100644 --- a/ports/ereignis/portfile.cmake +++ b/ports/ereignis/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Soundux/ereignis - REF v1.1 - SHA512 506a54e8d109028cd9e85597fbd6bf77694d55e78727d2889aa15846eb4ef00390153b719c6eb3d7f8d424eb7607b66f18adc24a2d907887e32c30ca0dca7034 + REF "v${VERSION}" + SHA512 b8c8bbb40bf3501e4612cddfbdbf8117f0e89c7781dfa551f1a62e825566dfd9755889d2c953827679d94198ebfbd8f01e85478d7ac0529b0d564d45788ca707 HEAD_REF master ) diff --git a/ports/ereignis/vcpkg.json b/ports/ereignis/vcpkg.json index 4508f421410b33..eb3aa937b78307 100644 --- a/ports/ereignis/vcpkg.json +++ b/ports/ereignis/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ereignis", - "version": "1.1", + "version": "2.3", "description": "A thread-safe C++17 Event Library", "homepage": "https://github.com/Soundux/ereignis", "license": "MIT", diff --git a/ports/lockpp/portfile.cmake b/ports/lockpp/portfile.cmake index 1af259ee94153a..b873754c329879 100644 --- a/ports/lockpp/portfile.cmake +++ b/ports/lockpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Soundux/lockpp - REF v1.0.2 - SHA512 6d92d3bbcbad3e2afd844ab95526e1eb49a7722d0d9d972ff85df561bbb9dc0b7a8aa5c83847f6832a806e52dde427ec0bcd11570b095d9cce7e35b3717e1f51 + REF "v${VERSION}" + SHA512 540caaec65fc89d1e683af9b7366997b4cd5338ebba9de3ea2003b74dc4b8249a5b1cc223892afddb0e165146c3b36ded26bd88f5fe2c77d125981de8a774baf HEAD_REF master ) diff --git a/ports/lockpp/vcpkg.json b/ports/lockpp/vcpkg.json index bc5b348775e06c..4391b5d9140e6e 100644 --- a/ports/lockpp/vcpkg.json +++ b/ports/lockpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lockpp", - "version": "1.0.2", + "version": "2.6", "description": "A C++17 Library that provides mutex protected objects", "homepage": "https://github.com/Soundux/lockpp", "license": "MIT", diff --git a/ports/saucer/fix-source-generation.patch b/ports/saucer/fix-source-generation.patch deleted file mode 100644 index be1dcde909bbd2..00000000000000 --- a/ports/saucer/fix-source-generation.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3800146..61a9e60 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer") - # -------------------------------------------------------------------------------------------------------- - - string(TOLOWER ${saucer_backend} saucer_backed_lower) --configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp") -+configure_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") - - # -------------------------------------------------------------------------------------------------------- - # Configure Library depending on options -@@ -91,6 +91,7 @@ include(FetchContent) - if (saucer_backend STREQUAL "Qt") - target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp") - target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp") -+ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") - - find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED) - target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel) diff --git a/ports/saucer/fix_findpkg.patch b/ports/saucer/fix_findpkg.patch new file mode 100644 index 00000000000000..a09b15f342f4e1 --- /dev/null +++ b/ports/saucer/fix_findpkg.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5eccb6..5f9ab71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,51 +131,16 @@ endif() + include("cmake/cpm.cmake") + include("cmake/nuget.cmake") + +-CPMFindPackage( +- NAME lockpp +- VERSION 2.6 +- GIT_REPOSITORY "https://github.com/Soundux/lockpp" +-) +- +-CPMFindPackage( +- NAME boost_callable_traits +- GIT_TAG boost-1.83.0 +- GIT_REPOSITORY "https://github.com/boostorg/callable_traits" +-) +- +-CPMFindPackage( +- NAME tl-expected +- VERSION 1.1.0 +- GIT_REPOSITORY "https://github.com/TartanLlama/expected" +- OPTIONS "EXPECTED_BUILD_TESTS OFF" +-) +- +-CPMFindPackage( +- NAME ereignis +- VERSION 2.3 +- GIT_REPOSITORY "https://github.com/Soundux/ereignis" +-) +- +-CPMFindPackage( +- NAME fmt +- GIT_TAG 10.1.1 +- GIT_REPOSITORY "https://github.com/fmtlib/fmt" +-) +- +-CPMFindPackage( +- NAME glaze +- VERSION 1.5.4 +- GIT_REPOSITORY "https://github.com/stephenberry/glaze" +-) +- +-CPMFindPackage( +- NAME flagpp +- VERSION 2.1 +- GIT_REPOSITORY "https://github.com/Curve/flagpp" +-) ++find_path(LOCKPP_INCLUDE_DIRS "lockpp") ++find_path(BOOST_CALLTRA_INCLUDE_DIRS "boost/callable_traits") ++find_package(tl-expected CONFIG REQUIRED) ++find_path(EREIGNIS_INCLUDE_DIRS "ereignis") ++find_package(fmt CONFIG REQUIRED) ++find_package(glaze CONFIG REQUIRED) ++find_path(FLAGPP_INCLUDE_DIRS "flagpp") + +-target_link_libraries(${PROJECT_NAME} PRIVATE cr::flagpp) +-target_link_libraries(${PROJECT_NAME} PUBLIC lockpp boost_callable_traits tl::expected glaze::glaze ereignis fmt) ++target_include_directories(${PROJECT_NAME} PRIVATE ${EREIGNIS_INCLUDE_DIRS} ${LOCKPP_INCLUDE_DIRS} ${BOOST_CALLTRA_INCLUDE_DIRS} ${FLAGPP_INCLUDE_DIRS}) ++target_link_libraries(${PROJECT_NAME} PRIVATE glaze::glaze fmt::fmt tl::expected) + + # -------------------------------------------------------------------------------------------------------- + # Setup Linkage +@@ -218,7 +183,7 @@ if (saucer_backend STREQUAL "WebView2") + target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE=1 _UNICODE=1 NOMINMAX=1) + + include("cmake/webview2.cmake") +- target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi webview2::webview2) ++ target_link_libraries(${PROJECT_NAME} ${saucer_linkage} Shlwapi unofficial::webview2::webview2) + endif() + + # -------------------------------------------------------------------------------------------------------- +@@ -258,6 +223,4 @@ if (saucer_prefer_remote AND saucer_backend STREQUAL "WebView2") + endif() + + install(DIRECTORY "include/saucer" TYPE INCLUDE) +-install(DIRECTORY "$/fmt" TYPE INCLUDE) +-install(DIRECTORY "$/glaze" TYPE INCLUDE) +-install(DIRECTORY "$/boost" TYPE INCLUDE) ++install(DIRECTORY "${BOOST_CALLTRA_INCLUDE_DIRS}/boost/callable_traits" DESTINATION "include/boost/callable_traits") +diff --git a/cmake/webview2.cmake b/cmake/webview2.cmake +index 9ee3dbc..3827e94 100644 +--- a/cmake/webview2.cmake ++++ b/cmake/webview2.cmake +@@ -1,11 +1,11 @@ + include("cmake/nuget.cmake") + + if (NOT saucer_prefer_remote) +- find_package(webview2 CONFIG REQUIRED) ++ find_package(unofficial-webview2 CONFIG REQUIRED) + return() + endif() + +-if (NOT TARGET webview2::webview2) ++if (NOT TARGET unofficial::webview2::webview2) + nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version}) + + add_library(webview2 STATIC IMPORTED) diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake index 9b6d8101f87103..eb43057abd5481 100644 --- a/ports/saucer/portfile.cmake +++ b/ports/saucer/portfile.cmake @@ -3,29 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO saucer/saucer - REF 6ae482092cca4d4a408e6bdf24714153d9203797 - SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0 + REF "v${VERSION}" + SHA512 29abb465a888aa4284795e293624598c09e0ba690bb430adb7a2122d82985daa1cfcfd594120f5657fc70349f8480e63554d72bff1b23f9dca86bcdbb930d953 HEAD_REF dev PATCHES - unofficial-webview2.patch - fix-source-generation.patch + fix_findpkg.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - set(BACKEND_OPTION "-Dsaucer_backend=WebView2") -else() - set(BACKEND_OPTION "-Dsaucer_backend=Qt6") -endif() - vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${BACKEND_OPTION} -Dsaucer_prefer_remote=OFF -Dsaucer_remote_webview2=OFF + MAYBE_UNUSED_VARIABLES + saucer_remote_webview2 ) vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/saucer/unofficial-webview2.patch b/ports/saucer/unofficial-webview2.patch deleted file mode 100644 index be42769a682cf7..00000000000000 --- a/ports/saucer/unofficial-webview2.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fa4269..f950363 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -111,8 +111,8 @@ elseif (saucer_backend STREQUAL "WebView2") - endif() - - if (NOT saucer_remote_webview2) -- find_package(webview2 CONFIG REQUIRED) -- target_link_libraries(${PROJECT_NAME} PRIVATE webview2::webview2) -+ find_package(unofficial-webview2 CONFIG REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::webview2::webview2) - else() - include("NuGet.cmake") - nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version}) diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index 481a36efd0c153..e52f3ee6814dfc 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,14 +1,16 @@ { "name": "saucer", - "version": "1.0.1", - "port-version": 3, + "version": "2.1.0", "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", "supports": "!uwp", "dependencies": [ + "boost-callable-traits", "ereignis", + "flagpp", "fmt", + "glaze", "lockpp", "nlohmann-json", { @@ -27,10 +29,6 @@ { "name": "webview2", "platform": "windows" - }, - { - "name": "wil", - "platform": "windows" } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 63462433efa01b..6f492793768043 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2445,7 +2445,7 @@ "port-version": 8 }, "ereignis": { - "baseline": "1.1", + "baseline": "2.3", "port-version": 0 }, "esaxx": { @@ -5193,7 +5193,7 @@ "port-version": 0 }, "lockpp": { - "baseline": "1.0.2", + "baseline": "2.6", "port-version": 0 }, "lodepng": { @@ -7593,8 +7593,8 @@ "port-version": 0 }, "saucer": { - "baseline": "1.0.1", - "port-version": 3 + "baseline": "2.1.0", + "port-version": 0 }, "sbp": { "baseline": "3.4.10", diff --git a/versions/e-/ereignis.json b/versions/e-/ereignis.json index f5ec1c4e6652f1..a0ebb40c889b38 100644 --- a/versions/e-/ereignis.json +++ b/versions/e-/ereignis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53ba30ec67abd936ea33d4c4136ca83a3e9c145c", + "version": "2.3", + "port-version": 0 + }, { "git-tree": "9fae65f1e52927feaf919019a722da7f20982e4c", "version": "1.1", diff --git a/versions/l-/lockpp.json b/versions/l-/lockpp.json index fbd5055fbc59a5..4ef6fa1137548e 100644 --- a/versions/l-/lockpp.json +++ b/versions/l-/lockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe1a86b6361bc55051cd31928d876ba7f0f6a8ab", + "version": "2.6", + "port-version": 0 + }, { "git-tree": "a186ea76115669b87e581cdc125423e950322d70", "version": "1.0.2", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index df53938ee23d0e..b60f0e0841149e 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ad0dc8844c60450afe70ba393b6d31a517b553d", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "15c87104efda5c84346ed7a7302713283e82eaaa", "version": "1.0.1", From 6a3528138b3a902abe3188cfdb61f4b2499a75d5 Mon Sep 17 00:00:00 2001 From: Kered13 Date: Wed, 8 Nov 2023 12:39:35 -0500 Subject: [PATCH 0308/1039] Update cppslippi to 1.3.3.14 (#34969) --- ports/cppslippi/portfile.cmake | 2 +- ports/cppslippi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppslippi.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/cppslippi/portfile.cmake b/ports/cppslippi/portfile.cmake index 91b1a5613b3903..08aab9ccbe124c 100644 --- a/ports/cppslippi/portfile.cmake +++ b/ports/cppslippi/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO cppslippi FILENAME "CppSlippi-${VERSION}.zip" - SHA512 454a905ea5b053c2000c158939d7bbcdbe5f2af2e1ef6d4d79c233e00889508260f20b0e0adff8be64904aabd525b79c59d18e5205ba86a905d4703d19115d04 + SHA512 88b58e15a18c4d3dfd3d79098db45f7ef4ab8fc1b27329920f4e2c55971a3c67ef81ec013112875b1c944a3a939af7ab8684c2ad253af1e175ea5e2c1e69fd69 NO_REMOVE_ONE_LEVEL ) diff --git a/ports/cppslippi/vcpkg.json b/ports/cppslippi/vcpkg.json index 047ea93617d596..6068a50fa9d2b6 100644 --- a/ports/cppslippi/vcpkg.json +++ b/ports/cppslippi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppslippi", - "version": "1.2.3.14", + "version": "1.3.3.14", "description": "C++ Slippi replay file parser.", "homepage": "https://sourceforge.net/projects/cppslippi/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6f492793768043..8f547e46139c60 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1885,7 +1885,7 @@ "port-version": 4 }, "cppslippi": { - "baseline": "1.2.3.14", + "baseline": "1.3.3.14", "port-version": 0 }, "cpptoml": { diff --git a/versions/c-/cppslippi.json b/versions/c-/cppslippi.json index fd72b394b291c0..2d1302828633bf 100644 --- a/versions/c-/cppslippi.json +++ b/versions/c-/cppslippi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7df05e339a6d25e29d35374e4f7ff1a4b78dbab", + "version": "1.3.3.14", + "port-version": 0 + }, { "git-tree": "bdb4a9aadefc971d10cb8c37bd13570e3c7fab0e", "version": "1.2.3.14", From fad822df2e4a8486234a3ff6dbaa71c3bfec0e18 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:40:40 -0800 Subject: [PATCH 0309/1039] [Azure Storage] Update to November Release (#34968) * [azure-storage-common-cpp] Update to 12.5.0 ## 12.5.0 (2023-11-07) ### Features Added - No public changes in this release. * [azure-storage-blobs-cpp] Update to 12.10.0 ## 12.10.0 (2023-11-07) ### Features Added - Features in `12.10.0-beta.1` are now generally available. * [azure-storage-files-datalake-cpp] Update to 12.9.0 ## 12.9.0 (2023-11-07) ### Features Added - Features in `12.9.0-beta.1` are now generally available. * [azure-storage-files-shares-cpp] Update to 12.8.0 ## 12.8.0 (2023-11-07) ### Features Added - Features in `12.8.0-beta.1` are now generally available. - Fixed a bug where the x-ms-file-request-intent request header was not being sent for `ShareFileClient::UploadRangeFromUri`. * [azure-storage-queues-cpp] Update to 12.2.0 ## 12.2.0 (2023-11-07) ### Features Added - New features in `12.2.0-beta.1` are now generally available. --- ports/azure-storage-blobs-cpp/portfile.cmake | 7 +++++-- ports/azure-storage-blobs-cpp/vcpkg.json | 6 +++--- .../fix-clang-on-windows.patch | 13 ------------ ports/azure-storage-common-cpp/portfile.cmake | 9 +++++---- ports/azure-storage-common-cpp/vcpkg.json | 6 +++--- .../portfile.cmake | 7 +++++-- .../vcpkg.json | 6 +++--- .../portfile.cmake | 7 +++++-- .../azure-storage-files-shares-cpp/vcpkg.json | 6 +++--- ports/azure-storage-queues-cpp/portfile.cmake | 7 +++++-- ports/azure-storage-queues-cpp/vcpkg.json | 6 +++--- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ .../a-/azure-storage-files-datalake-cpp.json | 5 +++++ .../a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 20 +++++++++---------- 17 files changed, 75 insertions(+), 50 deletions(-) delete mode 100644 ports/azure-storage-common-cpp/fix-clang-on-windows.patch diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 8b00f84e70671a..b416b955fe074b 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.9.0 - SHA512 10126fa8f34357d941cc7ac031c7811cdbf5fe998d2b6741e9e97325c67df5ed9c490ec42034d9b1ba56716e7de3b7283eb9059554d32b2f4d907e839b64b59f + REF azure-storage-blobs_12.10.0 + SHA512 652b4edf2e049b33ef37734ab3e421a7b2b8d2f497da2859fe73ae665e8fd76b360d02c9f64c42cd6dbc8baa7150a031263942fc7d6b311d2c051ccd044a0064 ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-blobs") diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 178263c79d9286..2a846d79c484be 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-storage-blobs-cpp", - "version-semver": "12.9.0", - "port-version": 1, + "version-semver": "12.10.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -12,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.4.0" + "version>=": "12.5.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/fix-clang-on-windows.patch b/ports/azure-storage-common-cpp/fix-clang-on-windows.patch deleted file mode 100644 index 2babe34280b746..00000000000000 --- a/ports/azure-storage-common-cpp/fix-clang-on-windows.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt -index 9e419922..ba77ab26 100644 ---- a/sdk/storage/azure-storage-common/CMakeLists.txt -+++ b/sdk/storage/azure-storage-common/CMakeLists.txt -@@ -97,8 +97,6 @@ target_link_libraries(azure-storage-common PUBLIC Azure::azure-core) - - if(WIN32) - target_link_libraries(azure-storage-common PRIVATE bcrypt webservices) -- # C28020 and C28204 are introduced by nlohmann/json -- target_compile_options(azure-storage-common PUBLIC /wd28204 /wd28020) - else() - find_package(LibXml2 REQUIRED) - target_include_directories(azure-storage-common SYSTEM PRIVATE ${LIBXML2_INCLUDE_DIRS}) diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index e89fddc12d43bd..482ed9687f1322 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,10 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.4.0 - SHA512 999bbd93b645849720d2fd4401b8f9e9f12ce31ea1362786cd1aa0392efd0a05de717d87b2db43a190c2a40f42477daddebcc00812efc4de3ccc08e7563001dd - PATCHES - fix-clang-on-windows.patch + REF azure-storage-common_12.5.0 + SHA512 46c9cc4ebec54f289ba7270356da4e89e5f8e890004c7a232200b87ca33357064c2f46670a1090fe41ca6962cdbc76d2e3520bb600438cbc0f21f15cf7816f04 ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-common") diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index a15b3debe9bb7a..af09fe2c5e8792 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-storage-common-cpp", - "version-semver": "12.4.0", - "port-version": 2, + "version-semver": "12.5.0", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -12,7 +12,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.9.0" + "version>=": "1.10.3" }, { "name": "libxml2", diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index adaf077d7310e0..9665096bd266a0 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.8.0 - SHA512 4539b8ba806abdf71cdf82e2bdcffe1adae1d19e6ea62f72cea6ac7e0beef32895d13cff53df4afe06b53ed5740c19bba858c09f75b74cd446d5c125e36ca2b3 + REF azure-storage-files-datalake_12.9.0 + SHA512 3314adc2c43b54f3bb776b099876062dc157cb35215c8efb49c1d23474479601ab0c067f901809c9ee4bce646feabf0065e8e8b96ae77f4d0f8585e8e269294b ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake") diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index d9e2670e66d621..9aaf0ff0a59709 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.8.0", - "port-version": 1, + "version-semver": "12.9.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -12,7 +12,7 @@ { "name": "azure-storage-blobs-cpp", "default-features": false, - "version>=": "12.9.0" + "version>=": "12.10.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 77265ee56ff2de..dd81fb34a17ba1 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.7.0 - SHA512 2482a7c437bd36e63efc8c77d917a09d73bde2bc12d49afd1e24cf0977656e991c59c15d34b52c1bd19c6988fe7c40c95b5edea8740977ffc676f3dd6758dc5e + REF azure-storage-files-shares_12.8.0 + SHA512 a22cce4f43fd77aabdb43fdbc9ea3e5a501f5abeaafe5f5fea7e8737b6b017dc2ca3b674ac0c5f8bcda9b836af7644b3c17db050b02db5e076728047aa5c2ec0 ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-files-shares") diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index dca31f29e90dc5..d68fda4a649983 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-storage-files-shares-cpp", - "version-semver": "12.7.0", - "port-version": 1, + "version-semver": "12.8.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -12,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.4.0" + "version>=": "12.5.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index f52d77dca6c676..ef313d8360432b 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.1.0 - SHA512 98f1b44f408418e43aedf57392c79a625348bbbe516a84d1682486d77655851546e191ea409397cc5c0d822d77bfe9ee2628e9a581334abe86d478418ac0ba9d + REF azure-storage-queues_12.2.0 + SHA512 ce0a89e3ae5e49f495904a614615906119ba09606ac2e781aae59cf2f4a00e6d4afe9bdd9675ec4cc59b50b47b5123a6333f125871df42db5d6554d341132676 ) if(EXISTS "${SOURCE_PATH}/sdk/storage/azure-storage-queues") diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index 003196aa8b9977..61ba8caef9fe48 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-storage-queues-cpp", - "version-semver": "12.1.0", - "port-version": 1, + "version-semver": "12.2.0", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." @@ -12,7 +12,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.4.0" + "version>=": "12.5.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index d2b76b365f6898..ea9aa76c531af6 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "902107525b099bb6c915311567519dcd55bd2aea", + "version-semver": "12.10.0", + "port-version": 0 + }, { "git-tree": "83ac6004707e784a7a57a72574548579a9ab79d0", "version-semver": "12.9.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index c054c896a18907..b353f67a87540f 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97351c3b87aae118c657334bb527c220e196aac7", + "version-semver": "12.5.0", + "port-version": 0 + }, { "git-tree": "8a12fa7967664e0823c8ab1be3ef80ba4faf9245", "version-semver": "12.4.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 7c828495cbd25f..664adc31b2e77a 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eef43191bf50fe79ddd687b71761765a2400a0c2", + "version-semver": "12.9.0", + "port-version": 0 + }, { "git-tree": "980d78708b5b02d395f9bd7342c18dc35e48dcbd", "version-semver": "12.8.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index d691282b57663b..92f3ce52e938f6 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": "98ae8cc3d7bad139e05b550c17fc37da3c5c1cef", + "version-semver": "12.8.0", + "port-version": 0 + }, { "git-tree": "7aad330cd95f2b69127ca9950d1c4295f5be937e", "version-semver": "12.7.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index f5c3a66bf09211..f2e944ded5f1c7 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e74bf6adaa2794ef229e4a605d31fea0b3b19bd", + "version-semver": "12.2.0", + "port-version": 0 + }, { "git-tree": "116fd90e1af9c32dabd414ac99ef121d6bacf0bf", "version-semver": "12.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8f547e46139c60..406666368e0fc6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -473,28 +473,28 @@ "port-version": 1 }, "azure-storage-blobs-cpp": { - "baseline": "12.9.0", - "port-version": 1 + "baseline": "12.10.0", + "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.4.0", - "port-version": 2 + "baseline": "12.5.0", + "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", "port-version": 6 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.8.0", - "port-version": 1 + "baseline": "12.9.0", + "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.7.0", - "port-version": 1 + "baseline": "12.8.0", + "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.1.0", - "port-version": 1 + "baseline": "12.2.0", + "port-version": 0 }, "azure-uamqp-c": { "baseline": "2023-08-07", From 7e6befc87cd7f513f692f8acd5038bb0411d11a9 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Thu, 9 Nov 2023 01:41:06 +0800 Subject: [PATCH 0310/1039] [workflow] update to v0.10.9 (#34965) * [workflow] update to v0.10.9 * [workflow] update versions * [workflow] use ${VERSION} * [workflow] update versions --- ports/workflow/portfile.cmake | 8 ++++---- ports/workflow/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/workflow.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/workflow/portfile.cmake b/ports/workflow/portfile.cmake index 062005d70cfbb5..78457c0a47996e 100644 --- a/ports/workflow/portfile.cmake +++ b/ports/workflow/portfile.cmake @@ -2,16 +2,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF v0.10.5-win - SHA512 4299b2c8bc545676b5437086c666a7b0955524aae758a8753719439697b3dd4d5b46c0a8eba9dba80c0daa9ee9c4188e46fd085f0d2f68f61b33fad1f903c4c2 + REF "v${VERSION}-win" + SHA512 c34518ca35f19ab5539ea82cc73ecbc9828413530cec8dbbe56b17517ec6b7b0326a29e5b343b950afe128829c8e23e75d19494e17f7be4fce9edb524c44ee56 HEAD_REF windows ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF v0.10.5 - SHA512 696e82a1f6a7e6c339fbabb7b1f98ffe40f5f5ee7e77f4c947c0c1532817409e7a61f020c6238a32acd9eb3e06cf3e522e6d67beda32d5bbb08ea1080c20277d + REF "v${VERSION}" + SHA512 25258e9dc161c5b30395caa3525a4ba5de5763cad5761cbdc8bb23d2468eb624ec49455a5c9ab628c219d7436f707da0138229c5fa82bcfccc24a485649acb56 HEAD_REF master ) endif() diff --git a/ports/workflow/vcpkg.json b/ports/workflow/vcpkg.json index 01c01352690ee1..895f19056dbfaa 100644 --- a/ports/workflow/vcpkg.json +++ b/ports/workflow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "workflow", - "version": "0.10.5", - "port-version": 1, + "version": "0.10.9", "description": "About C++ Parallel Computing and Asynchronous Networking Engine", "homepage": "https://github.com/sogou/workflow", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 406666368e0fc6..0ad5ffa4a38dff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9029,8 +9029,8 @@ "port-version": 3 }, "workflow": { - "baseline": "0.10.5", - "port-version": 1 + "baseline": "0.10.9", + "port-version": 0 }, "wpilib": { "baseline": "2023-08-24", diff --git a/versions/w-/workflow.json b/versions/w-/workflow.json index 09e52a2ffb56b2..171a16c6feef3c 100644 --- a/versions/w-/workflow.json +++ b/versions/w-/workflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b72e08d163acabe70e7804d7b3acc719c406ebf", + "version": "0.10.9", + "port-version": 0 + }, { "git-tree": "6f084c7076efb69884874d9cccadf7317c42b370", "version": "0.10.5", From cb81acf7b28f13f4c01ef6b8c0e9d481ea33c84c Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:41:37 -0800 Subject: [PATCH 0311/1039] [azure-core-amqp-cpp][azure-messaging-eventhubs-cpp] Update to November releases (#34960) * [azure-core-amqp-cpp] Update to 1.0.0-beta.5 ## 1.0.0-beta.5 (2023-11-07) ### Breaking Changes - Refactored AMQP headers to isolate internal-only types to "internal" subdirectory in headers. ### Other Changes - Removed public dependency on azure-uamqp-c to enable local bug fixes. * [azure-messaging-eventhubs-cpp] Update to 1.0.0-beta.4 ## 1.0.0-beta.4 (2023-11-07) ### Features Added - Fully functional eventhubs Processor. - Allow `ProducerClient` and `ConsumerClient` to be created with a connection string without an EntityPath element. ### Breaking Changes - Removed the `LoadBalancer` type from the public API surface. - `ConsumerClient` and `ProducerClient` objects can no longer be moved or copied. - If the connection string provided to `ConsumerClient` or `ProducerClient` contains an EntityPath, then the `EntityPath` parameter to the constructor must match the value provided in the connection string. ### Other Changes - Several `ostream` insertion operators were added for eventhubs types. --- ports/azure-core-amqp-cpp/portfile.cmake | 7 +++++-- ports/azure-core-amqp-cpp/vcpkg.json | 7 +++++-- ports/azure-messaging-eventhubs-cpp/portfile.cmake | 7 +++++-- ports/azure-messaging-eventhubs-cpp/vcpkg.json | 5 +++-- versions/a-/azure-core-amqp-cpp.json | 5 +++++ versions/a-/azure-messaging-eventhubs-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index da4284a422fcc7..6b1f056805af73 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.4 - SHA512 c8bc1e73e8f2a31ace636a5193e4909d1f673efb5f62c5cb27dbbe379ad77387bfecd862efb635c335044a6e7e1726a0ba39fba8713d97b0e80e239f9d92e3a7 + REF azure-core-amqp_1.0.0-beta.5 + SHA512 d9a75d1cdac2a58b2064f12c4f61adfc9969d4fd860146d6de398eb466e61602d6ce6db4a69554aadaa4f77105b8b746f51ca4a80758981895bb0a82cdf5aa70 ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index b9a6f43b391d02..23ed1da1ba0b10 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,6 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.4", + "version-semver": "1.0.0-beta.5", "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." @@ -9,12 +10,14 @@ "license": "MIT", "supports": "!uwp", "dependencies": [ + "azure-c-shared-utility", { "name": "azure-core-cpp", "default-features": false, "version>=": "1.10.0" }, - "azure-uamqp-c", + "azure-macro-utils-c", + "umock-c", { "name": "vcpkg-cmake", "host": true diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 1e2f17d19e857e..175f59d56fde9f 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.3 - SHA512 0ad0e02755eba07408c6a837a742c0e58890a4b5f281709e1d84ea59a378c0a013068428d99e81d4972172760a3fb55a6026d34d8a558a5747c48a6b3f85e664 + REF azure-messaging-eventhubs_1.0.0-beta.4 + SHA512 a96adb497b583356e7d38e3a24814b2ed12e116d273ad1bd4b710a65ae32b5840a72905d107b8ec157a75b80135416af9326839741795082d187d39335b14bf7 ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index 521ce83e32249d..e13512e01b1496 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,6 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.3", + "version-semver": "1.0.0-beta.4", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." @@ -11,7 +12,7 @@ { "name": "azure-core-amqp-cpp", "default-features": false, - "version>=": "1.0.0-beta.2" + "version>=": "1.0.0-beta.5" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 08f1e3af2e2cf1..2ff612fadd94e2 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5742923375357a52887b2c969db207937b01592", + "version-semver": "1.0.0-beta.5", + "port-version": 0 + }, { "git-tree": "50c7a85fdc78ded123beb5dd15e2b4557ace24b2", "version-semver": "1.0.0-beta.4", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index f05325a35e0b68..7e7f4994a6b487 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bde9f1c76919eecaaf6680e602eba5126c8d1fad", + "version-semver": "1.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "d50578e6b52b84c8be16a01ee83b4777c3c4bc9d", "version-semver": "1.0.0-beta.3", diff --git a/versions/baseline.json b/versions/baseline.json index 0ad5ffa4a38dff..3941b0227d5a68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -417,7 +417,7 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.4", + "baseline": "1.0.0-beta.5", "port-version": 0 }, "azure-core-cpp": { @@ -449,7 +449,7 @@ "port-version": 0 }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.3", + "baseline": "1.0.0-beta.4", "port-version": 0 }, "azure-security-attestation-cpp": { From 14bae4892f8c52f2db6ed571cd82b98d960421f0 Mon Sep 17 00:00:00 2001 From: KindRoach Date: Thu, 9 Nov 2023 01:41:57 +0800 Subject: [PATCH 0312/1039] [argparse] bump version to 3.0 (#34955) * [argparse] bump version to 3.0 * use ${VERSION} for github ref. --- 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 51908fbb81cd3c..d9a554e9b336fe 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 997da9255618311d1fcb0135ce86022729d1f1cb # v2.9 - SHA512 241e6a1ec76133b7ad4ab3984b1b4e08129f3dac80fc26a0010c9450ab83131ec9e2472844eba30265f2a6f1e94c7b7c07175f11a22553bd61a099b1bb148ef7 + REF "v${VERSION}" + SHA512 a7ed879eb3f71868cd84e513c0db63c4fecff1c9f0b34d6cfbe85d2439e83b80e97f713b497259c9775c9c7c1f639a08b73080045c51756de15e3d8c18b97116 HEAD_REF master ) diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json index 458c0a98c74087..c9db0f71ef3ce0 100644 --- a/ports/argparse/vcpkg.json +++ b/ports/argparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "argparse", - "version": "2.9", + "version": "3.0", "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 3f5371922e3e2b..ee0688713c92fa 100644 --- a/versions/a-/argparse.json +++ b/versions/a-/argparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8e0c44d4dfe3359b308711daac1e201dc4f8a21", + "version": "3.0", + "port-version": 0 + }, { "git-tree": "007156cde2fbc16b990f1a8cd0a29664873a923c", "version": "2.9", diff --git a/versions/baseline.json b/versions/baseline.json index 3941b0227d5a68..b8c4eeaa55cff3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -201,7 +201,7 @@ "port-version": 1 }, "argparse": { - "baseline": "2.9", + "baseline": "3.0", "port-version": 0 }, "args": { From b6f6f6e2ddf6fbeaaa8e4ba86fc674a352b0504f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 9 Nov 2023 01:42:58 +0800 Subject: [PATCH 0313/1039] [sqlite3] update to 3.43.2 (#34950) --- ports/sqlite3/add-config-include.patch | 12 ++++++------ ports/sqlite3/portfile.cmake | 5 ++++- ports/sqlite3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/sqlite3/add-config-include.patch b/ports/sqlite3/add-config-include.patch index df4b8172131e1f..7942c9cf36cb71 100644 --- a/ports/sqlite3/add-config-include.patch +++ b/ports/sqlite3/add-config-include.patch @@ -1,17 +1,17 @@ diff --git a/sqlite3.c b/sqlite3.c -index 1884b08..0d191be 100644 +index a1fbd60..68a4e21 100644 --- a/sqlite3.c +++ b/sqlite3.c -@@ -20,6 +20,7 @@ - ** The content in this amalgamation comes from Fossil check-in - ** d3a40c05c49e1a49264912b1a05bc2143ac. +@@ -22,6 +22,7 @@ */ -+#include "sqlite3-vcpkg-config.h" #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 ++#include "sqlite3-vcpkg-config.h" #ifndef SQLITE_PRIVATE + # define SQLITE_PRIVATE static + #endif diff --git a/sqlite3.h b/sqlite3.h -index b9d0692..698c410 100644 +index 0376113..271cf53 100644 --- a/sqlite3.h +++ b/sqlite3.h @@ -32,6 +32,7 @@ diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 5d4a6f987ac200..18375f3ee06fa8 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -4,7 +4,7 @@ string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," " vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 f17810f3b68b7f77a174503a863385a17bac0e9c819b9813cb75597cbd229ae8ad0b545410fc320669f377e79ab8412bbff8863f197d0f804c3a05b573df57e9 + SHA512 5ef0e65ee92a088187376fa82ccb182dffa35391dd4dbcb3fafeb0a6f1602ced1e212753837079a9cad007d73d3f5b8a67ca1a6596eba6cf0c695052fa307392 ) vcpkg_extract_source_archive( @@ -70,6 +70,9 @@ vcpkg_cmake_configure( -DPKGCONFIG_VERSION=${VERSION} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON + MAYBE_UNUSED_VARIABLES + SQLITE_ENABLE_FTS5 + SQLITE_ENABLE_MATH_FUNCTIONS ) vcpkg_cmake_install() diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 31540cdf3381dc..c1ae47d06d0e5f 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlite3", - "version": "3.43.1", + "version": "3.43.2", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index b8c4eeaa55cff3..d9c0d333804196 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8081,7 +8081,7 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.43.1", + "baseline": "3.43.2", "port-version": 0 }, "sqlitecpp": { diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index ef71f41ebcc86d..64334b9ce5e8a3 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45ea1b638c4911a25f145365f06a11802b12c81e", + "version": "3.43.2", + "port-version": 0 + }, { "git-tree": "6497ccc9668ca1e0b17a080b01e8585b33660336", "version": "3.43.1", From df0a79f8bdef53d03135330d716a517a89f25ab2 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Wed, 8 Nov 2023 20:43:44 +0300 Subject: [PATCH 0314/1039] [sail] Update to 0.9.0 (#34753) * [sail] Update to 0.9.0 (draft) * [sail] vcpkg x-add-version --all * [sail] Fix webp in upstream * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Use BUILD_TESTING * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update URL * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update release hash * vcpkg x-add-version --all * [sail] Added double quotes * vcpkg x-add-version --all --- ports/sail/avif.patch | 21 --------------------- ports/sail/portfile.cmake | 13 +++++-------- ports/sail/vcpkg.json | 27 ++++++++++++++++++++++----- ports/sail/webp.patch | 39 --------------------------------------- versions/baseline.json | 4 ++-- versions/s-/sail.json | 5 +++++ 6 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 ports/sail/avif.patch delete mode 100644 ports/sail/webp.patch diff --git a/ports/sail/avif.patch b/ports/sail/avif.patch deleted file mode 100644 index bc245277a160e6..00000000000000 --- a/ports/sail/avif.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/sail-codecs/avif/CMakeLists.txt b/src/sail-codecs/avif/CMakeLists.txt -index 3f36e0c8..7a24ad25 100644 ---- a/src/sail-codecs/avif/CMakeLists.txt -+++ b/src/sail-codecs/avif/CMakeLists.txt -@@ -1,7 +1,6 @@ --find_library(AVIF_LIBRARY avif ${SAIL_CODEC_AVIF_REQUIRED_OPTION}) --find_path(AVIF_INCLUDE_DIRS avif/avif.h ${SAIL_CODEC_AVIF_REQUIRED_OPTION}) -+find_package(libavif CONFIG ${SAIL_CODEC_AVIF_REQUIRED_OPTION}) - --if (NOT AVIF_LIBRARY OR NOT AVIF_INCLUDE_DIRS) -+if (NOT libavif_FOUND) - return() - endif() - -@@ -18,5 +17,4 @@ set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_depende - sail_codec(NAME avif - SOURCES helpers.h helpers.c io.h io.c avif.c - ICON avif.png -- DEPENDENCY_INCLUDE_DIRS ${AVIF_INCLUDE_DIRS} -- DEPENDENCY_LIBS ${AVIF_LIBRARY}) -+ DEPENDENCY_LIBS avif) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 0c044149ae7cda..e582897b6c8244 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -1,18 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-rc3 - SHA512 5de94277d57b862d4ab99266c2608cd37d7ca9eb89ef753ddddf47e4cebffab54b2cfb9c28d0c3bb7721f0d24c1310377c4b42adab477568e6965bd7ebc55b17 + REF "v${VERSION}" + SHA512 9d2e783a597bea5923db4eb822985488a24c5337376384f69bedeb2952d23e84005639c0e1aa243b81b40e87e428da470895ce30418fc31e0f1b60bc71b17d09 HEAD_REF master - PATCHES - avif.patch - webp.patch ) # Enable selected codecs set(ONLY_CODECS "") -foreach(CODEC avif bmp gif ico jpeg jpeg2000 pcx png psd qoi tga tiff wal webp xbm) +foreach(CODEC avif bmp gif ico jpeg jpeg2000 jpegxl pcx png psd qoi tga tiff wal webp xbm) if (${CODEC} IN_LIST FEATURES) list(APPEND ONLY_CODECS ${CODEC}) endif() @@ -23,11 +20,11 @@ list(JOIN ONLY_CODECS "\;" ONLY_CODECS_ESCAPED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DBUILD_TESTING=OFF -DSAIL_COMBINE_CODECS=ON -DSAIL_ONLY_CODECS=${ONLY_CODECS_ESCAPED} -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF - -DSAIL_BUILD_TESTS=OFF ) vcpkg_cmake_install() @@ -52,7 +49,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" # Fix pkg-config files vcpkg_fixup_pkgconfig() -# Unused because SAIL_COMBINE_CODECS is On +# Unused because SAIL_COMBINE_CODECS is ON vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sail/sail-common/config.h" "#define SAIL_CODECS_PATH \"${CURRENT_PACKAGES_DIR}/lib/sail/codecs\"" "") # Handle usage diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index d0cabea6cee39c..d6f400e89360ec 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-rc3", - "port-version": 2, + "version-semver": "0.9.0", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", @@ -17,7 +16,7 @@ } ], "default-features": [ - "high-priority" + "highest-priority" ], "features": { "all": { @@ -27,6 +26,7 @@ "name": "sail", "features": [ "high-priority", + "highest-priority", "low-priority", "lowest-priority", "medium-priority" @@ -50,12 +50,22 @@ ] }, "high-priority": { - "description": "Enable high priority codecs such as JPEG or PNG", + "description": "Enable high priority codecs such as BMP", + "dependencies": [ + { + "name": "sail", + "features": [ + "bmp" + ] + } + ] + }, + "highest-priority": { + "description": "Enable highest priority codecs such as JPEG or PNG", "dependencies": [ { "name": "sail", "features": [ - "bmp", "gif", "jpeg", "png", @@ -79,6 +89,12 @@ "jasper" ] }, + "jpegxl": { + "description": "Enable JPEG XL codec", + "dependencies": [ + "libjxl" + ] + }, "low-priority": { "description": "Enable low priority codecs such as TGA", "dependencies": [ @@ -114,6 +130,7 @@ "features": [ "avif", "jpeg2000", + "jpegxl", "webp" ] } diff --git a/ports/sail/webp.patch b/ports/sail/webp.patch deleted file mode 100644 index 2fa105e21b045d..00000000000000 --- a/ports/sail/webp.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/sail-codecs/webp/CMakeLists.txt b/src/sail-codecs/webp/CMakeLists.txt -index 64d31e5a..40c33084 100644 ---- a/src/sail-codecs/webp/CMakeLists.txt -+++ b/src/sail-codecs/webp/CMakeLists.txt -@@ -1,28 +1,20 @@ --find_library(WEBP_RELEASE_LIBRARY NAMES webp ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) --find_library(WEBP_DEBUG_LIBRARY NAMES webpd webp ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) --find_library(WEBP_DEMUX_RELEASE_LIBRARY NAMES webpdemux ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) --find_library(WEBP_DEMUX_DEBUG_LIBRARY NAMES webpdemuxd webpdemux ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) --find_path(WEBP_INCLUDE_DIRS webp/decode.h ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) -+find_package(WebP CONFIG ${SAIL_CODEC_WEBP_REQUIRED_OPTION}) - --if ((NOT WEBP_RELEASE_LIBRARY AND NOT WEBP_DEBUG_LIBRARY) OR (NOT WEBP_DEMUX_RELEASE_LIBRARY AND NOT WEBP_DEMUX_DEBUG_LIBRARY) OR NOT WEBP_INCLUDE_DIRS) -+if (NOT WebP_FOUND) - return() - endif() - - # This will add the following CMake rules to the CMake config for static builds so a client - # application links against the required dependencies: - # --# find_library(webp_RELEASE_LIBRARY NAMES webp) --# find_library(webp_DEBUG_LIBRARY NAMES webpd webp) --# set_property(TARGET SAIL::sail-codecs APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${webp_RELEASE_LIBRARY}> $<$:${webp_DEBUG_LIBRARY}>) -+# find_dependency(LIBWEBP REQUIRED) -+# set_property(TARGET SAIL::sail-codecs APPEND PROPERTY INTERFACE_LINK_LIBRARIES WebP::webp WebP::webpdecoder WebP::webpdemux) - # --# Same to webpdemux. --# --set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_library,webp,webpd" "find_library,webpdemux,webpdemuxd" PARENT_SCOPE) -+set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_dependency,WEBP,WebP::webp WebP::webpdecoder WebP::webpdemux" PARENT_SCOPE) - - # Common codec configuration - # - sail_codec(NAME webp - SOURCES helpers.h helpers.c webp.c - ICON webp.png -- DEPENDENCY_INCLUDE_DIRS ${WEBP_INCLUDE_DIRS} -- DEPENDENCY_LIBS optimized ${WEBP_RELEASE_LIBRARY} debug ${WEBP_DEBUG_LIBRARY} optimized ${WEBP_DEMUX_RELEASE_LIBRARY} debug ${WEBP_DEMUX_DEBUG_LIBRARY}) -+ DEPENDENCY_LIBS WebP::webp WebP::webpdecoder WebP::webpdemux) diff --git a/versions/baseline.json b/versions/baseline.json index d9c0d333804196..63f054de3230db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7569,8 +7569,8 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-rc3", - "port-version": 2 + "baseline": "0.9.0", + "port-version": 0 }, "sajson": { "baseline": "2018-09-21", diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 0d8c9aa5cd8a05..47a423d9d5ed0d 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63143e644f5e386b1b8aae22194e8b157bcdca5e", + "version-semver": "0.9.0", + "port-version": 0 + }, { "git-tree": "0c604af0721281506a77f887d07abca30fe350c3", "version-semver": "0.9.0-rc3", From f268ef2f7ef6fbdc0a0f719f4d51579c589feccb Mon Sep 17 00:00:00 2001 From: Julia DeMille <8127111+judemille@users.noreply.github.com> Date: Wed, 8 Nov 2023 12:08:18 -0600 Subject: [PATCH 0315/1039] [7zip] Add C headers to includes (#34828) * [7zip] Add C headers to includes. Some people need them. * [7zip] Update version 23.01 to include C headers. * [7zip] Bump port version. * [7zip] Version files updated. * [7zip] Reverting faulty version file changes. * [7zip] Version files changed, less faulty.. --- ports/7zip/CMakeLists.txt | 1 + ports/7zip/vcpkg.json | 1 + versions/7-/7zip.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt index 2f6298a09cef06..b4bed2e8d3372c 100644 --- a/ports/7zip/CMakeLists.txt +++ b/ports/7zip/CMakeLists.txt @@ -401,6 +401,7 @@ target_compile_definitions(7zip target_include_directories(7zip INTERFACE $/7zip/CPP + $/7zip/C ) install( diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index ecd006d66d6c88..a2a07dc20da938 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,6 +1,7 @@ { "name": "7zip", "version-string": "23.01", + "port-version": 1, "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 607eb1738a38ab..df6badd73f00f7 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f1fa323db9a88dd410e7d46ad651f7fe5cb620c", + "version-string": "23.01", + "port-version": 1 + }, { "git-tree": "770ce8dc829180bfcf2c396aa780474a87289f89", "version-string": "23.01", diff --git a/versions/baseline.json b/versions/baseline.json index 63f054de3230db..2ddda15198c092 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6,7 +6,7 @@ }, "7zip": { "baseline": "23.01", - "port-version": 0 + "port-version": 1 }, "ableton": { "baseline": "3.0.6", From fbe824cb47fdf7ae3a58f6e1dd0f5f4c52a9fb24 Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Wed, 8 Nov 2023 19:10:24 +0100 Subject: [PATCH 0316/1039] [crc32c] add license (#34516) * [crc32c] add license * Update version database --- ports/crc32c/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/crc32c.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/crc32c/vcpkg.json b/ports/crc32c/vcpkg.json index 3acb74812e56b7..3f8718aaa919b0 100644 --- a/ports/crc32c/vcpkg.json +++ b/ports/crc32c/vcpkg.json @@ -1,9 +1,10 @@ { "name": "crc32c", "version": "1.1.2", - "port-version": 1, + "port-version": 2, "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", "homepage": "https://github.com/google/crc32c", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 2ddda15198c092..ab45306c0cbb0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1946,7 +1946,7 @@ }, "crc32c": { "baseline": "1.1.2", - "port-version": 1 + "port-version": 2 }, "crfsuite": { "baseline": "2020-08-27", diff --git a/versions/c-/crc32c.json b/versions/c-/crc32c.json index 1b603575edc7ba..d275079e7bb0cc 100644 --- a/versions/c-/crc32c.json +++ b/versions/c-/crc32c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65cab652a6fffba3e3b25332d7935bf57aa3c4f0", + "version": "1.1.2", + "port-version": 2 + }, { "git-tree": "9704ed68003973bdffcd5224f720b97c424d1fa5", "version": "1.1.2", From f03eb4683dbc612fc50cb6e0b0ffa7e5794e37df Mon Sep 17 00:00:00 2001 From: talregev Date: Wed, 8 Nov 2023 20:12:24 +0200 Subject: [PATCH 0317/1039] [dartsim] fix pc dependencies (#34928) --- ports/dartsim/fix-pc-dependencies.patch | 8 ++++++++ ports/dartsim/portfile.cmake | 3 ++- ports/dartsim/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dartsim.json | 5 +++++ 5 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 ports/dartsim/fix-pc-dependencies.patch diff --git a/ports/dartsim/fix-pc-dependencies.patch b/ports/dartsim/fix-pc-dependencies.patch new file mode 100644 index 00000000000000..f2b4d82c81088a --- /dev/null +++ b/ports/dartsim/fix-pc-dependencies.patch @@ -0,0 +1,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,3 +70,3 @@ + set(DART_PKG_DESC "Dynamic Animation and Robotics Toolkit.") +-set(DART_PKG_EXTERNAL_DEPS "eigen, ccd, fcl, assimp, boost") ++set(DART_PKG_EXTERNAL_DEPS "assimp, ccd, eigen3, fcl, octomap") + diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index 7059ac1d96976b..7086f3f86b364c 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -4,11 +4,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dartsim/dart - REF v6.12.2 + REF v${VERSION} SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b HEAD_REF main PATCHES disable_unit_tests_examples_and_tutorials.patch + fix-pc-dependencies.patch ) vcpkg_cmake_configure( diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 1ac4af59e047d1..a0f8610cb019c3 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dartsim", "version": "6.12.2", - "port-version": 2, + "port-version": 3, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ab45306c0cbb0b..c388d29a82625a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2078,7 +2078,7 @@ }, "dartsim": { "baseline": "6.12.2", - "port-version": 2 + "port-version": 3 }, "dataframe": { "baseline": "2.1.0", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index 9366a8096a38c7..a9dbbddca54b6b 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d586df3f633aafc829fd66b18ad22120a9bbed2", + "version": "6.12.2", + "port-version": 3 + }, { "git-tree": "af3970efb060832f60efe9ad00eef7bc0e824a90", "version": "6.12.2", From 4e5e6b3fa66f0c52be86f7034792f45f959ec582 Mon Sep 17 00:00:00 2001 From: Kyle O'Connor Date: Wed, 8 Nov 2023 13:13:52 -0500 Subject: [PATCH 0318/1039] [opencv4] OpenJPEG feature (#34961) * add [BUILD_|WITH_]OPENJPEG * Add openjpeg feature * format-manifest * bump port version * x-add-version --- ports/opencv4/portfile.cmake | 3 ++- ports/opencv4/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 49a609ae9b0642..6ae5473fd99f62 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -68,6 +68,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "gtk" WITH_GTK "halide" WITH_HALIDE "jasper" WITH_JASPER + "openjpeg" WITH_OPENJPEG "jpeg" WITH_JPEG "lapack" WITH_LAPACK "nonfree" OPENCV_ENABLE_NONFREE @@ -398,6 +399,7 @@ vcpkg_cmake_configure( -Dade_DIR=${ADE_DIR} ###### Disable build 3rd party libs -DBUILD_JASPER=OFF + -DBUILD_OPENJPEG=OFF -DBUILD_JPEG=OFF -DBUILD_OPENEXR=OFF -DBUILD_PNG=OFF @@ -450,7 +452,6 @@ vcpkg_cmake_configure( -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENVINO=${WITH_OPENVINO} -DWITH_TBB=${WITH_TBB} - -DWITH_OPENJPEG=OFF -DWITH_CPUFEATURES=OFF ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index f09786b801057c..87b25cdec1be60 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 9, + "port-version": 10, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -207,7 +207,7 @@ "description": "Enable Intel Integrated Performance Primitives" }, "jasper": { - "description": "JPEG 2000 support for opencv", + "description": "JPEG 2000 support for opencv (deprecated)", "dependencies": [ "jasper" ] @@ -240,6 +240,12 @@ "opengl" ] }, + "openjpeg": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "openjpeg" + ] + }, "openmp": { "description": "Enable openmp support for opencv" }, diff --git a/versions/baseline.json b/versions/baseline.json index c388d29a82625a..9ed6c5856f0d7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6198,7 +6198,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 9 + "port-version": 10 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 5c58f663244772..be06cfa44c42a1 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f4fcf20bc429d1a01edb9fdf423ef78d18c9b6", + "version": "4.8.0", + "port-version": 10 + }, { "git-tree": "7ed8c48a9b2be5df262ccbcfa876f5314f429c10", "version": "4.8.0", From fe1e9f508ee13ed3d0a7d318beac7efe1ec4f9d7 Mon Sep 17 00:00:00 2001 From: Alex E <36134278+chusitoo@users.noreply.github.com> Date: Wed, 8 Nov 2023 13:27:40 -0500 Subject: [PATCH 0319/1039] [vit-vit-ctpl] add port (#34956) * add ctpl port files * add ctpl version * Code review --- ports/vit-vit-ctpl/portfile.cmake | 24 ++++++++++++++++++++++++ ports/vit-vit-ctpl/vcpkg.json | 25 +++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/v-/vit-vit-ctpl.json | 9 +++++++++ 4 files changed, 62 insertions(+) create mode 100644 ports/vit-vit-ctpl/portfile.cmake create mode 100644 ports/vit-vit-ctpl/vcpkg.json create mode 100644 versions/v-/vit-vit-ctpl.json diff --git a/ports/vit-vit-ctpl/portfile.cmake b/ports/vit-vit-ctpl/portfile.cmake new file mode 100644 index 00000000000000..3a25a10a5df4b6 --- /dev/null +++ b/ports/vit-vit-ctpl/portfile.cmake @@ -0,0 +1,24 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO vit-vit/ctpl + REF "ctpl_v.${VERSION}" + SHA512 5ab83a342e70559687c15f9ab8e7ca47d609713d64bf4248f05b9f311fddb44502ccd54d8352193c00ae570ebde3ea1149389ecdd0207ef46325eb8b648fb0e3 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lockfree WITH_LOCKFREE +) + +if(WITH_LOCKFREE) + file(INSTALL "${SOURCE_PATH}/ctpl.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endif() + +file(INSTALL "${SOURCE_PATH}/ctpl_stl.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/vit-vit-ctpl/vcpkg.json b/ports/vit-vit-ctpl/vcpkg.json new file mode 100644 index 00000000000000..c650a6c281ee75 --- /dev/null +++ b/ports/vit-vit-ctpl/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "vit-vit-ctpl", + "version": "0.0.2", + "description": "Modern and efficient C++ Thread Pool Library", + "homepage": "https://github.com/vit-vit/ctpl", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "lockfree": { + "description": "Depends on Boost Lockfree Queue library", + "dependencies": [ + "boost-lockfree" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 9ed6c5856f0d7e..71b78778a218e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8836,6 +8836,10 @@ "baseline": "1.1.0", "port-version": 0 }, + "vit-vit-ctpl": { + "baseline": "0.0.2", + "port-version": 0 + }, "vk-bootstrap": { "baseline": "0.7", "port-version": 1 diff --git a/versions/v-/vit-vit-ctpl.json b/versions/v-/vit-vit-ctpl.json new file mode 100644 index 00000000000000..974e70577d838b --- /dev/null +++ b/versions/v-/vit-vit-ctpl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "05de52269dd018412cc3e79ea4fa116661d07c0f", + "version": "0.0.2", + "port-version": 0 + } + ] +} From 174dc0bd143713e8e67ca1bba709f153a6660435 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 10 Nov 2023 02:33:33 +0800 Subject: [PATCH 0320/1039] [mozjpeg] update to 4.1.5 (#34978) * [mozjpeg] update to 4.1.5 * [mozjpeg] update to 4.1.5 --- ports/mozjpeg/portfile.cmake | 4 ++-- ports/mozjpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mozjpeg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake index 93935242657402..a792158cca2e90 100644 --- a/ports/mozjpeg/portfile.cmake +++ b/ports/mozjpeg/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mozilla/mozjpeg - REF a2d2907ff023227e80c1e4efa809812410275a12 #v4.1.1 - SHA512 77c003406a0b86859c461d92bd216168d6c4f5d55735e4a9ab473d3dbcad03fd4e398204f884dfd03f0fa883da296ac05a8c5242aa40792a3e179627e51db154 + REF "v${VERSION}" + SHA512 90e1b0067740b161398d908e90b976eccc2ee7174496ce9693ba3cdf4727559ecff39744611657d847dd83164b80993152739692a5233aca577ebd052efaf501 HEAD_REF master PATCHES fix-install-error.patch diff --git a/ports/mozjpeg/vcpkg.json b/ports/mozjpeg/vcpkg.json index b3c6bf8822acf5..ca0ec7d8c4bcd5 100644 --- a/ports/mozjpeg/vcpkg.json +++ b/ports/mozjpeg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mozjpeg", - "version": "4.1.1", + "version": "4.1.5", "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.", "homepage": "https://github.com/mozilla/mozjpeg", "license": "IJG AND BSD-3-Clause AND Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 71b78778a218e0..78167b1528f2ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5633,7 +5633,7 @@ "port-version": 0 }, "mozjpeg": { - "baseline": "4.1.1", + "baseline": "4.1.5", "port-version": 0 }, "mp-units": { diff --git a/versions/m-/mozjpeg.json b/versions/m-/mozjpeg.json index 6319dcac1918e2..ae1e565fede59c 100644 --- a/versions/m-/mozjpeg.json +++ b/versions/m-/mozjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d5cda3e9c9c8f0ed895897d457afaf8d9604363", + "version": "4.1.5", + "port-version": 0 + }, { "git-tree": "0eb278a28c1706df4c9ce1413968d9e2a40edda8", "version": "4.1.1", From 0a2903a310d23d5388f9f4a468e3a006c7a85b38 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 10 Nov 2023 02:34:09 +0800 Subject: [PATCH 0321/1039] [miniaudio] update to 0.11.19 (#34977) * [miniaudio] update to 0.11.19 * [miniaudio] update to 0.11.19 --- ports/miniaudio/portfile.cmake | 4 ++-- ports/miniaudio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/miniaudio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/miniaudio/portfile.cmake b/ports/miniaudio/portfile.cmake index 9c9e2f76b12a82..8fb3143ebb7002 100644 --- a/ports/miniaudio/portfile.cmake +++ b/ports/miniaudio/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/miniaudio - REF 9a7663496fc06f7a9439c752fd7666ca93328c20 - SHA512 ada4c52bdf91b7ce3530616f28adb50803e40d7b6d01a6c2d127211a1497a4fb99f6e3d2c37f5422bcad4c7ef99f916846c8c6ad05ac1b68756c0337b9720ad8 + REF "${VERSION}" + SHA512 b16fd9af65af050ddb0597498fc10aec1d277c9e6ebac968c0c2a0d8688181eb2a221f50b9d8101d454ede305ce50ab4c0729beaa1a6ffef71ab2402a7013994 HEAD_REF master ) diff --git a/ports/miniaudio/vcpkg.json b/ports/miniaudio/vcpkg.json index bb184f8921bc80..ec6226dd6c8d25 100644 --- a/ports/miniaudio/vcpkg.json +++ b/ports/miniaudio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "miniaudio", - "version": "0.11.14", + "version": "0.11.19", "description": "Audio playback and capture library written in C, in a single source file", "homepage": "https://github.com/mackron/miniaudio", "license": "Unlicense OR MIT-0" diff --git a/versions/baseline.json b/versions/baseline.json index 78167b1528f2ca..04898e69bc6a10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5521,7 +5521,7 @@ "port-version": 4 }, "miniaudio": { - "baseline": "0.11.14", + "baseline": "0.11.19", "port-version": 0 }, "minifb": { diff --git a/versions/m-/miniaudio.json b/versions/m-/miniaudio.json index 6cf07d245bf641..a806adbe779feb 100644 --- a/versions/m-/miniaudio.json +++ b/versions/m-/miniaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62c26f2cd7ae5eb016e30a1555ff384f045047d5", + "version": "0.11.19", + "port-version": 0 + }, { "git-tree": "3e5f5e31bc86e07e943aa7d88ec8af21cd8f7013", "version": "0.11.14", From 5c02b81bb525b440b398c1d6562fbf7e954a76a3 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 9 Nov 2023 18:35:39 +0000 Subject: [PATCH 0322/1039] [glib] update to 2.78.1 (#34964) * [glib] update to 2.78.1 (microsoft/vcpkg#34963) libelf suppression patch has been obsoleted by GNOME/glib@3916368 . * [glib] regenerate version registry (microsoft/vcpkg#34963) --- ports/glib/portfile.cmake | 3 +-- ports/glib/suppress-libelf-dependency.patch | 12 ------------ ports/glib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 5 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 ports/glib/suppress-libelf-dependency.patch diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index bc4fe0601efe44..8464e34f1ecdd9 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -2,7 +2,7 @@ string(REGEX MATCH "^([0-9]*[.][0-9]*)" GLIB_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(GLIB_ARCHIVE URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${VERSION}.tar.xz" FILENAME "glib-${VERSION}.tar.xz" - SHA512 3d06890002f4b13f831c83fbb70cfce529f9750e30888619e4d6277116be15d106379a03143412cf4b2a289c0cbdbbc299ecf17284fbffc06c791ecf7556c765 + SHA512 aa9ed9195951b00ac8221e958ea337fbda82621a862ef8f29dc2ea396a6253ce51c2a0a498dfa4e12642f1836f85f9564f09991979ae85c5ed4368355d857376 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -10,7 +10,6 @@ vcpkg_extract_source_archive(SOURCE_PATH PATCHES use-libiconv-on-windows.patch libintl.patch - suppress-libelf-dependency.patch ) if(APPLE) diff --git a/ports/glib/suppress-libelf-dependency.patch b/ports/glib/suppress-libelf-dependency.patch deleted file mode 100644 index cf14dd5771e466..00000000000000 --- a/ports/glib/suppress-libelf-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gio/meson.build b/gio/meson.build ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -935,7 +935,7 @@ endif - # Dependencies used by executables below - have_libelf = false - libelf = dependency('libelf', version : '>= 0.8.12', required : false) --if libelf.found() -+if false - have_libelf = true - else - # This fallback is necessary on *BSD. elfutils isn't the only libelf diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index da1c7406f5d19a..b25eabbb475183 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glib", - "version": "2.78.0", + "version": "2.78.1", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 04898e69bc6a10..baef3b96ba17f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 2 }, "glib": { - "baseline": "2.78.0", + "baseline": "2.78.1", "port-version": 0 }, "glibmm": { diff --git a/versions/g-/glib.json b/versions/g-/glib.json index b856f49bf3766f..4309342c1775a7 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c91a4d4382d4d271d13397214c536389fd4a122", + "version": "2.78.1", + "port-version": 0 + }, { "git-tree": "cd9adf35a5c743b40cedce00c43542980f338229", "version": "2.78.0", From b5efc3901285b351b85f7701ea19d082e4ec2524 Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Thu, 9 Nov 2023 19:59:25 +0100 Subject: [PATCH 0323/1039] [configcat] Update to version 3.1.0 (#34958) * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 --- ports/configcat/portfile.cmake | 2 +- ports/configcat/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/c-/configcat.json | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ports/configcat/portfile.cmake b/ports/configcat/portfile.cmake index 7b063435ad8536..e395317c5964e1 100644 --- a/ports/configcat/portfile.cmake +++ b/ports/configcat/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO configcat/cpp-sdk REF "v${VERSION}" - SHA512 cb86f575e1917edf10ec423d4ae85b47c979370bdb4381e1eecdb32bc64637f5088b3a3d91fa1b0aa2604fb0fe3011bc0964b3a45e5aa32aba1d53ba0da99fd5 + SHA512 f5a2217e0b451cb2390091dfec4e89e0fb3abfa22d74ed75e1038e060fe3009d0e114bf6f6556949e6574c3e82ca72bc6aad8be8fb5d3f0dea36a867f992d27f HEAD_REF master ) diff --git a/ports/configcat/vcpkg.json b/ports/configcat/vcpkg.json index d20dc24025d7d7..ef35692a72c5a3 100644 --- a/ports/configcat/vcpkg.json +++ b/ports/configcat/vcpkg.json @@ -1,13 +1,23 @@ { "name": "configcat", - "version": "3.0.0", + "version": "3.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", + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, "hash-library", "nlohmann-json", + { + "name": "openssl", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index baef3b96ba17f4..d1500c9126f78a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1757,7 +1757,7 @@ "port-version": 0 }, "configcat": { - "baseline": "3.0.0", + "baseline": "3.1.0", "port-version": 0 }, "console-bridge": { diff --git a/versions/c-/configcat.json b/versions/c-/configcat.json index 4b2d70ce407821..4666d61e132018 100644 --- a/versions/c-/configcat.json +++ b/versions/c-/configcat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8beddf56b4ad53f7c2bbd1e457c31858f1906e9c", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "5a5b038429eeed3e978742cb13ea7c207ad57d33", "version": "3.0.0", From e6424933699632762209a66da55c1c2fd0717674 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 10 Nov 2023 03:04:52 +0800 Subject: [PATCH 0324/1039] [tgui] Update to 1.1.0 (#34972) * update to 1.1.0 * update version --- ports/tgui/devendor-stb.patch | 52 ++++++++++------ ports/tgui/fix-dependencies.patch | 100 ------------------------------ ports/tgui/portfile.cmake | 9 +-- ports/tgui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tgui.json | 5 ++ 6 files changed, 45 insertions(+), 125 deletions(-) delete mode 100644 ports/tgui/fix-dependencies.patch diff --git a/ports/tgui/devendor-stb.patch b/ports/tgui/devendor-stb.patch index d346b312ff2a84..204267627352d2 100644 --- a/ports/tgui/devendor-stb.patch +++ b/ports/tgui/devendor-stb.patch @@ -1,27 +1,41 @@ +diff --git a/include/TGUI/extlibs/IncludeStbImage.hpp b/include/TGUI/extlibs/IncludeStbImage.hpp +index e19cccb..79d0f0c 100644 +--- a/include/TGUI/extlibs/IncludeStbImage.hpp ++++ b/include/TGUI/extlibs/IncludeStbImage.hpp +@@ -64,7 +64,7 @@ + #else + # define STB_IMAGE_STATIC + # define STB_IMAGE_IMPLEMENTATION +-# include ++# include + #endif + + #if defined(__GNUC__) +diff --git a/include/TGUI/extlibs/IncludeStbImageWrite.hpp b/include/TGUI/extlibs/IncludeStbImageWrite.hpp +index 2e23a5b..97ce878 100644 +--- a/include/TGUI/extlibs/IncludeStbImageWrite.hpp ++++ b/include/TGUI/extlibs/IncludeStbImageWrite.hpp +@@ -52,7 +52,7 @@ + #else + # define STB_IMAGE_WRITE_STATIC + # define STB_IMAGE_WRITE_IMPLEMENTATION +-# include ++# include + #endif + + #if defined(__GNUC__) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ebabb8a..4a166dc 100755 +index 6a08458..c575036 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -173,6 +173,9 @@ else() +@@ -225,6 +225,10 @@ else() + set_target_properties(tgui PROPERTIES MINSIZEREL_POSTFIX -s) 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 ++find_path(TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR stb_image_write.h REQUIRED) ++target_include_directories(tgui SYSTEM PRIVATE "${TGUI_SYSTEM_STB_IMAGE_WRITE_INCLUDE_DIR}") - #if defined(__GNUC__) - #pragma GCC diagnostic pop + if (TGUI_BUILD_AS_CXX_MODULE) + target_sources(tgui diff --git a/ports/tgui/fix-dependencies.patch b/ports/tgui/fix-dependencies.patch deleted file mode 100644 index 9432abbc1865e3..00000000000000 --- a/ports/tgui/fix-dependencies.patch +++ /dev/null @@ -1,100 +0,0 @@ -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..3f3f3ce 100644 ---- a/src/Backends/SDL/CMakeLists.txt -+++ b/src/Backends/SDL/CMakeLists.txt -@@ -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) -+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,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) -+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/portfile.cmake b/ports/tgui/portfile.cmake index 7eb1900174d332..ce9fa164850382 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -11,11 +11,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO texus/TGUI - REF v0.9.5 - SHA512 68c02679598448440ffaad69ee606a8413c2bcb508c91a59c2997ac866681617dadf6b9688f6c5eb07e5e38b5094a39bd79f0753a82236ec5f48498797c11134 - HEAD_REF 0.10 + REF "v${VERSION}" + SHA512 0896551286a40ea5b6e778018473bd230c7c3052cf19cbecfdc00789f029e9a753e569fdd5aab6f2e1e74c5fb8873bf1f7389e66abeaa3d628d6032941af331e + HEAD_REF 1.x PATCHES - fix-dependencies.patch devendor-stb.patch ) @@ -50,6 +49,8 @@ vcpkg_cmake_configure( -DTGUI_BUILD_GUI_BUILDER=OFF MAYBE_UNUSED_VARIABLES TGUI_BUILD_FRAMEWORK + TGUI_HAS_BACKEND_SDL + TGUI_HAS_BACKEND_SFML ) vcpkg_cmake_install() diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index b7a07a0ebf1369..961f463385a883 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tgui", - "version": "0.9.5", + "version": "1.1.0", "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 d1500c9126f78a..6996b6de2edbd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8317,7 +8317,7 @@ "port-version": 4 }, "tgui": { - "baseline": "0.9.5", + "baseline": "1.1.0", "port-version": 0 }, "theia": { diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index 23bbcafc4c6fae..57cd6ef0b2d3fd 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd583943a94fda26c0fe58b498ebc8675af7e831", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "99b11d7e5b91a6f1919402576952f951383e2c34", "version": "0.9.5", From 90512eeab933399a2c056a6407f4d50ce4dd8dc2 Mon Sep 17 00:00:00 2001 From: Anna Levenberg Date: Thu, 9 Nov 2023 14:08:40 -0500 Subject: [PATCH 0325/1039] [google-cloud-cpp] update to latest release (v2.18.0) (#34873) * [google-cloud-cpp] update to latest release (v2.18.0) * don't modify old version's git-tree * change git sha --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 1e8af355471f58..dace1512b5aa04 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 a3d84785b024e31e909592bca5a6589873bcd342848fae9520a9e7715bcb736db71184eeedbcbf6086105e6145937cabdd731a80879fd177f80895fdf09c3b46 + SHA512 18c3fc4fabd1fabfbfb33760636e9403f5b5965cde9e2feab38ac76063ba82fd4aa59a895ded7288ff7552e5806714b5428765b673b5eff95080cd1718bd6792 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 67ef87589a9ac7..d60fae7fd5ab41 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.17.0", - "port-version": 2, + "version": "2.18.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -1121,6 +1120,18 @@ } ] }, + "securesourcemanager": { + "description": "Secure Source Manager API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "securitycenter": { "description": "Security Command Center API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6996b6de2edbd8..920cedb1a02dc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3037,8 +3037,8 @@ "port-version": 5 }, "google-cloud-cpp": { - "baseline": "2.17.0", - "port-version": 2 + "baseline": "2.18.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 e5c8a14f2ab658..b1eb437c4ddd1f 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21cf84757dd988f8b1ea4aa318002a4cc047b697", + "version": "2.18.0", + "port-version": 0 + }, { "git-tree": "2a52d32521f59da4d2ecfe7beffe13bab448ea64", "version": "2.17.0", From 94b2e6181793114a934861c597b798dd9fe707c1 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 10 Nov 2023 03:09:34 +0800 Subject: [PATCH 0326/1039] [tinyorm] Disable warnings as errors. (#34990) * [tinyorm] Disable warnings as errors. * version --- ports/tinyorm/portfile.cmake | 1 + ports/tinyorm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tinyorm.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/tinyorm/portfile.cmake b/ports/tinyorm/portfile.cmake index eeb21ca3a2ec2b..0f4d22ca5b5e55 100644 --- a/ports/tinyorm/portfile.cmake +++ b/ports/tinyorm/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_cmake_configure( -DTINY_PORT:STRING=${PORT} -DTINY_VCPKG:BOOL=ON -DVERBOSE_CONFIGURE:BOOL=ON + -DWARNINGS_AS_ERRORS=FALSE ${FEATURE_OPTIONS} ) diff --git a/ports/tinyorm/vcpkg.json b/ports/tinyorm/vcpkg.json index 281f79ec679a28..5f26da6cdf49ec 100644 --- a/ports/tinyorm/vcpkg.json +++ b/ports/tinyorm/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tinyorm", "version-semver": "0.36.5", + "port-version": 1, "maintainers": "Silver Zachara ", "description": "Modern C++ ORM library for Qt framework", "homepage": "https://github.com/silverqx/TinyORM", diff --git a/versions/baseline.json b/versions/baseline.json index 920cedb1a02dc7..e2fa1abb3e8097 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8426,7 +8426,7 @@ }, "tinyorm": { "baseline": "0.36.5", - "port-version": 0 + "port-version": 1 }, "tinyply": { "baseline": "2.3.4", diff --git a/versions/t-/tinyorm.json b/versions/t-/tinyorm.json index 257131a6367370..73c327c483646d 100644 --- a/versions/t-/tinyorm.json +++ b/versions/t-/tinyorm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba", + "version-semver": "0.36.5", + "port-version": 1 + }, { "git-tree": "b21b31342cfe5d58cce629fab598e6f968e5118e", "version-semver": "0.36.5", From a37c3c2399d11d4178879e9c9e6158a3fdc69195 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:16:28 +0100 Subject: [PATCH 0327/1039] [magnum] fix features (#34980) --- ports/magnum/portfile.cmake | 38 ++++++++++++++++++++----------------- ports/magnum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magnum.json | 5 +++++ 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index 8039763b62f01c..c060e1a73aa3c7 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -128,36 +128,40 @@ else() file(REMOVE ${LIB_TO_REMOVE}) endif() - file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*") - file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/*Any*") + if (VCPKG_TARGET_IS_UWP) + set(debug_dir "magnum") + else() + set(debug_dir "magnum-d") + endif() + + file(GLOB_RECURSE LIB_TO_REMOVE_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*") + file(GLOB_RECURSE LIB_TO_KEEP_DBG "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/*Any*") if(LIB_TO_KEEP_DBG) list(REMOVE_ITEM LIB_TO_REMOVE_DBG ${LIB_TO_KEEP_DBG}) endif() if(LIB_TO_REMOVE_DBG) file(REMOVE ${LIB_TO_REMOVE_DBG}) endif() - - # fonts and fontconverters don't have Any* plugins - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fonts") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/fontconverters") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fonts") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/fontconverters") - + # remove maybe empty dirs - file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/importers/*") - if(maybe_empty STREQUAL "") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/importers") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d/importers") - file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + foreach(subdir "fonts" "importers" "fontconverters" "imageconverters" "audioimporters") + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}/*") if(maybe_empty STREQUAL "") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum/${subdir}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}/${subdir}") endif() + endforeach() + + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/magnum/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/${debug_dir}") endif() + endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/magnum") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/${debug_dir}") endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index b6f94bc1ffa0c3..f700c12ee4be2c 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 16, + "port-version": 17, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e2fa1abb3e8097..dd262e08e89fa9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5326,7 +5326,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 16 + "port-version": 17 }, "magnum-extras": { "baseline": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 8377599b6ac4b0..07f0746ce5c7ac 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa47736590b34d1ce7158f0ebf783c2b54dcb004", + "version-string": "2020.06", + "port-version": 17 + }, { "git-tree": "d923e5792a77042485ffd4b32afecca23f18c7d9", "version-string": "2020.06", From 7c5a86fcc63f430c640d59fc88d01fc94ff90e66 Mon Sep 17 00:00:00 2001 From: Lukas Rost Date: Thu, 9 Nov 2023 20:24:46 +0100 Subject: [PATCH 0328/1039] [wolfssl] Add feature flags `dtls` and `secret-callback` (#33295) * wolfssl: add features `dtls` and `secret-callback` * bump port version * add missing cmake options for wolfssl * update version database * increment port version to resolve conflicts * update version database * fix newline * update version database again * set CMAKE_C_FLAGS using detected configuration * update version database * update version database --- ports/wolfssl/portfile.cmake | 23 ++++++++++++++++++++++- ports/wolfssl/vcpkg.json | 15 ++++++++++++++- versions/baseline.json | 2 +- versions/w-/wolfssl.json | 5 +++++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 090830006179e4..2be75a74fa66ac 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -7,6 +7,22 @@ vcpkg_from_github( PATCHES ) +if ("dtls" IN_LIST FEATURES) + set(ENABLE_DTLS yes) +else() + set(ENABLE_DTLS no) +endif() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +foreach(config RELEASE DEBUG) + string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -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") + if ("secret-callback" IN_LIST FEATURES) + string(APPEND VCPKG_COMBINED_C_FLAGS_${config} " -DHAVE_SECRET_CALLBACK") + endif() +endforeach() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -21,8 +37,13 @@ vcpkg_cmake_configure( -DWOLFSSL_OCSPSTAPLING_V2=yes -DWOLFSSL_CRL=yes -DWOLFSSL_DES3=yes - -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB\ -DWOLFSSL_CUSTOM_OID\ -DHAVE_OID_ENCODING\ -DWOLFSSL_CERT_GEN\ -DWOLFSSL_ASN_TEMPLATE\ -DWOLFSSL_KEY_GEN\ -DHAVE_PKCS7\ -DHAVE_AES_KEYWRAP\ -DWOLFSSL_AES_DIRECT\ -DHAVE_X963_KDF' + -DWOLFSSL_DTLS=${ENABLE_DTLS} + -DWOLFSSL_DTLS13=${ENABLE_DTLS} + -DWOLFSSL_DTLS_CID=${ENABLE_DTLS} + OPTIONS_RELEASE + -DCMAKE_C_FLAGS=${VCPKG_COMBINED_C_FLAGS_RELEASE} OPTIONS_DEBUG + -DCMAKE_C_FLAGS=${VCPKG_COMBINED_C_FLAGS_DEBUG} -DWOLFSSL_DEBUG=yes) vcpkg_cmake_install() diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 0abb5cc8898c67..8a6249e3dd24e6 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wolfssl", "version": "5.6.4", + "port-version": 1, "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", @@ -13,6 +14,18 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true + } + ], + "features": { + "dtls": { + "description": "DTLS support" + }, + "secret-callback": { + "description": "Enables callback to provide TLS keys for debugging" } - ] + } } diff --git a/versions/baseline.json b/versions/baseline.json index dd262e08e89fa9..87a725d7f5357c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9022,7 +9022,7 @@ }, "wolfssl": { "baseline": "5.6.4", - "port-version": 0 + "port-version": 1 }, "wolftpm": { "baseline": "2.7.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index 8579506cea69df..0bb433f0235106 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb8d59a3965864a1330fa99418eef1df5c354a50", + "version": "5.6.4", + "port-version": 1 + }, { "git-tree": "65cc018a18a436969ef0fa7ff531d83994326f43", "version": "5.6.4", From 69600a0dfee552aab711d41fc52498eb2fcef9b3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 9 Nov 2023 20:27:39 +0100 Subject: [PATCH 0329/1039] [zlib-ng] add flags in pkgconfig (#34903) --- ports/zlib-ng/fix-cflags.patch | 24 ++++++++++++++++++++++++ ports/zlib-ng/portfile.cmake | 2 ++ ports/zlib-ng/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zlib-ng.json | 5 +++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ports/zlib-ng/fix-cflags.patch diff --git a/ports/zlib-ng/fix-cflags.patch b/ports/zlib-ng/fix-cflags.patch new file mode 100644 index 00000000000000..6d2a3511201560 --- /dev/null +++ b/ports/zlib-ng/fix-cflags.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a645ad6e..fbc2bdba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1159,6 +1159,9 @@ else() + endif() + + set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.pc) ++if(WITH_GZFILEOP) ++ set(PKG_CONFIG_CFLAGS "-DWITH_GZFILEOP") ++endif() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein + ${ZLIB_PC} @ONLY) + configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein +diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein +index 3d440ce6..df8bf9f0 100644 +--- a/zlib.pc.cmakein ++++ b/zlib.pc.cmakein +@@ -11,4 +11,4 @@ Version: @ZLIB_FULL_VERSION@ + + Requires: + Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@ +-Cflags: -I${includedir} ++Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index e4a26f40f3a075..646b8abe8bcc1a 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e HEAD_REF develop + PATCHES + fix-cflags.patch ) vcpkg_cmake_configure( diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index d3093f486f8976..d566b33e81448d 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zlib-ng", "version": "2.1.3", + "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 87a725d7f5357c..b78b166a3c554f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9302,7 +9302,7 @@ }, "zlib-ng": { "baseline": "2.1.3", - "port-version": 0 + "port-version": 1 }, "zlmediakit": { "baseline": "2023-08-12", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index 4155c7899e24aa..5ae306f6008b5e 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48a2a573758db5e1b96e889043fffaf453fa9cf4", + "version": "2.1.3", + "port-version": 1 + }, { "git-tree": "b5618019c0972a9e8bb9422609352679cf248f85", "version": "2.1.3", From f5c5b8ddbb88dec7eed4a5ac54c36d1c64d2d29d Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 9 Nov 2023 21:28:51 +0200 Subject: [PATCH 0330/1039] Add port gui7 (#34830) --- ports/gz-gui7/dependencies.patch | 22 ++++++++++++++++++++++ ports/gz-gui7/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/gz-gui7/vcpkg.json | 32 ++++++++++++++++++++++++++++++++ ports/gz-physics6/portfile.cmake | 4 ++-- ports/gz-physics6/vcpkg.json | 1 + versions/baseline.json | 6 +++++- versions/g-/gz-gui7.json | 9 +++++++++ versions/g-/gz-physics6.json | 5 +++++ 8 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 ports/gz-gui7/dependencies.patch create mode 100644 ports/gz-gui7/portfile.cmake create mode 100644 ports/gz-gui7/vcpkg.json create mode 100644 versions/g-/gz-gui7.json diff --git a/ports/gz-gui7/dependencies.patch b/ports/gz-gui7/dependencies.patch new file mode 100644 index 00000000000000..3d5d2f29375a5e --- /dev/null +++ b/ports/gz-gui7/dependencies.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,13 +80,17 @@ + set(GZ_TOOLS_VER 2) + + #-------------------------------------- + # Find QT ++set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets") ++if (WIN32) ++set(qt_pkgconfig "") ++endif() + gz_find_package (Qt5 + COMPONENTS + Core + Quick + QuickControls2 + Widgets + REQUIRED +- PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets" ++ PKGCONFIG ${qt_pkgconfig} + ) diff --git a/ports/gz-gui7/portfile.cmake b/ports/gz-gui7/portfile.cmake new file mode 100644 index 00000000000000..c9a42982267012 --- /dev/null +++ b/ports/gz-gui7/portfile.cmake @@ -0,0 +1,28 @@ +set(PACKAGE_NAME gui) + +ignition_modular_library( + NAME ${PACKAGE_NAME} + REF ${PORT}_${VERSION} + VERSION ${VERSION} + SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f + OPTIONS + PATCHES + dependencies.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-gui-7/plugins/*.dll") + if (NOT plugins STREQUAL "") + file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/") + file(REMOVE ${plugins}) + endif() + + file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-gui-7/plugins/*.dll") + if (NOT plugins_debug STREQUAL "") + file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/") + file(REMOVE ${plugins_debug}) + endif() + + # Lacking pc files for Qt + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() diff --git a/ports/gz-gui7/vcpkg.json b/ports/gz-gui7/vcpkg.json new file mode 100644 index 00000000000000..a70f344915dbd1 --- /dev/null +++ b/ports/gz-gui7/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "gz-gui7", + "version": "7.2.1", + "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.", + "homepage": "https://gazebosim.org/libs/gui", + "license": "Apache-2.0", + "dependencies": [ + "gz-cmake3", + "gz-common5", + "gz-math7", + "gz-msgs9", + "gz-plugin2", + "gz-rendering7", + "gz-transport12", + "gz-utils2", + { + "name": "ignition-modularscripts", + "host": true + }, + "protobuf", + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "qt5-quickcontrols2", + "default-features": false + }, + "sdformat13", + "tinyxml2" + ] +} diff --git a/ports/gz-physics6/portfile.cmake b/ports/gz-physics6/portfile.cmake index 1b7f2ad4430e47..d6b1087a807423 100644 --- a/ports/gz-physics6/portfile.cmake +++ b/ports/gz-physics6/portfile.cmake @@ -13,13 +13,13 @@ ignition_modular_library( if(VCPKG_TARGET_IS_WINDOWS) file(GLOB plugins "${CURRENT_PACKAGES_DIR}/lib/gz-physics-6/engine-plugins/*.dll") if (NOT plugins STREQUAL "") - file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/engine-plugins/") + file(COPY ${plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/engine-plugins/") file(REMOVE ${plugins}) endif() file(GLOB plugins_debug "${CURRENT_PACKAGES_DIR}/debug/lib/gz-physics-6/engine-plugins/*.dll") if (NOT plugins_debug STREQUAL "") - file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/engine-plugins/") + file(COPY ${plugins_debug} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/engine-plugins/") file(REMOVE ${plugins_debug}) endif() endif() diff --git a/ports/gz-physics6/vcpkg.json b/ports/gz-physics6/vcpkg.json index 6ec3970062fca3..e72fe3c34e8c5a 100644 --- a/ports/gz-physics6/vcpkg.json +++ b/ports/gz-physics6/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-physics6", "version": "6.5.1", + "port-version": 1, "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.", "homepage": "https://gazebosim.org/libs/physics", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b78b166a3c554f..b71a0457e0ca7f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3188,6 +3188,10 @@ "baseline": "8.1.0", "port-version": 0 }, + "gz-gui7": { + "baseline": "7.2.1", + "port-version": 0 + }, "gz-math7": { "baseline": "7.3.0", "port-version": 0 @@ -3198,7 +3202,7 @@ }, "gz-physics6": { "baseline": "6.5.1", - "port-version": 0 + "port-version": 1 }, "gz-plugin2": { "baseline": "2.0.1", diff --git a/versions/g-/gz-gui7.json b/versions/g-/gz-gui7.json new file mode 100644 index 00000000000000..737ccb5c2c8633 --- /dev/null +++ b/versions/g-/gz-gui7.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3fc2d2bd35c8d9c5dad86739f113b952cb65913a", + "version": "7.2.1", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gz-physics6.json b/versions/g-/gz-physics6.json index fafcde192d89d0..4fc4b164441d86 100644 --- a/versions/g-/gz-physics6.json +++ b/versions/g-/gz-physics6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f21733a38332420967e218df27d7adfc125c6f07", + "version": "6.5.1", + "port-version": 1 + }, { "git-tree": "9e84a89c5e37806e67295d51b6bd1ec565ccaede", "version": "6.5.1", From 9868b80bef05960db919c288434ef793340ddb8c Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:24:39 -0800 Subject: [PATCH 0331/1039] [ncnn] Update to 20231027 (#35016) * update ncnn * update version --------- Co-authored-by: Monica --- ports/ncnn/portfile.cmake | 6 +++--- ports/ncnn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ncnn.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/ncnn/portfile.cmake b/ports/ncnn/portfile.cmake index dff1fe35f7ee9d..f8e846e23f2130 100644 --- a/ports/ncnn/portfile.cmake +++ b/ports/ncnn/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/ncnn - REF 20221128 - SHA512 589e52b63eabfac1f8e47acc34bef6a87ce365851a5c4d551665c321938a2d8e622ab211babac38771695b9f4443516577ba1634409a55c2436498a7d28d8218 + REF "${VERSION}" + SHA512 722966b3b30c5a4df81c6d45237b1821acc69db0c78350a41e3bc60e3f40c3dc64587ae0ab223635c468314c665e477ee7e0c2d3d4cccbc72bb15aeb56dcda6c HEAD_REF master ) @@ -26,4 +26,4 @@ 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/ncnn/vcpkg.json b/ports/ncnn/vcpkg.json index 13b14a6036dc82..fbf005e68ae177 100644 --- a/ports/ncnn/vcpkg.json +++ b/ports/ncnn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ncnn", - "version": "20221128", + "version": "20231027", "description": "ncnn is a high-performance neural network inference computing framework.", "homepage": "https://github.com/Tencent/ncnn", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b71a0457e0ca7f..604e5163e778a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5841,7 +5841,7 @@ "port-version": 2 }, "ncnn": { - "baseline": "20221128", + "baseline": "20231027", "port-version": 0 }, "ncurses": { diff --git a/versions/n-/ncnn.json b/versions/n-/ncnn.json index 3084d2f0f06557..348ed94bf90426 100644 --- a/versions/n-/ncnn.json +++ b/versions/n-/ncnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a6a2a9cc4c71cac799469f587478b987a63e0ed", + "version": "20231027", + "port-version": 0 + }, { "git-tree": "792660456e6b0e405ad0c67b0474ae80fea47878", "version": "20221128", From 294c7e2240c8f6e59f8c042aecf520d3471ecb34 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:25:49 -0800 Subject: [PATCH 0332/1039] [joltphysics] Update to 4.0.0 (#34975) * [joltphysics] Update to latest commit * update version * update to 4.0.0 * update version * Update joltphysics.json --- ports/joltphysics/fix-export.diff | 20 ++++++++++---------- ports/joltphysics/portfile.cmake | 2 +- ports/joltphysics/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/j-/joltphysics.json | 5 +++++ 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/ports/joltphysics/fix-export.diff b/ports/joltphysics/fix-export.diff index 2dc7e3ec859e0e..a49dba54cfa338 100644 --- a/ports/joltphysics/fix-export.diff +++ b/ports/joltphysics/fix-export.diff @@ -1,8 +1,8 @@ diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt -index e4fddc50..655cdc80 100644 +index cc4cf1d..330b987 100644 --- a/Build/CMakeLists.txt +++ b/Build/CMakeLists.txt -@@ -91,8 +91,8 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA +@@ -100,8 +100,8 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA endif() # Set compiler flags for various configurations @@ -13,7 +13,7 @@ index e4fddc50..655cdc80 100644 set(CMAKE_CXX_FLAGS_DISTRIBUTION "/GS- /Gy /O2 /Oi /Ot") set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address /Od") set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all") -@@ -148,8 +148,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQU +@@ -160,8 +160,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQU endif() # Set compiler flags for various configurations @@ -24,7 +24,7 @@ index e4fddc50..655cdc80 100644 set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O3") set(CMAKE_CXX_FLAGS_RELEASEASAN "-fsanitize=address") set(CMAKE_CXX_FLAGS_RELEASEUBSAN "-fsanitize=undefined,implicit-conversion,float-divide-by-zero,local-bounds -fno-sanitize-recover=all") -@@ -193,7 +193,11 @@ if (IOS) +@@ -205,7 +205,11 @@ if (XCODE) endif() # Install Jolt library and includes @@ -37,7 +37,7 @@ index e4fddc50..655cdc80 100644 foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES}) string(REPLACE ${PHYSICS_REPO_ROOT} "" RELATIVE_SRC_FILE ${SRC_FILE}) get_filename_component(DESTINATION_PATH ${RELATIVE_SRC_FILE} DIRECTORY) -@@ -202,6 +206,17 @@ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES}) +@@ -214,6 +218,17 @@ foreach(SRC_FILE ${JOLT_PHYSICS_SRC_FILES}) endif() endforeach() @@ -52,17 +52,17 @@ index e4fddc50..655cdc80 100644 + DESTINATION share/unofficial-joltphysics +) + - # Check if we're the root CMakeLists.txt, if not we are included by another CMake file and we should disable everything except for the main library + # Check if we're the root CMakeLists.txt, if not we are included by another CMake file and we should disable everything except for the main library if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) # Ability to turn ON/OFF individual applications diff --git a/Jolt/Jolt.cmake b/Jolt/Jolt.cmake -index 176a7578..b31b2417 100644 +index c0f7099..d447a3f 100644 --- a/Jolt/Jolt.cmake +++ b/Jolt/Jolt.cmake -@@ -431,10 +431,13 @@ source_group(TREE ${JOLT_PHYSICS_ROOT} FILES ${JOLT_PHYSICS_SRC_FILES}) +@@ -474,10 +474,13 @@ if (BUILD_SHARED_LIBS) + target_compile_definitions(Jolt PRIVATE JPH_BUILD_SHARED_LIBRARY) + endif() - # Create Jolt lib - add_library(Jolt STATIC ${JOLT_PHYSICS_SRC_FILES}) -target_include_directories(Jolt PUBLIC ${PHYSICS_REPO_ROOT}) +target_include_directories(Jolt PUBLIC + $ diff --git a/ports/joltphysics/portfile.cmake b/ports/joltphysics/portfile.cmake index 068b6f0b2550c3..3e2cf0000a7d18 100644 --- a/ports/joltphysics/portfile.cmake +++ b/ports/joltphysics/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jrouwe/JoltPhysics REF "v${VERSION}" - SHA512 367e5b945e8f91a0c0c9eb699db6f49351aa39b0af9b8fd0be5f474d65b28a7244880eedad10cbd2db0e031daa28bbabb5f9fb8bf9af653dd1f86904bfde44a2 + SHA512 9b7530c37fc865682c4a130afc87daef1b038d1f457d2330a5253f35e3a4b6399ad738e97961f0ca8a9ae41ed999179e1c864dc699c5c93341ce4b6e6b2a1a61 HEAD_REF master PATCHES fix-export.diff diff --git a/ports/joltphysics/vcpkg.json b/ports/joltphysics/vcpkg.json index 1c8fc998af1bdb..85c829fadeb885 100644 --- a/ports/joltphysics/vcpkg.json +++ b/ports/joltphysics/vcpkg.json @@ -1,7 +1,6 @@ { "name": "joltphysics", - "version": "3.0.1", - "port-version": 1, + "version": "4.0.0", "description": "A multi core friendly rigid body physics and collision detection library suitable for games and VR applications", "homepage": "https://github.com/jrouwe/JoltPhysics", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 604e5163e778a4..5d7ceb44352e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3621,8 +3621,8 @@ "port-version": 3 }, "joltphysics": { - "baseline": "3.0.1", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "josuttis-jthread": { "baseline": "2020-07-21", diff --git a/versions/j-/joltphysics.json b/versions/j-/joltphysics.json index 0785b3f9b75610..10e69e5780c4e0 100644 --- a/versions/j-/joltphysics.json +++ b/versions/j-/joltphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7ea4a51e3f8cfa76e079f80d8ece87ef6695553", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "f8fca568d1ae240c8d3ca23ae3b9a09f6fb518ba", "version": "3.0.1", From 9dea34a447469791862d6a1a73b2cb1875de5ddd Mon Sep 17 00:00:00 2001 From: eao197 Date: Fri, 10 Nov 2023 22:26:37 +0300 Subject: [PATCH 0333/1039] [sobjectizer] Update to v.5.8.1.1 (#34974) * SObjectizer updated to v.5.8.1.1. * x-add-version applied for SObjectizer. --- ports/sobjectizer/portfile.cmake | 2 +- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 6b3226a07ed6e7..bd41024ef72b3b 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer REF "v.${VERSION}" - SHA512 9484ef5fd07deb6c82dba868f089fbdfbae34b33380cd25cdb40ba57468b429e8746e76a4fd1808f33f3609f143150d17966642816b27a78e7a1153520b28f0e + SHA512 2121c33660ed9866527533a4cce660762d2c92e4224a7d1ef3130e26fd9015664fa0190b673cea89568314a4fa4cbb9414be9c86983ae87d07cacc122ced79bf ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 887c93759897bf..9b2b75dfd56f00 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.8.1", + "version": "5.8.1.1", "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 5d7ceb44352e73..2baeae18b67e37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7925,7 +7925,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.8.1", + "baseline": "5.8.1.1", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index e960bc9edbc08b..84ff0173af267f 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19bcadb4abff7ed5b5423eca7280259ab6b3045a", + "version": "5.8.1.1", + "port-version": 0 + }, { "git-tree": "318301f060f4853b2ed29d087e7d7730fe55d156", "version": "5.8.1", From a241fec927f9c26845ca532130dadee0887840a7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:27:13 +0100 Subject: [PATCH 0334/1039] [qtdeclarative] fix hidden build order dep on qtlanguageserver (#34893) * add language server dep * v db --- ports/qtdeclarative/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/q-/qtdeclarative.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 3bdfe496f30272..35e1cbc4b3ea7d 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtdeclarative", "version": "6.6.0", + "port-version": 1, "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, @@ -18,6 +19,7 @@ "host": true, "default-features": false }, + "qtlanguageserver", { "name": "qtshadertools", "default-features": false diff --git a/versions/baseline.json b/versions/baseline.json index 2baeae18b67e37..ef814d36448608 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7070,7 +7070,7 @@ }, "qtdeclarative": { "baseline": "6.6.0", - "port-version": 0 + "port-version": 1 }, "qtdeviceutilities": { "baseline": "6.6.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 587cf2f18f038b..2e9959b26715e2 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fcbb7948afc44ea3d2d5ebff7cf9fd9c576010c", + "version": "6.6.0", + "port-version": 1 + }, { "git-tree": "a1b753b4c94c95edf6c8ab7bac9c4577f060b9a4", "version": "6.6.0", From 8e745df694a4b7db69e95c7155ac7d3d923b5663 Mon Sep 17 00:00:00 2001 From: Robert Coup Date: Fri, 10 Nov 2023 19:30:23 +0000 Subject: [PATCH 0335/1039] python3: disable tkinter module on posix (#34998) When running with VCPKG_FORCE_SYSTEM_BINARIES=ON (linux/arm64) then the Python build will pick up libtk and attempt to build the tkinter module, linking to the system library and causing either a build failure or an external link dependency. Fix this by explicitly disabling it as we do for curses. --- ports/python3/0012-force-disable-curses.patch | 24 ------------------- .../python3/0012-force-disable-modules.patch | 13 ++++++++++ ports/python3/portfile.cmake | 2 +- ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 ++++ 6 files changed, 21 insertions(+), 27 deletions(-) delete mode 100644 ports/python3/0012-force-disable-curses.patch create mode 100644 ports/python3/0012-force-disable-modules.patch diff --git a/ports/python3/0012-force-disable-curses.patch b/ports/python3/0012-force-disable-curses.patch deleted file mode 100644 index 65e99c82445ce3..00000000000000 --- a/ports/python3/0012-force-disable-curses.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 08599a02debaa2ea015d1221dd2c8ca0481640a3 Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 26 Apr 2023 05:17:09 +0000 -Subject: [PATCH 12/14] force disable curses - ---- - Modules/Setup | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Modules/Setup b/Modules/Setup -index 87c6a152f8..7ad53f5b4f 100644 ---- a/Modules/Setup -+++ b/Modules/Setup -@@ -300,3 +300,7 @@ xxsubtype xxsubtype.c - # - # _sqlite3 _tkinter _curses pyexpat - # _codecs_jp _codecs_kr _codecs_tw unicodedata -+ -+*disabled* -+_curses -+_curses_panel --- -2.25.1 - diff --git a/ports/python3/0012-force-disable-modules.patch b/ports/python3/0012-force-disable-modules.patch new file mode 100644 index 00000000000000..f97f19e5b28a9d --- /dev/null +++ b/ports/python3/0012-force-disable-modules.patch @@ -0,0 +1,13 @@ +diff --git a/Modules/Setup b/Modules/Setup +index 87c6a152f8..7ad53f5b4f 100644 +--- a/Modules/Setup ++++ b/Modules/Setup +@@ -375,3 +375,8 @@ xxsubtype xxsubtype.c + # + # _sqlite3 _tkinter _curses pyexpat + # _codecs_jp _codecs_kr _codecs_tw unicodedata ++ ++*disabled* ++_curses ++_curses_panel ++_tkinter diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index c7e23e7b61bf54..a39a2a0ba67384 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -15,7 +15,7 @@ set(PATCHES 0005-dont-copy-vcruntime.patch 0008-python.pc.patch 0010-dont-skip-rpath.patch - 0012-force-disable-curses.patch + 0012-force-disable-modules.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch 0018-fix-sysconfig-include.patch diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index ffe9e3cb152f9c..7a64699ae1bfc7 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.11.5", - "port-version": 1, + "port-version": 2, "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 ef814d36448608..64a2c824277abe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6810,7 +6810,7 @@ }, "python3": { "baseline": "3.11.5", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 01105eabc45e5a..6e12f40b9c378b 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f51d67945e156a17ca72a743f04455a368e73272", + "version": "3.11.5", + "port-version": 2 + }, { "git-tree": "a428056a4e0e86adce9344f051e4678e50e6cb35", "version": "3.11.5", From 1e8122f2f83d454e7b3aaf3a1a2f871d29570e96 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:43:18 -0800 Subject: [PATCH 0336/1039] [log4cxx] fix find_package error (#34996) * [log4cxx] fix find_package error * update version --------- Co-authored-by: vzhli17 --- ports/log4cxx/fix-find-package.patch | 13 +++++++++++++ ports/log4cxx/portfile.cmake | 2 ++ ports/log4cxx/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/log4cxx.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/log4cxx/fix-find-package.patch diff --git a/ports/log4cxx/fix-find-package.patch b/ports/log4cxx/fix-find-package.patch new file mode 100644 index 00000000000000..037cf7f14cbf48 --- /dev/null +++ b/ports/log4cxx/fix-find-package.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61c0479..3bd3327 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ find_package(APR-Util REQUIRED) + find_package( Threads REQUIRED ) + + # Find expat for XML parsing +-find_package(EXPAT REQUIRED) ++find_package(expat CONFIG REQUIRED) + if(TARGET EXPAT::EXPAT) + set(EXPAT_LIBRARIES EXPAT::EXPAT) + elseif(TARGET expat::expat) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index efacf7905d9fb3..5c3debe74e08bc 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + fix-find-package.patch ) vcpkg_cmake_configure( diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index f7769b3fd43c8a..c14e45fd487486 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "log4cxx", "version": "1.1.0", + "port-version": 1, "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 64a2c824277abe..a65f3d2bc4d4f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5218,7 +5218,7 @@ }, "log4cxx": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 047d7ba6549e1c..4d2e6129e76ab1 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c030a796829f4525b2369a135d7bdc615b6fb14b", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "eca29ecb5127d26bd46aad143468b069a045d104", "version": "1.1.0", From 11610eabb91dc70853081d7be6b064c896863f13 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 10 Nov 2023 12:00:25 -0800 Subject: [PATCH 0337/1039] Add msbuild feature to use z-applocal, and avoid trying to applocal deploy for non executable project types. (#35012) * Hook up z-applocal, work started by @vicroms. * Fix spelling of utf8 * Use standard warning formats. * Don't get in the way of stdout. * Don't try to Applocal deploy if the linker does not run. * Make VcpkgUseBuiltInApplocalDeps docs a bit nicer. * Change to (experimental) prefix. * Add an X. --- .../buildsystems/msbuild/vcpkg-general.xml | 14 +++++++ scripts/buildsystems/msbuild/vcpkg.props | 1 + scripts/buildsystems/msbuild/vcpkg.targets | 40 ++++++++++++++----- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml index 32610684d5f68a..af45f5ca722df5 100644 --- a/scripts/buildsystems/msbuild/vcpkg-general.xml +++ b/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -41,6 +41,20 @@ + + + + + + + + + + + + diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index 36bccc55abf4c2..a2f8adcc8ae836 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -34,6 +34,7 @@ Tried to add /lib as a parameter to the linker call but was unable to find a way to pass it as the first parameter. --> false true + false true diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 361850bd838031..c831b0fce3f6cf 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -182,8 +182,12 @@ Importance="High" /> + StandardErrorImportance="High" + UseUtf8Encoding="Always" + StdOutEncoding="utf-8" + StdErrEncoding="utf-8" + UseCommandProcessor="false" + /> + Condition="'$(_ZVcpkgClassicOrManifest)' == 'true' and '$(VcpkgApplocalDeps)' == 'true' and '$(LinkSkippedExecution)' != 'true' and '@(Link)' != ''"> - <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" + <_ZVcpkgApplocalInstalledBinDir>$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin + <_ZVcpkgApplocalTLogPath>$(TLogLocation)$(ProjectName).write.1u.tlog + <_ZVcpkgApplocalCopiedFilesLogPath>$(IntDir)vcpkg.applocal.log + <_ZVcpkgApplocalBuiltinArguments>--target-binary="$(TargetPath)" --installed-bin-dir="$(_ZVcpkgApplocalInstalledBinDir)" --tlog-file="$(_ZVcpkgApplocalTLogPath)" --copied-files-log="$(_ZVcpkgApplocalCopiedFilesLogPath)" + <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgApplocalInstalledBinDir)" "$(_ZVcpkgApplocalTLogPath)" "$(_ZVcpkgApplocalCopiedFilesLogPath)" + + + + + + Condition="$(_ZVcpkgAppLocalExitCode) == 9009 and '$(VcpkgXUseBuiltInApplocalDeps)' != 'true'"> + Condition="$(_ZVcpkgAppLocalExitCode) != 0 and '$(VcpkgXUseBuiltInApplocalDeps)' != 'true'"/> + From 2366ae1f0c4954bba788dce784a0584b9abd2337 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 10 Nov 2023 22:32:07 +0100 Subject: [PATCH 0338/1039] [xmlsec] no uwp (#35006) --- ports/xmlsec/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/x-/xmlsec.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/xmlsec/vcpkg.json b/ports/xmlsec/vcpkg.json index 19c7f7d57cd8c2..17faf2ef15790b 100644 --- a/ports/xmlsec/vcpkg.json +++ b/ports/xmlsec/vcpkg.json @@ -1,11 +1,11 @@ { "name": "xmlsec", "version": "1.3.1", - "port-version": 1, + "port-version": 2, "description": "XML Security Library is a C library based on LibXML2. The library supports major XML security standards.", "homepage": "https://www.aleksey.com/xmlsec/", "license": "X11 AND MPL-1.1", - "supports": "!xbox", + "supports": "!xbox & !uwp", "dependencies": [ "libxml2", "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index a65f3d2bc4d4f4..c4254d5e013cec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9162,7 +9162,7 @@ }, "xmlsec": { "baseline": "1.3.1", - "port-version": 1 + "port-version": 2 }, "xnnpack": { "baseline": "2022-02-17", diff --git a/versions/x-/xmlsec.json b/versions/x-/xmlsec.json index 6d32e4da36abfc..d52bf06ce1ae32 100644 --- a/versions/x-/xmlsec.json +++ b/versions/x-/xmlsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66d4ee9a9a576f6af80a2b830becab2f6ee7beb7", + "version": "1.3.1", + "port-version": 2 + }, { "git-tree": "9152aec5099de6e629c31adc81bd07fc6f87607e", "version": "1.3.1", From b633a4696a7674c2b3a6cf081f678ba960a047d4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 10 Nov 2023 22:32:20 +0100 Subject: [PATCH 0339/1039] [yara] no uwp (#35004) --- ports/yara/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/y-/yara.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 0e81f70a85b775..4692a0ef944c37 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,9 +1,11 @@ { "name": "yara", "version": "4.3.2", + "port-version": 1, "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ "openssl", { diff --git a/versions/baseline.json b/versions/baseline.json index c4254d5e013cec..6bf809bc80d3b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9234,7 +9234,7 @@ }, "yara": { "baseline": "4.3.2", - "port-version": 0 + "port-version": 1 }, "yas": { "baseline": "7.1.0", diff --git a/versions/y-/yara.json b/versions/y-/yara.json index bdf1606f75006c..ea69bcac5f6ffc 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5f938703b1025e041b7ad9eb9ab28f954e39e57", + "version": "4.3.2", + "port-version": 1 + }, { "git-tree": "993e6ee9f366ecd84f0636ae4f7de293293a9068", "version": "4.3.2", From 61f610845fb206298a69f708104a51d651872877 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:02:26 +0800 Subject: [PATCH 0340/1039] [itsy-bitsy,ztd-cuneicode,ztd-encoding-tables,ztd-idk,ztd-platform,ztd-static-containers] add new port (#34735) * [itsy-bitsy] add new port * [ztd-text] update * update * fix idk windows * update single * fix include cmake * make them static,and fix ztd text dependency * fix cuneicode linkage * update to lastest * fix ztd marco * use upstream changes * update to lastest * Revert "update to lastest" This reverts commit ee088768817e1245ba3855641e594e5bf408b007. * fix comparison * fix c32_state alignment * fetch upstream lastest change * CI [skip actions] * add unofficial namespace * ztd-text remove usage * CI [skip actions] * CI [skip actions] * CI [skip actions] * remove unofficial namespace * remove target sources * fix version * fix static_containers deps * fix deps * dynamci libs * Revert "dynamci libs" This reverts commit c44e4c3f5c767b801952982e816e67f63dd58047. --- ports/itsy-bitsy/fix-cmake-install.patch | 55 ++++++ ports/itsy-bitsy/portfile.cmake | 27 +++ ports/itsy-bitsy/vcpkg.json | 18 ++ ports/ztd-cuneicode/fix-cmake-install.patch | 95 +++++++++ ports/ztd-cuneicode/portfile.cmake | 22 +++ ports/ztd-cuneicode/vcpkg.json | 18 ++ .../fix-cmake-install.patch | 68 +++++++ ports/ztd-encoding-tables/portfile.cmake | 22 +++ ports/ztd-encoding-tables/vcpkg.json | 18 ++ ports/ztd-idk/fix-cmake-install.patch | 187 ++++++++++++++++++ ports/ztd-idk/portfile.cmake | 22 +++ ports/ztd-idk/vcpkg.json | 17 ++ ports/ztd-platform/fix-cmake-install.patch | 72 +++++++ ports/ztd-platform/portfile.cmake | 22 +++ ports/ztd-platform/vcpkg.json | 18 ++ ports/ztd-static-containers/fix-cmake.patch | 68 +++++++ ports/ztd-static-containers/portfile.cmake | 18 ++ ports/ztd-static-containers/vcpkg.json | 17 ++ ports/ztd-text/fix-cmake-install.patch | 109 ++++++++++ ports/ztd-text/portfile.cmake | 33 +--- ports/ztd-text/usage | 4 - ports/ztd-text/vcpkg.json | 6 +- versions/baseline.json | 26 ++- versions/i-/itsy-bitsy.json | 9 + versions/z-/ztd-cuneicode.json | 9 + versions/z-/ztd-encoding-tables.json | 9 + versions/z-/ztd-idk.json | 9 + versions/z-/ztd-platform.json | 9 + versions/z-/ztd-static-containers.json | 9 + versions/z-/ztd-text.json | 5 + 30 files changed, 988 insertions(+), 33 deletions(-) create mode 100644 ports/itsy-bitsy/fix-cmake-install.patch create mode 100644 ports/itsy-bitsy/portfile.cmake create mode 100644 ports/itsy-bitsy/vcpkg.json create mode 100644 ports/ztd-cuneicode/fix-cmake-install.patch create mode 100644 ports/ztd-cuneicode/portfile.cmake create mode 100644 ports/ztd-cuneicode/vcpkg.json create mode 100644 ports/ztd-encoding-tables/fix-cmake-install.patch create mode 100644 ports/ztd-encoding-tables/portfile.cmake create mode 100644 ports/ztd-encoding-tables/vcpkg.json create mode 100644 ports/ztd-idk/fix-cmake-install.patch create mode 100644 ports/ztd-idk/portfile.cmake create mode 100644 ports/ztd-idk/vcpkg.json create mode 100644 ports/ztd-platform/fix-cmake-install.patch create mode 100644 ports/ztd-platform/portfile.cmake create mode 100644 ports/ztd-platform/vcpkg.json create mode 100644 ports/ztd-static-containers/fix-cmake.patch create mode 100644 ports/ztd-static-containers/portfile.cmake create mode 100644 ports/ztd-static-containers/vcpkg.json create mode 100644 ports/ztd-text/fix-cmake-install.patch delete mode 100644 ports/ztd-text/usage create mode 100644 versions/i-/itsy-bitsy.json create mode 100644 versions/z-/ztd-cuneicode.json create mode 100644 versions/z-/ztd-encoding-tables.json create mode 100644 versions/z-/ztd-idk.json create mode 100644 versions/z-/ztd-platform.json create mode 100644 versions/z-/ztd-static-containers.json diff --git a/ports/itsy-bitsy/fix-cmake-install.patch b/ports/itsy-bitsy/fix-cmake-install.patch new file mode 100644 index 00000000000000..64a53767000ae8 --- /dev/null +++ b/ports/itsy-bitsy/fix-cmake-install.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7b2e2a..9219be1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,8 @@ project(itsy.bitsy + DESCRIPTION "Standard bit utilities to supplement the C and C++ standard libraries." + LANGUAGES C CXX) + ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + # # Pre-dependencies + # this is for all the deps we may or may not need before-hand to make things right + if(ITSY_BITSY_READTHEDOCS) +@@ -100,10 +102,7 @@ option(ITSY_BITSY_EXAMPLES "Enable build of examples" OFF) + + # # Dependencies + # ztd.idk +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) ++find_package(ztd.idk CONFIG REQUIRED) + + # # itsy.bitsy Target + # Build Target +@@ -136,6 +135,10 @@ export(TARGETS itsy.bitsy FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/itsy.bitsy-tar + + install(TARGETS itsy.bitsy + EXPORT itsy.bitsy) ++install(EXPORT itsy.bitsy ++ FILE itsy.bitsy-targets.cmake ++ DESTINATION lib/cmake/itsy.bitsy ++) + + install(DIRECTORY include/itsy + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +diff --git a/cmake/itsy.bitsy-config.cmake.in b/cmake/itsy.bitsy-config.cmake.in +index 9f87935..6e18425 100644 +--- a/cmake/itsy.bitsy-config.cmake.in ++++ b/cmake/itsy.bitsy-config.cmake.in +@@ -9,10 +9,13 @@ + # See https://github.com/ThePhD/itsy_bitsy#using-the-library for documentation. + + @PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.idk CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/itsy.bitsy-targets.cmake") + +-include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake") + + MESSAGE(STATUS ${CMAKE_CURRENT_LIST_DIR}) ++add_library(itsy::bitsy ALIAS itsy.bitsy) + + if (TARGET sol2) + get_target_property(SOL2_INCLUDE_DIRS diff --git a/ports/itsy-bitsy/portfile.cmake b/ports/itsy-bitsy/portfile.cmake new file mode 100644 index 00000000000000..1e8839ec6161ee --- /dev/null +++ b/ports/itsy-bitsy/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ThePhD/itsy_bitsy + REF d5b6bf9509bb2dff6235452d427f0b1c349d5f8b + SHA512 06489e46ad55a7fa55ddf88290509b157cf53518a8d9532d5a56e9907e5efaa298cb8946807e497461d322f62b4bad9b16864ef0def527edc8503f7a7884b8e1 + HEAD_REF main + PATCHES fix-cmake-install.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFETCHCONTENT_FULLY_DISCONNECTED=ON + -DITSY_BITSY_SINGLE=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME itsy.bitsy CONFIG_PATH "lib/cmake/itsy.bitsy") + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/itsy-bitsy/vcpkg.json b/ports/itsy-bitsy/vcpkg.json new file mode 100644 index 00000000000000..b73069245373c8 --- /dev/null +++ b/ports/itsy-bitsy/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "itsy-bitsy", + "version-date": "2022-08-02", + "description": "Bit containers, sequences, and views for everyone. ", + "homepage": "https://github.com/ThePhD/itsy_bitsy", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "ztd-idk" + ] +} diff --git a/ports/ztd-cuneicode/fix-cmake-install.patch b/ports/ztd-cuneicode/fix-cmake-install.patch new file mode 100644 index 00000000000000..431530bfba154f --- /dev/null +++ b/ports/ztd-cuneicode/fix-cmake-install.patch @@ -0,0 +1,95 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 00aa8b6..d49889b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,12 @@ FetchContent_Declare(ztd.cmake + GIT_TAG main) + FetchContent_MakeAvailable(ztd.cmake) + set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE}) ++include(FetchContent) ++FetchContent_Declare(ztd.cmake ++ GIT_REPOSITORY https://github.com/soasis/cmake ++ GIT_TAG main) ++FetchContent_MakeAvailable(ztd.cmake) ++set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE}) + + # # Project declaration + # informs about the project, gives a description, version and MOST IMPORTANTLY +@@ -49,6 +55,8 @@ project(ztd.cuneicode + HOMEPAGE_URL "https://ztdcuneicode.readthedocs.io/en/latest/" + LANGUAGES C CXX) + ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + if(ZTD_CUNEICODE_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? + include(CheckCXXCompilerFlag) +@@ -132,15 +140,7 @@ option(ZTD_CUNEICODE_SIMDUTF_SHARED "Enable the simdutf shared target for cuneic + + # # Dependencies + # ztd.idk +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) +-# ztd.encoding_tables +-FetchContent_Declare(ztd.encoding_tables +- GIT_REPOSITORY https://github.com/soasis/encoding_tables.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.encoding_tables) ++find_package(ztd.encoding_tables CONFIG REQUIRED) + + # # Main Library + file(GLOB ztd.cuneicode.includes CONFIGURE_DEPENDS include/*.hpp) +@@ -187,15 +187,12 @@ target_compile_options(ztd.cuneicode PUBLIC + ${--enable-conforming-preprocessor} + ) + ++install(TARGETS ztd.cuneicode ++ EXPORT ztd.cuneicode-targets ++ DESTINATION lib) + install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +-install(TARGETS ztd.cuneicode +- PUBLIC_HEADER +- RUNTIME +- ARCHIVE +- LIBRARY +-) + + # # Config / Version packaging + # Version configurations +@@ -213,6 +210,15 @@ export(TARGETS ztd.cuneicode + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-targets.cmake") + ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.cuneicode/ztd.cuneicode-config-version.cmake ++ DESTINATION share/ztd.cuneicode ++ ) ++install(EXPORT ztd.cuneicode-targets ++ FILE ztd.cuneicode-targets.cmake ++ DESTINATION share/ztd.cuneicode ++) + if(ZTD_CUNEICODE_GENERATE_SINGLE) + add_subdirectory(single) + endif() +diff --git a/cmake/ztd.cuneicode-config.cmake.in b/cmake/ztd.cuneicode-config.cmake.in +index 4bfb041..823d50b 100644 +--- a/cmake/ztd.cuneicode-config.cmake.in ++++ b/cmake/ztd.cuneicode-config.cmake.in +@@ -1,6 +1,11 @@ + @PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.encoding_tables CONFIG) + +-if (TARGET ztd::cuneicode) ++include(${CMAKE_CURRENT_LIST_DIR}/ztd.cuneicode-targets.cmake) ++ ++if (TARGET ztd.cuneicode) ++ add_library(ztd::cuneicode ALIAS ztd.cuneicode) + get_target_property(ZTD_CUNEICODE_INCLUDE_DIRS + ztd.cuneicode.single INTERFACE_INCLUDE_DIRECTORIES) + set_and_check(ZTD_CUNEICODE_INCLUDE_DIRS "${ZTD_CUNEICODE_INCLUDE_DIRS}") diff --git a/ports/ztd-cuneicode/portfile.cmake b/ports/ztd-cuneicode/portfile.cmake new file mode 100644 index 00000000000000..0bff550409f1f2 --- /dev/null +++ b/ports/ztd-cuneicode/portfile.cmake @@ -0,0 +1,22 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/cuneicode + REF 093041aa934b7b09e7ee7300abdc3f54bb57e389 + SHA512 0066fee5cf75fa07dc97934153e4206e4add69f15602526c1953b0302d5a6f8b56256e837a73acee187b0e02e676fba1350ad39b162c4901c624b12fa4e0fb03 + HEAD_REF main + PATCHES fix-cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-cuneicode/vcpkg.json b/ports/ztd-cuneicode/vcpkg.json new file mode 100644 index 00000000000000..dc1d8fd0f5287c --- /dev/null +++ b/ports/ztd-cuneicode/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ztd-cuneicode", + "version-date": "2023-11-03", + "description": "Shared tables between C and C++ for encoding infrastructure", + "homepage": "http://ztdcuneicode.rtfd.io/", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "ztd-encoding-tables" + ] +} diff --git a/ports/ztd-encoding-tables/fix-cmake-install.patch b/ports/ztd-encoding-tables/fix-cmake-install.patch new file mode 100644 index 00000000000000..c56beb7afe40ee --- /dev/null +++ b/ports/ztd-encoding-tables/fix-cmake-install.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7612c6c..8d2233d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,6 +50,8 @@ project(ztd.encoding_tables + HOMEPAGE_URL "https://ztdencoding_tables.rtfd.io/" + LANGUAGES CXX C) + ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + if(ZTD_ENCODING_TABLES_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? + include(CheckCXXCompilerFlag) +@@ -127,10 +129,7 @@ if(ZTD_ENCODING_TABLES_IS_TOP_LEVEL_PROJECT) + endif() + + # # Main Dependency +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) ++find_package(ztd.idk CONFIG REQUIRED) + + # # Main library declarations + # ztd.encoding_tables +@@ -179,7 +178,9 @@ if(ZTD_ENCODING_TABLES_IS_TOP_LEVEL_PROJECT) + ) + endif() + +-install(TARGETS ztd.encoding_tables) ++install(TARGETS ztd.encoding_tables ++ EXPORT ztd.encoding_tables-targets ++ DESTINATION lib) + install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +@@ -199,9 +200,15 @@ export(TARGETS ztd.encoding_tables + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-targets.cmake" + ) + +-install( +- DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmake" +- TYPE DATA ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.encoding_tables/ztd.encoding_tables-config-version.cmake ++ DESTINATION share/ztd.encoding_tables ++ ) ++ ++install(EXPORT ztd.encoding_tables-targets ++ FILE ztd.encoding_tables-targets.cmake ++ DESTINATION share/ztd.encoding_tables + ) + + if(ZTD_ENCODING_TABLES_GENERATE_SINGLE) +diff --git a/cmake/ztd.encoding_tables-config.cmake.in b/cmake/ztd.encoding_tables-config.cmake.in +index 2b8db83..579f865 100644 +--- a/cmake/ztd.encoding_tables-config.cmake.in ++++ b/cmake/ztd.encoding_tables-config.cmake.in +@@ -1,6 +1,7 @@ + @PACKAGE_INIT@ + +-find_package(ztd.encoding_tables CONFIG REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.idk CONFIG) + include(${CMAKE_CURRENT_LIST_DIR}/ztd.encoding_tables-targets.cmake) + + if (TARGET ztd.encoding_tables) diff --git a/ports/ztd-encoding-tables/portfile.cmake b/ports/ztd-encoding-tables/portfile.cmake new file mode 100644 index 00000000000000..7b97b0d16b4bfe --- /dev/null +++ b/ports/ztd-encoding-tables/portfile.cmake @@ -0,0 +1,22 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/encoding_tables + REF 2f4324b3d84db2300d0bf3d0e568a28992df2b55 + SHA512 ec8684bca5673609c0b3014228b6b35647896f8288d6ef85778a7bb8a191c4c92985a11d625e7e5e306b738c16dce232f2604e7cf583ca5e9b76ff4a9f447732 + HEAD_REF main + PATCHES fix-cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-encoding-tables/vcpkg.json b/ports/ztd-encoding-tables/vcpkg.json new file mode 100644 index 00000000000000..e4a8d130777ae4 --- /dev/null +++ b/ports/ztd-encoding-tables/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ztd-encoding-tables", + "version-date": "2023-06-10", + "description": "Shared tables between C and C++ for encoding infrastructure", + "homepage": "https://github.com/soasis/encoding_tables", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "ztd-idk" + ] +} diff --git a/ports/ztd-idk/fix-cmake-install.patch b/ports/ztd-idk/fix-cmake-install.patch new file mode 100644 index 00000000000000..e657f49681955a --- /dev/null +++ b/ports/ztd-idk/fix-cmake-install.patch @@ -0,0 +1,187 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 746afa7..803b82e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,11 +34,6 @@ cmake_policy(VERSION 3.21) + # # Project kickstart + # Includes a bunch of basic flags and utilities shared across projects + # See more at the github repository link below +-include(FetchContent) +-FetchContent_Declare(ztd.cmake +- GIT_REPOSITORY https://github.com/soasis/cmake.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.cmake) + set(CMAKE_PROJECT_INCLUDE ${ZTD_CMAKE_PROJECT_PRELUDE}) + + # # Project declaration +@@ -50,6 +45,8 @@ project(ztd.idk + HOMEPAGE_URL "https://ztdidk.rtfd.io/" + LANGUAGES CXX C) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) + if(ZTD_IDK_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? + include(CheckCXXCompilerFlag) +@@ -89,9 +86,6 @@ if(ZTD_IDK_IS_TOP_LEVEL_PROJECT) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") + +- if(NOT DEFINED CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 17) +- endif() + + if(NOT DEFINED CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 11) +@@ -133,6 +127,7 @@ endif() + # ztd.version + add_library(ztd.version INTERFACE) + add_library(ztd::version ALIAS ztd.version) ++target_compile_features(ztd.version INTERFACE cxx_std_20) + target_include_directories(ztd.version + INTERFACE + $ +@@ -143,20 +138,32 @@ install(DIRECTORY include/ + ${CMAKE_INSTALL_INCLUDEDIR} + ) + ++install(TARGETS ztd.version ++ EXPORT ztd.version-targets ++ DESTINATION lib) + configure_package_config_file( + cmake/ztd.version-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config.cmake" +- INSTALL_DESTINATION lib/cmake/ztd.version ++ INSTALL_DESTINATION share/ztd.version + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config-version.cmake" + COMPATIBILITY SameMajorVersion + ) ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-config-version.cmake ++ DESTINATION share/ztd.version ++ ) + export(TARGETS ztd.version + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.version/ztd.version-targets.cmake" + ) ++install(EXPORT ztd.version-targets ++ FILE ztd.version-targets.cmake ++ DESTINATION share/ztd.version ++) + + # ztd.tag_invoke + file(GLOB_RECURSE ztd.tag_invoke.includes +@@ -166,6 +173,7 @@ file(GLOB_RECURSE ztd.tag_invoke.includes + ) + + add_library(ztd.tag_invoke INTERFACE) ++target_compile_features(ztd.tag_invoke INTERFACE cxx_std_20) + add_library(ztd::tag_invoke ALIAS ztd.tag_invoke) + target_include_directories(ztd.tag_invoke + INTERFACE +@@ -179,10 +187,14 @@ install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + ++install(TARGETS ztd.tag_invoke ++ EXPORT ztd.tag_invoke-targets ++ DESTINATION lib) ++ + configure_package_config_file( + cmake/ztd.tag_invoke-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config.cmake" +- INSTALL_DESTINATION lib/cmake/ztd.tag_invoke ++ INSTALL_DESTINATION share/ztd.tag_invoke + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) + write_basic_package_version_file( +@@ -193,6 +205,16 @@ export(TARGETS ztd.tag_invoke + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-targets.cmake" + ) ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.tag_invoke/ztd.tag_invoke-config-version.cmake ++ DESTINATION share/ztd.tag_invoke ++) ++install(EXPORT ztd.tag_invoke-targets ++ FILE ztd.tag_invoke-targets.cmake ++ DESTINATION share/ztd.tag_invoke ++) ++ + + # ztd.idk + file(GLOB_RECURSE ztd.idk.includes +@@ -241,7 +263,9 @@ if(ZTD_IDK_IS_TOP_LEVEL_PROJECT) + ) + endif() + +-install(TARGETS ztd.idk) ++install(TARGETS ztd.idk ++ EXPORT ztd.idk-targets ++ DESTINATION lib) + install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +@@ -249,7 +273,7 @@ install(DIRECTORY include/ + configure_package_config_file( + cmake/ztd.idk-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config.cmake" +- INSTALL_DESTINATION lib/cmake/ztd.idk ++ INSTALL_DESTINATION share/ztd.idk + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) + write_basic_package_version_file( +@@ -261,11 +285,17 @@ export(TARGETS ztd.idk + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-targets.cmake" + ) + +-install( +- DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmake" +- TYPE DATA ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.idk/ztd.idk-config-version.cmake ++ DESTINATION share/ztd.idk/ ++ ) ++install(EXPORT ztd.idk-targets ++ FILE ztd.idk-targets.cmake ++ DESTINATION share/ztd.idk/ + ) + ++ + if(ZTD_IDK_GENERATE_SINGLE) + add_subdirectory(single) + endif() +diff --git a/cmake/ztd.idk-config.cmake.in b/cmake/ztd.idk-config.cmake.in +index 4ceb0ec..8377221 100644 +--- a/cmake/ztd.idk-config.cmake.in ++++ b/cmake/ztd.idk-config.cmake.in +@@ -1,7 +1,8 @@ + @PACKAGE_INIT@ + +-find_package(ztd.version CONFIG REQUIRED) +-find_package(ztd.tag_invoke CONFIG REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.version CONFIG ) ++find_dependency(ztd.tag_invoke CONFIG) + include(${CMAKE_CURRENT_LIST_DIR}/ztd.idk-targets.cmake) + + if (TARGET ztd.idk) +diff --git a/cmake/ztd.tag_invoke-config.cmake.in b/cmake/ztd.tag_invoke-config.cmake.in +index 504c60b..ee2f5cd 100644 +--- a/cmake/ztd.tag_invoke-config.cmake.in ++++ b/cmake/ztd.tag_invoke-config.cmake.in +@@ -1,6 +1,6 @@ + @PACKAGE_INIT@ +- +-find_package(ztd.version CONFIG REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.version CONFIG ) + include(${CMAKE_CURRENT_LIST_DIR}/ztd.tag_invoke-targets.cmake) + + if (TARGET ztd.tag_invoke) diff --git a/ports/ztd-idk/portfile.cmake b/ports/ztd-idk/portfile.cmake new file mode 100644 index 00000000000000..4cfbb5799911a3 --- /dev/null +++ b/ports/ztd-idk/portfile.cmake @@ -0,0 +1,22 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/idk + REF ad64a1759a506bb0761c7b20c40da8c91865f50e + SHA512 b6f1afa78b23331ba19116101667bb9dd070deafb9d685f99f165c75ec30d7bfe90443034b6f1882c3186c490f3fc4ed648cdc3fff6fa8450375676d8e9c4727 + HEAD_REF main + PATCHES + fix-cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-idk/vcpkg.json b/ports/ztd-idk/vcpkg.json new file mode 100644 index 00000000000000..0a28ce692665cd --- /dev/null +++ b/ports/ztd-idk/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ztd-idk", + "version-date": "2023-11-03", + "description": "The IDK (Industrial Development Kit) library!", + "homepage": "https://github.com/soasis/idk", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ztd-platform/fix-cmake-install.patch b/ports/ztd-platform/fix-cmake-install.patch new file mode 100644 index 00000000000000..f793fd614e23b9 --- /dev/null +++ b/ports/ztd-platform/fix-cmake-install.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57c97c4..d0e0da9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,6 +49,8 @@ project(ztd.platform + HOMEPAGE_URL "https://ztdplatform.readthedocs.io/en/latest/" + LANGUAGES C CXX) + ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + if(ZTD_PLATFORM_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? + include(CheckCXXCompilerFlag) +@@ -121,10 +123,7 @@ option(ZTD_PLATFORM_USE_ENCODING_C "Enable encoding_rs's C bindings with ztd::pl + + # # Dependencies + # ztd.idk +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) ++find_package(ztd.idk CONFIG REQUIRED) + + # encoding_c + if (ZTD_PLATFORM_USE_ENCODING_C) +@@ -408,11 +407,8 @@ install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + install(TARGETS ztd.platform +- PUBLIC_HEADER +- RUNTIME +- ARCHIVE +- LIBRARY +-) ++ EXPORT ztd.platform-targets ++ DESTINATION lib) + + # # Config / Version packaging + # Version configurations +@@ -430,6 +426,15 @@ export(TARGETS ztd.platform + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-targets.cmake") + ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.platform/ztd.platform-config-version.cmake ++ DESTINATION share/ztd.platform ++ ) ++install(EXPORT ztd.platform-targets ++ FILE ztd.platform-targets.cmake ++ DESTINATION share/ztd.platform ++) + # # Benchmarks, Tests, Examples + if(ZTD_PLATFORM_TESTS) + include(CTest) +diff --git a/cmake/ztd.platform-config.cmake.in b/cmake/ztd.platform-config.cmake.in +index 37629fc..5d5886c 100644 +--- a/cmake/ztd.platform-config.cmake.in ++++ b/cmake/ztd.platform-config.cmake.in +@@ -1,6 +1,11 @@ + @PACKAGE_INIT@ + +-if (TARGET ztd::platform) ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.idk CONFIG) ++ ++include(${CMAKE_CURRENT_LIST_DIR}/ztd.platform-targets.cmake) ++if (TARGET ztd.platform) ++ add_library(ztd::platform ALIAS ztd.platform) + get_target_property(ZTD_PLATFORM_INCLUDE_DIRS + ztd.platform INTERFACE_INCLUDE_DIRECTORIES) + set_and_check(ZTD_PLATFORM_INCLUDE_DIRS "${ZTD_PLATFORM_INCLUDE_DIRS}") diff --git a/ports/ztd-platform/portfile.cmake b/ports/ztd-platform/portfile.cmake new file mode 100644 index 00000000000000..0d2a97287e452d --- /dev/null +++ b/ports/ztd-platform/portfile.cmake @@ -0,0 +1,22 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/platform + REF d92b8e5b85a4cabae62ad19ccfcc5c3f94ab1a14 + SHA512 d7482bbfa00c6c8226e368fde664ee77e915b4d01ea93e79dffb43b51b44808628c1d3d3daa5e6c8e5cd239dcd4c1ae31c3d0f534df9e1e9bf7a134b24322cfa + HEAD_REF main + PATCHES fix-cmake-install.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-platform/vcpkg.json b/ports/ztd-platform/vcpkg.json new file mode 100644 index 00000000000000..e0283782f1eeb9 --- /dev/null +++ b/ports/ztd-platform/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ztd-platform", + "version-date": "2022-12-30", + "description": "A library for messing with platfom-dependent configurations and libraries, and sometimes hiding their cores.", + "homepage": "https://github.com/soasis/platform", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "ztd-idk" + ] +} diff --git a/ports/ztd-static-containers/fix-cmake.patch b/ports/ztd-static-containers/fix-cmake.patch new file mode 100644 index 00000000000000..cef15e5a2e34ee --- /dev/null +++ b/ports/ztd-static-containers/fix-cmake.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32371d4..22223ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,6 +33,8 @@ project(ztd.static_containers + VERSION 0.5.0 + DESCRIPTION "A library for a fixed-capacity vector." + LANGUAGES C CXX) ++include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + + if(ZTD_STATIC_CONTAINERS_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? +@@ -113,10 +115,7 @@ option(ZTD_STATIC_CONTAINERS_BENCHMARKS "Enable build of benchmarks" OFF) + + # # Dependencies + # ztd.idk +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) ++find_package(ztd.idk CONFIG REQUIRED) + + file(GLOB_RECURSE ztd.static_containers.sources + LIST_DIRECTORIES FALSE +@@ -126,7 +125,6 @@ file(GLOB_RECURSE ztd.static_containers.sources + + add_library(ztd.static_containers INTERFACE) + add_library(ztd::static_containers ALIAS ztd.static_containers) +-target_sources(ztd.static_containers INTERFACE ${ztd.static_containers.sources}) + target_link_libraries(ztd.static_containers + INTERFACE + ztd::idk +@@ -155,6 +153,18 @@ export(TARGETS ztd.static_containers + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-targets.cmake") + ++install(TARGETS ztd.static_containers ++ EXPORT ztd.static_containers-targets) ++install(EXPORT ztd.static_containers-targets ++ FILE ztd.static_containers-targets.cmake ++ DESTINATION share/ztd.static_containers ++) ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.static_containers/ztd.static_containers-config-version.cmake ++ DESTINATION share/ztd.static_containers ++) ++ + # # Benchmarks, Tests, Examples + if(ZTD_STATIC_CONTAINERS_TESTS) + enable_testing() +diff --git a/cmake/ztd.static_containers-config.cmake.in b/cmake/ztd.static_containers-config.cmake.in +index f96ace2..94340c1 100644 +--- a/cmake/ztd.static_containers-config.cmake.in ++++ b/cmake/ztd.static_containers-config.cmake.in +@@ -1,6 +1,9 @@ + @PACKAGE_INIT@ +- +-if (TARGET ztd::static_containers) ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.idk CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/ztd.static_containers-targets.cmake") ++if (TARGET ztd.static_containers) ++ add_library(ztd::static_containers ALIAS ztd.static_containers) + get_target_property(ZTD_STATIC_CONTAINERS_INCLUDE_DIRS + ztd.static_containers INTERFACE_INCLUDE_DIRECTORIES) + set_and_check(ZTD_STATIC_CONTAINERS_INCLUDE_DIRS "${ZTD_STATIC_CONTAINERS_INCLUDE_DIRS}") diff --git a/ports/ztd-static-containers/portfile.cmake b/ports/ztd-static-containers/portfile.cmake new file mode 100644 index 00000000000000..54db520842a54d --- /dev/null +++ b/ports/ztd-static-containers/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO soasis/static_containers + REF e1a21217b6dba3028e6cc6bf0f9562972ea1c43d + SHA512 ec5b98e2282e72eb09617006afaf2522a471b6eb3928c90fb878c46b7453bb94ddafb19cb4738c5561905003d299bb23d15ebf71c555259b5e500594fbadd97f + HEAD_REF main + PATCHES fix-cmake.patch +) + +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-static-containers/vcpkg.json b/ports/ztd-static-containers/vcpkg.json new file mode 100644 index 00000000000000..643667ecbd8044 --- /dev/null +++ b/ports/ztd-static-containers/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "ztd-static-containers", + "version-date": "2022-12-12", + "description": "Containers of fixed capacity", + "homepage": "https://github.com/soasis/static_containers", + "license": "CC0-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/ztd-text/fix-cmake-install.patch b/ports/ztd-text/fix-cmake-install.patch new file mode 100644 index 00000000000000..f053e76efadacb --- /dev/null +++ b/ports/ztd-text/fix-cmake-install.patch @@ -0,0 +1,109 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd8e1c8..c92aaa5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,6 +51,8 @@ project(ztd.text + HOMEPAGE_URL "https://ztdtext.readthedocs.io/en/latest/" + LANGUAGES C CXX) + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) + if(ZTD_TEXT_READTHEDOCS) + # ReadTheDocs seems unable to handle the include at the project level: something must be going wrong? + include(CheckCXXCompilerFlag) +@@ -139,40 +141,17 @@ option(ZTD_TEXT_BOOST.TEXT "Enable usage of Boost.Text benchmarks and examples" + + # # Dependencies + # ztd.idk +-FetchContent_Declare(ztd.idk +- GIT_REPOSITORY https://github.com/soasis/idk.git +- GIT_SHALLOW ON +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.idk) + + # ztd.static_containers +-FetchContent_Declare(ztd.static_containers +- GIT_REPOSITORY https://github.com/soasis/static_containers.git +- GIT_SHALLOW ON +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.static_containers) ++find_package(ztd.static_containers CONFIG REQUIRED) + + # ztd.encoding_tables +-FetchContent_Declare(ztd.encoding_tables +- GIT_REPOSITORY https://github.com/soasis/encoding_tables.git +- GIT_SHALLOW ON +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.encoding_tables) + + # ztd.cuneicode + set(ZTD_CUNEICODE_SIMDUTF_SHARED ${ZTD_TEXT_BENCHMARKS}) +-FetchContent_Declare(ztd.cuneicode +- GIT_REPOSITORY https://github.com/soasis/cuneicode.git +- GIT_SHALLOW ON +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.cuneicode) + + # ztd.platform +-FetchContent_Declare(ztd.platform +- GIT_REPOSITORY https://github.com/soasis/platform.git +- GIT_SHALLOW ON +- GIT_TAG main) +-FetchContent_MakeAvailable(ztd.platform) ++find_package(ztd.platform CONFIG REQUIRED) + + if (ZTD_TEXT_BENCHAMRKS OR ZTD_TEXT_GENERATE_SINGLE OR ZTD_TEXT_DOCUMENTATION) + find_package(Python3 REQUIRED COMPONENTS Interpreter) +@@ -187,16 +166,17 @@ target_include_directories(ztd.text + INTERFACE + $ + $) +-target_sources(ztd.text INTERFACE ${ztd.text.includes}) + target_link_libraries(ztd.text + INTERFACE +- ztd::idk + ztd::static_containers + ztd::platform + ztd::cuneicode) + install(DIRECTORY include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + ++install(TARGETS ztd.text ++ EXPORT ztd.text-targets ++ DESTINATION lib) + # # Config / Version packaging + # Version configurations + configure_package_config_file( +@@ -213,6 +193,15 @@ export(TARGETS ztd.text + FILE + "${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-targets.cmake") + ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/cmake/ztd.text/ztd.text-config-version.cmake ++ DESTINATION share/ztd.text ++ ) ++install(EXPORT ztd.text-targets ++ FILE ztd.text-targets.cmake ++ DESTINATION share/ztd.text ++) + if(ZTD_TEXT_GENERATE_SINGLE) + add_subdirectory(single) + endif() +diff --git a/cmake/ztd.text-config.cmake.in b/cmake/ztd.text-config.cmake.in +index a526740..e11ce0c 100644 +--- a/cmake/ztd.text-config.cmake.in ++++ b/cmake/ztd.text-config.cmake.in +@@ -1,6 +1,11 @@ + @PACKAGE_INIT@ ++include(CMakeFindDependencyMacro) ++find_dependency(ztd.platform CONFIG) ++find_dependency(ztd.static_containers CONFIG) + +-if (TARGET ztd::text) ++include (${CMAKE_CURRENT_LIST_DIR}/ztd.text-targets.cmake) ++if (TARGET ztd.text) ++ add_library(ztd::text ALIAS ztd.text) + get_target_property(ZTD_TEXT_INCLUDE_DIRS + ztd.text INTERFACE_INCLUDE_DIRECTORIES) + set_and_check(ZTD_TEXT_INCLUDE_DIRS "${ZTD_TEXT_INCLUDE_DIRS}") diff --git a/ports/ztd-text/portfile.cmake b/ports/ztd-text/portfile.cmake index 377a475b06f0fe..600221a966b89d 100644 --- a/ports/ztd-text/portfile.cmake +++ b/ports/ztd-text/portfile.cmake @@ -1,37 +1,18 @@ -vcpkg_from_github( - OUT_SOURCE_PATH ZTD_CMAKE_PATH - REPO soasis/cmake - REF 4277edaf7bf237de07c4a9833f6546872ab9f151 - SHA512 f05143068a1f22bd46aa0d8c250afb04b29ffbc0f32d746093bfb61f274d0e212ff9786a5163608097ed989b5b212d73811179f311a37d2b2eedce89cc75ee94 - HEAD_REF main -) - -vcpkg_from_github( - OUT_SOURCE_PATH ZTD_IDK_PATH - REPO soasis/idk - REF 6173bb3d433a3dab65e8c356ef69441aa5a86275 - SHA512 083711e9fc9b03aac34c5a7e182691a9bc9ee2d7c2d9ed2f55093423e2655f7a3829bd3e3db82bc42a78721795ca2d21a7b64c71f05e3c03ea3198f6228eb6f2 - HEAD_REF main -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO soasis/text - REF d76205c12300234f815e099e5f8152f443515df5 - SHA512 836b6cb1a59cd1138bc4c00f9f511bced912d1d5dc36a4a7d757ef1cd7e31cf5046b5a32476ffa89ea9c0ca7834028774f9baa8c74bfc9287cc16ef3b4e987df + REF c07fba735ee8389d328103c10ce9a8d49f345060 + SHA512 ca9ecacf3260f3915b7d2d90fb1d84f4083775043d592ac5d869a15debf5512d42488d43bd0d3d981180519359a423314e563f2065fa3effe2749904706f483a HEAD_REF main + PATCHES fix-cmake-install.patch ) +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DFETCHCONTENT_FULLY_DISCONNECTED=ON - -DFETCHCONTENT_SOURCE_DIR_ZTD.CMAKE=${ZTD_CMAKE_PATH} - -DFETCHCONTENT_SOURCE_DIR_ZTD.IDK=${ZTD_IDK_PATH} ) -vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib") +vcpkg_cmake_install() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ztd-text/usage b/ports/ztd-text/usage deleted file mode 100644 index 86c8ef9fc2230b..00000000000000 --- a/ports/ztd-text/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package ztd-text is header only and can be used from CMake via: - - find_path(ZTD_INCLUDE_DIRS ztd) - target_include_directories(main PRIVATE ${ZTD_INCLUDE_DIRS}) diff --git a/ports/ztd-text/vcpkg.json b/ports/ztd-text/vcpkg.json index 1de4a13965f670..965edd81922a55 100644 --- a/ports/ztd-text/vcpkg.json +++ b/ports/ztd-text/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ztd-text", - "version-date": "2022-03-21", + "version-date": "2023-11-03", "description": "A spicy text library.", "homepage": "https://github.com/soasis/text", "license": "Apache-2.0", @@ -9,6 +9,8 @@ { "name": "vcpkg-cmake", "host": true - } + }, + "ztd-platform", + "ztd-static-containers" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6bf809bc80d3b4..536a975686f4ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3584,6 +3584,10 @@ "baseline": "4.3.1", "port-version": 10 }, + "itsy-bitsy": { + "baseline": "2022-08-02", + "port-version": 0 + }, "ixwebsocket": { "baseline": "11.4.4", "port-version": 2 @@ -9340,8 +9344,28 @@ "baseline": "1.0.7", "port-version": 0 }, + "ztd-cuneicode": { + "baseline": "2023-11-03", + "port-version": 0 + }, + "ztd-encoding-tables": { + "baseline": "2023-06-10", + "port-version": 0 + }, + "ztd-idk": { + "baseline": "2023-11-03", + "port-version": 0 + }, + "ztd-platform": { + "baseline": "2022-12-30", + "port-version": 0 + }, + "ztd-static-containers": { + "baseline": "2022-12-12", + "port-version": 0 + }, "ztd-text": { - "baseline": "2022-03-21", + "baseline": "2023-11-03", "port-version": 0 }, "zug": { diff --git a/versions/i-/itsy-bitsy.json b/versions/i-/itsy-bitsy.json new file mode 100644 index 00000000000000..63647594ceff8d --- /dev/null +++ b/versions/i-/itsy-bitsy.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "47a87b2c492f644c8d64be60e192e2511f725fb3", + "version-date": "2022-08-02", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-cuneicode.json b/versions/z-/ztd-cuneicode.json new file mode 100644 index 00000000000000..57913fa286e83e --- /dev/null +++ b/versions/z-/ztd-cuneicode.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2730f0379c0ef98a286d57784b01649d5bb59d52", + "version-date": "2023-11-03", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-encoding-tables.json b/versions/z-/ztd-encoding-tables.json new file mode 100644 index 00000000000000..9d27ea8f958efe --- /dev/null +++ b/versions/z-/ztd-encoding-tables.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e215ca14e25c6f458c76eb73e4de83eaea7aba57", + "version-date": "2023-06-10", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-idk.json b/versions/z-/ztd-idk.json new file mode 100644 index 00000000000000..45584467a70055 --- /dev/null +++ b/versions/z-/ztd-idk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c79037b1bd68d612fdf0810c619361a715e37f4a", + "version-date": "2023-11-03", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-platform.json b/versions/z-/ztd-platform.json new file mode 100644 index 00000000000000..8203b9ab438005 --- /dev/null +++ b/versions/z-/ztd-platform.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7211ea7b21e73ba018f6863d7d84db1545ecb63c", + "version-date": "2022-12-30", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-static-containers.json b/versions/z-/ztd-static-containers.json new file mode 100644 index 00000000000000..f6897001f557e1 --- /dev/null +++ b/versions/z-/ztd-static-containers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7df39e58c9b30ecd92335e2d3a49a8a793e8c956", + "version-date": "2022-12-12", + "port-version": 0 + } + ] +} diff --git a/versions/z-/ztd-text.json b/versions/z-/ztd-text.json index 11d2b3dc2590c0..af5e5b0ecc8db7 100644 --- a/versions/z-/ztd-text.json +++ b/versions/z-/ztd-text.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9d678e835ff88ff81c3fb1e6273d247f1ec33bd", + "version-date": "2023-11-03", + "port-version": 0 + }, { "git-tree": "594b7d2a437b6576bfd4993e9763cac18621e903", "version-date": "2022-03-21", From b34998bd3205d5803eda9694604fb8d944b4433b Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Mon, 13 Nov 2023 19:50:34 +0100 Subject: [PATCH 0341/1039] [sentry-native] Update to 0.6.7 (#35077) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 2 +- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 51814f64a09cb0..87bd7bfc00ed62 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 0fa548b70e3fbb87614521d797a577ffa185991f0942cf20dd965f8c068414512a63f5d715672ecf243aa31d18fdcda6ce355ad8614ede7b988d0a103cda7244 + SHA512 fb2c03c9e3662078e4475390b785760ede1a156713fdfdba2cc8979148a9b4788203c4f923f2b59fcd1fcfa6a4ff77613484186b2a99a4e16100e24d7fc765ae ) vcpkg_extract_source_archive( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 9e8d60ea8ece5e..1ab22c1ef08aa2 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.6", + "version": "0.6.7", "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 536a975686f4ae..925bf327dbbd74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7737,7 +7737,7 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.6.6", + "baseline": "0.6.7", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index c8e101cdbc76f7..53a5d971bcee04 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "095696cc8cbe39b017311226154e23b909318ef1", + "version": "0.6.7", + "port-version": 0 + }, { "git-tree": "eda2bc26483b80cda6cb44c7aa2506de7c254547", "version": "0.6.6", From 69860f9b4c0522e82fd0d6260015339a097040e0 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Tue, 14 Nov 2023 02:51:00 +0800 Subject: [PATCH 0342/1039] [magic-enum] update to 0.9.4 (#35069) * [magic-enum] update to 0.9.4 * [magic-enum] update versions --- ports/magic-enum/portfile.cmake | 2 +- ports/magic-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index b98ec397025094..7bd06c05d5b4b7 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum REF "v${VERSION}" - SHA512 0bee01840d69a102f9c07e063a8314f40593bd476545176ba2895549b899d6c619d76588e2d55e2c71c2812cd41c1f802e0718461e8b31d37ac6264273001236 + SHA512 1c850a87fa8f449b98d748f3e74a82463d9ca5e7ddcd4c318465230d26032f75d5e103b9a27782e1e7d808156241686c22382086b9d553f9d37b32c83115552d HEAD_REF master ) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 63be06d0d6c594..58bbe96e2a98f6 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.9.3", + "version": "0.9.4", "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 925bf327dbbd74..c1b69e62a69a74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5325,7 +5325,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.9.3", + "baseline": "0.9.4", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index bfcae2d5d5df27..a736697a7683c5 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3900ab3a53f394e82cc65e071fb7ffc3641024c1", + "version": "0.9.4", + "port-version": 0 + }, { "git-tree": "f2261a86b9d2e1ff3f42c80919f58d59e4e4335c", "version": "0.9.3", From 421579b6e6cac42d9a5a5935e53e218ce94a347f Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Tue, 14 Nov 2023 02:51:17 +0800 Subject: [PATCH 0343/1039] [matio] update to 1.5.26 (#35067) * [matio] update to 1.5.26 * [matio] update versions --- ports/matio/portfile.cmake | 4 ++-- ports/matio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/matio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/matio/portfile.cmake b/ports/matio/portfile.cmake index a76dd929342bc0..abbe06e9551af6 100644 --- a/ports/matio/portfile.cmake +++ b/ports/matio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tbeu/matio - REF b07ee6c1512ab788f91e71910d07fc3ea954f812 # v1.5.24 - SHA512 b9a1abe88565bb01db9aa826248b63927e8576d4e9b72665dee53cc29e0baf6c7af232f298fb6a22b3b96d820cb692ff29f98e2d0d751edc22a5f1ee884fc2df + REF "v${VERSION}" + SHA512 b0ff73b7d39b68c87f371e397ed8f46040f1334e8d81d2b462f62bf7d14c6566e4f5a0c55955696cbbc035ff7b41e5811ce7429476ae48c1465f48f77b4dc6b2 HEAD_REF master PATCHES fix-dependencies.patch ) diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json index ec2706791baddd..4cc03ed8680ac4 100644 --- a/ports/matio/vcpkg.json +++ b/ports/matio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "matio", - "version": "1.5.24", + "version": "1.5.26", "description": "MATLAB MAT File I/O Library", "homepage": "https://github.com/tbeu/matio", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c1b69e62a69a74..e061c2496e312e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5417,7 +5417,7 @@ "port-version": 5 }, "matio": { - "baseline": "1.5.24", + "baseline": "1.5.26", "port-version": 0 }, "matplotlib-cpp": { diff --git a/versions/m-/matio.json b/versions/m-/matio.json index 5ee2918406788f..229c737f7c8ee5 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fd8ec3eacecc04384ff5a048c0962f852cdb793", + "version": "1.5.26", + "port-version": 0 + }, { "git-tree": "08eada66141696ad861d881ac1639d41682916e1", "version": "1.5.24", From 4e9fefefc5229e15881dd8ad6571265f53d821c6 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:23:00 +0800 Subject: [PATCH 0344/1039] [aws-c-io] update to 0.13.35 (#35054) * [aws-c-io] update to 0.13.35 * [aws-c-io] update to 0.13.35 --- ports/aws-c-io/portfile.cmake | 2 +- ports/aws-c-io/vcpkg.json | 2 +- versions/a-/aws-c-io.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 96bbd92917232e..36320230b86408 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 54f6ef23ab7fb65c9d1425d21d59daf1b13a50595f7f06c7d4f74bfb5941a7ddf0185ae3249b940473422c1880bb034c0610876c6e13ae499ccd2dcc888c1b23 + SHA512 286090cb04fa75e98e8bf33a665f9a1dce8601d543af330b0a610f10ddddc211408db56bdcc125a2b399181530bd56fb102cddcba32fb885d1ab6bd6ab666be2 HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index f7720445def08d..66a7a0d66ab85f 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.13.32", + "version": "0.13.35", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index 47add147f10ce6..f735eb75847a39 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caab59ca1fe5071d552eaf073a501151ac6099a5", + "version": "0.13.35", + "port-version": 0 + }, { "git-tree": "888ba4e86b810e8181ed897d4dc03b1a9f78c9f7", "version": "0.13.32", diff --git a/versions/baseline.json b/versions/baseline.json index e061c2496e312e..ded44fd3edc8fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -377,7 +377,7 @@ "port-version": 0 }, "aws-c-io": { - "baseline": "0.13.32", + "baseline": "0.13.35", "port-version": 0 }, "aws-c-mqtt": { From 345fd91546b270d0f25476eace01257a70abb8cb Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:23:13 +0800 Subject: [PATCH 0345/1039] [vcpkg baseline][ztd-text] passing remove from fail (#35079) --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bd501e00a067f7..9dd2e4db99b75f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1294,9 +1294,6 @@ yara:x64-uwp=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail -ztd-text:arm-neon-android=fail -ztd-text:arm64-android=fail -ztd-text:x64-android=fail zyre:x64-windows-static-md=fail # Ports which needs to pass in CI From 6193a5e89d2fb5621aaaf3bb7d9e7d136eb06f4e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Nov 2023 09:23:52 +0100 Subject: [PATCH 0346/1039] [gdal] Update to 3.7.3 (#35073) --- ports/gdal/fix-jpeg.patch | 13 ------------- ports/gdal/portfile.cmake | 4 +--- ports/gdal/upstream-b5858ed.diff | 21 --------------------- ports/gdal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 6 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 ports/gdal/fix-jpeg.patch delete mode 100644 ports/gdal/upstream-b5858ed.diff diff --git a/ports/gdal/fix-jpeg.patch b/ports/gdal/fix-jpeg.patch deleted file mode 100644 index fb395373445a60..00000000000000 --- a/ports/gdal/fix-jpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake -index 9568ef043e..94617e3ac9 100644 ---- a/cmake/helpers/CheckDependentLibraries.cmake -+++ b/cmake/helpers/CheckDependentLibraries.cmake -@@ -416,7 +416,7 @@ if (GDAL_USE_JPEG AND (JPEG_LIBRARY MATCHES ".*turbojpeg\.(so|lib)")) - "JPEG_LIBRARY should point to a library with libjpeg ABI, not TurboJPEG. See https://libjpeg-turbo.org/About/TurboJPEG for the difference" - ) - endif () --if (TARGET JPEG::JPEG) -+if (GDAL_USE_JPEG AND TARGET JPEG::JPEG) - set(EXPECTED_JPEG_LIB_VERSION "" CACHE STRING "Expected libjpeg version number") - mark_as_advanced(GDAL_CHECK_PACKAGE_${name}_NAMES) - if (EXPECTED_JPEG_LIB_VERSION) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 07f27f062a6b83..5ce1bdd8cd8afa 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,14 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 95b0dee07a616c8fb26ded2c538a6933ba070c0567e88af9356daea9b1df6c910edb4fcf55766839c1873829d20948b1714b3e2285e5ac57de8fcf0970ff53ff + SHA512 db23c751aa1bfc9f9f80c4dc900e86fb19579251d3577ef5bd06f9ddf76ba8c74aa404b5477ced5649d011e2111ca8df38d5acc87de6723f7e50f3bb22c9ee8f HEAD_REF master PATCHES find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch - fix-jpeg.patch - upstream-b5858ed.diff ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") diff --git a/ports/gdal/upstream-b5858ed.diff b/ports/gdal/upstream-b5858ed.diff deleted file mode 100644 index 9c31afcc2df6c0..00000000000000 --- a/ports/gdal/upstream-b5858ed.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp -index ed79c0972e0..33846d66513 100644 ---- a/frmts/gtiff/geotiff.cpp -+++ b/frmts/gtiff/geotiff.cpp -@@ -2886,8 +2886,16 @@ static void ThreadDecompressionFunc(void *pData) - psJob->nXBlock, psJob->nYBlock); - if (apoBlocks[i] == nullptr) - { -+ // Temporary disabling of dirty block fushing, otherwise -+ // we can be in a deadlock situation, where the -+ // GTiffDataset::SubmitCompressionJob() method waits for jobs -+ // to be finished, that can't finish (actually be started) -+ // because this task and its siblings are taking all the -+ // available workers allowed by the global thread pool. -+ GDALRasterBlock::EnterDisableDirtyBlockFlush(); - apoBlocks[i] = poDS->GetRasterBand(iBand)->GetLockedBlockRef( - psJob->nXBlock, psJob->nYBlock, TRUE); -+ GDALRasterBlock::LeaveDisableDirtyBlockFlush(); - if (apoBlocks[i] == nullptr) - return false; - } diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 2001a0c25ab0c8..1dca7f426b8847 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.7.2", - "port-version": 1, + "version-semver": "3.7.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 ded44fd3edc8fc..538647601a873a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2861,8 +2861,8 @@ "port-version": 0 }, "gdal": { - "baseline": "3.7.2", - "port-version": 1 + "baseline": "3.7.3", + "port-version": 0 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index d91f56fd259c3e..58ac8b8d4dcee0 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "388e85b332e219ece9bdb669274ca04762500330", + "version-semver": "3.7.3", + "port-version": 0 + }, { "git-tree": "3931fc54de192cbee6b4683bc2261b2f3093130f", "version-semver": "3.7.2", From 4760200b67d09369cce0d012a9f317239d1e91b0 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:25:12 +0100 Subject: [PATCH 0347/1039] [dlib] no uwp (#35044) --- ports/dlib/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/d-/dlib.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index 752f77a6b67bac..2c1008337a5879 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,10 +1,11 @@ { "name": "dlib", "version": "19.24", - "port-version": 2, + "port-version": 3, "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", + "supports": "!uwp", "dependencies": [ "blas", "lapack", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9dd2e4db99b75f..eb320a637c717b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -286,8 +286,6 @@ discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail discordcoreapi:x64-osx=fail discount:x64-android=fail -dlib:arm64-uwp=fail -dlib:x64-uwp=fail drogon:arm-neon-android=fail drogon:arm64-android=fail drogon:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 538647601a873a..0d08d7cd788e28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2222,7 +2222,7 @@ }, "dlib": { "baseline": "19.24", - "port-version": 2 + "port-version": 3 }, "dmlc": { "baseline": "2022-06-22", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index 3ab172ef7be184..2d62df6293e255 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a2fe0fe58b23b16ef1f94c5b68bbd560ac54649", + "version": "19.24", + "port-version": 3 + }, { "git-tree": "9eaa35254408c210c84c3bfebb8e8651bab075e0", "version": "19.24", From 50de385678a3090a4eb63d056395d9c3915d0446 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:25:29 +0100 Subject: [PATCH 0348/1039] [realsense2] no uwp (#35046) --- ports/realsense2/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 0390b62b5d1f8e..abbc316213961b 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,9 +1,11 @@ { "name": "realsense2", "version": "2.54.2", + "port-version": 1, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ { "name": "libusb", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index eb320a637c717b..c9b4dfcff0cb4b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1010,8 +1010,6 @@ rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail realsense2:arm64-windows=fail -realsense2:arm64-uwp=fail -realsense2:x64-uwp=fail replxx:arm-neon-android=fail replxx:arm64-android=fail replxx:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0d08d7cd788e28..9f5414068a8078 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7370,7 +7370,7 @@ }, "realsense2": { "baseline": "2.54.2", - "port-version": 0 + "port-version": 1 }, "recast": { "baseline": "deprecated", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 6ba3ef956305ef..6a30bca87b1f92 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17434b2bd3e05364a70afea06d2d7ccb9db544c6", + "version": "2.54.2", + "port-version": 1 + }, { "git-tree": "c860a042c288cc1618ea5e728e8eb715b233ff44", "version": "2.54.2", From c75ff8cf3b784f67aa614552f32a6b2c7b9d8efc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:25:44 +0100 Subject: [PATCH 0349/1039] [nng] no uwp (#35045) --- ports/nng/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/n-/nng.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index cdb6da7df70493..dc061e924151a3 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,9 +1,11 @@ { "name": "nng", "version-semver": "1.5.2", + "port-version": 1, "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c9b4dfcff0cb4b..c9d3f7081aca49 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -796,8 +796,6 @@ ngspice:x64-windows-static=fail nmap:arm-neon-android=fail nmap:arm64-android=fail nmap:x64-android=fail -nng:arm64-uwp=fail -nng:x64-uwp=fail nrf-ble-driver:arm-neon-android=fail nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 9f5414068a8078..61689e7d279b42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5938,7 +5938,7 @@ }, "nng": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "nngpp": { "baseline": "1.3.0", diff --git a/versions/n-/nng.json b/versions/n-/nng.json index b13488a6a06c71..0e3d7329a4e653 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83ce54077bc3c44805db7725549b28e7bc90d536", + "version-semver": "1.5.2", + "port-version": 1 + }, { "git-tree": "8e400d4ac38af1eafba51433102b0963d06053b2", "version-semver": "1.5.2", From f436353b4ff3d8309f4f7bbf5d1f840618384714 Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Tue, 14 Nov 2023 21:24:27 +0100 Subject: [PATCH 0350/1039] [usrsctp] add license (#35087) * [usrsctp] add license * Update version database --- ports/usrsctp/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/u-/usrsctp.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json index 56683423af4653..f7ab9991dbe4da 100644 --- a/ports/usrsctp/vcpkg.json +++ b/ports/usrsctp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "usrsctp", "version": "0.9.5.0", - "port-version": 1, + "port-version": 2, "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.", + "homepage": "https://github.com/sctplab/usrsctp", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 61689e7d279b42..1597886dec2dab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8682,7 +8682,7 @@ }, "usrsctp": { "baseline": "0.9.5.0", - "port-version": 1 + "port-version": 2 }, "utf8h": { "baseline": "2021-11-18", diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json index 44c86c94478843..9866648ceead3b 100644 --- a/versions/u-/usrsctp.json +++ b/versions/u-/usrsctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ac1cb14a09660bf33bd8f3dc7727bcf8080ae02", + "version": "0.9.5.0", + "port-version": 2 + }, { "git-tree": "fcf79007e70c0b2872453841199dae68e7ac01fa", "version": "0.9.5.0", From 56319638f64d5cad203a3c876bc03f7c1c014b97 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:28:50 +0100 Subject: [PATCH 0351/1039] [stale bot] don't mark issues as stale and not stale in the same run (#35081) --- .github/workflows/stale.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 50752ce8d77c1b..07bef3cc8a6721 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,14 +7,14 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v6 + - uses: actions/stale@v8 with: stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.' any-of-labels: 'category:question,requires:repro,requires:more-information' days-before-issue-stale: 28 days-before-pr-stale: -1 days-before-close: 14 - - uses: actions/stale@v6 + - uses: actions/stale@v8 with: stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." any-of-labels: 'category:new-port' @@ -22,10 +22,11 @@ jobs: days-before-issue-stale: 60 days-before-pr-stale: -1 days-before-close: 14 - - uses: actions/stale@v6 + - uses: actions/stale@v8 with: stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment." exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information' days-before-issue-stale: 180 days-before-pr-stale: -1 days-before-close: 14 + operations-per-run: 50 From 6d0e15bdb1eae15ee0605f8cd53b757f1dbb9346 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Wed, 15 Nov 2023 07:37:54 +1100 Subject: [PATCH 0352/1039] [kdalgorithms] update to 1.2 (#35064) * [kdalgorithms] update to version 1.2 * [kdalgorithms] update to version 1.2 --- ports/kdalgorithms/portfile.cmake | 7 +++---- ports/kdalgorithms/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kdalgorithms.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/kdalgorithms/portfile.cmake b/ports/kdalgorithms/portfile.cmake index 97aff2baf60f2a..f3a9b1c55dd8a1 100644 --- a/ports/kdalgorithms/portfile.cmake +++ b/ports/kdalgorithms/portfile.cmake @@ -2,12 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDAB/KDAlgorithms - REF 93023b7b6640a227cfa6b2e7f1b8e72d10a0b981 - SHA512 151488c5ba30fceee204278e620bbc509464cb993d4207891ba627cb4384dc585927336f263ea80bfeb46f5100fdb31edcef13482d4b7f70b79480d1b153f087 - HEAD_REF master + REF ${VERSION} + SHA512 2229712954c377e9167b78fc931988f33c82349baeae9a64e3506f66fd96508e8482ce777c4ef8928c2ab38cbeffc413e96c75a9f41902080230f8c434782232 ) -file(INSTALL "${SOURCE_PATH}/src/kdalgorithms.h" "${SOURCE_PATH}/src/bits" +file(INSTALL "${SOURCE_PATH}/src/kdalgorithms.h" "${SOURCE_PATH}/src/kdalgorithms_bits" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/kdalgorithms/vcpkg.json b/ports/kdalgorithms/vcpkg.json index a6229618637e8a..abcbff625fcc5a 100644 --- a/ports/kdalgorithms/vcpkg.json +++ b/ports/kdalgorithms/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kdalgorithms", - "version-date": "2023-02-11", + "version": "1.2", "description": "KDAB's algorithm helpers for C++14 and up", "homepage": "https://github.com/KDAB/KDAlgorithms", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 1597886dec2dab..44b3ca39de9014 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3705,7 +3705,7 @@ "port-version": 1 }, "kdalgorithms": { - "baseline": "2023-02-11", + "baseline": "1.2", "port-version": 0 }, "kdbindings": { diff --git a/versions/k-/kdalgorithms.json b/versions/k-/kdalgorithms.json index def1e1a7a7f74d..7a329b1fc5238e 100644 --- a/versions/k-/kdalgorithms.json +++ b/versions/k-/kdalgorithms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05bf1ff5e346918f8fa5e6ece05126d72a6409f4", + "version": "1.2", + "port-version": 0 + }, { "git-tree": "c1d9ec1859767d60adf003d94fe81eb7eaac668e", "version-date": "2023-02-11", From 47e01f3ea49e0abc888896998e525bac6ca90213 Mon Sep 17 00:00:00 2001 From: Pierre Wendling <50808272+FtZPetruska@users.noreply.github.com> Date: Tue, 14 Nov 2023 21:41:42 +0100 Subject: [PATCH 0353/1039] [yaml-cpp] Update patch with upstream fixes. (#35058) The patch from https://github.com/jbeder/yaml-cpp/pull/1242 fixes loading the CMake config multiple times. --- ports/yaml-cpp/vcpkg.json | 1 + ports/yaml-cpp/yaml-cpp-pr-1212.patch | 20 +++++++++++--------- versions/baseline.json | 2 +- versions/y-/yaml-cpp.json | 5 +++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ports/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json index 6da03605e186e3..6e5818e2ed9e16 100644 --- a/ports/yaml-cpp/vcpkg.json +++ b/ports/yaml-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "yaml-cpp", "version-semver": "0.8.0", + "port-version": 1, "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", "homepage": "https://github.com/jbeder/yaml-cpp", "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", diff --git a/ports/yaml-cpp/yaml-cpp-pr-1212.patch b/ports/yaml-cpp/yaml-cpp-pr-1212.patch index 4044815a181177..784f3d5d5466c7 100644 --- a/ports/yaml-cpp/yaml-cpp-pr-1212.patch +++ b/ports/yaml-cpp/yaml-cpp-pr-1212.patch @@ -46,12 +46,11 @@ index 46dc180..5055c24 100644 if(YAML_CPP_BUILD_TESTS) add_subdirectory(test) - diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in -index 799b9b418..f71e13b8f 100644 +index 799b9b4..cbbc773 100644 --- a/yaml-cpp-config.cmake.in +++ b/yaml-cpp-config.cmake.in -@@ -11,12 +11,20 @@ set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") +@@ -11,12 +11,23 @@ set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") # Are we building shared libraries? @@ -66,12 +65,15 @@ index 799b9b418..f71e13b8f 100644 set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") -check_required_components(@EXPORT_TARGETS@) -+add_library(yaml-cpp INTERFACE IMPORTED) -+target_link_libraries(yaml-cpp INTERFACE yaml-cpp::yaml-cpp) -+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17) -+ set_target_properties(yaml-cpp PROPERTIES -+ DEPRECATION "The target yaml-cpp is deprecated and will be removed in version 0.10.0. Use the yaml-cpp::yaml-cpp target instead." -+ ) ++# Protect against multiple inclusion, which would fail when already imported targets are added once more. ++if(NOT TARGET yaml-cpp) ++ add_library(yaml-cpp INTERFACE IMPORTED) ++ target_link_libraries(yaml-cpp INTERFACE yaml-cpp::yaml-cpp) ++ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17) ++ set_target_properties(yaml-cpp PROPERTIES ++ DEPRECATION "The target yaml-cpp is deprecated and will be removed in version 0.10.0. Use the yaml-cpp::yaml-cpp target instead." ++ ) ++ endif() +endif() + +check_required_components(yaml-cpp) diff --git a/versions/baseline.json b/versions/baseline.json index 44b3ca39de9014..28b590d23c5201 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9234,7 +9234,7 @@ }, "yaml-cpp": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "yara": { "baseline": "4.3.2", diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json index 52b16425e359fc..7db95699ace4da 100644 --- a/versions/y-/yaml-cpp.json +++ b/versions/y-/yaml-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb1a38369faa80d2af500df32ef6d4a747336dcb", + "version-semver": "0.8.0", + "port-version": 1 + }, { "git-tree": "595f95f94e93c518b99e8c0e83ef35ced9e7867a", "version-semver": "0.8.0", From d73fba0543381e99e399a136eb19f21d6446eae8 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Wed, 15 Nov 2023 04:43:13 +0800 Subject: [PATCH 0354/1039] [bext-di] Update to 1.3.0 (#35056) * update port. * update versions file. * Apply suggestions from code review Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * update versions. * update versions file. --------- Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/bext-di/portfile.cmake | 6 +++--- ports/bext-di/vcpkg.json | 3 +-- versions/b-/bext-di.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/bext-di/portfile.cmake b/ports/bext-di/portfile.cmake index 36ce8c0a9b213f..f60b74a074eb06 100644 --- a/ports/bext-di/portfile.cmake +++ b/ports/bext-di/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/di - REF 6078f073feb8560127fbf0308b3794a551146252 # v1.2.0 - SHA512 d7876b10b0365a92095ee7edefdc9cb9a0e237baf2bad124a927f22ed6ec30e18802b20517bc032184f39b7b4d71f44e965bdcea074646871d0194bd4e851d43 + REF "v${VERSION}" + SHA512 2371415df0b6569861d60c32908afb6fae8bfa221ad4153eeb7f60143f8449eca6c81b57067d5009b8cd85e31c04ede554fdee23008ddeffa4e7746856e250ae HEAD_REF cpp14 ) @@ -14,4 +14,4 @@ vcpkg_download_distfile(LICENSE FILENAME "di-copyright" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) -file(INSTALL ${LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${LICENSE}") diff --git a/ports/bext-di/vcpkg.json b/ports/bext-di/vcpkg.json index 2b47e5578d98b1..aaeeeceb8ce112 100644 --- a/ports/bext-di/vcpkg.json +++ b/ports/bext-di/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bext-di", - "version": "1.2.0", - "port-version": 1, + "version": "1.3.0", "description": "C++14 Dependency Injection Library.", "homepage": "https://github.com/boost-ext/di" } diff --git a/versions/b-/bext-di.json b/versions/b-/bext-di.json index c53b8f6e1d9d59..6a14ef9d8a6842 100644 --- a/versions/b-/bext-di.json +++ b/versions/b-/bext-di.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4882fdad119370cd0496487cd2b2cfc4db087ce", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "8b3c494eee383a036b07453ff9b34d1be65be06d", "version": "1.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 28b590d23c5201..c730739a422e61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -565,8 +565,8 @@ "port-version": 0 }, "bext-di": { - "baseline": "1.2.0", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "bext-mp": { "baseline": "2023-03-02", From 92f6027025ed4f589679d9b9f3d0f967fb8216c3 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 04:43:43 +0800 Subject: [PATCH 0355/1039] [aws-c-cal] update to 0.6.9 (#35055) * [aws-c-cal] update to 0.6.9 * [aws-c-cal] update to 0.6.9 --- ports/aws-c-cal/portfile.cmake | 2 +- ports/aws-c-cal/vcpkg.json | 3 +-- versions/a-/aws-c-cal.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index 4782cce5420e48..3cef1fbb2825a2 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal REF "v${VERSION}" - SHA512 b1116977b467c2c7f10f84912a3bc2a8329e3ec22c58f19f7b8a244a2b08fb3420bed62791b7ad6f06b8aeff6c361a33ddc0ac28cf781dfa1aafc83a62aa24ec + SHA512 deee106b366522e6781974c92b1aa06542b7857b91a8d4cb59eb0e17247ce7fc3ffacb044c032ff7f2a0f9baca807d4c2d9a14934d4576966f48bfc0661e5edb HEAD_REF master PATCHES remove-libcrypto-messages.patch ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index 49f97f29c2b79c..b1d22ed8eade63 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-c-cal", - "version": "0.6.2", - "port-version": 1, + "version": "0.6.9", "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index 3c127a8840357b..f2ce100b5341db 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43c961d933d7a928c15cdfb7c5f7a6c16875bed5", + "version": "0.6.9", + "port-version": 0 + }, { "git-tree": "df757b731aa4c59ac71c43d02fe87edaff5680b3", "version": "0.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index c730739a422e61..b058aefe882e01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -357,8 +357,8 @@ "port-version": 0 }, "aws-c-cal": { - "baseline": "0.6.2", - "port-version": 1 + "baseline": "0.6.9", + "port-version": 0 }, "aws-c-common": { "baseline": "0.9.4", From 17444f13ad7dbb161d160aed85a2efc2f28841fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Chlumsk=C3=BD?= Date: Tue, 14 Nov 2023 21:46:04 +0100 Subject: [PATCH 0356/1039] [msdfgen] Update to 1.11 (#35043) --- ports/msdfgen/portfile.cmake | 4 ++-- ports/msdfgen/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/msdfgen.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake index 9997d22fac3430..03678799fec770 100644 --- a/ports/msdfgen/portfile.cmake +++ b/ports/msdfgen/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Chlumsky/msdfgen - REF a811ef8935354d3f6d767cff6c4eebeb683777f2 # accessed on 2023-01-20 - SHA512 6c7fb9e9a4f4dee2502e1dca2c4612aae005697476e30664cc263f09e336b1cd0b529d75af667cdd9063ac1dd183867ce9f5bb88731e3071687c87937dab29d9 + REF v1.11 + SHA512 b5223bbdbd7245e7a891914158a25ea1d570bbe1066ca6c016d1ddd469d5156690f83f91c78630b2b2efcc890de0b7e1c9e8963a67f9eb8f83c6d45284d5b08a HEAD_REF master ) diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json index fa80a40850fd0c..c52af196a12686 100644 --- a/ports/msdfgen/vcpkg.json +++ b/ports/msdfgen/vcpkg.json @@ -1,7 +1,6 @@ { "name": "msdfgen", - "version": "1.10.0", - "port-version": 1, + "version": "1.11.0", "description": "Multi-channel signed distance field generator", "homepage": "https://github.com/Chlumsky/msdfgen", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b058aefe882e01..ea868f389f3870 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5709,8 +5709,8 @@ "port-version": 0 }, "msdfgen": { - "baseline": "1.10.0", - "port-version": 1 + "baseline": "1.11.0", + "port-version": 0 }, "msgpack": { "baseline": "6.0.0", diff --git a/versions/m-/msdfgen.json b/versions/m-/msdfgen.json index 3fb678ae2bd28f..b1a4b4ee517f72 100644 --- a/versions/m-/msdfgen.json +++ b/versions/m-/msdfgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb66c5ad525b3152e1f73a029dfd0a2caa4a7f5c", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "22eb77c9256846ad9c1e01e6ffff25b02b5edbd5", "version": "1.10.0", From 28179a6fd0411b89b6bdec9ba9185d30e31b8c18 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 04:47:15 +0800 Subject: [PATCH 0357/1039] [octomap] update to 1.9.8 (#35039) * [octomap] update to 1.9.8 * [octomap] update to 1.9.8 --- ports/octomap/portfile.cmake | 4 ++-- ports/octomap/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/octomap.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index e33e45d2b6e6cc..d820b3a411cb0a 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OctoMap/octomap - REF c4a4304895f6cfc31723dc95df252fe7e756a0ef # v1.9.6 - SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd + REF "v${VERSION}" + SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e HEAD_REF master PATCHES 001-fix-exported-targets.patch diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json index 868c7ce7c6ce65..e8275e75296dea 100644 --- a/ports/octomap/vcpkg.json +++ b/ports/octomap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "octomap", - "version": "1.9.6", - "port-version": 1, + "version": "1.9.8", "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", "homepage": "https://octomap.github.io/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ea868f389f3870..aebeec9ebbaebe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6085,8 +6085,8 @@ "port-version": 0 }, "octomap": { - "baseline": "1.9.6", - "port-version": 1 + "baseline": "1.9.8", + "port-version": 0 }, "ode": { "baseline": "0.16.3", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index c5a074b928cb4d..1d595812f6d7b4 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24dd4ca217fd0e4b7fcb86301556f96d8f8d0c7", + "version": "1.9.8", + "port-version": 0 + }, { "git-tree": "b778b0aef20fee697a18865995fff021501e8509", "version": "1.9.6", From b58df1160822908af3a50e3e45f8eb26d7006686 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Tue, 14 Nov 2023 21:54:21 +0100 Subject: [PATCH 0358/1039] [ffmpeg] Bump to 6.1 (#35042) * [ffmpeg] Bump to 6.1 * [ffnvcodec] Bump to 11.1.5.3 * vcpkg x-add-version --all * [avisynthplus] Bump to 3.7.3 * vcpkg x-add-version --all * [avisynthplus] Remove no more required patch * vcpkg x-add-version --all * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * vcpkg x-add-version --all --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/avisynthplus/clang-cl.patch | 20 ------- ports/avisynthplus/portfile.cmake | 6 +- ports/avisynthplus/vcpkg.json | 3 +- ports/ffmpeg/0001-create-lib-libraries.patch | 6 +- ports/ffmpeg/0004-fix-debug-build.patch | 11 ++-- ports/ffmpeg/0006-fix-StaticFeatures.patch | 14 ++--- .../ffmpeg/0020-fix-aarch64-libswscale.patch | 16 ++--- ports/ffmpeg/0024-fix-gcc13-binutils.patch | 60 ------------------- ports/ffmpeg/portfile.cmake | 5 +- ports/ffmpeg/vcpkg.json | 3 +- ports/ffnvcodec/portfile.cmake | 4 +- ports/ffnvcodec/vcpkg.json | 2 +- versions/a-/avisynthplus.json | 5 ++ versions/baseline.json | 10 ++-- versions/f-/ffmpeg.json | 5 ++ versions/f-/ffnvcodec.json | 5 ++ 16 files changed, 53 insertions(+), 122 deletions(-) delete mode 100644 ports/avisynthplus/clang-cl.patch delete mode 100644 ports/ffmpeg/0024-fix-gcc13-binutils.patch diff --git a/ports/avisynthplus/clang-cl.patch b/ports/avisynthplus/clang-cl.patch deleted file mode 100644 index c5cf087f80b1fa..00000000000000 --- a/ports/avisynthplus/clang-cl.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 5e018b73c2e478..a3d8612511c3dc 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AviSynth/AviSynthPlus - REF v3.7.2 - SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1 + REF "v${VERSION}" + SHA512 0e0daa83e3ab729fdc35a52c60c23c9142f1229187af893d0dbbd36f88eced36f63a3e8c767a3dc825edaa5395a49a5aad726f6b61de8f6b291557eec20de426 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 655d892ca5a6af..209fea9a90b1c1 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avisynthplus", - "version": "3.7.2", - "port-version": 2, + "version": "3.7.3", "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/ports/ffmpeg/0001-create-lib-libraries.patch b/ports/ffmpeg/0001-create-lib-libraries.patch index 64e44e8d9a9b83..ced7ba86be2bd8 100644 --- a/ports/ffmpeg/0001-create-lib-libraries.patch +++ b/ports/ffmpeg/0001-create-lib-libraries.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 34c2adb..1c8008a 100755 +index 1f0b9497cb..3243e23021 100644 --- a/configure +++ b/configure -@@ -5631,15 +5631,17 @@ case $target_os in +@@ -5697,17 +5697,19 @@ case $target_os in ;; win32|win64) disable symver @@ -18,8 +18,10 @@ index 34c2adb..1c8008a 100755 +# fi ! enabled small && test_cmd $windres --version && enable gnu_windres enabled x86_32 && check_ldflags -LARGEADDRESSAWARE + add_cppflags -DWIN32_LEAN_AND_MEAN shlibdir_default="$bindir_default" + LIBPREF="" + LIBSUF=".lib" SLIBPREF="" SLIBSUF=".dll" + SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' diff --git a/ports/ffmpeg/0004-fix-debug-build.patch b/ports/ffmpeg/0004-fix-debug-build.patch index b85d7bbe759144..1c7056c4cc0907 100644 --- a/ports/ffmpeg/0004-fix-debug-build.patch +++ b/ports/ffmpeg/0004-fix-debug-build.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index bd2de34..fba948a 100755 +index 3243e23021..6d3f31fc95 100644 --- a/configure +++ b/configure -@@ -3993,6 +3993,9 @@ for opt do +@@ -4284,6 +4284,9 @@ for opt do --libfuzzer=*) libfuzzer_path="$optval" ;; @@ -12,7 +12,7 @@ index bd2de34..fba948a 100755 *) optname="${opt%%=*}" optname="${optname#--}" -@@ -6464,8 +6464,12 @@ +@@ -6630,7 +6633,11 @@ fi enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion || check_lib zlib zlib.h zlibVersion -lz; } @@ -25,8 +25,7 @@ index bd2de34..fba948a 100755 enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma enabled zlib && test_exec $zlib_extralibs < -@@ -6350,7 +6350,11 @@ enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8 +@@ -6793,7 +6800,11 @@ enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019. enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init || require libsmbclient libsmbclient.h smbc_init -lsmbclient; } @@ -37,5 +36,5 @@ index bd2de34..fba948a 100755 + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +fi enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr - enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init + enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init diff --git a/ports/ffmpeg/0006-fix-StaticFeatures.patch b/ports/ffmpeg/0006-fix-StaticFeatures.patch index dc7f818435112d..76a649654ad3a3 100644 --- a/ports/ffmpeg/0006-fix-StaticFeatures.patch +++ b/ports/ffmpeg/0006-fix-StaticFeatures.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 3bdcfc6..00b2f13 100644 +index 6d3f31fc95..f5f4a769cc 100644 --- a/configure +++ b/configure -@@ -6351,7 +6351,8 @@ if enabled libmfx; then +@@ -6761,7 +6761,8 @@ if enabled libmfx; then fi enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load @@ -12,16 +12,16 @@ index 3bdcfc6..00b2f13 100644 enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine || require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; } enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei -lnppif || -@@ -6392,7 +6393,7 @@ if enabled debug_configure; then +@@ -6805,7 +6806,7 @@ if enabled debug_configure; then else enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ fi -enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr +enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm - enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init + enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket -@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" +@@ -6888,6 +6889,8 @@ enabled openal && { check_pkg_config openal "openal >= 1.1" "AL/al.h" enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel || check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL || check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL || @@ -30,7 +30,7 @@ index 3bdcfc6..00b2f13 100644 die "ERROR: opencl not found"; } && { test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || -@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP +@@ -6914,6 +6917,7 @@ enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" ope check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto || check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 || @@ -38,7 +38,7 @@ index 3bdcfc6..00b2f13 100644 die "ERROR: openssl not found"; } enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create && -@@ -6707,7 +6711,7 @@ enabled amf && +@@ -7215,7 +7219,7 @@ enabled amf && if enabled libc_iconv; then check_func_headers iconv.h iconv elif enabled iconv; then diff --git a/ports/ffmpeg/0020-fix-aarch64-libswscale.patch b/ports/ffmpeg/0020-fix-aarch64-libswscale.patch index 6019b06645544c..f47e82ed8a2070 100644 --- a/ports/ffmpeg/0020-fix-aarch64-libswscale.patch +++ b/ports/ffmpeg/0020-fix-aarch64-libswscale.patch @@ -1,28 +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 +index 89d69e7f6c..4bc1607a7a 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 + 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 + 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 + 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 + 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 + compute_rgba v6.8b,v5.8b,v4.8b,v7.8b, v18.8b,v17.8b,v16.8b,v19.8b .endif diff --git a/ports/ffmpeg/0024-fix-gcc13-binutils.patch b/ports/ffmpeg/0024-fix-gcc13-binutils.patch deleted file mode 100644 index 395b4db0366849..00000000000000 --- a/ports/ffmpeg/0024-fix-gcc13-binutils.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/libavcodec/x86/mathops.h b/libavcodec/x86/mathops.h -index 6298f5e..ca7e2df 100644 ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index b4f29767b61764..604a147aeda224 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg - REF n${VERSION} - SHA512 da1b836c8f51cf69f95db750d5da5191a71d534fa7b0f019d6d6454f8dd6db5598789576b4fe5ad983dcd0197b9a7e8f9d43f10707b6d40ac31425da23da35b2 + REF "n${VERSION}" + SHA512 abb9207364553248278f8e23e3d565da51ecb0ae9b20edda41624b314541bc3f53a8d6aac7fa5455168d2323d5d70d5a8acbe059f33423fbc2563e1a6cd0348b HEAD_REF master PATCHES 0001-create-lib-libraries.patch @@ -20,7 +20,6 @@ vcpkg_from_github( 0015-Fix-xml2-detection.patch 0020-fix-aarch64-libswscale.patch 0022-fix-iconv.patch - 0024-fix-gcc13-binutils.patch ) if(SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 1afb1c802817dc..1f997616a0ae13 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "6.0", - "port-version": 2, + "version": "6.1", "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/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index d884b49c659de0..2386bfa928d167 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FFmpeg/nv-codec-headers - REF n${VERSION} - SHA512 c08b7b3d08ef6e95819268067e09c588e5064d4c2320554f868579e96dc841e1eab217c03ef44e246aabdfa8b5e8e267cd5f0726f9c959f45fb27cb79af7c454 + REF "n${VERSION}" + SHA512 386e4e1e0606a5ebd95c0ca60a2cdbadd1e24ac64df65f707dd00ee1fc822f56535637eaf4a375dd25f2f91fb00ffabb95953a1bab9fc101d1c522e2954f37c0 HEAD_REF master ) diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index 28a99a3b67dd9f..3b63cb87f2652d 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ffnvcodec", - "version": "11.1.5.2", + "version": "11.1.5.3", "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "linux | (!osx & !uwp & !(arm64 & windows))" diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index d9eba72bad6fa4..966009bac747e5 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6a5198252f84212548934db0f73184919283928", + "version": "3.7.3", + "port-version": 0 + }, { "git-tree": "4e89f515dc497bb37dd138d024d572ef318a10fb", "version": "3.7.2", diff --git a/versions/baseline.json b/versions/baseline.json index aebeec9ebbaebe..7396a3e96765b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -341,8 +341,8 @@ "port-version": 0 }, "avisynthplus": { - "baseline": "3.7.2", - "port-version": 2 + "baseline": "3.7.3", + "port-version": 0 }, "avro-c": { "baseline": "1.11.3", @@ -2589,11 +2589,11 @@ "port-version": 7 }, "ffmpeg": { - "baseline": "6.0", - "port-version": 2 + "baseline": "6.1", + "port-version": 0 }, "ffnvcodec": { - "baseline": "11.1.5.2", + "baseline": "11.1.5.3", "port-version": 0 }, "fftw3": { diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index c38dd4d6e2f3c1..1f0e1edd4a4871 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e350faae831bb8d75c4ebcee81d9161484aecdba", + "version": "6.1", + "port-version": 0 + }, { "git-tree": "9f33fe16e3a4e278bc2eb92b24483d00b90e9f3a", "version": "6.0", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 6cf12fd2600af2..a7e570d69add8e 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e9c042e433dca081ec8f18d57d19851bc6182a3", + "version": "11.1.5.3", + "port-version": 0 + }, { "git-tree": "129a409f9a9a143a3964c7d6cdb5fef51c777cc4", "version": "11.1.5.2", From 17c58325f4d0a4549f0ef16adc3f41bbd4a2b07b Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 04:55:52 +0800 Subject: [PATCH 0359/1039] [numactl] update to 2.0.16 (#35038) * [numactl] update to 2.0.16 * [numactl] update to 2.0.16 --- ports/numactl/portfile.cmake | 4 ++-- ports/numactl/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/numactl.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake index 17a058022fe149..ac6c8e4e4ebfda 100644 --- a/ports/numactl/portfile.cmake +++ b/ports/numactl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO numactl/numactl - REF v2.0.14 - SHA512 ADAF405F092FD9653F26D00F8C80CB83852C56EBD5D00E714E20D505008E74AA7105B0FB7AA55A605DEAC0D1491CEFF57DE931037D33E7944FCA105BC6510ED4 + REF "v${VERSION}" + SHA512 de89bd9f4a9be0e27b21d096aa17a554c209414b5d08b6a2dbd03f8f4830fe4fc5adc88fa8cb08ae1cf75884835dacbde5b6f5d31386244a2582924d2260fcb6 HEAD_REF master ) diff --git a/ports/numactl/vcpkg.json b/ports/numactl/vcpkg.json index 267e8300da8d10..056bb8716a252b 100644 --- a/ports/numactl/vcpkg.json +++ b/ports/numactl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "numactl", - "version": "2.0.14", - "port-version": 1, + "version": "2.0.16", "description": "NUMA support for Linux", "homepage": "https://github.com/numactl/numactl", "supports": "linux" diff --git a/versions/baseline.json b/versions/baseline.json index 7396a3e96765b1..16adc8e74af40a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6001,8 +6001,8 @@ "port-version": 0 }, "numactl": { - "baseline": "2.0.14", - "port-version": 1 + "baseline": "2.0.16", + "port-version": 0 }, "numcpp": { "baseline": "2.11.0", diff --git a/versions/n-/numactl.json b/versions/n-/numactl.json index ce482e60d0a526..77efc33101750a 100644 --- a/versions/n-/numactl.json +++ b/versions/n-/numactl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a43cd7692e36347f0bef1c92c982253051f9027", + "version": "2.0.16", + "port-version": 0 + }, { "git-tree": "38b7d6feca43ff05b6a059aae8ce218fa382853e", "version": "2.0.14", From 4e175915003d9cf847641ac8e8f2b449715156d7 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 04:56:13 +0800 Subject: [PATCH 0360/1039] [nsync] update to 1.26.0 (#35037) * [nsync] update to 1.26.0 * [nsync] update to 1.26.0 --- ports/nsync/portfile.cmake | 4 ++-- ports/nsync/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nsync.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/nsync/portfile.cmake b/ports/nsync/portfile.cmake index fe2ff4d5157c2e..d927e630817215 100644 --- a/ports/nsync/portfile.cmake +++ b/ports/nsync/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/nsync - REF 1.24.0 - SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f + REF "${VERSION}" + SHA512 8aa49997f100f161f0f32e99c9004ee845d7b16c1391e7eb62eea0897e2f91b7f9e5181055fdca637518751b6b26e16a1cd53e45adceda145285752c4b74f3bf HEAD_REF master PATCHES fix-install.patch diff --git a/ports/nsync/vcpkg.json b/ports/nsync/vcpkg.json index 54c24f43f12149..2ec424eec20a9f 100644 --- a/ports/nsync/vcpkg.json +++ b/ports/nsync/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nsync", - "version": "1.24.0", - "port-version": 1, + "version": "1.26.0", "description": "nsync is a C library that exports various synchronization primitives, such as mutexes", "homepage": "https://github.com/google/nsync", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 16adc8e74af40a..fe9559a24e1233 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5981,8 +5981,8 @@ "port-version": 2 }, "nsync": { - "baseline": "1.24.0", - "port-version": 1 + "baseline": "1.26.0", + "port-version": 0 }, "nt-wrapper": { "baseline": "2019-08-10", diff --git a/versions/n-/nsync.json b/versions/n-/nsync.json index e88b93ba9e19d3..810d7003e05830 100644 --- a/versions/n-/nsync.json +++ b/versions/n-/nsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2861341c0435829734827dc84d7166d95d8e8bee", + "version": "1.26.0", + "port-version": 0 + }, { "git-tree": "f2333cb932309608aa164aadaacb8d4592c71068", "version": "1.24.0", From dc3c55f092c96fb3f1dcdff84e6a99f947ea4165 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 14 Nov 2023 12:58:05 -0800 Subject: [PATCH 0361/1039] [azure-identity-cpp] Update to 1.6.0 (#35035) ## 1.6.0 (2023-11-10) ### Features Added - Added `WorkloadIdentityCredential`. - When one of the credentials within `DefaultAzureCredential` is successful, it gets re-used during all subsequent attempts to get the token. - Updated `ClientSecretCredentialOptions` and `ClientCertificateCredentialOptions` to read the default value for the authority host option from the environment variable first. ### Breaking Changes - Add `WorkloadIdentityCredential` to the `DefaultAzureCredential`. ### Bugs Fixed - Do not throw an exception during `AzureCliCredential` construction, but rather delay it to the `GetToken()` call. - Harden checks for the tenant ID. - Disallow space character when validating tenant id and scopes as input for `AzureCliCredential`. - Add authority host url validation to reject non-HTTPS schemes. - [[#4084]](https://github.com/Azure/azure-sdk-for-cpp/issues/4084) Remove OpenSSL dependency on Windows. (A community contribution, courtesy of _[teo-tsirpanis](https://github.com/teo-tsirpanis)_) ### Other Changes - Add default values to some `WorkloadIdentityCredentialOptions` fields such as authority host by reading them from the environment. - Add logging to `WorkloadIdentityCredential` to help with debugging. - Create separate lists of characters that are allowed within tenant ids and scopes in `AzureCliCredential`. ### Acknowledgments Thank you to our developer community members who helped to make Azure Identity better with their contributions to this release: - Theodore Tsirpanis _([GitHub](https://github.com/teo-tsirpanis))_ --- ports/azure-identity-cpp/portfile.cmake | 7 +++++-- ports/azure-identity-cpp/vcpkg.json | 13 ++++++++++--- versions/a-/azure-identity-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index 06cc7bbce16008..f4389c55e12e07 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.5.1 - SHA512 f3e12c0685ec7a1cde724feafbc84a8aa66688ed7b54bb9c4787d516aee3142310863013a5d49869e1a1e64af8f5ce908640fee64190bc9c2f9715e3afa833bc + REF azure-identity_1.6.0 + SHA512 a856bc8f3c536d0ac2a5d7817d4bb890bf0688940075ea191df45a58faff46790acda9cdd917cd4f14496c9a696c8cf31be7935b08dd2d549e8ea5d30dbe2c94 ) if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity") diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 2cccb7b873ce9d..429251a0c1fe73 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,7 +1,7 @@ { + "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", "name": "azure-identity-cpp", - "version-semver": "1.5.1", - "port-version": 1, + "version-semver": "1.6.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." @@ -14,7 +14,10 @@ "default-features": false, "version>=": "1.9.0" }, - "openssl", + { + "name": "openssl", + "platform": "!windows & !uwp" + }, { "name": "vcpkg-cmake", "host": true @@ -22,6 +25,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "wil", + "platform": "windows & !uwp" } ] } diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index ba3078ee05fd6d..c5d73670ac1760 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb43628d1a08baa198ed4cdc7d317ed73ed3815f", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "5fd04f09c1fc0efef3008e8407828b368d75ee5d", "version-semver": "1.5.1", diff --git a/versions/baseline.json b/versions/baseline.json index fe9559a24e1233..6464c2901abbf6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -429,8 +429,8 @@ "port-version": 1 }, "azure-identity-cpp": { - "baseline": "1.5.1", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "azure-iot-sdk-c": { "baseline": "2023-08-07", From 7b3ea912e979594eef9cff9e37606d0d15e9c8fc Mon Sep 17 00:00:00 2001 From: Osyotr Date: Wed, 15 Nov 2023 00:03:37 +0300 Subject: [PATCH 0362/1039] [Qt] Try mirrors if main server is down (#35029) --- ports/qtbase/cmake/qt_install_submodule.cmake | 4 ++-- ports/qtbase/cmake/qt_port_details.cmake | 24 ++++++++++++------- ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 ++++ 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index e8d1fb0a367257..38819d70727666 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -63,9 +63,9 @@ function(qt_download_submodule_impl) set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}") endif() - qt_get_url_filename("${_qarg_SUBMODULE}" url filename) + qt_get_url_filename("${_qarg_SUBMODULE}" urls filename) vcpkg_download_distfile(archive - URLS "${url}" + URLS ${urls} FILENAME "${filename}" ${sha512} ) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 8c47f7e09703c0..151dc74961e4be 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -101,23 +101,31 @@ set(QT_FROM_QT_GIT qtinterfaceframework) #set(QT_FROM_QT_GIT ${QT_PORTS}) #list(POP_FRONT QT_FROM_QT_GIT) -function(qt_get_url_filename qt_port out_url out_filename) +function(qt_get_url_filename qt_port out_urls 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(urls "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(urls "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) + if(NOT QT_DEV_BRANCH) - set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + set(branch_subpath "archive") else() - set(url "https://download.qt.io/development_releases/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + set(branch_subpath "development_releases") endif() + set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + set(mirrors + "https://download.qt.io/" + "https://mirrors.ocf.berkeley.edu/qt/" + ) + set(url_subpath "${branch_subpath}/qt/${qt_major_minor}/${QT_VERSION}/submodules/${filename}") + list(TRANSFORM mirrors APPEND "${url_subpath}" OUTPUT_VARIABLE urls) endif() - set(${out_url} "${url}" PARENT_SCOPE) + set(${out_urls} ${urls} PARENT_SCOPE) set(${out_filename} "${filename}" PARENT_SCOPE) endfunction() @@ -145,9 +153,9 @@ if(QT_UPDATE_VERSION) 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) + qt_get_url_filename("${qt_port}" urls filename) vcpkg_download_distfile(archive - URLS "${url}" + URLS ${urls} FILENAME "${filename}" SKIP_SHA512 ) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c51ec7d5265f38..cee0cfb67f1711 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.6.0", + "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 6464c2901abbf6..231e5eddfbf754 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7054,7 +7054,7 @@ }, "qtbase": { "baseline": "6.6.0", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.6.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 28f94cb4595aef..c8ffa9c0e9d68d 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11861d085aeee91737a5dede66bb78845d99b0e7", + "version": "6.6.0", + "port-version": 1 + }, { "git-tree": "eb1e1a00df34c350c817ee3d9ab90d2c52ced194", "version": "6.6.0", From e61900cc51358bcd1eeb9308c8c725d5580e6254 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Tue, 14 Nov 2023 14:04:50 -0700 Subject: [PATCH 0363/1039] [ginkgo] Update version to 1.7.0 (#35028) * [ginkgo] add version 1.7.0 * update version --- ports/ginkgo/portfile.cmake | 2 +- ports/ginkgo/vcpkg.json | 7 ++++--- versions/baseline.json | 2 +- versions/g-/ginkgo.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index a17f906d0df3a3..88efb1cd34cddd 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ginkgo-project/ginkgo REF "v${VERSION}" - SHA512 507a17bc9ad010c235c4ae49ac4bef3f4d5b65b4ea02bfa5cad5ea578fa65d28f564d1faf0a1f5618a6e72d744217f58bdff68c5f1fffc9cfb484800f7f84c50 + SHA512 a7e71eaae8dc62e0b670f0db82f82e23b82860b3f6a5428e28f4652ed2a496f53d04238039b95f43cdf465cf86d2724ed88113a65e5e761ab839244e1b58ea46 HEAD_REF master ) diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index 73aa6817f96ca1..fc4c1b818b154e 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ginkgo", - "version-semver": "1.6.0", - "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", + "version-semver": "1.7.0", + "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems.", "homepage": "https://github.com/ginkgo-project/ginkgo", "license": "BSD-3-Clause", "supports": "!(x86 | android)", @@ -29,7 +29,8 @@ ] }, "openmp": { - "description": "Build the OpenMP backend of Ginkgo" + "description": "Build the OpenMP backend of Ginkgo", + "supports": "mingw | !windows" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 231e5eddfbf754..fcf6430682ff88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2941,7 +2941,7 @@ "port-version": 3 }, "ginkgo": { - "baseline": "1.6.0", + "baseline": "1.7.0", "port-version": 0 }, "gklib": { diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index a946d291131506..6f93f91da04e7e 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bb942245eec037ad042ba29ec426573031513e7", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "09962781615d028b2b96be5aef56b0590fd7b54f", "version-semver": "1.6.0", From 2d8202f06d45f4220fa8aa0fc222d1d8221fd144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 14 Nov 2023 15:05:37 -0600 Subject: [PATCH 0364/1039] [arrow] Update to 14.0.1 (#35026) * [arrow] Update to 14.0.1 * Update versions --- ports/arrow/portfile.cmake | 2 +- ports/arrow/vcpkg.json | 2 +- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index ed6abdf5f40045..834741486eb7f1 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 9e1f8179e37279a47baa3587c66d8b385362478d998601b5f0a8bb2f360ec8cdb954705f397dac413ac1411e72d4dd740e3785823cc063ca35eb80585d2eedf2 + SHA512 31d19f0ca80349f63db74bae813256b47907f85725a9bf01ef6f32406e79828ebb4701faedb52696b6a5b3bb89ad4e136485fd5eb35d396dd42147c11d4d2713 ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index bc2c5ada6d22e2..631f4089a5f7a2 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "14.0.0", + "version": "14.0.1", "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index f72542292b16a6..517b0ba6168b79 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3517d0d8bf39d98d806b0c84eac2f5f1acbbf32", + "version": "14.0.1", + "port-version": 1 + }, { "git-tree": "c1c1beba87b3d9ac5ffc73764c62622cbd31eace", "version": "14.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index fcf6430682ff88..1250d5ebaee53e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -237,7 +237,7 @@ "port-version": 5 }, "arrow": { - "baseline": "14.0.0", + "baseline": "14.0.1", "port-version": 1 }, "arsenalgear": { From 877eaea99993eac466024d583eb720d717a3917b Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:05:58 +0100 Subject: [PATCH 0365/1039] [configcat] Update to version 3.1.1 (#35025) * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.1 * [configcat] Update to version 3.1.1 --- ports/configcat/portfile.cmake | 2 +- ports/configcat/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/configcat.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/configcat/portfile.cmake b/ports/configcat/portfile.cmake index e395317c5964e1..9714cb3a171dd4 100644 --- a/ports/configcat/portfile.cmake +++ b/ports/configcat/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO configcat/cpp-sdk REF "v${VERSION}" - SHA512 f5a2217e0b451cb2390091dfec4e89e0fb3abfa22d74ed75e1038e060fe3009d0e114bf6f6556949e6574c3e82ca72bc6aad8be8fb5d3f0dea36a867f992d27f + SHA512 2d2c456c978babc3223783ec0e08ac7e73294703db4f932da12ce7e4b5163510689c4b996311543fd68acffc613a15a776767b144a4089eb12566a52af8017b7 HEAD_REF master ) diff --git a/ports/configcat/vcpkg.json b/ports/configcat/vcpkg.json index ef35692a72c5a3..90fa97b2f31189 100644 --- a/ports/configcat/vcpkg.json +++ b/ports/configcat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "configcat", - "version": "3.1.0", + "version": "3.1.1", "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 1250d5ebaee53e..76a901de974a29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1757,7 +1757,7 @@ "port-version": 0 }, "configcat": { - "baseline": "3.1.0", + "baseline": "3.1.1", "port-version": 0 }, "console-bridge": { diff --git a/versions/c-/configcat.json b/versions/c-/configcat.json index 4666d61e132018..b78bee82ea433c 100644 --- a/versions/c-/configcat.json +++ b/versions/c-/configcat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278ce6bc975733e7807d36490f0e6d5c5c786ebb", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "8beddf56b4ad53f7c2bbd1e457c31858f1906e9c", "version": "3.1.0", From a3aec9d93b9f7f69ed85fdb7f104a0e4fa28a598 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 05:08:03 +0800 Subject: [PATCH 0366/1039] [libmt32emu] update to 2.7.1 (#35019) * [libmt32emu] update to 2.7.1 * [libmt32emu] update to 2.7.1 * fix homepage --- ports/libmt32emu/portfile.cmake | 4 ++-- ports/libmt32emu/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libmt32emu.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake index a7fc0a2c6289e6..5741c5ecca4466 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 08aba2f0018f4e7c2af855c268a97b8b84f8dc06 #vlibmt32emu_2_7_0 - SHA512 ef277767c6c18b1aa341b2e2cdac04c27bc19ef0aa2f1e0a4125c92128f64d5938eab53cf1d6bf2f9abaa5a59d14873e91e1518878165af48ac6b93c3e208aa5 + REF libmt32emu_2_7_1 + SHA512 369d1c5f16b37f3d8544ad30a30c3aa9d0796f67fcf5988e789958bff14bba119f7c5fd4c43816eb369a14b56f22f0c7eb3016ff838cd36d1d6f22ed84a2e8b9 HEAD_REF master ) diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json index 45be996b263caa..ae3ea2bf0d13a5 100644 --- a/ports/libmt32emu/vcpkg.json +++ b/ports/libmt32emu/vcpkg.json @@ -1,8 +1,8 @@ { "name": "libmt32emu", - "version": "2.7.0", + "version": "2.7.1", "description": "A MT-32 emulator", - "homepage": "https://github.com/munt/munt/tree/master/mt32emu", + "homepage": "https://github.com/munt/munt", "license": "GPL-2.0-or-later", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 76a901de974a29..771b5e81d8985f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4525,7 +4525,7 @@ "port-version": 0 }, "libmt32emu": { - "baseline": "2.7.0", + "baseline": "2.7.1", "port-version": 0 }, "libmupdf": { diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json index b202270b31de18..3473b4c09f9b9f 100644 --- a/versions/l-/libmt32emu.json +++ b/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e0ccfe803d0e3248671df0f3db4d1374a5a31c5", + "version": "2.7.1", + "port-version": 0 + }, { "git-tree": "bf84211f16b9b598e1ebd2cee0be2487d2e49fca", "version": "2.7.0", From 426dcc68e0ab4aa005d2dc58bdb2f00fb63271c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Tue, 14 Nov 2023 22:11:02 +0100 Subject: [PATCH 0367/1039] [llfio,ned14-internal-quickcpplib,outcome,status-code] Update to 2023-11-06 (#34935) * [ned14-internal-quickcpplib] Update to 2023-11-06 * [status-code] Update to 2023-11-0 * [outcome] Update to 2.2.7 * [llfio] Update to 2023-11-06 * Update version database * [outcome,llfio] Fix find_dependency usage --- ports/llfio/portfile.cmake | 20 +++++---- ports/llfio/vcpkg.json | 3 +- .../ned14-internal-quickcpplib/portfile.cmake | 28 ++----------- .../sha_manifest.cmake | 4 +- ports/ned14-internal-quickcpplib/vcpkg.json | 2 +- ports/outcome/fix-find-library.patch | 41 ------------------- ports/outcome/fix-status-code-include.patch | 16 -------- ports/outcome/portfile.cmake | 11 ++--- ports/outcome/vcpkg.json | 3 +- ports/status-code/add-missing-include.patch | 12 ------ ports/status-code/portfile.cmake | 9 ++-- ports/status-code/vcpkg.json | 3 +- versions/baseline.json | 14 +++---- 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, 56 insertions(+), 130 deletions(-) delete mode 100644 ports/outcome/fix-find-library.patch delete mode 100644 ports/outcome/fix-status-code-include.patch delete mode 100644 ports/status-code/add-missing-include.patch diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 1722bb977422e5..f24881af55dc85 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 b588deb7593d62e3afc025f85477d09b8012fb90 - SHA512 47b43c716406d2847b16c33730376dc2a98ad8d079319387087ba4b37fdf5623c660fc53c92e2f90995a877001a7a739985d15d0b5133e079254e2d85ba5d8e4 + REF aa2be6c0db56b4164837d3bc20938785dea7419d + SHA512 37ebb7ad87cd5c6eedad25221ee34809587fd18245b3c6af56fa64f165d46e826310c66f61ad7e1ab6bfab9cf9331dc51ea08389b9adea11b1225f3fc63f0240 HEAD_REF develop PATCHES ) @@ -17,8 +17,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH NTKEC_SOURCE_PATH REPO ned14/ntkernel-error-category - REF bbd44623594142155d49bd3ce8820d3cf9da1e1e - SHA512 589d3bc7bca98ca8d05ce9f5cf009dd98b8884bdf3739582f2f6cbf5a324ce95007ea041450ed935baa4a401b4a0242c181fb6d2dcf7ad91587d75f05491f50e + REF 278b90e2c7bb07e70d155ad8c7b904188280b7dc + SHA512 a0e35fb196085012da0299d0dc456e70f4d4044144bc720f24c9a0ac1483724c137ef89740dc65821d135ca070650775a6802c0b21b24703a93d4ef60a30ffdb HEAD_REF master ) @@ -35,7 +35,7 @@ file(RENAME "${NTKEC_SOURCE_PATH}" "${SOURCE_PATH}/include/llfio/ntkernel-error- set(extra_config) # cmake does not correctly set CMAKE_SYSTEM_PROCESSOR when targeting ARM on Windows if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) - list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=On) + list(APPEND extra_config -DLLFIO_ASSUME_CROSS_COMPILING=ON) endif() # setting CMAKE_CXX_STANDARD here to prevent llfio from messing with compiler flags # the cmake package config requires said C++ standard target transitively via quickcpplib @@ -57,14 +57,15 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib + -Dllfio_IS_DEPENDENCY=On + "-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}" ${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= + -DCMAKE_POLICY_DEFAULT_CMP0091=NEW # MSVC detection fails without this ${extra_config} ) @@ -83,8 +84,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/llfio) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if("status-code" IN_LIST FEATURES) - file(INSTALL "${CURRENT_PORT_DIR}/usage-status-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + set(_USAGE_FEATURE "status-code") else() - file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + set(_USAGE_FEATURE "error-code") endif() +file(INSTALL "${CURRENT_PORT_DIR}/usage-${_USAGE_FEATURE}-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME usage) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index da0e059b5d98da..e484339231e4fe 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llfio", - "version-date": "2023-03-13", - "port-version": 1, + "version-date": "2023-11-06", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 284afcc32abac7..d71d3b8d8a4870 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -39,16 +39,6 @@ vcpkg_from_github( quicklib-depheaders.patch ) -# Quickcpplib deploys subsets of the dependency headers into a private subdirectory -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 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( OUT_SOURCE_PATH OPT_SOURCE_PATH REPO akrzemi1/Optional @@ -66,7 +56,9 @@ set(VCPKG_BUILD_TYPE release) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPROJECT_IS_DEPENDENCY=On + -Dquickcpplib_IS_DEPENDENCY=ON + -DQUICKCPPLIB_USE_SYSTEM_BYTE_LITE=ON + -DQUICKCPPLIB_USE_SYSTEM_SPAN_LITE=ON -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON "-DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib" @@ -77,20 +69,6 @@ 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/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 019734d1001fb8..cc54ee6698a05b 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 79752ee52078003522dca492f98995b45d13d60c) -set(QUICKCPPLIB_SHA512 fa0a1d0d33ab7001e47974469f1437abe8fb273b6b576f7e1da6a8d583b33b3786236a31f43a36d9822ffe3c59d062a441f857f476d0bfe175cccc9b5fdf2593) +set(QUICKCPPLIB_REF 7ca9350ad6eac11ef80b472c33dbd44650b1c2f0) +set(QUICKCPPLIB_SHA512 d3258590502c02bb3ff11eb26bc00004e7ab4bb886a77e5c91ce76546193f37aa665885b6484345df4361a8d0cece2236e7b77a112372f4db4d3ebd2be5fff32) 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 6dac12d9dd9642..f97f8ac7fc6b07 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ned14-internal-quickcpplib", - "version-date": "2023-03-13", + "version-date": "2023-11-06", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/outcome/fix-find-library.patch b/ports/outcome/fix-find-library.patch deleted file mode 100644 index 5d7f22b8b7dd80..00000000000000 --- a/ports/outcome/fix-find-library.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 1b601054a95ead..00000000000000 --- a/ports/outcome/fix-status-code-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/portfile.cmake b/ports/outcome/portfile.cmake index d6943416d11995..c29dea89c6fe70 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -24,12 +24,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF 90032f99503b4620f21d8160dc3af06fa343541f - SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f + REF v${VERSION} + SHA512 2057f2f967f7aad3f78d081c72130122c1f99b837ce23ec9de9bfe0cd0fc493ce7085071cb2a54a840252ba0d82e14d99d622c1e0fdf9a8a20f41e5f89fa4645 HEAD_REF develop PATCHES - fix-find-library.patch # incorporated into upstream after 2.2.4 - fix-status-code-include.patch # incorporated into upstream after 2.2.4 ) # Because outcome's deployed files are header-only, the debug build is not necessary @@ -39,10 +37,9 @@ set(VCPKG_BUILD_TYPE release) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib + -Doutcome_IS_DEPENDENCY=ON + "-DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}" -DOUTCOME_BUNDLE_EMBEDDED_STATUS_CODE=OFF - -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCXX_CONCEPTS_FLAGS= diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 5ae09aacd740de..2c52dd078f8efc 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,7 +1,6 @@ { "name": "outcome", - "version": "2.2.4", - "port-version": 1, + "version": "2.2.7", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/status-code/add-missing-include.patch b/ports/status-code/add-missing-include.patch deleted file mode 100644 index 70f827486f2c6d..00000000000000 --- a/ports/status-code/add-missing-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/wg21/file_io_error.cpp b/wg21/file_io_error.cpp -index 41f23a1..fe69458 100644 ---- a/wg21/file_io_error.cpp -+++ b/wg21/file_io_error.cpp -@@ -24,6 +24,7 @@ http://www.boost.org/LICENSE_1_0.txt) - - #define _CRT_SECURE_NO_WARNINGS - #include // for sprintf -+#include // for std::move - - #include "status-code/system_error2.hpp" - diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index bbe94a28edb790..06ff0730c5c5a1 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 5be338838d278e730b78c07f6306ae71f6c1959c - SHA512 61685b7ba40fd2e8a985a8135065b335655aac7aee7778ca3317004c9730078361cfa4bd1b9ac2f9002efc707bfb6168c0275f11e0c5a6b079d42c8240528a90 + REF 63b229c756202525d1c90d21706fdfb744096220 + SHA512 610b40b6a967fcce9494478d4518e2529be328ce2aaccbedab8d2264d19d2791e427f51b48886fceacafecf74f24a3d25a9dd54697d375bdc8414521cce579a5 HEAD_REF master PATCHES - add-missing-include.patch ) # Because status-code's deployed files are header-only, the debug build is not necessary @@ -14,8 +13,10 @@ set(VCPKG_BUILD_TYPE release) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPROJECT_IS_DEPENDENCY=On + -Dstatus-code_IS_DEPENDENCY=ON -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Boost ) vcpkg_cmake_install() diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index 0e0f2ba3db2269..627fe7eb82337e 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,7 +1,6 @@ { "name": "status-code", - "version-date": "2023-01-27", - "port-version": 2, + "version-date": "2023-11-06", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index 771b5e81d8985f..3f8090437ae0d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5181,8 +5181,8 @@ "port-version": 0 }, "llfio": { - "baseline": "2023-03-13", - "port-version": 1 + "baseline": "2023-11-06", + "port-version": 0 }, "llgl": { "baseline": "2023-03-05", @@ -5861,7 +5861,7 @@ "port-version": 1 }, "ned14-internal-quickcpplib": { - "baseline": "2023-03-13", + "baseline": "2023-11-06", "port-version": 0 }, "neon2sse": { @@ -6385,8 +6385,8 @@ "port-version": 0 }, "outcome": { - "baseline": "2.2.4", - "port-version": 1 + "baseline": "2.2.7", + "port-version": 0 }, "p-ranav-csv": { "baseline": "2019-07-11", @@ -8141,8 +8141,8 @@ "port-version": 0 }, "status-code": { - "baseline": "2023-01-27", - "port-version": 2 + "baseline": "2023-11-06", + "port-version": 0 }, "status-value-lite": { "baseline": "1.1.0", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index c4cac7b440aedf..1005d260860957 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc1f2c9ef08627e6330c223e15dbe9f798545f0a", + "version-date": "2023-11-06", + "port-version": 0 + }, { "git-tree": "45b00c3d0af2dfae0043832ca9b6f86393a9b432", "version-date": "2023-03-13", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index 46a54ffcf4eaba..f5d5d8434fadb4 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7be7cf3170221b9393f84ec28a2b940956cabb9f", + "version-date": "2023-11-06", + "port-version": 0 + }, { "git-tree": "59fa084ab6de6874b5dc5e56665312104d0f454a", "version-date": "2023-03-13", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index ed92afed941c3c..4f85aaa3630fce 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47944a9cbc611b2c0b1d0a3acb1d0a38881dbc87", + "version": "2.2.7", + "port-version": 0 + }, { "git-tree": "504177d3c3f3d1a063db2ce6d12292141e874d37", "version": "2.2.4", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index e4c27c30d6da33..858841bfab4f47 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dca3b484e4be516afae962ee6760d3eef5eb4779", + "version-date": "2023-11-06", + "port-version": 0 + }, { "git-tree": "40d6b3bdc23cdb7de14e9f07eb229d0124b9c550", "version-date": "2023-01-27", From 83712a60606dfe4bad7c8207462743d828cd056e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 14 Nov 2023 14:01:08 -0800 Subject: [PATCH 0368/1039] Improve and extract internals of vcpkg_find_acquire_program. (#34881) * Extract vcpkg_extract_archive from vcpkg_find_acquire_program. * Extract vcpkg_download_sourceforge from vcpkg_from_sourceforge. This allows vcpkg_find_acquire_program to download from SourceForge without needing to temporarily change _VCPKG_EDITABLE. * Use whether a URI is known for an entity to decide whether to downloads it rather than checking a separate supported_on_unix boolean. * Add unparsed arguments check to vcpkg_extract_archive --- .../cmake/vcpkg_download_sourceforge.cmake | 85 +++++++++++++++++++ scripts/cmake/vcpkg_extract_archive.cmake | 51 +++++++++++ .../cmake/vcpkg_extract_source_archive.cmake | 8 +- .../vcpkg_find_acquire_program(7Z).cmake | 14 +-- .../vcpkg_find_acquire_program(ARIA2).cmake | 10 ++- .../vcpkg_find_acquire_program(BAZEL).cmake | 2 - .../vcpkg_find_acquire_program(DARK).cmake | 12 +-- .../vcpkg_find_acquire_program(DOXYGEN).cmake | 18 ++-- .../vcpkg_find_acquire_program(GN).cmake | 4 +- .../vcpkg_find_acquire_program(GO).cmake | 12 +-- .../vcpkg_find_acquire_program(GPERF).cmake | 10 ++- .../vcpkg_find_acquire_program(JOM).cmake | 20 +++-- .../vcpkg_find_acquire_program(MESON).cmake | 1 - .../vcpkg_find_acquire_program(NASM).cmake | 13 ++- .../vcpkg_find_acquire_program(NINJA).cmake | 2 - .../vcpkg_find_acquire_program(NUGET).cmake | 16 ++-- ...vcpkg_find_acquire_program(PATCHELF).cmake | 1 - .../vcpkg_find_acquire_program(PERL).cmake | 16 ++-- ...cpkg_find_acquire_program(PKGCONFIG).cmake | 3 +- .../vcpkg_find_acquire_program(RUBY).cmake | 10 ++- .../vcpkg_find_acquire_program(SCONS).cmake | 10 ++- .../vcpkg_find_acquire_program(SWIG).cmake | 10 +-- .../vcpkg_find_acquire_program(YASM).cmake | 14 +-- .../cmake/vcpkg_find_acquire_program.cmake | 82 ++++++------------ scripts/cmake/vcpkg_from_sourceforge.cmake | 83 +++--------------- scripts/ports.cmake | 2 + 26 files changed, 286 insertions(+), 223 deletions(-) create mode 100644 scripts/cmake/vcpkg_download_sourceforge.cmake create mode 100644 scripts/cmake/vcpkg_extract_archive.cmake diff --git a/scripts/cmake/vcpkg_download_sourceforge.cmake b/scripts/cmake/vcpkg_download_sourceforge.cmake new file mode 100644 index 00000000000000..ad10ad690f86b0 --- /dev/null +++ b/scripts/cmake/vcpkg_download_sourceforge.cmake @@ -0,0 +1,85 @@ +function(vcpkg_download_sourceforge out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" + "" + "REPO;REF;SHA512;FILENAME" + "") + + foreach(arg_name IN ITEMS REPO SHA512 FILENAME) + if(NOT DEFINED "arg_${arg_name}") + message(FATAL_ERROR "${arg_name} is required.") + endif() + endforeach() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(sourceforge_host "https://sourceforge.net/projects") + + if(arg_REPO MATCHES "^([^/]*)$") # just one element + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "") + elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + else() + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: + - an organization name without any slashes, or + - an organization name followed by a repository name separated by a single slash") + endif() + + if(DEFINED arg_REF) + set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}") + elseif(DEFINED repo_name) + set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}") + else() + set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}") + endif() + + string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref) + + set(sourceforge_mirrors + cfhcable # United States + pilotfiber # New York, NY + gigenet # Chicago, IL + versaweb # Las Vegas, NV + ayera # Modesto, CA + netactuate # Durham, NC + phoenixnap # Tempe, AZ + astuteinternet # Vancouver, BC + freefr # Paris, France + netcologne # Cologne, Germany + deac-riga # Latvia + excellmedia # Hyderabad, India + iweb # Montreal, QC + jaist # Nomi, Japan + jztkft # Mezotur, Hungary + managedway # Detroit, MI + nchc # Taipei, Taiwan + netix # Bulgaria + ufpr # Curitiba, Brazil + tenet # Wynberg, South Africa + ) + if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated. + Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.") + list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + endif() + + set(all_urls "${url}/download") + foreach(mirror IN LISTS sourceforge_mirrors) + list(APPEND all_urls "${url}/download?use_mirror=${mirror}") + endforeach() + + vcpkg_download_distfile(archive + URLS ${all_urls} + SHA512 "${arg_SHA512}" + FILENAME "${arg_FILENAME}" + ) + + set("${out_var}" "${archive}" PARENT_SCOPE) +endfunction() diff --git a/scripts/cmake/vcpkg_extract_archive.cmake b/scripts/cmake/vcpkg_extract_archive.cmake new file mode 100644 index 00000000000000..b6bc86847969f8 --- /dev/null +++ b/scripts/cmake/vcpkg_extract_archive.cmake @@ -0,0 +1,51 @@ +function(vcpkg_extract_archive) + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "ARCHIVE;DESTINATION" + "" + ) + + foreach(arg_name IN ITEMS ARCHIVE DESTINATION) + if(NOT DEFINED "arg_${arg_name}") + message(FATAL_ERROR "${arg_name} is required.") + endif() + endforeach() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(EXISTS "${arg_DESTINATION}") + message(FATAL_ERROR "${arg_DESTINATION} was an extraction target, but it already exists.") + endif() + + file(MAKE_DIRECTORY "${arg_DESTINATION}") + + cmake_path(GET arg_ARCHIVE EXTENSION archive_extension) + string(TOLOWER "${archive_extension}" archive_extension) + if("${archive_extension}" MATCHES [[\.msi$]]) + cmake_path(NATIVE_PATH arg_ARCHIVE archive_native_path) + cmake_path(NATIVE_PATH arg_DESTINATION destination_native_path) + cmake_path(GET arg_ARCHIVE PARENT_PATH archive_directory) + vcpkg_execute_in_download_mode( + COMMAND msiexec + /a "${archive_native_path}" + /qn "TARGETDIR=${destination_native_path}" + WORKING_DIRECTORY "${archive_directory}" + ) + elseif("${archive_extension}" MATCHES [[\.7z\.exe$]]) + vcpkg_find_acquire_program(7Z) + vcpkg_execute_in_download_mode( + COMMAND ${7Z} x + "${arg_ARCHIVE}" + "-o${arg_DESTINATION}" + -y -bso0 -bsp0 + WORKING_DIRECTORY "${arg_DESTINATION}" + ) + else() + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${arg_ARCHIVE}" + WORKING_DIRECTORY "${arg_DESTINATION}" + ) + endif() +endfunction() diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index f1ecb44e29dc03..7b090c5eb2a42e 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -2,13 +2,7 @@ function(z_vcpkg_extract_source_archive_deprecated_mode archive working_director cmake_path(GET archive FILENAME archive_filename) if(NOT EXISTS "${working_directory}/${archive_filename}.extracted") message(STATUS "Extracting source ${archive}") - file(MAKE_DIRECTORY "${working_directory}") - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND "${CMAKE_COMMAND}" -E tar xjf "${archive}" - WORKING_DIRECTORY "${working_directory}" - LOGNAME extract - ) + vcpkg_extract_archive(ARCHIVE "${archive}" DESTINATION "${working_directory}") file(TOUCH "${working_directory}/${archive_filename}.extracted") endif() endfunction() diff --git a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake index b4b34fefea0c12..88617b1ca380c4 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake @@ -1,7 +1,9 @@ set(program_name 7z) -set(tool_subdirectory "23.01") -set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path -list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip") -set(download_urls "https://7-zip.org/a/7z2301.msi") -set(download_filename "7z2301.msi") -set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596) +if(CMAKE_HOST_WIN32) + set(tool_subdirectory "23.01") + set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path + list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip") + set(download_urls "https://7-zip.org/a/7z2301.msi") + set(download_filename "7z2301.msi") + set(download_sha512 002c8ab30be802fa5fa90896d2bdf710bfbd89e39487af25af9d63821986e6d11c42b1c4f4acc79d325719b10193cd31c38f648403ef16f0580609afa8da9596) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake b/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake index 5241f21eec5eb3..16153deffa5aa7 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(ARIA2).cmake @@ -1,6 +1,8 @@ set(program_name aria2c) set(program_version 1.35.0) -set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") -set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") -set(download_filename "aria2-${program_version}-win-32bit-build1.zip") -set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) +if(CMAKE_HOST_WIN32) + set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") + set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") + set(download_filename "aria2-${program_version}-win-32bit-build1.zip") + set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake b/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake index f3521f0e9491e3..59153af6eb8615 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(BAZEL).cmake @@ -2,14 +2,12 @@ set(program_name bazel) set(program_version 4.2.2) set(rename_binary_to "bazel") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) set(tool_subdirectory "${program_version}-linux") set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") set(download_filename "bazel-${tool_subdirectory}-x86_64") set(raw_executable ON) set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) set(tool_subdirectory "${program_version}-darwin") set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") set(download_filename "bazel-${tool_subdirectory}-x86_64") diff --git a/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake b/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake index 3efc1b73a9bb1c..9362a7ed28000a 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(DARK).cmake @@ -1,6 +1,8 @@ set(program_name dark) -set(tool_subdirectory "wix311-binaries") -set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") -set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") -set(download_filename "wix311-binaries.zip") -set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) +if(CMAKE_HOST_WIN32) + set(tool_subdirectory "wix311-binaries") + set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") + set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") + set(download_filename "wix311-binaries.zip") + set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake b/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake index fa1f19d36ce747..86ebf4f5a62d02 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(DOXYGEN).cmake @@ -1,11 +1,11 @@ set(program_name doxygen) set(program_version 1.9.1) -vcpkg_list(SET sourceforge_args - REPO doxygen - REF "rel-${program_version}" - FILENAME "doxygen-${program_version}.windows.bin.zip" - SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" - ) -set(tool_subdirectory c3eeb6b9fa-76d69c6db5) +if(CMAKE_HOST_WIN32) + set(download_filename "doxygen-${program_version}.windows.bin.zip") + set(download_sha512 "c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b") + vcpkg_list(SET sourceforge_args + REPO doxygen + REF "rel-${program_version}" + ) + set(tool_subdirectory c3eeb6b9fa-76d69c6db5) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(GN).cmake b/scripts/cmake/vcpkg_find_acquire_program(GN).cmake index 473ecd826c2e11..94b5690226cc53 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(GN).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(GN).cmake @@ -7,7 +7,6 @@ else() # Old behavior message("Consider adding vcpkg-tool-gn as a host dependency of this port or create an issue at https://github.com/microsoft/vcpkg/issues") set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(supported_on_unix ON) EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) if(HOST_ARCH STREQUAL "aarch64") set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC") @@ -19,7 +18,6 @@ else() # Old behavior set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F") endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(supported_on_unix ON) EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) if(HOST_ARCH STREQUAL "arm64") set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC") @@ -31,7 +29,7 @@ else() # Old behavior set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5") endif() else() - if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64") + if("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64") set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C") set(gn_platform "windows-amd64") set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686") diff --git a/scripts/cmake/vcpkg_find_acquire_program(GO).cmake b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake index 0ca0e03692c9ef..d2e59abd88c725 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(GO).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(GO).cmake @@ -1,8 +1,10 @@ set(program_name go) -set(tool_subdirectory 1.21.1.windows-386) -set(paths_to_search "${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin") set(brew_package_name "go") set(apt_package_name "golang-go") -set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") -set(download_filename "go${tool_subdirectory}.zip") -set(download_sha512 417a4bd95a10f21c2166badd2303e1956d91d0e783e334c99ea0176a323e815729c8c3af3f7ec68f057b757d06bcc75be82584031c4069c89a2db62bbfa902e8) +if(CMAKE_HOST_WIN32) + set(tool_subdirectory 1.21.1.windows-386) + set(paths_to_search "${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin") + set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") + set(download_filename "go${tool_subdirectory}.zip") + set(download_sha512 417a4bd95a10f21c2166badd2303e1956d91d0e783e334c99ea0176a323e815729c8c3af3f7ec68f057b757d06bcc75be82584031c4069c89a2db62bbfa902e8) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake b/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake index d10a1c435d5bb0..dc52162655f912 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(GPERF).cmake @@ -1,6 +1,8 @@ set(program_name gperf) set(program_version 3.0.1) -set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") -set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") -set(download_filename "gperf-${program_version}-bin.zip") -set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) +if(CMAKE_HOST_WIN32) + set(download_filename "gperf-${program_version}-bin.zip") + set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) + set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") + set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake index 1842a26340981b..f3d5a2d1de7089 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(JOM).cmake @@ -1,11 +1,13 @@ set(program_name jom) set(program_version_string 1_1_4) -set(tool_subdirectory "jom-${program_version_string}") -set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") -set(download_urls - "https://download.qt.io/official_releases/jom/jom_${program_version_string}.zip" - "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_${program_version_string}.zip" - "https://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_${program_version_string}.zip" -) -set(download_filename "jom_${program_version_string}.zip") -set(download_sha512 a683bd829c84942223a791dae8abac5cfc2e3fa7de84c6fdc490ad3aa996a26c9fa0be0636890f02c9d56948bbe3225b43497cb590d1cb01e70c6fac447fa17b) +if(CMAKE_HOST_WIN32) + set(download_urls + "https://download.qt.io/official_releases/jom/jom_${program_version_string}.zip" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_${program_version_string}.zip" + "https://mirrors.ukfast.co.uk/sites/qt.io/official_releases/jom/jom_${program_version_string}.zip" + ) + set(download_filename "jom_${program_version_string}.zip") + set(download_sha512 a683bd829c84942223a791dae8abac5cfc2e3fa7de84c6fdc490ad3aa996a26c9fa0be0636890f02c9d56948bbe3225b43497cb590d1cb01e70c6fac447fa17b) + set(tool_subdirectory "jom-${program_version_string}") + set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake b/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake index 4bb05a0911f541..d927040bf8bccc 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(MESON).cmake @@ -15,5 +15,4 @@ else() # Old behavior set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") set(download_filename "meson-${ref}.tar.gz") set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) - set(supported_on_unix ON) endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake b/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake index 63573380c1ff9c..8e76bede81e69c 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NASM).cmake @@ -1,8 +1,13 @@ set(program_name nasm) set(program_version 2.16.01) -set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") set(brew_package_name "nasm") set(apt_package_name "nasm") -set(download_urls "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip" "https://gstreamer.freedesktop.org/src/mirror/nasm-${program_version}-win64.zip") -set(download_filename "nasm-${program_version}-win64.zip") -set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062) +if(CMAKE_HOST_WIN32) + set(download_urls + "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win64/nasm-${program_version}-win64.zip" + "https://gstreamer.freedesktop.org/src/mirror/nasm-${program_version}-win64.zip" + ) + set(download_filename "nasm-${program_version}-win64.zip") + set(download_sha512 ce4d02f530dc3376b4513f219bbcec128ee5bebd8a5c332599b48d8071f803d1538d7258fec7c2e9b4d725b8d7314cea2696289d0493017eb13bfe70e5cb5062) + set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake index b94b29f4618d9b..a7bbc9add0ad08 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NINJA).cmake @@ -1,6 +1,5 @@ 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") @@ -15,7 +14,6 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") - set(supported_on_unix OFF) else() execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) if(HOST_ARCH MATCHES "x86_64|amd64|AMD64") diff --git a/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake index d7f1bd9b01de81..f7c1ffbb798c3d 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(NUGET).cmake @@ -1,9 +1,11 @@ set(program_name nuget) -set(tool_subdirectory "5.11.0") -set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") set(brew_package_name "nuget") -set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") -set(rename_binary_to "nuget.exe") -set(download_filename "nuget.5.11.0.exe") -set(raw_executable ON) -set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) +if(CMAKE_HOST_WIN32) + set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") + set(download_filename "nuget.5.11.0.exe") + set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) + set(tool_subdirectory "5.11.0") + set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") + set(raw_executable ON) + set(rename_binary_to "nuget.exe") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake index 1827bfa973f3fe..a10c75d2ba8f59 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PATCHELF).cmake @@ -1,6 +1,5 @@ set(program_name patchelf) set(program_version 0.14.5) -set(supported_on_unix ON) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE) if(HOST_ARCH STREQUAL "aarch64") diff --git a/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake index dab39811907d26..aba77e4b046381 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PERL).cmake @@ -1,11 +1,13 @@ set(program_name perl) set(program_version 5.38.0.1) -set(tool_subdirectory ${program_version}) -set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) set(brew_package_name "perl") set(apt_package_name "perl") -set(download_urls - "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" -) -set(download_filename "strawberry-perl-5.38.0.1-64bit-portable.zip") -set(download_sha512 9b604f19e245a809bd18857bd91ebaec81ca031394ec69a3369df64d3590d2c9d557326d8aa10f91e78b1f1d56689aa57a8ec3a8cad4d2e542c96eb714a3831d) +if(CMAKE_HOST_WIN32) + set(download_urls + "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" + ) + set(download_filename "strawberry-perl-5.38.0.1-64bit-portable.zip") + set(download_sha512 9b604f19e245a809bd18857bd91ebaec81ca031394ec69a3369df64d3590d2c9d557326d8aa10f91e78b1f1d56689aa57a8ec3a8cad4d2e542c96eb714a3831d) + set(tool_subdirectory ${program_version}) + set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake index 559d3dc6f73539..d6ef8a21cf5193 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake @@ -1,12 +1,11 @@ set(program_name pkg-config) -if(DEFINED ENV{PKG_CONFIG}) +if(DEFINED "ENV{PKG_CONFIG}") debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "") set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE) return() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} - set(supported_on_unix ON) set(rename_binary_to "pkg-config") set(program_version 0.29.2.1) set(raw_executable ON) diff --git a/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake b/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake index e6c948d5d989f5..c955e6ad65b188 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(RUBY).cmake @@ -1,6 +1,8 @@ set(program_name "ruby") set(program_version 2.7.4-1) -set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") -set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") -set(download_filename "rubyinstaller-${program_version}-x86.7z") -set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) +if(CMAKE_HOST_WIN32) + set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") + set(download_filename "rubyinstaller-${program_version}-x86.7z") + set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) + set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake b/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake index 0ced68ce2f2a43..e5056a9e76b3b2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(SCONS).cmake @@ -1,8 +1,10 @@ set(program_name scons) set(program_version 4.1.0) -set(tool_subdirectory "${program_version}") set(interpreter PYTHON2) set(search_names "scons.py") -set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") -set(download_filename "scons-local-${program_version}.zip") -set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) +if(CMAKE_HOST_WIN32) + set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") + set(download_filename "scons-local-${program_version}.zip") + set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) + set(tool_subdirectory "${program_version}") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake index 5fe019c096d4c2..5189eda22b0fdf 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(SWIG).cmake @@ -1,15 +1,15 @@ set(program_version 4.0.2) set(program_name swig) if(CMAKE_HOST_WIN32) + set(download_filename "swigwin-${program_version}.zip") + set(download_sha512 "b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d") vcpkg_list(SET sourceforge_args REPO swig/swigwin REF "swigwin-${program_version}" - FILENAME "swigwin-${program_version}.zip" - SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" ) - set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}") + + set(tool_subdirectory "b8f105f9b9-f0518bc3b7") + set(paths_to_search "${DOWNLOADS}/tools/swig/b8f105f9b9-f0518bc3b7/swigwin-${program_version}") else() set(apt_package_name "swig") set(brew_package_name "swig") diff --git a/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake b/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake index e676ceabea0ebb..ae8c8771d7ec61 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(YASM).cmake @@ -1,10 +1,12 @@ set(program_name yasm) set(program_version 1.3.0.6.g1962) -set(tool_subdirectory 1.3.0.6) set(brew_package_name "yasm") set(apt_package_name "yasm") -set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") -set(download_filename "yasm-${program_version}.exe") -set(rename_binary_to "yasm.exe") -set(raw_executable ON) -set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) +if(CMAKE_HOST_WIN32) + set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") + set(download_filename "yasm-${program_version}.exe") + set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) + set(tool_subdirectory 1.3.0.6) + set(raw_executable ON) + set(rename_binary_to "yasm.exe") +endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 32825d86ca92f4..3b92d822b7c323 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -105,7 +105,6 @@ function(vcpkg_find_acquire_program program) set(rename_binary_to "") set(tool_subdirectory "") set(interpreter "") - set(supported_on_unix "") set(post_install_command "") set(paths_to_search "") set(version_command "") @@ -153,7 +152,7 @@ function(vcpkg_find_acquire_program program) ) endif() if(NOT ${program}) - if(NOT VCPKG_HOST_IS_WINDOWS AND NOT supported_on_unix) + if("${download_urls}" STREQUAL "" AND "${sourceforge_args}" STREQUAL "") set(example ".") if(NOT "${brew_package_name}" STREQUAL "" AND VCPKG_HOST_IS_OSX) set(example ":\n brew install ${brew_package_name}") @@ -163,66 +162,41 @@ function(vcpkg_find_acquire_program program) message(FATAL_ERROR "Could not find ${program_name}. Please install it via your package manager${example}") endif() - if(NOT "${sourceforge_args}" STREQUAL "") - # Locally change editable to suppress re-extraction each time - set(_VCPKG_EDITABLE 1) - vcpkg_from_sourceforge(OUT_SOURCE_PATH SFPATH ${sourceforge_args}) - unset(_VCPKG_EDITABLE) - else() + if("${sourceforge_args}" STREQUAL "") vcpkg_download_distfile(archive_path URLS ${download_urls} SHA512 "${download_sha512}" FILENAME "${download_filename}" ) - + else() + vcpkg_download_sourceforge(archive_path + ${sourceforge_args} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + endif() + if(raw_executable) file(MAKE_DIRECTORY "${full_subdirectory}") - if(raw_executable) - if(NOT "${rename_binary_to}" STREQUAL "") - file(INSTALL "${archive_path}" - DESTINATION "${full_subdirectory}" - RENAME "${rename_binary_to}" - FILE_PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) - else() - file(COPY "${archive_path}" - DESTINATION "${full_subdirectory}" - FILE_PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) - endif() + if("${rename_binary_to}" STREQUAL "") + file(COPY "${archive_path}" + DESTINATION "${full_subdirectory}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) else() - cmake_path(GET download_filename EXTENSION archive_extension) - string(TOLOWER "${archive_extension}" archive_extension) - if("${archive_extension}" MATCHES [[\.msi$]]) - cmake_path(NATIVE_PATH archive_path archive_native_path) - cmake_path(NATIVE_PATH full_subdirectory destination_native_path) - vcpkg_execute_in_download_mode( - COMMAND msiexec - /a "${archive_native_path}" - /qn "TARGETDIR=${destination_native_path}" - WORKING_DIRECTORY "${DOWNLOADS}" - ) - elseif("${archive_extension}" MATCHES [[\.7z\.exe$]]) - vcpkg_find_acquire_program(7Z) - vcpkg_execute_in_download_mode( - COMMAND ${7Z} x - "${archive_path}" - "-o${full_subdirectory}" - -y -bso0 -bsp0 - WORKING_DIRECTORY "${full_subdirectory}" - ) - else() - vcpkg_execute_in_download_mode( - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" - WORKING_DIRECTORY "${full_subdirectory}" - ) - endif() + file(INSTALL "${archive_path}" + DESTINATION "${full_subdirectory}" + RENAME "${rename_binary_to}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) endif() + else() + vcpkg_extract_archive(ARCHIVE "${archive_path}" DESTINATION "${full_subdirectory}") endif() if(NOT "${post_install_command}" STREQUAL "") diff --git a/scripts/cmake/vcpkg_from_sourceforge.cmake b/scripts/cmake/vcpkg_from_sourceforge.cmake index b2209ab3583fff..19772c30501468 100644 --- a/scripts/cmake/vcpkg_from_sourceforge.cmake +++ b/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -4,93 +4,32 @@ function(vcpkg_from_sourceforge) "OUT_SOURCE_PATH;REPO;REF;SHA512;FILENAME;WORKING_DIRECTORY" "PATCHES") - if(NOT DEFINED arg_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") - endif() - if(NOT DEFINED arg_SHA512) - message(FATAL_ERROR "SHA512 must be specified.") - endif() - if(NOT DEFINED arg_REPO) - message(FATAL_ERROR "The sourceforge repository must be specified.") - endif() - + foreach(arg_name IN ITEMS OUT_SOURCE_PATH SHA512 REPO FILENAME) + if(NOT DEFINED "arg_${arg_name}") + message(FATAL_ERROR "${arg_name} is required.") + endif() + endforeach() if(arg_DISABLE_SSL) message(WARNING "DISABLE_SSL has been deprecated and has no effect") endif() - - set(sourceforge_host "https://sourceforge.net/projects") - - if(arg_REPO MATCHES "^([^/]*)$") # just one element - set(org_name "${CMAKE_MATCH_1}") - set(repo_name "") - elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements - set(org_name "${CMAKE_MATCH_1}") - set(repo_name "${CMAKE_MATCH_2}") - else() - message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: - - an organization name without any slashes, or - - an organization name followed by a repository name separated by a single slash") - endif() - - if(DEFINED arg_REF) - set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}") - elseif(DEFINED repo_name) - set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}") - else() - set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}") - endif() - - string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref) - set(sourceforge_mirrors - cfhcable # United States - pilotfiber # New York, NY - gigenet # Chicago, IL - versaweb # Las Vegas, NV - ayera # Modesto, CA - netactuate # Durham, NC - phoenixnap # Tempe, AZ - astuteinternet # Vancouver, BC - freefr # Paris, France - netcologne # Cologne, Germany - deac-riga # Latvia - excellmedia # Hyderabad, India - iweb # Montreal, QC - jaist # Nomi, Japan - jztkft # Mezotur, Hungary - managedway # Detroit, MI - nchc # Taipei, Taiwan - netix # Bulgaria - ufpr # Curitiba, Brazil - tenet # Wynberg, South Africa - ) - if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) - message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated. - Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.") - list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}") - list(REMOVE_DUPLICATES sourceforge_mirrors) - elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) - list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}") - list(REMOVE_DUPLICATES sourceforge_mirrors) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - set(all_urls "${url}/download") - foreach(mirror IN LISTS sourceforge_mirrors) - list(APPEND all_urls "${url}/download?use_mirror=${mirror}") - endforeach() - - vcpkg_download_distfile(ARCHIVE - URLS ${all_urls} + vcpkg_download_sourceforge(ARCHIVE + REPO "${arg_REPO}" + REF "${arg_REF}" SHA512 "${arg_SHA512}" FILENAME "${arg_FILENAME}" ) set(no_remove_one_level_param "") - set(working_directory_param "") if(arg_NO_REMOVE_ONE_LEVEL) set(no_remove_one_level_param "NO_REMOVE_ONE_LEVEL") endif() + set(working_directory_param "") if(DEFINED arg_WORKING_DIRECTORY) set(working_directory_param "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}") endif() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 8cc7f125ea11c3..e18ee37bde5ef7 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -48,9 +48,11 @@ include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake") include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake") include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake") include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake") +include("${SCRIPTS}/cmake/vcpkg_download_sourceforge.cmake") include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake") include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake") include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake") +include("${SCRIPTS}/cmake/vcpkg_extract_archive.cmake") include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake") include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake") include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake") From ced9a6771de19b1bc695c89a064af90ea3551867 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:09:58 +0100 Subject: [PATCH 0369/1039] [cfitsio] fix uwp build (#35009) --- ports/cfitsio/0006-fix-uwp.patch | 13 +++++++++++++ ports/cfitsio/portfile.cmake | 1 + ports/cfitsio/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/c-/cfitsio.json | 5 +++++ 6 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 ports/cfitsio/0006-fix-uwp.patch diff --git a/ports/cfitsio/0006-fix-uwp.patch b/ports/cfitsio/0006-fix-uwp.patch new file mode 100644 index 00000000000000..cb2fa7f5aa2166 --- /dev/null +++ b/ports/cfitsio/0006-fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7afb480..4fcdf40 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -195,7 +195,7 @@ IF (BUILD_SHARED_LIBS) + + # To expand the command line arguments in Windows, see: + # http://msdn.microsoft.com/en-us/library/8bch7bkk.aspx +- if(MSVC) ++ if(MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore") + set_target_properties(FPack Funpack PROPERTIES LINK_FLAGS "setargv.obj") + endif(MSVC) + diff --git a/ports/cfitsio/portfile.cmake b/ports/cfitsio/portfile.cmake index 75c5d5bc08f0f9..57388a344f2e44 100644 --- a/ports/cfitsio/portfile.cmake +++ b/ports/cfitsio/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive( 0003-add-Wno-error-implicit-funciton-declaration-to-cmake.patch 0004-pkg-config.patch 0005-fix-link2019-error.patch + 0006-fix-uwp.patch ) vcpkg_check_features( diff --git a/ports/cfitsio/vcpkg.json b/ports/cfitsio/vcpkg.json index fe638417c43ad2..282e34ad461b95 100644 --- a/ports/cfitsio/vcpkg.json +++ b/ports/cfitsio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cfitsio", "version": "3.49", - "port-version": 4, + "port-version": 5, "description": "Library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c9d3f7081aca49..53274de6794274 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -145,8 +145,6 @@ catch-classic:x86-windows = skip cctag:x64-windows-static-md=fail cello:arm64-uwp=fail cello:x64-uwp=fail -cfitsio:arm64-uwp=fail -cfitsio:x64-uwp=fail chakracore:x64-linux=skip # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) charls:arm64-windows=skip diff --git a/versions/baseline.json b/versions/baseline.json index 3f8090437ae0d7..65a7cf285bdf80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1506,7 +1506,7 @@ }, "cfitsio": { "baseline": "3.49", - "port-version": 4 + "port-version": 5 }, "cgal": { "baseline": "5.6", diff --git a/versions/c-/cfitsio.json b/versions/c-/cfitsio.json index 5014d8acf632b3..101a9d41966580 100644 --- a/versions/c-/cfitsio.json +++ b/versions/c-/cfitsio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "373230dbd5e9968b5efd6b9d7227accc836b840f", + "version": "3.49", + "port-version": 5 + }, { "git-tree": "b2df854891a5beda50e8cf8004a7af0766c5c5bc", "version": "3.49", From 7da80835ace36f4fb4abe5511ec739ea408b3d64 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:09:28 +0800 Subject: [PATCH 0370/1039] [mygui] update to 3.4.3 (#35103) * [mygui] update to 3.4.3 * [mygui] update to 3.4.3 --- ports/mygui/portfile.cmake | 2 +- ports/mygui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mygui.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake index d024c74c6a91c8..73cf93af18e36c 100644 --- a/ports/mygui/portfile.cmake +++ b/ports/mygui/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MyGUI/mygui REF MyGUI${VERSION} - SHA512 202f3df35f0767778b5a91b71dbd1ad3409d0a1977d5fbe3f0d48db430276c71b84edc5a28dd1fdb8e60245b56f2bda99872a4d860b83585f08406b28fb850fe + SHA512 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb HEAD_REF master PATCHES fix-generation.patch diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index a569a21bccabed..043c5c1a7b2525 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mygui", - "version": "3.4.2", + "version": "3.4.3", "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 65a7cf285bdf80..2e456dbf61f54c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5769,7 +5769,7 @@ "port-version": 0 }, "mygui": { - "baseline": "3.4.2", + "baseline": "3.4.3", "port-version": 0 }, "mysql-connector-cpp": { diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index 91a534849edb6d..df7eaedb27dddb 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d1cea52873da58281082ab47f35ba73bd13a18", + "version": "3.4.3", + "port-version": 0 + }, { "git-tree": "bc0449cfc21fca4e1ee5afda7c0919fffb9cd864", "version": "3.4.2", From 2b14b606cea54573eec11080a3ac00737958b6d6 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 15 Nov 2023 09:09:51 +0800 Subject: [PATCH 0371/1039] [numcpp] update to 2.12.1 (#35102) * [numcpp] update to 2.12.1 * [numcpp] update to 2.12.1 --- ports/numcpp/portfile.cmake | 2 +- ports/numcpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/numcpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake index f3b91bb78ac0ed..7abb36edb8bfd6 100644 --- a/ports/numcpp/portfile.cmake +++ b/ports/numcpp/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dpilger26/NumCpp REF "Version_${VERSION}" - SHA512 57848211a9ff55b12e9590351e5add36082809a3457b2983317b5cb23d8f1c04a65b2c7a17d119b2c3e3959ef152c8e9dc38cf338da362ef9499c9c9eeb393eb + SHA512 ab038f74d7aa4836de4da3f8613cbabf0c1205f40ee9bf3de9692e8a943b16846a006d5885e2ddb22f9b893256dc4761994ad70f0fb5e8cf14612bc08644b30d HEAD_REF master ) diff --git a/ports/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json index b4c35e50dcfa71..4129b4547fdb57 100644 --- a/ports/numcpp/vcpkg.json +++ b/ports/numcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "numcpp", - "version": "2.11.0", + "version": "2.12.1", "description": "C++ implementation of the Python Numpy library", "homepage": "https://dpilger26.github.io/NumCpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2e456dbf61f54c..396787b66f0800 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6005,7 +6005,7 @@ "port-version": 0 }, "numcpp": { - "baseline": "2.11.0", + "baseline": "2.12.1", "port-version": 0 }, "nuspell": { diff --git a/versions/n-/numcpp.json b/versions/n-/numcpp.json index 219f6ed47b4286..1374bff88ab27b 100644 --- a/versions/n-/numcpp.json +++ b/versions/n-/numcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a6e04f1febb3a78dbb37c375e8e0b322802c244", + "version": "2.12.1", + "port-version": 0 + }, { "git-tree": "aa42201ab3a189b38031fe0d912e3d62e9a44b8f", "version": "2.11.0", From d2845dc758c3ba057efce12d8d4c1ebf9c9dd33d Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 16 Nov 2023 07:04:47 +0800 Subject: [PATCH 0372/1039] [sfml] Update to 2.6.1 (#35118) * update to 2.6.1 * update version --- ports/sfml/fix-osx.patch | 13 ------------- ports/sfml/portfile.cmake | 3 +-- ports/sfml/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sfml.json | 5 +++++ 5 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 ports/sfml/fix-osx.patch diff --git a/ports/sfml/fix-osx.patch b/ports/sfml/fix-osx.patch deleted file mode 100644 index afbaa282b4f373..00000000000000 --- a/ports/sfml/fix-osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake -index e0118eb..76a4dcc 100644 ---- a/cmake/Macros.cmake -+++ b/cmake/Macros.cmake -@@ -24,8 +24,6 @@ function(sfml_set_stdlib target) - if (${CMAKE_GENERATOR} MATCHES "Xcode") - sfml_set_xcode_property(${target} CLANG_CXX_LIBRARY "libc++") - else() -- target_compile_options(${target} PRIVATE "-stdlib=libc++") -- target_link_libraries(${target} PRIVATE "-stdlib=libc++") - endif() - endif() - endfunction() diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 38d1612dc14a0e..4a8c497feccae7 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO SFML/SFML REF "${VERSION}" HEAD_REF master - SHA512 aac734e8b0e16936c0238ec792c922923545ec6cf06576bc70004fa1920cd05b4c5e56fbc8a77b650bbe6e202adc39df1d30509dbce95778d04338917a38a87a + SHA512 b376d3b00277ed60d107fe1268c210749b3aafcee618a8f924b181a9b476e92b9cb9baddecf70a8913b5910c471d53ea0260a876ad7b2db2b98b944d9f508714 PATCHES fix-dependencies.patch - fix-osx.patch ) # The embedded FindFreetype doesn't properly handle debug libraries diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index 575742ee9a58dd..3f17c0aac6846f 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sfml", - "version": "2.6.0", - "port-version": 19, + "version": "2.6.1", "description": "Simple and fast multimedia library", "homepage": "https://github.com/SFML/SFML", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 396787b66f0800..e70b0a8ec98137 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7769,8 +7769,8 @@ "port-version": 6 }, "sfml": { - "baseline": "2.6.0", - "port-version": 19 + "baseline": "2.6.1", + "port-version": 0 }, "sfsexp": { "baseline": "1.3.1", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index 57dc77d8e90214..8f37cff22bbf42 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cf9cce0cc82c37f5a37c1c97d05c7fcb4609486", + "version": "2.6.1", + "port-version": 0 + }, { "git-tree": "29d5488afb2bc4a0ea9a986412d569ba9575809b", "version": "2.6.0", From 24b141631e7a9cabdfa1c524f088a5014813d82b Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 15 Nov 2023 18:19:00 -0500 Subject: [PATCH 0373/1039] [bgfx] Update to 1.122.8595-458 (#35113) Use release artifact file for submodules instead of checking them out manually. This prevents future mistakes of bad references of submodules. Future updates will only requires updates to the version and sha. --- ports/bgfx/portfile.cmake | 41 +++++++++------------------------------ ports/bgfx/vcpkg.json | 2 +- versions/b-/bgfx.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 16 insertions(+), 34 deletions(-) diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake index 67d6b14e2e4a7d..0e0c17db0de414 100644 --- a/ports/bgfx/portfile.cmake +++ b/ports/bgfx/portfile.cmake @@ -1,33 +1,13 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO "bkaradzic/bgfx.cmake" - HEAD_REF master - REF v${VERSION} - SHA512 5d19e3ba50db25c203d87b1f47e9151a21f2afced35a7306d33c4fd2fc44f4d56826a1920023bd6de5cebbed2301e39e152f4c17e63905e34f56b39e34b235d1 +vcpkg_download_distfile( + ARCHIVE_FILE + URLS https://github.com/bkaradzic/bgfx.cmake/releases/download/v${VERSION}/bgfx.cmake.v${VERSION}.tar.gz + FILENAME bgfx.cmake.v${VERSION}.tar.gz + SHA512 369943ce0f8f2b5332d7334247d3a9ef0e28a6b1ff5ee250a01f83d1a0bd865687397da791e4c861d1c1b18ec4285f50153139f3c0e398611c7f3b672d1c751c ) -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_BX - REPO "bkaradzic/bx" - HEAD_REF master - REF 9b1805ea8bdc63552e4e32ff72842fce0238bb10 - SHA512 9032b160204faf939b33d46123b7220de441377b2fc95447b87714ce12d31f0c220ee9b53d9a7807f8ae3e807f7d2bea6dd255a4443bb66e4aa0679f10696e96 -) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_BIMG - REPO "bkaradzic/bimg" - HEAD_REF master - REF ec02df824a763b2e2ae31e19c674ba0bc88c0695 - SHA512 e0f26afae510244e85758ddaada83e3d6b48745b447e197bffcb972f1fd8f42269f2e9f3ee48a6d54ea99d0ad66062a6212a3604f7e61d616681b815fb8a6d8f -) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_BGFX - REPO "bkaradzic/bgfx" - HEAD_REF master - REF e2c5b1d3e1320145baebc405a3c894cd851f8dc1 - SHA512 5bde6c2b4f147c01c7949eff529b940b8981e06a3b72e8389e991b98e3052a83762e59a798b1b0eb3292c35889f8f3fb68f54613c270c4f3f0f942e11cc9f3e9 +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE ${ARCHIVE_FILE} ) vcpkg_check_features( @@ -48,10 +28,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-inject-packages.cmake" DESTINATION "$ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS -DBX_DIR=${SOURCE_PATH_BX} - -DBIMG_DIR=${SOURCE_PATH_BIMG} - -DBGFX_DIR=${SOURCE_PATH_BGFX} - -DBGFX_LIBRARY_TYPE=${BGFX_LIBRARY_TYPE} + OPTIONS -DBGFX_LIBRARY_TYPE=${BGFX_LIBRARY_TYPE} -DBX_AMALGAMATED=ON -DBGFX_AMALGAMATED=ON -DBGFX_BUILD_EXAMPLES=OFF diff --git a/ports/bgfx/vcpkg.json b/ports/bgfx/vcpkg.json index 8db3f9e2f6a682..0699bade64cbf8 100644 --- a/ports/bgfx/vcpkg.json +++ b/ports/bgfx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bgfx", - "version": "1.121.8534-453", + "version": "1.122.8595-458", "maintainers": "Sandy Carter ", "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.", "homepage": "https://bkaradzic.github.io/bgfx/overview.html", diff --git a/versions/b-/bgfx.json b/versions/b-/bgfx.json index 0e26ee4e1af4c7..08f0a6ca255fa4 100644 --- a/versions/b-/bgfx.json +++ b/versions/b-/bgfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5af63ea2a285a9577943683a6e1347d17487402", + "version": "1.122.8595-458", + "port-version": 0 + }, { "git-tree": "11c8b127eab949129fb5adf3006c9655ab1bb525", "version": "1.121.8534-453", diff --git a/versions/baseline.json b/versions/baseline.json index e70b0a8ec98137..e0694fc1244546 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -593,7 +593,7 @@ "port-version": 0 }, "bgfx": { - "baseline": "1.121.8534-453", + "baseline": "1.122.8595-458", "port-version": 0 }, "bigint": { From e556c1a8e282eb8c0a023b31490764897a9e6e75 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 16 Nov 2023 00:22:58 +0100 Subject: [PATCH 0374/1039] [ztd-static-containers] fix deps (#35111) --- ports/ztd-static-containers/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/z-/ztd-static-containers.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/ztd-static-containers/vcpkg.json b/ports/ztd-static-containers/vcpkg.json index 643667ecbd8044..f268e09dcceab6 100644 --- a/ports/ztd-static-containers/vcpkg.json +++ b/ports/ztd-static-containers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ztd-static-containers", "version-date": "2022-12-12", + "port-version": 1, "description": "Containers of fixed capacity", "homepage": "https://github.com/soasis/static_containers", "license": "CC0-1.0", @@ -12,6 +13,7 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "ztd-idk" ] } diff --git a/versions/baseline.json b/versions/baseline.json index e0694fc1244546..41e7681d7cf120 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9362,7 +9362,7 @@ }, "ztd-static-containers": { "baseline": "2022-12-12", - "port-version": 0 + "port-version": 1 }, "ztd-text": { "baseline": "2023-11-03", diff --git a/versions/z-/ztd-static-containers.json b/versions/z-/ztd-static-containers.json index f6897001f557e1..db16f2dd966dd5 100644 --- a/versions/z-/ztd-static-containers.json +++ b/versions/z-/ztd-static-containers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9178972642436ec0fdba9274b7107314d09df794", + "version-date": "2022-12-12", + "port-version": 1 + }, { "git-tree": "7df39e58c9b30ecd92335e2d3a49a8a793e8c956", "version-date": "2022-12-12", From b4e9db1d851e1646d921ed9e43cbd5822884b66d Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Thu, 16 Nov 2023 00:41:15 +0100 Subject: [PATCH 0375/1039] [alpaka] Update to 1.0.0 (#35109) --- ports/alpaka/portfile.cmake | 4 ++-- ports/alpaka/vcpkg.json | 3 +-- versions/a-/alpaka.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/alpaka/portfile.cmake b/ports/alpaka/portfile.cmake index e513ba4843dd8d..94f469bcba7643 100644 --- a/ports/alpaka/portfile.cmake +++ b/ports/alpaka/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alpaka-group/alpaka - REF 0.9.0 - SHA512 c079c0101a1e1c0d244c074e19fcefa6c15751fbb6be072c6f245e515dece8700a40fd101b2b0ba5f9760f4545bf23e1917ea9804accbe16a45039f8b0ed8a01 + REF 1.0.0 + SHA512 42e326fa07a741761c334e43ed03e9b950a580ffa86c005f20f9e0887bc648c189b5937ce1a9c08de6a8f295375d771077a709d5adfa14bea46af622985a196d HEAD_REF develop ) set(VCPKG_BUILD_TYPE release) diff --git a/ports/alpaka/vcpkg.json b/ports/alpaka/vcpkg.json index 0f6de580f4d0f3..3ee4f4ac4a63cc 100644 --- a/ports/alpaka/vcpkg.json +++ b/ports/alpaka/vcpkg.json @@ -1,7 +1,6 @@ { "name": "alpaka", - "version": "0.9.0", - "port-version": 1, + "version": "1.0.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", diff --git a/versions/a-/alpaka.json b/versions/a-/alpaka.json index 92ee626696422e..5fac31b71d052f 100644 --- a/versions/a-/alpaka.json +++ b/versions/a-/alpaka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8de339e1b25c07aa1f0eda93117730b60da400e5", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "7149b432a8cfdb7406ce5979d11c11c5caa8fe3f", "version": "0.9.0", diff --git a/versions/baseline.json b/versions/baseline.json index 41e7681d7cf120..f5a84b16a73e14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -89,8 +89,8 @@ "port-version": 0 }, "alpaka": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "1.0.0", + "port-version": 0 }, "alsa": { "baseline": "1.2.10", From 540956515c92dffddc522a0d6298a7337d6fb239 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 16 Nov 2023 07:42:50 +0800 Subject: [PATCH 0376/1039] [libobfuscate] new port (#35106) * add new port. * add header install. * formatting. * versions. * Update ports/obfuscate/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * rename port. * update versions file. --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/libobfuscate/portfile.cmake | 11 +++++++++++ ports/libobfuscate/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/l-/libobfuscate.json | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 ports/libobfuscate/portfile.cmake create mode 100644 ports/libobfuscate/vcpkg.json create mode 100644 versions/l-/libobfuscate.json diff --git a/ports/libobfuscate/portfile.cmake b/ports/libobfuscate/portfile.cmake new file mode 100644 index 00000000000000..801c9d4e65f64c --- /dev/null +++ b/ports/libobfuscate/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO adamyaxley/Obfuscate + REF 674a53f34c05a1dd092561face7a6807f921d223 + SHA512 9a3ef203386f149d916d9511492da94b6ab02fb001475ecb423eaf3f5510f6332ac57ce889a6b26a8a7c54066ec3d5ffabc5886338ecdaf0590423c385c449d9 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/obfuscate.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libobfuscate/vcpkg.json b/ports/libobfuscate/vcpkg.json new file mode 100644 index 00000000000000..33c7d516b18465 --- /dev/null +++ b/ports/libobfuscate/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libobfuscate", + "version-date": "2023-03-23", + "description": "Guaranteed compile-time string literal obfuscation header-only library for C++14.", + "homepage": "https://github.com/adamyaxley/Obfuscate", + "license": "Unlicense" +} diff --git a/versions/baseline.json b/versions/baseline.json index f5a84b16a73e14..0fa0de6e212447 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4552,6 +4552,10 @@ "baseline": "2021-11-03", "port-version": 0 }, + "libobfuscate": { + "baseline": "2023-03-23", + "port-version": 0 + }, "libodb": { "baseline": "2.4.0", "port-version": 10 diff --git a/versions/l-/libobfuscate.json b/versions/l-/libobfuscate.json new file mode 100644 index 00000000000000..f5c3f59cb6a350 --- /dev/null +++ b/versions/l-/libobfuscate.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5751c998780a780e002a23faffc94d7d328d74c0", + "version-date": "2023-03-23", + "port-version": 0 + } + ] +} From ced267328cb2b039df1cd498909257e0cb50805b Mon Sep 17 00:00:00 2001 From: SportsDataPlayground <26510541+SportsDataPlayground@users.noreply.github.com> Date: Thu, 16 Nov 2023 06:46:34 +0700 Subject: [PATCH 0377/1039] [wil] Update to latest v1.0.231028.1 version (#35099) * [wil] Update to latest v1.0.231028.1 version See https://github.com/microsoft/wil/releases/tag/v1.0.231028.1 for details * Update wil.json --- ports/wil/portfile.cmake | 4 ++-- ports/wil/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wil.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 2a929e4b2cad4d..26f60109dc5301 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 v1.0.230824.2 - SHA512 be9774b8d8ccc2df9fce4343aca87f721c90c8ef4a9d00ccf61a3182aafda7d98d4af96cf098ef5400a5234c1457fa745b40f9540e1f1c1cbf402181e484dcf8 + REF v1.0.231028.1 + SHA512 c9bbf3ab64ed63f57fc50954b03fa57c24e5399c79d6a53803e66741874bf582646ac886c8adeac09c881a71980ec0624529c06d9c89e8846e17d79cb3f3cc83 HEAD_REF master ) diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index ebd816c1b63586..8929d9a2711047 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wil", - "version-date": "2023-08-24", - "port-version": 1, + "version-date": "2023-10-28", "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0fa0de6e212447..e226ce5615d441 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8981,8 +8981,8 @@ "port-version": 2 }, "wil": { - "baseline": "2023-08-24", - "port-version": 1 + "baseline": "2023-10-28", + "port-version": 0 }, "wildmidi": { "baseline": "0.4.5", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 682f476c840a00..285cfc12446006 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39b5070b1e40ec7b9333c2fbb88941beef73155f", + "version-date": "2023-10-28", + "port-version": 0 + }, { "git-tree": "1305125361ca7587fdcdd0caac7609c15a94e48f", "version-date": "2023-08-24", From c4959758dd7bc9e6ea1fdca82e09fff70ff54105 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 16 Nov 2023 07:47:08 +0800 Subject: [PATCH 0378/1039] [jasper] Update to 4.1.0 (#35104) * update port. * update versions file. --- ports/jasper/no_stdc_check.patch | 12 ++++++------ ports/jasper/portfile.cmake | 4 ++-- ports/jasper/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/j-/jasper.json | 5 +++++ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/jasper/no_stdc_check.patch b/ports/jasper/no_stdc_check.patch index 7552a57da5f4ba..0c579a54084988 100644 --- a/ports/jasper/no_stdc_check.patch +++ b/ports/jasper/no_stdc_check.patch @@ -1,24 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 840908739..c485b830c 100644 +index ba6f117..8d2e9f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -414,7 +414,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR - # will need to be set manually from the command line +@@ -424,7 +424,7 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR # (e.g., using -DJAS_STDC_VERSION=YYYYMML) or by changing the line below. + if(NOT JAS_WASM) set(JAS_STDC_VERSION "0L" CACHE INTERNAL "The value of __STDC_VERSION__.") - if (JAS_STDC_VERSION STREQUAL "0L") + if (0) message(FATAL_ERROR "The value of __STDC_VERSION__ cannot be automatically determined " "when cross-compiling. Please set JAS_STDC_VERSION to the value " -@@ -423,8 +423,9 @@ if((DEFINED JAS_CROSSCOMPILING AND JAS_CROSSCOMPILING) OR - "appropriately.") +@@ -434,8 +434,9 @@ if(NOT JAS_WASM) endif() + endif() else() - jas_get_stdc_version(status JAS_STDC_VERSION) - if(NOT status) + #jas_get_stdc_version(status JAS_STDC_VERSION) -+ set(JAS_STDC_VERSION 0L) ++ set(JAS_STDC_VERSION 0L) + if(0) message(FATAL_ERROR "Cannot determine the value of __STDC_VERSION__.") endif() diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index f4761abe1e59fa..52b735443667c1 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jasper-software/jasper - REF 402d096b39f4f618ad9e6ff2b4fc1b5eb260a2e4 # version-4.0.0 - SHA512 b2c2a2514479ec4a3d634d42d0a614951c06f6177e43a80b9a31797b7d4ad248fcdff632596806fcf811c87779990ba7c19aa2f9b91afafbc172dd85f96bb239 + REF "version-${VERSION}" + SHA512 940841f4094987526ee23aed84f2b028b0f4d58cd2be91dcf737102018d8da111870959ad64710b14ae1ca4ca8361fc900ff6ecee31f0f23ef435bf7f0935462 HEAD_REF master PATCHES no_stdc_check.patch diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index 7df60a535b0f86..369b7e6e676842 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jasper", - "version": "4.0.0", - "port-version": 2, + "version": "4.1.0", "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/jasper-software/jasper", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e226ce5615d441..e29b9eb9da39ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3605,8 +3605,8 @@ "port-version": 1 }, "jasper": { - "baseline": "4.0.0", - "port-version": 2 + "baseline": "4.1.0", + "port-version": 0 }, "jbig2dec": { "baseline": "0.20", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index 45f0ae26a07835..2d0db8e255247d 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbbc1e3a2819d3e823e778a5a35045cc44946c23", + "version": "4.1.0", + "port-version": 0 + }, { "git-tree": "d7f51c26899ba9433a5a3ab92fc5b5887d5c764c", "version": "4.0.0", From 682799e13109790e77623db1eba7615be9578da3 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 16 Nov 2023 07:48:13 +0800 Subject: [PATCH 0379/1039] [winsparkle] update to 0.8.1 (#35101) * update port. * update versions file. --- ports/winsparkle/portfile.cmake | 22 ++++++++++------------ ports/winsparkle/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/winsparkle.json | 5 +++++ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ports/winsparkle/portfile.cmake b/ports/winsparkle/portfile.cmake index 2291c583deb488..a0ae2724c81779 100644 --- a/ports/winsparkle/portfile.cmake +++ b/ports/winsparkle/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/vslavik/winsparkle/releases/download/v0.7.0/WinSparkle-0.7.0.zip" - FILENAME "winsparkle-070.zip" - SHA512 c2cf29e1880534c170110f8e5a966939aecc9a9e05afc87868400074f1492fcac949b61e2ce4636eadd2f127caad3660e0f763476e9523aad3834d673f6edd77 + URLS "https://github.com/vslavik/winsparkle/releases/download/v0.8.1/WinSparkle-0.8.1.zip" + FILENAME "winsparkle-081.zip" + SHA512 05588793272618ca13fe884620f1ed421276b011a906f15c92f4879b1787c71b175ae1a170b80fe2adfdb7669eac90c38fac929a9bcf382388983f9aea25ba9c ) vcpkg_extract_source_archive( @@ -14,11 +14,10 @@ file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT} file(GLOB TOOLS_LIST "${SOURCE_PATH}/bin/*.bat") file(INSTALL ${TOOLS_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - -# Note: It is an explicit design goal for WinSparkle to be a single -# self-contained DLL with no external dependencies (to the point that -# it even links to static CRT!). This matters for e.g. in-app delta updates -# or re-launching the app after update. It is not statically linked even if a +# Note: It is an explicit design goal for WinSparkle to be a single +# self-contained DLL with no external dependencies (to the point that +# it even links to static CRT!). This matters for e.g. in-app delta updates +# or re-launching the app after update. It is not statically linked even if a # static linking is used for everything else. set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) @@ -27,7 +26,7 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(INSTALL "${SOURCE_PATH}/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") @@ -36,7 +35,7 @@ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well + # We have no debug, but since Winsparkle is a self-contained dll, we can copy it to the Debug folder as well file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(INSTALL "${SOURCE_PATH}/x64/Release/WinSparkle.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") @@ -44,5 +43,4 @@ else() message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/winsparkle/vcpkg.json b/ports/winsparkle/vcpkg.json index 16a5766e4809ec..3eda505ab808de 100644 --- a/ports/winsparkle/vcpkg.json +++ b/ports/winsparkle/vcpkg.json @@ -1,7 +1,6 @@ { "name": "winsparkle", - "version": "0.7.0", - "port-version": 2, + "version": "0.8.1", "description": "WinSparkle is an easy-to-use software update library for Windows developers.", "homepage": "https://winsparkle.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e29b9eb9da39ce..3659de0edb0965 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9013,8 +9013,8 @@ "port-version": 5 }, "winsparkle": { - "baseline": "0.7.0", - "port-version": 2 + "baseline": "0.8.1", + "port-version": 0 }, "wintoast": { "baseline": "1.2.0", diff --git a/versions/w-/winsparkle.json b/versions/w-/winsparkle.json index 543117aa62560f..748c844670fd4d 100644 --- a/versions/w-/winsparkle.json +++ b/versions/w-/winsparkle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "033cf81cd03bc5533ddb7e57d65f704db078ba44", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "4c6c0404e941beb4139069e5a5cb03e7e59655a4", "version": "0.7.0", From 324c2436f045e951c86e872b4b117f9182f1ed29 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 16 Nov 2023 07:49:32 +0800 Subject: [PATCH 0380/1039] [kubazip] update to 0.2.6 (#35100) * update port. * update versions file. --- ports/kubazip/portfile.cmake | 6 +++--- ports/kubazip/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kubazip.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/kubazip/portfile.cmake b/ports/kubazip/portfile.cmake index e08713a127de4d..b7cba8bf6b8bdb 100644 --- a/ports/kubazip/portfile.cmake +++ b/ports/kubazip/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kuba--/zip - REF 42151612e8546c55485ec38cf0d57e57e51a8abd #v0.2.4 - SHA512 9cbb7bcb8095c365c4529f06c883f3aa0c1038ed3aa6a0419dafb90355abf6e5cd02f7ffd5cbb54fe3893102bb21f568d415b71500630ad203a1f911b6e52ef5 + REF "v${VERSION}" + SHA512 959805452f566b24ee78bc56794403733d19e86885a7f94581fca4218817a65ea4ea8b79457a452e0cc06992dc2165b3ff90360cec5f43cd8c0f934027ee9fd5 HEAD_REF master PATCHES fix_targets.patch @@ -18,4 +18,4 @@ 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/UNLICENSE") diff --git a/ports/kubazip/vcpkg.json b/ports/kubazip/vcpkg.json index 1d296ea8e8361d..aee73b083b412d 100644 --- a/ports/kubazip/vcpkg.json +++ b/ports/kubazip/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kubazip", - "version": "0.2.4", + "version": "0.2.6", "description": "A portable, simple zip library written in C", "homepage": "https://github.com/kuba--/zip", "license": "Unlicense", diff --git a/versions/baseline.json b/versions/baseline.json index 3659de0edb0965..67460fc3a46188 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3921,7 +3921,7 @@ "port-version": 0 }, "kubazip": { - "baseline": "0.2.4", + "baseline": "0.2.6", "port-version": 0 }, "kubernetes": { diff --git a/versions/k-/kubazip.json b/versions/k-/kubazip.json index f895e05b2384f0..4b72a03b592eab 100644 --- a/versions/k-/kubazip.json +++ b/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a53b15054c06a67cd7ba9f19e54476893cddad72", + "version": "0.2.6", + "port-version": 0 + }, { "git-tree": "14bf9d5b15ecf5769d10e5000e74167e97b0ade1", "version": "0.2.4", From e8f5747b89e452473d03ff53ec981d5b8f2f124d Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 16 Nov 2023 07:52:09 +0800 Subject: [PATCH 0381/1039] [qt-advanced-docking-system] update to 4.2.0 (#35105) * update port. * update versions file. * remove unneeded patch. * update versions file. --- ports/qt-advanced-docking-system/portfile.cmake | 4 +--- ports/qt-advanced-docking-system/qt.patch | 11 ----------- ports/qt-advanced-docking-system/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/qt-advanced-docking-system.json | 5 +++++ 5 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 ports/qt-advanced-docking-system/qt.patch diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 2f404860a994a0..182e8eb149a8f5 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System REF "${VERSION}" - SHA512 d7b1501cd8d15aead7eca38172f3335d5a5f3165f948658df09016b773a870f024d16bf472ed7a65cb178408177a6af9db647892942818e53d044f67648e3435 + SHA512 2da93dfecdccf494ab051dd42c79ade681534530914ad4ddfc38ec77c32b3c1e56242bef7dd1bfe8b14bc63564c485d59da2518bf6d6b76c3be905accfe6297c HEAD_REF master - PATCHES - qt.patch ) if(VCPKG_CROSSCOMPILING) diff --git a/ports/qt-advanced-docking-system/qt.patch b/ports/qt-advanced-docking-system/qt.patch deleted file mode 100644 index 29643835b14ab4..00000000000000 --- a/ports/qt-advanced-docking-system/qt.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2ec56aa..054ea73 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,5 @@ - cmake_minimum_required(VERSION 3.5) - project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT}) --find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui Widgets REQUIRED) - if (UNIX AND NOT APPLE) - include_directories(${Qt${QT_VERSION_MAJOR}Gui_PRIVATE_INCLUDE_DIRS}) diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 1404b611c1fb8d..0155ecfabbc400 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt-advanced-docking-system", - "version": "4.0.3", - "port-version": 1, + "version": "4.2.0", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 67460fc3a46188..3135f7dffeb893 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6865,8 +6865,8 @@ "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "4.0.3", - "port-version": 1 + "baseline": "4.2.0", + "port-version": 0 }, "qt3d": { "baseline": "6.6.0", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index 9f0721cb2934ff..78543a3f8dc566 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce9908d6903a343d5b5d22750c4c29fe097ff418", + "version": "4.2.0", + "port-version": 0 + }, { "git-tree": "98c020f1eda45cfc5d1eee6369bbdb5c1a52825a", "version": "4.0.3", From b61706e96cde9bdb6ecab86156fb44547cdafb28 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 16 Nov 2023 08:02:14 +0800 Subject: [PATCH 0382/1039] [aws-c-http,aws-c-auth,aws-c-s3,aws-c-mqtt,aws-c-common,aws-sdk-cpp,aws-crt-cpp] update to 0.7.14, 0.7.6, 0.3.24, 0.9.9, 0.9.9,1.11.201,0.24.7 (#35070) * [aws-c-http] update to 0.7.14 * [aws-c-http] update to 0.7.14 * [aws-c-mqtt] update to 0.9.9 * [aws-c-mqtt] update to 0.9.9 * [aws-c-s3] update to 0.3.23 * [aws-c-s3] update to 0.3.23 * [aws-c-auth] update to 0.7.6 * [aws-c-auth] update to 0.7.6 * [aws-crt-cpp] update to 0.24.5 * [aws-crt-cpp] update to 0.24.5 * [aws-sdk-cpp] update to 1.11.200 * [aws-sdk-cpp] update to 1.11.200 * [aws-c-common] update to 0.9.8 * [aws-c-common] update to 0.9.8 * [aws-c-common] update to 0.9.9 * [aws-c-common] update to 0.9.9 * [aws-c-s3] update to 0.3.24 * [aws-c-s3] update to 0.3.24 * [aws-crt-cpp] update to 0.24.7 * [aws-crt-cpp] update to 0.24.7 * [aws-sdk-cpp] update to 1.11.201 * [aws-sdk-cpp] update to 1.11.201 --- ports/aws-c-auth/portfile.cmake | 2 +- ports/aws-c-auth/vcpkg.json | 2 +- ports/aws-c-common/portfile.cmake | 2 +- ports/aws-c-common/vcpkg.json | 2 +- ports/aws-c-http/portfile.cmake | 2 +- ports/aws-c-http/vcpkg.json | 2 +- ports/aws-c-mqtt/portfile.cmake | 2 +- ports/aws-c-mqtt/vcpkg.json | 2 +- ports/aws-c-s3/portfile.cmake | 2 +- ports/aws-c-s3/vcpkg.json | 2 +- ports/aws-crt-cpp/portfile.cmake | 2 +- ports/aws-crt-cpp/vcpkg.json | 2 +- ports/aws-sdk-cpp/portfile.cmake | 2 +- ports/aws-sdk-cpp/vcpkg.json | 3 +-- versions/a-/aws-c-auth.json | 5 +++++ versions/a-/aws-c-common.json | 5 +++++ versions/a-/aws-c-http.json | 5 +++++ versions/a-/aws-c-mqtt.json | 5 +++++ versions/a-/aws-c-s3.json | 5 +++++ versions/a-/aws-crt-cpp.json | 5 +++++ versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 16 ++++++++-------- 22 files changed, 57 insertions(+), 23 deletions(-) diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index 1b84cfd9c64671..381fd83daf635d 100644 --- a/ports/aws-c-auth/portfile.cmake +++ b/ports/aws-c-auth/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-auth REF "v${VERSION}" - SHA512 1afcdcd9899b9630af52173f172b2e3a0b10fe0979e80da59dbf0ff3dad07de5be9076a3cc3db76544fa2b479fe7c8aaeb319dd9b81c0a2637bd89433cb11b9d + SHA512 2f3b4c8bc91b84f570eda29904fc6078557fd393a879cd710f8ad06abc37fd0fffb535a19c2813a333a2c384da8756f85bb6589bdc3aa1a2a4a9754795aca705 HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index ae6363828d006d..2394a7d120f3ef 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-auth", - "version": "0.7.4", + "version": "0.7.6", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", "license": "Apache-2.0", diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index e9e0adf7cf7a7b..0143b7cdae66c4 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 203e6d313c0a435d0e042f79a4c87f91765206fd997b12c7d18cafe9551945fc1d976bd3a5c6fc9c60f4bbca52ebb15771a6ac2783666581b79d5d7153822485 + SHA512 4e9df8edeefa7765fb68c25b36a72dd389ef3cf99ec0d37661f527a85f36d59f87fe6f0d2c7c52132abe45062ac7eb74513552d98b72c5aadb074624b1eb741f 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 d8a56856681572..381ae8b13143b3 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.9.4", + "version": "0.9.9", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake index 1370e36e72e651..12301dd48db7a7 100644 --- a/ports/aws-c-http/portfile.cmake +++ b/ports/aws-c-http/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-http REF "v${VERSION}" - SHA512 48132df910d67d58e6a28481fcb19401272fa929f8e0b14e0c6b1f5c425221099d32671bbdd05d973f54b1463e8e20ae2fe6ffe56fcc1b02b684c9a0ba43e204 + SHA512 205cf1cc4b766fd42cfca6ab84974e0797f2a52f8cdf64fed0c4327a2b70c251e5c9561b1cf714cbe4b7ef87092a094830071e6621bd0e0e1684b2e66ea718e2 HEAD_REF master ) diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json index b12be55b31afec..dcbb887aa9e0ad 100644 --- a/ports/aws-c-http/vcpkg.json +++ b/ports/aws-c-http/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-http", - "version": "0.7.13", + "version": "0.7.14", "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", "license": "Apache-2.0", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index fcd05e047b6c38..78355c14502065 100644 --- a/ports/aws-c-mqtt/portfile.cmake +++ b/ports/aws-c-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-mqtt REF "v${VERSION}" - SHA512 25f2097978174f15186a22bab37af36ef41aef9dba7a2d035495ea5cd60159d09ca6b22eb123eb9d911f2555d5688ffe1194e4015d080651d0a44323e15aee2a + SHA512 e7c85fbbf91848720848751748d75eeb2b788552871d3055a93724aa9d814ef088821d77a8dc8fa265b8f8c730990d221e5babc4bdbff0b73f03e24bb54d3c60 HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index 039a75d4c73bae..b22e3ce28932c2 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-mqtt", - "version": "0.9.6", + "version": "0.9.9", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index 6c60e22af29dfb..b5ce27ecc730e7 100644 --- a/ports/aws-c-s3/portfile.cmake +++ b/ports/aws-c-s3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-s3 REF "v${VERSION}" - SHA512 f96cab50c0f96d6cb3cb8e142cc95c91e9efd0b02d115e91ec5d2fc7c4be350d58342f5846065216a49c080aaf3954fa9732ff423bad20b250afe4227ee3aaef + SHA512 5a6738d77d87ece6125233c6f50a446843dd8d3b11749a61c80d0eb8e8528d51ab9ccfe65fb59a00bc249d5a4d47b7787b5dcae963d8f60f49eaf5d9c1b3f7db HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 0616b5d83a55ad..1d73db0e104e1d 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-s3", - "version": "0.3.17", + "version": "0.3.24", "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", "license": "Apache-2.0", diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index 1d0b4306e9369e..ee85a6563396ad 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-crt-cpp REF "v${VERSION}" - SHA512 88631845bf78e526b3160d0ba6ff67922b09f8e25864bfeeb4cf16f2d217bf00c9686e53e70382129d8209612453190024a16aa3cff153198960c8895f2e1772 + SHA512 32359a7a94e9f044de1184e633a7e2466e697022fd713a507c143c465c6ecb9632354c067d3987e21d86b9c614c8d2af180645b6c79a5c6533cbeb6a1a762bcf PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 6a5f6e4128c31b..65b1f07cde673d 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-crt-cpp", - "version": "0.23.1", + "version": "0.24.7", "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index e66073eb24af2d..525068260a295f 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 63de900870e9bec23d42e9458e0e9b1579a9e2dc7b0f404eae1b0dd406898b6d6841c5e2f498710b3828f212705437da3a2fe94813a6c3a842945100a05ae368 + SHA512 03d21fd2b12116a43aa8163f69d5707d259c6330ddee80a5fef3b344d3797bab72e56ade7fd6669c2532798337a922e2439e0c57d1e76d2b2e8470909c4d996d PATCHES patch-relocatable-rpath.patch fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 138894a9eec944..726944b0127367 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.169", - "port-version": 2, + "version": "1.11.201", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index c6b2ad5cf8ae12..896cd855b1aa62 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab09a6f41712ba35a021c3d6392a804e47858668", + "version": "0.7.6", + "port-version": 0 + }, { "git-tree": "f5aba6169081364e7585dfc613a0a476bac838f2", "version": "0.7.4", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index f51a7646f206ed..ccc20b53b662cf 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30465cfdc4851970efc5767fd57ad6e0dedad46a", + "version": "0.9.9", + "port-version": 0 + }, { "git-tree": "6d58a5944c2340297985dc05678671129c45d40f", "version": "0.9.4", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json index 2a0fe56e8155af..b614134bec873b 100644 --- a/versions/a-/aws-c-http.json +++ b/versions/a-/aws-c-http.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb6f67641f77b8ba24d435c6cf49b7a36cf80536", + "version": "0.7.14", + "port-version": 0 + }, { "git-tree": "ab0c882c2d7c32b58e11c9e7124574933b701d8f", "version": "0.7.13", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 913bdaa4eea1f3..936cc9a53a05df 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9210c6a8260e7b5058fd4d9bb7d1a42cd6d78079", + "version": "0.9.9", + "port-version": 0 + }, { "git-tree": "c48dfcca0c391e496b3ba1709f491d3cba914e89", "version": "0.9.6", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index e591f9a04a43d4..4dbc1faa7cdd4b 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "709e576231214f693d747d8187e44b30c77f4443", + "version": "0.3.24", + "port-version": 0 + }, { "git-tree": "11800b01a8e9e48aa7fe4c7e5f2e64592b5d7ebd", "version": "0.3.17", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index 3531c58844434d..1ad459bf30df2f 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "855f83fcf951b5fcaf0af75159ff979980670088", + "version": "0.24.7", + "port-version": 0 + }, { "git-tree": "8c9935cdadd2baa48566f59d5ca1c253d3187ed1", "version": "0.23.1", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index c4e50267a8e9db..d1a2985b410fe7 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e0ba4822d4dcc90eac626f351d7a3fd215a68a8", + "version": "1.11.201", + "port-version": 0 + }, { "git-tree": "bb95756096209a013e786b104a11b0aa6357119d", "version": "1.11.169", diff --git a/versions/baseline.json b/versions/baseline.json index 3135f7dffeb893..f4d838227aeebc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.4", + "baseline": "0.7.6", "port-version": 0 }, "aws-c-cal": { @@ -361,7 +361,7 @@ "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.4", + "baseline": "0.9.9", "port-version": 0 }, "aws-c-compression": { @@ -373,7 +373,7 @@ "port-version": 0 }, "aws-c-http": { - "baseline": "0.7.13", + "baseline": "0.7.14", "port-version": 0 }, "aws-c-io": { @@ -381,11 +381,11 @@ "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.9.6", + "baseline": "0.9.9", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.3.17", + "baseline": "0.3.24", "port-version": 0 }, "aws-c-sdkutils": { @@ -397,7 +397,7 @@ "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.23.1", + "baseline": "0.24.7", "port-version": 0 }, "aws-lambda-cpp": { @@ -405,8 +405,8 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.169", - "port-version": 2 + "baseline": "1.11.201", + "port-version": 0 }, "azmq": { "baseline": "2023-03-23", From 67e861818abe8858c395ac3a043532e55111cc9f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Nov 2023 01:56:18 +0100 Subject: [PATCH 0383/1039] [zimpl] New port (#35053) * [zimpl] New port * Fix msvc * MSVC needs pcre2 * Fix MSVC runtime * Fix msvc and mingw --- ports/zimpl/libm.diff | 13 +++++++++++ ports/zimpl/msvc.diff | 48 ++++++++++++++++++++++++++++++++++++++ ports/zimpl/portfile.cmake | 40 +++++++++++++++++++++++++++++++ ports/zimpl/vcpkg.json | 24 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/z-/zimpl.json | 9 +++++++ 6 files changed, 138 insertions(+) create mode 100644 ports/zimpl/libm.diff create mode 100644 ports/zimpl/msvc.diff create mode 100644 ports/zimpl/portfile.cmake create mode 100644 ports/zimpl/vcpkg.json create mode 100644 versions/z-/zimpl.json diff --git a/ports/zimpl/libm.diff b/ports/zimpl/libm.diff new file mode 100644 index 00000000000000..6b340cc47983a2 --- /dev/null +++ b/ports/zimpl/libm.diff @@ -0,0 +1,13 @@ +diff --git a/zimpl/CMakeLists.txt b/zimpl/CMakeLists.txt +index 7cf9d85..07fa187 100644 +--- a/zimpl/CMakeLists.txt ++++ b/zimpl/CMakeLists.txt +@@ -151,6 +151,8 @@ include(CheckSymbolExists) + find_library(libm m) + if(NOT libm) + set(libm "") ++else() ++ set(libm m) + endif() + + set(libs ${libs} ${libm}) diff --git a/ports/zimpl/msvc.diff b/ports/zimpl/msvc.diff new file mode 100644 index 00000000000000..dc152d0649fb56 --- /dev/null +++ b/ports/zimpl/msvc.diff @@ -0,0 +1,48 @@ +diff --git a/zimpl/CMakeLists.txt b/zimpl/CMakeLists.txt +index 7cf9d85..85d33a7 100644 +--- a/zimpl/CMakeLists.txt ++++ b/zimpl/CMakeLists.txt +@@ -4,7 +4,7 @@ project(ZIMPL + VERSION 3.5.3 + LANGUAGES C) + +-if(CMAKE_BUILD_TYPE STREQUAL "Debug") ++if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT WIN32) + # if changing these flags, also update GCCWARN/GXXWARN in make/make.project + set(ADD_C_FLAGS -Wall -Wextra -Wno-unknown-pragmas -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-noreturn -Wmissing-declarations -fno-omit-frame-pointer) + +@@ -112,7 +112,6 @@ if(MSVC) + ) + + foreach(variable ${variables}) +- string(REGEX REPLACE "/M[T,D][ d]" "" ${variable} "${${variable}}") + # message("${variable} = ${${variable}}") + endforeach() + endif() +@@ -128,9 +127,11 @@ if(ZLIB_FOUND) + include_directories(${ZLIB_INCLUDE_DIRS}) + else() + add_definitions(-DWITHOUT_ZLIB) ++endif() + +- # look for pcre if ZLIB could not be found +- find_package(PCRE) ++if(WIN32) ++ find_package(PCRE NAMES pcre2 REQUIRED) ++ set(PCRE_LIBRARIES "$") + if(PCRE_FOUND) + add_definitions(-DWITH_PCRE) + add_definitions(-DPCRE2_STATIC) +diff --git a/zimpl/zimpl-config.cmake.in b/zimpl/zimpl-config.cmake.in +index b653f0c..946f6f2 100644 +--- a/zimpl/zimpl-config.cmake.in ++++ b/zimpl/zimpl-config.cmake.in +@@ -1,3 +1,8 @@ ++if(WIN32) ++ include(CMakeFindDependencyMacro) ++ find_dependency(pcre2) ++endif() ++ + if(NOT TARGET libzimpl) + include("${CMAKE_CURRENT_LIST_DIR}/zimpl-targets.cmake") + endif() diff --git a/ports/zimpl/portfile.cmake b/ports/zimpl/portfile.cmake new file mode 100644 index 00000000000000..03da58ee05b375 --- /dev/null +++ b/ports/zimpl/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# The latest version of ZIMPL is included in the SCIP Optimization Suite. +set(scipoptsuite_version 8.0.4) +vcpkg_download_distfile(ARCHIVE + URLS "https://scipopt.org/download/release/scipoptsuite-${scipoptsuite_version}.tgz" + SHA512 46b56b3a4a5fcb4d6d53b5ffd9320bdf37fb55b9b8450a065312aa1e4f88863d3c563a495cf2622ef70a80132149c7b8f36cdb9a9e43906f4cfcafcb9dd6d606 + FILENAME "scipoptsuite-${scipoptsuite_version}.tgz" +) +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + libm.diff + msvc.diff +) + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/zimpl" + OPTIONS + -DBREW=false + "-DBISON_EXECUTABLE=${BISON}" + "-DFLEX_EXECUTABLE=${FLEX}" + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=1 + MAYBE_UNUSED_VARIABLES + BREW +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zimpl) +vcpkg_copy_tools(TOOL_NAMES zimpl AUTO_CLEAN) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zimpl/zimpl-config.cmake" "../../../include" "../../include") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zimpl/mmlparse2.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/zimpl/" "") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/zimpl/LICENSE") diff --git a/ports/zimpl/vcpkg.json b/ports/zimpl/vcpkg.json new file mode 100644 index 00000000000000..a2d2e04d97f3db --- /dev/null +++ b/ports/zimpl/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "zimpl", + "version": "3.5.3", + "description": "Zuse Institut Mathematical Programming Language", + "homepage": "http://zimpl.zib.de/", + "license": "LGPL-3.0-or-later", + "supports": "!uwp", + "dependencies": [ + "gmp", + { + "name": "pcre2", + "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 f4d838227aeebc..c897724513eedd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9300,6 +9300,10 @@ "baseline": "1.0.0", "port-version": 1 }, + "zimpl": { + "baseline": "3.5.3", + "port-version": 0 + }, "zint": { "baseline": "2.12.0", "port-version": 1 diff --git a/versions/z-/zimpl.json b/versions/z-/zimpl.json new file mode 100644 index 00000000000000..a9a9269988c89e --- /dev/null +++ b/versions/z-/zimpl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6598ebbe8c537c546a9cc0d71c8fd9e0a4dd6b94", + "version": "3.5.3", + "port-version": 0 + } + ] +} From 6b07285422fdffdfcd66d57b5a7b23c75e9ce659 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:02:47 -0800 Subject: [PATCH 0384/1039] [exiv2] update to 0.28.1 and fix build error (#35020) * [exiv2] update to 0.28.1 * update version * Fix option * update version --------- Co-authored-by: vzhli17 --- ports/exiv2/dont-find-python.patch | 6 +++--- ports/exiv2/fix-expat.patch | 21 +++++++++------------ ports/exiv2/portfile.cmake | 7 +++---- ports/exiv2/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/e-/exiv2.json | 5 +++++ 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ports/exiv2/dont-find-python.patch b/ports/exiv2/dont-find-python.patch index 0529efd6d26930..a94babd5e66028 100644 --- a/ports/exiv2/dont-find-python.patch +++ b/ports/exiv2/dont-find-python.patch @@ -1,10 +1,10 @@ diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake -index 664522c2a..cbfa5d908 100644 +index 67a6cfd..d5006ff 100644 --- a/cmake/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -30,10 +30,12 @@ endif() - list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") + list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/") +if(EXIV2_BUILD_UNIT_TESTS) find_package (Python3 COMPONENTS Interpreter) @@ -13,5 +13,5 @@ index 664522c2a..cbfa5d908 100644 endif() +endif() - find_package(Filesystem REQUIRED) + find_package(Filesystem COMPONENTS Experimental Final REQUIRED) diff --git a/ports/exiv2/fix-expat.patch b/ports/exiv2/fix-expat.patch index 98669c4f914f37..fa4118909824f1 100644 --- a/ports/exiv2/fix-expat.patch +++ b/ports/exiv2/fix-expat.patch @@ -1,9 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 41a672e8..1311c856 100644 +index 85dd6cd..4967d8a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -182,7 +182,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE - ) +@@ -178,7 +178,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP) target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR}) @@ -12,17 +11,15 @@ index 41a672e8..1311c856 100644 list(APPEND requires_private_list "expat") endif() - if (EXIV2_ENABLE_XMP) diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt -index 9c148a61..0fed7cde 100644 +index 87c59c0..d2f23e6 100644 --- a/xmpsdk/CMakeLists.txt +++ b/xmpsdk/CMakeLists.txt -@@ -28,7 +28,7 @@ add_library(exiv2-xmp OBJECT - - target_link_libraries(exiv2-xmp - PRIVATE -- EXPAT::EXPAT -+ expat::expat +@@ -31,6 +31,7 @@ target_include_directories(exiv2-xmp SYSTEM + ${PROJECT_SOURCE_DIR}/xmpsdk/include + ${EXPAT_INCLUDE_DIRS} ) ++target_link_libraries(exiv2-xmp PRIVATE expat::expat) - target_include_directories(exiv2-xmp SYSTEM + # Prevent a denial-service-attack related to XML entity expansion + # ("billion laughs attack"). diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index bde1fd91f194c4..90e57f67cd2061 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 REF "v${VERSION}" - SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad + SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b HEAD_REF master PATCHES fix-find_expat.patch @@ -10,13 +10,11 @@ vcpkg_from_github( fix-brotli.patch fix-expat.patch dont-find-python.patch - ios.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES xmp EXIV2_ENABLE_XMP - video EXIV2_ENABLE_VIDEO png EXIV2_ENABLE_PNG nls EXIV2_ENABLE_NLS bmff EXIV2_ENABLE_BMFF @@ -39,6 +37,7 @@ vcpkg_cmake_configure( -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF + -DEXIV2_ENABLE_VIDEO=OFF -DEXIV2_TEAM_EXTRA_WARNINGS=OFF -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF -DEXIV2_TEAM_PACKAGING=OFF @@ -46,7 +45,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/exiv2) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/exiv2) vcpkg_fixup_pkgconfig() configure_file( diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 6221cfbb84d5c2..fc0040c24db600 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "exiv2", - "version": "0.28.0", - "port-version": 1, + "version": "0.28.1", "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", @@ -49,7 +48,7 @@ ] }, "video": { - "description": "Build video support into library" + "description": "Deprecated. it will be removed in the future." }, "xmp": { "description": "Build with XMP metadata support", diff --git a/versions/baseline.json b/versions/baseline.json index c897724513eedd..0c9b2d4161b0a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2473,8 +2473,8 @@ "port-version": 7 }, "exiv2": { - "baseline": "0.28.0", - "port-version": 1 + "baseline": "0.28.1", + "port-version": 0 }, "expat": { "baseline": "2.5.0", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 443146396ed380..8d77826bab7889 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c1020def33eb27e28b1cb0bd2cfd53dfe5fbae5", + "version": "0.28.1", + "port-version": 0 + }, { "git-tree": "550a17385502e498859987df6696ffdccc55190d", "version": "0.28.0", From b54e3648330d257ce2ba4df9db52f1bd91e3769b Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 16 Nov 2023 04:04:11 +0300 Subject: [PATCH 0385/1039] [restinio] Update to 0.7.0 (#35083) * RESTinio updated to v.0.7.0. * Fix manifest format. * x-add-version for RESTinio-0.7.0. * Remove files that not needed anymore. * x-add-version for updated RESTinio port. * Remove comment with vim settings. * x-add-version for updated RESTinio's portfile. --- ports/restinio/fix-cmake-config.diff | 12 ------------ ports/restinio/fix-project.diff | 10 ---------- ports/restinio/portfile.cmake | 19 ++++++++++++++----- ports/restinio/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/r-/restinio.json | 5 +++++ 6 files changed, 23 insertions(+), 30 deletions(-) delete mode 100644 ports/restinio/fix-cmake-config.diff delete mode 100644 ports/restinio/fix-project.diff diff --git a/ports/restinio/fix-cmake-config.diff b/ports/restinio/fix-cmake-config.diff deleted file mode 100644 index fc398dfd5a5cc9..00000000000000 --- a/ports/restinio/fix-cmake-config.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dev/restinio/cmake/restinio-config.cmake.in b/dev/restinio/cmake/restinio-config.cmake.in -index b8df667..02db4d8 100644 ---- a/dev/restinio/cmake/restinio-config.cmake.in -+++ b/dev/restinio/cmake/restinio-config.cmake.in -@@ -1,3 +1,7 @@ - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+find_dependency(unofficial-http-parser) -+find_dependency(fmt) -+ - include(${CMAKE_CURRENT_LIST_DIR}/restinio-targets.cmake) diff --git a/ports/restinio/fix-project.diff b/ports/restinio/fix-project.diff deleted file mode 100644 index eff08ef1d947b1..00000000000000 --- a/ports/restinio/fix-project.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/vcpkg/CMakeLists.txt b/vcpkg/CMakeLists.txt -index 2c36cda..be3d6ce 100644 ---- a/vcpkg/CMakeLists.txt -+++ b/vcpkg/CMakeLists.txt -@@ -1,4 +1,5 @@ - cmake_minimum_required(VERSION 3.3) -+project(restinio-vcpkg CXX) - - SET(CMAKE_CXX_STANDARD 14) - SET(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 6ce236049702e2..ce40357e656da6 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -2,18 +2,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio REF "v.${VERSION}" - SHA512 0d69567a68f17f3ad30978f1ee165e673f77332f519c2e9429284d87886f90c0dea46b8dcaedb55cf4c1611eca79b9196178e37deb56ad89272ca19382f290bc - PATCHES - fix-cmake-config.diff - fix-project.diff + SHA512 de9929d9ed6acf9574482ffa3f865a550e319716c9cfc5a9e2e9f604169206df022d55e0e55174c66f0edc04a4491c028755272067e55ae646ecfccc1573f78f ) set(VCPKG_BUILD_TYPE release) # header-only vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/vcpkg" + SOURCE_PATH "${SOURCE_PATH}/dev" + OPTIONS + -DRESTINIO_INSTALL=ON + -DRESTINIO_TEST=OFF + -DRESTINIO_SAMPLE=OFF + -DRESTINIO_BENCHMARK=OFF + -DRESTINIO_WITH_SOBJECTIZER=OFF + -DRESTINIO_ASIO_SOURCE=standalone + -DRESTINIO_DEP_STANDALONE_ASIO=find + -DRESTINIO_DEP_LLHTTP=find + -DRESTINIO_DEP_FMT=find + -DRESTINIO_DEP_EXPECTED_LITE=find ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/restinio) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index 68cc04cf16c8c5..35de5e84786385 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,13 +1,14 @@ { "name": "restinio", - "version": "0.6.19", + "version": "0.7.0", "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", "dependencies": [ "asio", + "expected-lite", "fmt", - "http-parser", + "llhttp", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 0c9b2d4161b0a2..387ac3d9576cc6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7429,7 +7429,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.19", + "baseline": "0.7.0", "port-version": 0 }, "rexo": { diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index a0aafefd646eab..bfae60f4f1b9af 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06ab98765576c8b3d11f5a9a1d4125e0176c482a", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "fa95495106621bad74854c9f376a2c5e1b936f05", "version": "0.6.19", From 4d73751b3428ef49a7ac5d5df696b92e302de993 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:24:14 -0500 Subject: [PATCH 0386/1039] [libaes-siv] New port (#34519) * [ports/libaes-siv] New port * [ports/libaes-siv/CMakeLists.txt] Only include one C file ; use compile flags from their official CMakeLists.txt ; link OpenSSL * Update ports/libaes-siv/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * `./vcpkg x-add-version --all --overwrite-version` * [ports/libaes-siv/CMakeLists.txt] Copy yara port's approach to depending on OpenSSL * [ports/libaes-siv/CMakeLists.txt] Use @ for escaping vars and use https://cmake.org/cmake/help/latest/command/file.html#configure instead of `file(WRITE` following by `configure_file` * Update ports/libaes-siv/CMakeLists.txt Co-authored-by: Kai Pastor * Update ports/libaes-siv/CMakeLists.txt Co-authored-by: Kai Pastor * Update ports/libaes-siv/CMakeLists.txt Co-authored-by: Kai Pastor * ./vcpkg x-add-version libaes-siv --overwrite-version --------- Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Kai Pastor --- ports/libaes-siv/CMakeLists.txt | 74 ++++++++++++++++++++++++++++ ports/libaes-siv/header_rename.patch | 39 +++++++++++++++ ports/libaes-siv/portfile.cmake | 34 +++++++++++++ ports/libaes-siv/usage | 3 ++ ports/libaes-siv/vcpkg.json | 18 +++++++ versions/baseline.json | 4 ++ versions/l-/libaes-siv.json | 9 ++++ 7 files changed, 181 insertions(+) create mode 100644 ports/libaes-siv/CMakeLists.txt create mode 100644 ports/libaes-siv/header_rename.patch create mode 100644 ports/libaes-siv/portfile.cmake create mode 100644 ports/libaes-siv/usage create mode 100644 ports/libaes-siv/vcpkg.json create mode 100644 versions/l-/libaes-siv.json diff --git a/ports/libaes-siv/CMakeLists.txt b/ports/libaes-siv/CMakeLists.txt new file mode 100644 index 00000000000000..0e3f20a159e7dc --- /dev/null +++ b/ports/libaes-siv/CMakeLists.txt @@ -0,0 +1,74 @@ +cmake_minimum_required(VERSION 3.19) +set(no_lib_project_name "aes_siv") +project(libaes-siv LANGUAGES C) +set(PROJECT_VERSION "${VERSION}") + +set(Header_Files "${no_lib_project_name}.h") +set(Source_Files "${no_lib_project_name}.c") + +add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}") + +include(GNUInstallDirs) +target_include_directories( + "${PROJECT_NAME}" + PUBLIC + "$" + "$" + "$" +) +target_compile_features("${PROJECT_NAME}" PRIVATE c_std_99) +set(config_file "${CMAKE_BINARY_DIR}/include/${no_lib_project_name}_config.h") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${config_file}") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -Wstrict-prototypes -Wconversion -Og -ggdb3 -ftree-vectorize") + set(CMAKE_C_FLAGS_RELEASE "-Wall -Wextra -Wstrict-prototypes -Wconversion -O3 -fomit-frame-pointer -funroll-loops -ftree-vectorize -DNDEBUG") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Wstrict-prototypes -Wconversion -ggdb3 -O3 -funroll-loops -ftree-vectorize -DNDEBUG") + set(CMAKE_C_FLAGS_MINSIZEREL "-Wall -Wextra -Wstrict-prototypes -Wconversion -Os -fomit-frame-pointer -ftree-vectorize -DNDEBUG") +endif(CMAKE_C_COMPILER_ID STREQUAL "GNU") + +if(CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL AppleClang) + set(CMAKE_C_FLAGS_DEBUG "-Wall -Wextra -Wstrict-prototypes -Wconversion -O0 -ggdb3 -ftree-vectorize") + set(CMAKE_C_FLAGS_RELEASE "-Wall -Wextra -Wstrict-prototypes -Wconversion -O3 -fomit-frame-pointer -funroll-loops -ftree-vectorize -DNDEBUG") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Wall -Wextra -Wstrict-prototypes -Wconversion -ggdb3 -O3 -funroll-loops -ftree-vectorize -DNDEBUG") + set(CMAKE_C_FLAGS_MINSIZEREL "-Wall -Wextra -Wstrict-prototypes -Wconversion -Os -fomit-frame-pointer -ftree-vectorize -DNDEBUG") +endif(CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL AppleClang) + +find_package(OpenSSL REQUIRED COMPONENTS Crypto) +target_link_libraries("${PROJECT_NAME}" PRIVATE OpenSSL::Crypto) + +install( + 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}" +) +set(cmake_config_file "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}-config.cmake") +file(CONFIGURE + OUTPUT "${cmake_config_file}" + CONTENT [[ +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-@PROJECT_NAME@Targets.cmake") +]] + @ONLY +) + +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 "${cmake_config_file}" "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}") +install(FILES ${Header_Files} "${config_file}" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT "unofficial-${PROJECT_NAME}Config" + FILE "unofficial-${PROJECT_NAME}Targets.cmake" + NAMESPACE "unofficial::${PROJECT_NAME}::" + DESTINATION "share/unofficial-${PROJECT_NAME}") + diff --git a/ports/libaes-siv/header_rename.patch b/ports/libaes-siv/header_rename.patch new file mode 100644 index 00000000000000..db8ba13614ad7d --- /dev/null +++ b/ports/libaes-siv/header_rename.patch @@ -0,0 +1,39 @@ +diff --git a/aes_siv.c b/aes_siv.c +index 00a510d..2b31ed3 100644 +--- a/aes_siv.c ++++ b/aes_siv.c +@@ -5,7 +5,7 @@ + #define _POSIX_C_SOURCE 200112L + #define _ISOC99_SOURCE 1 + +-#include "config.h" ++#include "aes_siv_config.h" + #include "aes_siv.h" + + #include +diff --git a/bench.c b/bench.c +index ea5a29b..61cb485 100644 +--- a/bench.c ++++ b/bench.c +@@ -2,7 +2,7 @@ + * SPDX-License-Identifier: Apache-2.0 + */ + +-#include "config.h" ++#include "aes_siv_config.h" + #include "aes_siv.h" + + #define _POSIX_C_SOURCE 200112L +diff --git a/tests.c b/tests.c +index 996cc58..9ff9637 100644 +--- a/tests.c ++++ b/tests.c +@@ -5,7 +5,7 @@ + #define _POSIX_C_SOURCE 200112L + #define _ISOC99_SOURCE 1 + +-#include "config.h" ++#include "aes_siv_config.h" + #include "aes_siv.h" + + #undef NDEBUG diff --git a/ports/libaes-siv/portfile.cmake b/ports/libaes-siv/portfile.cmake new file mode 100644 index 00000000000000..5b625dae5a3657 --- /dev/null +++ b/ports/libaes-siv/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO dfoxfranke/libaes_siv + REF 9681279cfaa6e6399bb7ca3afbbc27fc2e19df4b + SHA512 96441420339bd11f37f4feff29f9306afa60e5b07ac7e7b879778c0e6964f8f679ffb7c1deca43ca054b7851e4e7bf5fca548dc60c92469fe9d3235cb5a37776 + HEAD_REF master + PATCHES + header_rename.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libaes-siv/usage b/ports/libaes-siv/usage new file mode 100644 index 00000000000000..9d08d6cd603296 --- /dev/null +++ b/ports/libaes-siv/usage @@ -0,0 +1,3 @@ +libaes-siv provides CMake targets: + find_package(unofficial-libaes-siv CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libaes-siv::libaes-siv) diff --git a/ports/libaes-siv/vcpkg.json b/ports/libaes-siv/vcpkg.json new file mode 100644 index 00000000000000..f1dc46551a116f --- /dev/null +++ b/ports/libaes-siv/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libaes-siv", + "version-date": "2020-10-15", + "description": "An RFC5297-compliant C implementation of AES-SIV.", + "homepage": "https://github.com/dfoxfranke/libaes_siv", + "license": "Apache-2.0", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 387ac3d9576cc6..424319bda97ace 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4028,6 +4028,10 @@ "baseline": "1.3.2", "port-version": 1 }, + "libaes-siv": { + "baseline": "2020-10-15", + "port-version": 0 + }, "libaiff": { "baseline": "5.0", "port-version": 9 diff --git a/versions/l-/libaes-siv.json b/versions/l-/libaes-siv.json new file mode 100644 index 00000000000000..253c87361515f4 --- /dev/null +++ b/versions/l-/libaes-siv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ecae087c343539db9225d7a31c076e245925d30b", + "version-date": "2020-10-15", + "port-version": 0 + } + ] +} From ac2a14f35fcd57d7a38f09af75dd5258e96dd6ac Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Thu, 16 Nov 2023 03:13:58 +0000 Subject: [PATCH 0387/1039] [libvpx] Bump to 1.13.1 (#35047) Based on https://github.com/microsoft/vcpkg/pull/34814 by @LilyWangLL but tailored for RustDesk to build on arm64-ios, arm*-linux etc. Signed-off-by: Vasyl Gello --- .../0003-add-uwp-v142-and-v143-support.patch | 27 +++--- ports/libvpx/0005-fix-arm64-build.patch | 13 +++ ports/libvpx/portfile.cmake | 84 ++++++++++++++----- ports/libvpx/vcpkg.json | 7 +- ports/libvpx/vpx.pc.in | 25 +++--- versions/baseline.json | 4 +- versions/l-/libvpx.json | 5 ++ 7 files changed, 112 insertions(+), 53 deletions(-) create mode 100644 ports/libvpx/0005-fix-arm64-build.patch 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 ce323c498fc64f..43cebde3116b35 100644 --- a/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch +++ b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,5 +1,5 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 119d206..41bac75 100644 +index 110f16e..c161d0e 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1038,7 +1038,7 @@ EOF @@ -85,21 +85,19 @@ index 58bb66b..b4cad6c 100644 fi fi diff --git a/configure b/configure -index beea650..91ae3c8 100644 +index ae289f7..78f5fc1 100644 --- a/configure +++ b/configure -@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc" - all_platforms="${all_platforms} arm64-darwin20-gcc" +@@ -103,6 +103,8 @@ all_platforms="${all_platforms} arm64-darwin20-gcc" all_platforms="${all_platforms} arm64-darwin21-gcc" + all_platforms="${all_platforms} arm64-darwin22-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" +all_platforms="${all_platforms} arm64-uwp-vs17" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" -+all_platforms="${all_platforms} arm64-win64-vs16" -+all_platforms="${all_platforms} arm64-win64-vs17" - all_platforms="${all_platforms} armv7-android-gcc" #neon Cortex-A8 - all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 + all_platforms="${all_platforms} arm64-win64-vs16" +@@ -112,6 +114,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 @@ -108,12 +106,7 @@ index beea650..91ae3c8 100644 all_platforms="${all_platforms} armv7-win32-gcc" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" -+all_platforms="${all_platforms} armv7-win32-vs16" -+all_platforms="${all_platforms} armv7-win32-vs17" - all_platforms="${all_platforms} armv7s-darwin-gcc" - all_platforms="${all_platforms} armv8-linux-gcc" - all_platforms="${all_platforms} loongarch32-linux-gcc" -@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc" +@@ -143,6 +147,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" @@ -122,7 +115,7 @@ index beea650..91ae3c8 100644 all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" -@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" +@@ -167,6 +173,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" @@ -131,7 +124,7 @@ index beea650..91ae3c8 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" -@@ -485,11 +497,10 @@ process_targets() { +@@ -491,11 +499,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}" @@ -147,7 +140,7 @@ index beea650..91ae3c8 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}" -@@ -578,6 +589,10 @@ process_detect() { +@@ -584,6 +591,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in diff --git a/ports/libvpx/0005-fix-arm64-build.patch b/ports/libvpx/0005-fix-arm64-build.patch new file mode 100644 index 00000000000000..76c0c8171f7b31 --- /dev/null +++ b/ports/libvpx/0005-fix-arm64-build.patch @@ -0,0 +1,13 @@ +diff --git a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c +index 33753f7..997775a 100644 +--- a/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c ++++ b/vp9/encoder/arm/neon/vp9_diamond_search_sad_neon.c +@@ -220,7 +220,7 @@ int vp9_diamond_search_sad_neon(const MACROBLOCK *x, + // Look up the component cost of the residual motion vector + { + uint32_t cost[4]; +- int16_t __attribute__((aligned(16))) rowcol[8]; ++ DECLARE_ALIGNED(16, int16_t, rowcol[8]); + vst1q_s16(rowcol, v_diff_mv_w); + + // Note: This is a use case for gather instruction diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index e14cd8f9a551ce..30f79431492949 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(LIBVPX_VERSION 1.12.0) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libvpx - REF v${LIBVPX_VERSION} - SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0 + REF "v${VERSION}" + SHA512 49706838563c92fab7334376848d0f374efcbc1729ef511e967c908fd2ecd40e8d197f1d85da6553b3a7026bdbc17e5a76595319858af26ce58cb9a4c3854897 HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch 0003-add-uwp-v142-and-v143-support.patch 0004-remove-library-suffixes.patch + 0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b ) vcpkg_find_acquire_program(PERL) @@ -108,11 +107,11 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) ) if (VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nopost-nomt-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx") else() - set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx") + set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${VERSION}/include/vpx") endif() file( INSTALL @@ -137,6 +136,7 @@ else() set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug") set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}") + set(AS_NASM "--as=nasm") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPTIONS "${OPTIONS} --disable-static --enable-shared") @@ -156,20 +156,58 @@ else() set(LIBVPX_TARGET_ARCH "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(LIBVPX_TARGET_ARCH "x86_64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(LIBVPX_TARGET_ARCH "armv7") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) set(LIBVPX_TARGET_ARCH "arm64") else() message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}") endif() - if(VCPKG_TARGET_IS_MINGW) - if(LIBVPX_TARGET_ARCH STREQUAL "x86") - set(LIBVPX_TARGET "x86-win32-gcc") - else() - set(LIBVPX_TARGET "x86_64-win64-gcc") - endif() - elseif(VCPKG_TARGET_IS_LINUX) + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + + # Set environment variables for configure + if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$") + message(STATUS "Cross-building for ${TARGET_TRIPLET} with ${CMAKE_MATCH_1}") + set(ENV{CROSS} ${CMAKE_MATCH_1}) + unset(AS_NASM) + else() + set(ENV{CC} ${VCPKG_DETECTED_CMAKE_C_COMPILER}) + set(ENV{CXX} ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}) + set(ENV{AR} ${VCPKG_DETECTED_CMAKE_AR}) + set(ENV{LD} ${VCPKG_DETECTED_CMAKE_LINKER}) + set(ENV{RANLIB} ${VCPKG_DETECTED_CMAKE_RANLIB}) + set(ENV{STRIP} ${VCPKG_DETECTED_CMAKE_STRIP}) + endif() + + if(VCPKG_TARGET_IS_MINGW) + if(LIBVPX_TARGET_ARCH STREQUAL "x86") + set(LIBVPX_TARGET "x86-win32-gcc") + else() + set(LIBVPX_TARGET "x86_64-win64-gcc") + endif() + elseif(VCPKG_TARGET_IS_LINUX) set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc") + elseif(VCPKG_TARGET_IS_ANDROID) + set(LIBVPX_TARGET "generic-gnu") + # Settings + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(OPTIONS "${OPTIONS} --disable-sse4_1 --disable-avx --disable-avx2 --disable-avx512") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(OPTIONS "${OPTIONS} --disable-avx --disable-avx2 --disable-avx512") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(OPTIONS "${OPTIONS} --enable-thumb --disable-neon") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(OPTIONS "${OPTIONS} --enable-thumb") + endif() + # Set environment variables for configure + set(ENV{AS} ${VCPKG_DETECTED_CMAKE_C_COMPILER}) + set(ENV{LDFLAGS} "${LDFLAGS} --target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET}") + # Set clang target + set(OPTIONS "${OPTIONS} --extra-cflags=--target=${VCPKG_DETECTED_CMAKE_C_COMPILER_TARGET} --extra-cxxflags=--target=${VCPKG_DETECTED_CMAKE_CXX_COMPILER_TARGET}") + # Unset nasm and let AS do its job + unset(AS_NASM) elseif(VCPKG_TARGET_IS_OSX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(LIBVPX_TARGET "arm64-darwin20-gcc") @@ -179,6 +217,14 @@ else() else() set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS endif() + elseif(VCPKG_TARGET_IS_IOS) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm) + set(LIBVPX_TARGET "armv7-darwin-gcc") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + set(LIBVPX_TARGET "arm64-darwin-gcc") + else() + message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE} on iOS") + endif() else() set(LIBVPX_TARGET "generic-gnu") # use default target endif() @@ -196,14 +242,14 @@ else() ${OPTIONS} ${OPTIONS_RELEASE} ${MAC_OSX_MIN_VERSION_CFLAGS} - --as=nasm + ${AS_NASM} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME configure-${TARGET_TRIPLET}-rel) message(STATUS "Building libvpx for Release") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "make -j8" + ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME build-${TARGET_TRIPLET}-rel ) @@ -230,14 +276,14 @@ else() ${OPTIONS} ${OPTIONS_DEBUG} ${MAC_OSX_MIN_VERSION_CFLAGS} - --as=nasm + ${AS_NASM} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME configure-${TARGET_TRIPLET}-dbg) message(STATUS "Building libvpx for Debug") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "make -j8" + ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME build-${TARGET_TRIPLET}-dbg ) @@ -265,4 +311,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY) -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/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index a2045b4cde9fed..0a11ff7eab8d56 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,11 +1,14 @@ { "name": "libvpx", - "version": "1.12.0", - "port-version": 2, + "version": "1.13.1", "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, { "name": "vcpkg-msbuild", "host": true, diff --git a/ports/libvpx/vpx.pc.in b/ports/libvpx/vpx.pc.in index c01bb2e9beb476..6df64d4b4dbdde 100644 --- a/ports/libvpx/vpx.pc.in +++ b/ports/libvpx/vpx.pc.in @@ -1,13 +1,12 @@ -prefix=@LIBVPX_PREFIX@ -# pkg-config file from libvpx v1.10.0 -exec_prefix=${prefix} -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: vpx -Description: WebM Project VPx codec implementation -Version: @LIBVPX_VERSION@ -Requires: -Conflicts: -Libs: -L"${libdir}" -lvpx -Cflags: -I"${includedir}" +prefix=@LIBVPX_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: vpx +Description: WebM Project VPx codec implementation +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L"${libdir}" -lvpx +Cflags: -I"${includedir}" diff --git a/versions/baseline.json b/versions/baseline.json index 424319bda97ace..69677c5f7e79be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4969,8 +4969,8 @@ "port-version": 2 }, "libvpx": { - "baseline": "1.12.0", - "port-version": 2 + "baseline": "1.13.1", + "port-version": 0 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index c1470a3736ee03..ffe6435098b8be 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1484fb529e99fdedd95f2b46f65738a9e95fcaa1", + "version": "1.13.1", + "port-version": 0 + }, { "git-tree": "255c8c5ca6526bd7a0ac6f3a6a7838c77ee97e5e", "version": "1.12.0", From 9f7d381ec19d92d5b052a3d45caba1bbb4bc6165 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 17 Nov 2023 04:45:05 +0800 Subject: [PATCH 0388/1039] [ode] update to 0.16.4 (#35147) * [ode] update to 0.16.4 * [ode] update to 0.16.4 --- ports/ode/portfile.cmake | 2 +- ports/ode/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/ode.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake index 33712158914468..f8a494cc0d0974 100644 --- a/ports/ode/portfile.cmake +++ b/ports/ode/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO odedevs/ode REF ${VERSION} - SHA512 3ea6245f622c5ca616cc4ae5e9877526c16d9174262fe107867a98b0976284d530ad71a97e5feac1fbfcc780bcd056330f47d3c9eb2bcc66e0696e17d54b93b1 + SHA512 d253bc06bca85ed5af95e92acc57b5a9c4382393365c4a0c852a5872a4061ce1bff875a9121624276a60d74e919fb976c2a2b37864203f6c3bcd2def8af953c6 HEAD_REF master PATCHES ) diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json index cf953d8a213351..d5fafb34782c30 100644 --- a/ports/ode/vcpkg.json +++ b/ports/ode/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ode", - "version": "0.16.3", - "port-version": 1, + "version": "0.16.4", "description": "Open Dynamics Engine", "homepage": "https://bitbucket.org/odedevs/ode/src/master/", "license": "BSD-3-Clause OR LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 69677c5f7e79be..e09a6a99ebaa36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6097,8 +6097,8 @@ "port-version": 0 }, "ode": { - "baseline": "0.16.3", - "port-version": 1 + "baseline": "0.16.4", + "port-version": 0 }, "offscale-libetcd-cpp": { "baseline": "2019-07-10", diff --git a/versions/o-/ode.json b/versions/o-/ode.json index b2d89a2c6c15c4..265bec42832e7b 100644 --- a/versions/o-/ode.json +++ b/versions/o-/ode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46b8d731d701f329ee4dd983ea196bddf1e32545", + "version": "0.16.4", + "port-version": 0 + }, { "git-tree": "a60eef1df499ade4a7442bd3caa8a7e684aedb72", "version": "0.16.3", From bf1c8fef4069078f6e86bf1ffd0d98fe0106704e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wegner?= Date: Thu, 16 Nov 2023 21:48:05 +0100 Subject: [PATCH 0389/1039] [libressl] enable support for uwp and arm. (#35135) --- ports/libressl/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/l-/libressl.json | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 9b04f5ac29f186..27b6ccf3ece978 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,10 +1,9 @@ { "name": "libressl", "version": "3.6.2", - "port-version": 1, + "port-version": 2, "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "license": "ISC", - "supports": "!(uwp | arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index e09a6a99ebaa36..7ab5c5ed121ca8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4710,7 +4710,7 @@ }, "libressl": { "baseline": "3.6.2", - "port-version": 1 + "port-version": 2 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index d2d92f33aa8ab0..293402c9ec22fc 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "213551b173db269dfd275c34a776ab7d093c5012", + "version": "3.6.2", + "port-version": 2 + }, { "git-tree": "ad22d9c62107c65630cd57d97749920a02016095", "version": "3.6.2", From 7085a5eaf2fc38c838a0b962a247251695ff4564 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 17 Nov 2023 04:49:12 +0800 Subject: [PATCH 0390/1039] [nuspell] update to 5.1.4 (#35132) * [nuspell] update to 5.1.4 * [nuspell] update to 5.1.4 --- ports/nuspell/portfile.cmake | 4 ++-- ports/nuspell/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nuspell.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 43b4d4c6ae0a5a..b6649579cc504c 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.2 - SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8 + REF "v${VERSION}" + SHA512 f4119b3fe5944be8f5bc35ccff8d7a93b0f4fa9f129bc97a7b96879a11b5b35bd714b41dd209267417e94c5fed45fd3a74b349f94424f4b90bde07d9694d1d7d HEAD_REF master ) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 68fc8609fb0146..772563cf8ed608 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nuspell", - "version-semver": "5.1.2", - "port-version": 1, + "version-semver": "5.1.4", "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 7ab5c5ed121ca8..5cd190e06b0cf8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6017,8 +6017,8 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.1.2", - "port-version": 1 + "baseline": "5.1.4", + "port-version": 0 }, "nvtt": { "baseline": "2.1.2", diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index 9738f8d1d9a777..5914d4e88322d1 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "060ff508c132af5317809061a91139e6e99f3fda", + "version-semver": "5.1.4", + "port-version": 0 + }, { "git-tree": "a9dfb4c97779fd3bd294df93a76aa309578949c9", "version-semver": "5.1.2", From 272edfa75b7e7f87f4f06a83bcfcec94bb94d7bc Mon Sep 17 00:00:00 2001 From: Javier Peletier Date: Thu, 16 Nov 2023 21:50:03 +0100 Subject: [PATCH 0391/1039] [flecs] update to 3.2.9 (#35122) * [flecs] update to 3.2.9 * [flecs] update version database --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 1255301e1a438a..282daaa04ecfd7 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 0931777bf7b43cd86a882bb3172ee8ce6294495eee010edc08afb33d09440280b46b2453395c69ac023f4f6d8a0600097c4b1797666c9094e1ae394659017853 + SHA512 9573e57432ea6117b59e8dff9470e71ed2283d9ab0a16affbef2c3f73cc8dad3d00243482c9bb34b9ddc936ac2d7941eb35fd68443431fc9feb825d57beae1ba HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 22f8d345848822..24370967a2408b 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.8", + "version": "3.2.9", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 5cd190e06b0cf8..fda5c75b9816a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2661,7 +2661,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.8", + "baseline": "3.2.9", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 8b97502ce90664..e4f24b2d8c2f38 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3e457520cb62f9b06079dc826ef63666ceb132b", + "version": "3.2.9", + "port-version": 0 + }, { "git-tree": "524cb7cfd119c5f71730df87f81208d2dc1c28a2", "version": "3.2.8", From f287c482288ba916c3a479598a301ce471a8c6a1 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 17 Nov 2023 04:53:14 +0800 Subject: [PATCH 0392/1039] [unittest-cpp] Fix build failure on uwp (#35096) * fix build failure under uwp * update version * include * update version * enable test * update version * remove CI --- ports/unittest-cpp/portfile.cmake | 5 +++-- ports/unittest-cpp/vcpkg.json | 2 +- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/u-/unittest-cpp.json | 5 +++++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake index 886e380d7c60ec..654ff2eea710c9 100644 --- a/ports/unittest-cpp/portfile.cmake +++ b/ports/unittest-cpp/portfile.cmake @@ -12,12 +12,13 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUTPP_INCLUDE_TESTS_IN_BUILD=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/UnitTest++) -file(RENAME "${CURRENT_PACKAGES_DIR}/share/unittest-cpp" "${CURRENT_PACKAGES_DIR}/share/unittest++") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/UnitTest++ PACKAGE_NAME unittest++) # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/unittest-cpp/vcpkg.json b/ports/unittest-cpp/vcpkg.json index f9e1024c89f1bc..c80c29e7c2486e 100644 --- a/ports/unittest-cpp/vcpkg.json +++ b/ports/unittest-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unittest-cpp", "version-semver": "2.0.0", - "port-version": 4, + "port-version": 5, "description": "A lightweight unit testing framework for C++", "homepage": "https://github.com/unittest-cpp/unittest-cpp", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 53274de6794274..47c8b4c5239492 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1197,12 +1197,6 @@ tvision:arm-neon-android=fail tvision:arm64-android=fail tvision:x64-android=fail unicorn:x64-windows-static-md=fail -unittest-cpp:arm-neon-android=fail -unittest-cpp:arm64-android=fail -unittest-cpp:arm64-windows=fail -unittest-cpp:arm64-uwp=fail -unittest-cpp:x64-android=fail -unittest-cpp:x64-uwp=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:arm64-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index fda5c75b9816a8..8316d3cd7f92c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8634,7 +8634,7 @@ }, "unittest-cpp": { "baseline": "2.0.0", - "port-version": 4 + "port-version": 5 }, "unixodbc": { "baseline": "2.3.11", diff --git a/versions/u-/unittest-cpp.json b/versions/u-/unittest-cpp.json index d188aa93944181..04f13dc3e75086 100644 --- a/versions/u-/unittest-cpp.json +++ b/versions/u-/unittest-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb7c434ff783ab8c87dfa014eb7142d4ca4727da", + "version-semver": "2.0.0", + "port-version": 5 + }, { "git-tree": "0e2e8b9a3b236e9777fb4a549162c4030c11460b", "version-semver": "2.0.0", From 6fec1e983d5efc1856fe2d0afee3e115b4872e12 Mon Sep 17 00:00:00 2001 From: Julia DeMille <8127111+judemille@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:57:06 -0600 Subject: [PATCH 0393/1039] [geographiclib] Remove unnecessary and broken cross-compile check. (#35030) * [geographiclib] Removed cross-compile check. It is broken, and as far as I can tell, unnecessary. The target is still validated, but whether or not cross-compiling is occuring is not. Related to microsoft#8104. * [geographiclib] Port version bumped. --- ports/geographiclib/portfile.cmake | 1 + ...roken-and-unnecessary-cross-compile-check.patch | 14 ++++++++++++++ ports/geographiclib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/geographiclib.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index a2b1a05608ea97..3071d92c2e52ea 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_sourceforge( REF distrib-C++ FILENAME "GeographicLib-2.3.tar.gz" SHA512 1a1bd0fc2dc3e1372cf22618af3a4340bbc6497f94c64226c97654dfff92a4bf3acf47d91592741fe0c643d401d9721f680bdb4974b8ee258fb09d525fbaec67 + PATCHES remove-broken-and-unnecessary-cross-compile-check.patch ) vcpkg_check_features( diff --git a/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch b/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch new file mode 100644 index 00000000000000..fb634782a812bf --- /dev/null +++ b/ports/geographiclib/remove-broken-and-unnecessary-cross-compile-check.patch @@ -0,0 +1,14 @@ +diff -Naur a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in +--- a/cmake/project-config-version.cmake.in 2023-07-25 07:37:40.000000000 -0500 ++++ b/cmake/project-config-version.cmake.in 2023-11-10 16:58:52.835325073 -0600 +@@ -48,10 +48,6 @@ + # Reject if the user asks for an incompatible precsision. + set (REASON "GEOGRAPHICLIB_PRECISION = @GEOGRAPHICLIB_PRECISION@") + set (PACKAGE_VERSION_UNSUITABLE TRUE) +-elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@") +- # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING}. +- set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") +- set (PACKAGE_VERSION_UNSUITABLE TRUE) + elseif (CMAKE_CROSSCOMPILING AND + NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND + CMAKE_SYSTEM_PROCESSOR STREQUAL "@CMAKE_SYSTEM_PROCESSOR@")) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 82a9b8ec9954ea..d2d5bd5412d014 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geographiclib", "version": "2.3", + "port-version": 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 8316d3cd7f92c1..409fccd4a07d3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2890,7 +2890,7 @@ }, "geographiclib": { "baseline": "2.3", - "port-version": 0 + "port-version": 1 }, "geos": { "baseline": "3.11.2", diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index bc8f5fd94cab13..7c05789fc46608 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d81b3f7975338273ed42ce6544734e24b6c7915a", + "version": "2.3", + "port-version": 1 + }, { "git-tree": "f24840f27f1c858b85e449c3066cec7978c304c6", "version": "2.3", From a536f766ad52d535dc32647d9808c86f167a8739 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Fri, 17 Nov 2023 08:44:05 +0800 Subject: [PATCH 0394/1039] [itay-grudev-singleapplication] Add new port (#35034) * add port. * formatting. * update versioning. * better handling of features. * update version. * fix non-windows builds. * update versions file. * try by adding prefix. * update versions file. * remove features. * remove file. * update versions file. * fixes. * add versions file. --- .../Config.cmake.in | 23 ++++++++++++++ .../portfile.cmake | 31 +++++++++++++++++++ .../itay-grudev-singleapplication/vcpkg.json | 26 ++++++++++++++++ versions/baseline.json | 4 +++ .../i-/itay-grudev-singleapplication.json | 9 ++++++ 5 files changed, 93 insertions(+) create mode 100644 ports/itay-grudev-singleapplication/Config.cmake.in create mode 100644 ports/itay-grudev-singleapplication/portfile.cmake create mode 100644 ports/itay-grudev-singleapplication/vcpkg.json create mode 100644 versions/i-/itay-grudev-singleapplication.json diff --git a/ports/itay-grudev-singleapplication/Config.cmake.in b/ports/itay-grudev-singleapplication/Config.cmake.in new file mode 100644 index 00000000000000..05d1dd9d7fb256 --- /dev/null +++ b/ports/itay-grudev-singleapplication/Config.cmake.in @@ -0,0 +1,23 @@ +if(NOT TARGET itay-grudev-singleapplication) + add_library(itay-grudev-singleapplication UNKNOWN IMPORTED) + + set_target_properties(itay-grudev-singleapplication PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + ) + + find_library(SingleApplication_LIBRARY_RELEASE NAMES SingleApplication PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + if(EXISTS "${SingleApplication_LIBRARY_RELEASE}") + set_property(TARGET itay-grudev-singleapplication APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(itay-grudev-singleapplication PROPERTIES IMPORTED_LOCATION_RELEASE "${SingleApplication_LIBRARY_RELEASE}") + endif() + + find_library(SingleApplication_LIBRARY_DEBUG NAMES SingleApplication PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + if(EXISTS "${SingleApplication_LIBRARY_DEBUG}") + set_property(TARGET itay-grudev-singleapplication APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(itay-grudev-singleapplication PROPERTIES IMPORTED_LOCATION_DEBUG "${SingleApplication_LIBRARY_DEBUG}") + endif() + + set_target_properties(itay-grudev-singleapplication PROPERTIES + INTERFACE_COMPILE_DEFINITIONS QAPPLICATION_CLASS=@QAPPLICATION_CLASS@ + ) +endif() \ No newline at end of file diff --git a/ports/itay-grudev-singleapplication/portfile.cmake b/ports/itay-grudev-singleapplication/portfile.cmake new file mode 100644 index 00000000000000..67d688fcb47342 --- /dev/null +++ b/ports/itay-grudev-singleapplication/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO itay-grudev/SingleApplication + REF "v${VERSION}" + SHA512 9a63dcbfd4c80626093b23df0ee97d704b494d928b76b81e0373a0a847e73a0c4fd6557e338221c473412394c4ab3456d90e1e5c7894112b08ce7f11c9e66e58 + HEAD_REF master +) + +set(QAPPLICATION_CLASS QGuiApplication) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DQT_DEFAULT_MAJOR_VERSION=6 + -DQAPPLICATION_CLASS=${QAPPLICATION_CLASS} +) + +vcpkg_cmake_build(TARGET SingleApplication) + +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}SingleApplication${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}SingleApplication${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() +file(INSTALL "${SOURCE_PATH}/singleapplication.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" @ONLY) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/itay-grudev-singleapplication/vcpkg.json b/ports/itay-grudev-singleapplication/vcpkg.json new file mode 100644 index 00000000000000..a864cddb23b48c --- /dev/null +++ b/ports/itay-grudev-singleapplication/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "itay-grudev-singleapplication", + "version": "3.5.1", + "description": "Replacement of QtSingleApplication for Qt 5 and Qt 6 with support for inter-instance communication", + "homepage": "https://github.com/itay-grudev/SingleApplication", + "license": "MIT", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network", + "widgets" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 409fccd4a07d3f..4098d7c31591bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3576,6 +3576,10 @@ "baseline": "1.13.7", "port-version": 0 }, + "itay-grudev-singleapplication": { + "baseline": "3.5.1", + "port-version": 0 + }, "itk": { "baseline": "5.3rc02", "port-version": 0 diff --git a/versions/i-/itay-grudev-singleapplication.json b/versions/i-/itay-grudev-singleapplication.json new file mode 100644 index 00000000000000..7173a60c15102f --- /dev/null +++ b/versions/i-/itay-grudev-singleapplication.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7b08f908fc4c8f97f323dc6ebbc1562483fded0e", + "version": "3.5.1", + "port-version": 0 + } + ] +} From b4f39984b95d63725a9d8e6892d348279f56663b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 17 Nov 2023 08:45:52 +0800 Subject: [PATCH 0395/1039] [jsonifier] Remove duplicate header files (#35097) --- ports/jsonifier/portfile.cmake | 6 ++++-- ports/jsonifier/uninstall-head.patch | 13 +++++++++++++ ports/jsonifier/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/j-/jsonifier.json | 5 +++++ 5 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 ports/jsonifier/uninstall-head.patch diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 55ef21df964c0f..777b29f5c04547 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -4,14 +4,16 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 e2611b116cd6d73426b32fea11b3b52527466e7e59d8e8c842ccca9dac2b42679457d7ad77e11512c15fb319e650c74bbee0dce3ae7d24c127b756790eebf020 HEAD_REF main + PATCHES + uninstall-head.patch ) +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.md") diff --git a/ports/jsonifier/uninstall-head.patch b/ports/jsonifier/uninstall-head.patch new file mode 100644 index 00000000000000..f00fc12b7b4ad8 --- /dev/null +++ b/ports/jsonifier/uninstall-head.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc4ed65..23a9738 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,7 +63,7 @@ set_target_properties( + OUTPUT_NAME "jsonifier" + CXX_STANDARD_REQUIRED ON + CXX_EXTENSIONS OFF +- PUBLIC_HEADER "${HEADERS}" ++ #PUBLIC_HEADER "${HEADERS}" + ) + + target_include_directories( diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index d976f62cbc560e..3776d434b89e0a 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jsonifier", "version": "0.9.91", + "port-version": 1, "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", @@ -9,10 +10,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4098d7c31591bd..90e89dd8edb82d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "jsonifier": { "baseline": "0.9.91", - "port-version": 0 + "port-version": 1 }, "jsonnet": { "baseline": "0.20.0", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 923e5f2614c11c..0d75479c467e2d 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be9213f10f70e56d8f7fad547c9691558f9babc9", + "version": "0.9.91", + "port-version": 1 + }, { "git-tree": "b8901c8d3fee5951e101c1b8a3b64de58c6ebeed", "version": "0.9.91", From 42f810ba2697aed1e24175b61f5e8eacf245fc3b Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Fri, 17 Nov 2023 08:49:36 +0800 Subject: [PATCH 0396/1039] [wintoast] Update to 1.3.0 (#34999) * update port version. * done. * Fix port build. * update version. * resolve some comments. * fix versions. * add cmake config file. * update versions file. * use unofficial namespace. * fix debug-only and release-only builds. * update versions file. * update versions. --- ports/wintoast/CMakeLists.txt | 25 ------------------------- ports/wintoast/Config.cmake.in | 19 +++++++++++++++++++ ports/wintoast/portfile.cmake | 27 ++++++++++++++++----------- ports/wintoast/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wintoast.json | 5 +++++ 6 files changed, 43 insertions(+), 40 deletions(-) delete mode 100644 ports/wintoast/CMakeLists.txt create mode 100644 ports/wintoast/Config.cmake.in diff --git a/ports/wintoast/CMakeLists.txt b/ports/wintoast/CMakeLists.txt deleted file mode 100644 index eb70fb9cfb4fe5..00000000000000 --- a/ports/wintoast/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -cmake_minimum_required(VERSION 3.11) -project(wintoast) - -set(SRC_FILES -src/wintoastlib.cpp -) - -add_library(wintoast ${SRC_FILES}) - -target_include_directories(wintoast PUBLIC - $ - $ -) - -# Install targets -install(TARGETS wintoast - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -# Install headers -if (INSTALL_HEADERS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/wintoastlib.h DESTINATION include/wintoast) -endif() \ No newline at end of file diff --git a/ports/wintoast/Config.cmake.in b/ports/wintoast/Config.cmake.in new file mode 100644 index 00000000000000..575d76b5b12e39 --- /dev/null +++ b/ports/wintoast/Config.cmake.in @@ -0,0 +1,19 @@ +if(NOT TARGET unofficial::wintoast::wintoast) + add_library(unofficial::wintoast::wintoast UNKNOWN IMPORTED) + + set_target_properties(unofficial::wintoast::wintoast PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + ) + + find_library(WinToast_LIBRARY_RELEASE NAMES WinToast PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + if(EXISTS "${WinToast_LIBRARY_RELEASE}") + set_property(TARGET unofficial::wintoast::wintoast APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::wintoast::wintoast PROPERTIES IMPORTED_LOCATION_RELEASE "${WinToast_LIBRARY_RELEASE}") + endif() + + find_library(WinToast_LIBRARY_DEBUG NAMES WinToast PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + if(EXISTS "${WinToast_LIBRARY_DEBUG}") + set_property(TARGET unofficial::wintoast::wintoast APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::wintoast::wintoast PROPERTIES IMPORTED_LOCATION_DEBUG "${WinToast_LIBRARY_DEBUG}") + endif() +endif() \ No newline at end of file diff --git a/ports/wintoast/portfile.cmake b/ports/wintoast/portfile.cmake index 3cbb33b65e8a9b..ea6c0d5d0679dd 100644 --- a/ports/wintoast/portfile.cmake +++ b/ports/wintoast/portfile.cmake @@ -3,23 +3,28 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mohabouje/WinToast - REF v1.2.0 - SHA512 d8bd44439100772929eb8a4eb4aebfd66fa54562c838eb4c081a382dc1d73c545faa6d9675e320864d9b533e4a0c4a673e44058c7f643ccd56ec90830cdfaf45 + REF "v${VERSION}" + SHA512 b9e34595049851754dafe506681af494f59edf94a4324c20aaeadea25b9ed0abac87e93384d2080c327dbbdd22441800e9af7c5ce6728d7cc1464796a83cffbd HEAD_REF master ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_RELEASE -DINSTALL_HEADERS=ON - OPTIONS_DEBUG -DINSTALL_HEADERS=OFF - + OPTIONS + -DWINTOASTLIB_BUILD_EXAMPLES=OFF + -DWINTOASTLIB_QT_ENABLED=OFF ) -vcpkg_cmake_install() +vcpkg_cmake_build(TARGET WinToast) + +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}WinToast${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}WinToast${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() +file(INSTALL "${SOURCE_PATH}/include/wintoastlib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) -# Install license -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") \ No newline at end of file diff --git a/ports/wintoast/vcpkg.json b/ports/wintoast/vcpkg.json index b96aa95b300586..aa7d817e31ab9f 100644 --- a/ports/wintoast/vcpkg.json +++ b/ports/wintoast/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wintoast", - "version": "1.2.0", - "port-version": 2, + "version": "1.3.0", "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.", "supports": "windows & !uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 90e89dd8edb82d..d63cb4d05b7326 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9025,8 +9025,8 @@ "port-version": 0 }, "wintoast": { - "baseline": "1.2.0", - "port-version": 2 + "baseline": "1.3.0", + "port-version": 0 }, "wmipp": { "baseline": "1.2.0", diff --git a/versions/w-/wintoast.json b/versions/w-/wintoast.json index b61765e3e8ff0d..6ce73985a21b9b 100644 --- a/versions/w-/wintoast.json +++ b/versions/w-/wintoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0c791ec550f242764df15235770a4767c4e917a", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "7e0b224e777c1a12676204204a97636e3639c4c1", "version": "1.2.0", From 939eaca4969825d5ccd06ec64f7541864c96a606 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 17 Nov 2023 08:52:43 +0800 Subject: [PATCH 0397/1039] [mongo-cxx-driver] update to 3.9.0 (#34994) * update to 3.9.0 * update version * update libbson * update version * Fix static compilation issue * update version * patch * update version * patch * update version --- ports/libbson/fix-include-directory.patch | 30 ++----- ports/libbson/portfile.cmake | 10 ++- ports/libbson/vcpkg.json | 2 +- .../disable-dynamic-when-static.patch | 63 ++++++------- ports/mongo-c-driver/fix-dependencies.patch | 89 +++++++++---------- .../fix-include-directory.patch | 24 +---- ports/mongo-c-driver/fix-mingw.patch | 59 +++++------- ports/mongo-c-driver/pkgconfig.patch | 36 -------- ports/mongo-c-driver/portfile.cmake | 7 +- ports/mongo-c-driver/vcpkg.json | 2 +- ports/mongo-cxx-driver/fix-dependencies.patch | 55 +++++++++--- ports/mongo-cxx-driver/portfile.cmake | 8 +- ports/mongo-cxx-driver/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/l-/libbson.json | 5 ++ versions/m-/mongo-c-driver.json | 5 ++ versions/m-/mongo-cxx-driver.json | 5 ++ 17 files changed, 174 insertions(+), 234 deletions(-) delete mode 100644 ports/mongo-c-driver/pkgconfig.patch diff --git a/ports/libbson/fix-include-directory.patch b/ports/libbson/fix-include-directory.patch index 02a35320dcbb91..398644f90ccdab 100644 --- a/ports/libbson/fix-include-directory.patch +++ b/ports/libbson/fix-include-directory.patch @@ -1,33 +1,13 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 88de79a..c3cfd7e 100644 +index e3eaca4..ef3644b 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -347,7 +347,7 @@ if (ENABLE_EXAMPLES) - endif () # ENABLE_EXAMPLES +@@ -302,7 +302,7 @@ endif () # ENABLE_EXAMPLES + # 8888888 888 888 88888P' "Y888 "Y888888 888 888 set (BSON_HEADER_INSTALL_DIR - "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}" + "${CMAKE_INSTALL_INCLUDEDIR}" ) - - if (MONGOC_ENABLE_STATIC_INSTALL) -diff --git a/src/libbson/src/libbson-1.0.pc.in b/src/libbson/src/libbson-1.0.pc.in -index b65abbc..33346f3 100644 ---- a/src/libbson/src/libbson-1.0.pc.in -+++ b/src/libbson/src/libbson-1.0.pc.in -@@ -7,4 +7,4 @@ Name: libbson - Description: The libbson BSON serialization library. - Version: @VERSION@ - Libs: -L${libdir} -lbson-@BSON_API_VERSION@ --Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -+Cflags: -I${includedir} -diff --git a/src/libbson/src/libbson-static-1.0.pc.in b/src/libbson/src/libbson-static-1.0.pc.in -index 6ee58d0..e03a95b 100644 ---- a/src/libbson/src/libbson-static-1.0.pc.in -+++ b/src/libbson/src/libbson-static-1.0.pc.in -@@ -7,4 +7,4 @@ Name: libbson static archive - Description: The libbson BSON serialization library. - Version: @VERSION@ - Libs: -L${libdir} -lbson-static-@BSON_API_VERSION@ @LIBBSON_LIBRARIES@ --Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -DBSON_STATIC -+Cflags: -I${includedir} -DBSON_STATIC + function(install_export_target target) + # Tell pkg-config where the headers are going: diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 38341d152ec0a6..cc936f85419ce3 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,19 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 + SHA512 e0f15a8a45ff156136251f1a0e5d0cc2b0253ba9dbf062a6eaef73e02c3b7999d3af31a9eb2ebf2c141e5b2367e356b3ea56b8eb083a5097d88f81bbc4f0be23 HEAD_REF master PATCHES - disable-dynamic-when-static.patch fix-include-directory.patch # vcpkg legacy decision - fix-missing-header.patch # for building mongo-c-driver ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") # Cannot use string(COMPARE EQUAL ...) set(ENABLE_STATIC OFF) +set(ENABLE_SHARED OFF) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ENABLE_STATIC ON) +else() + set(ENABLE_SHARED ON) endif() vcpkg_cmake_configure( @@ -33,10 +34,13 @@ vcpkg_cmake_configure( -DENABLE_SRV=OFF -DENABLE_SSL=OFF -DENABLE_STATIC=${ENABLE_STATIC} + -DENABLE_SHARED=${ENABLE_SHARED} -DENABLE_TESTS=OFF -DENABLE_UNINSTALL=OFF -DENABLE_ZLIB=SYSTEM -DENABLE_ZSTD=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_ICU ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index ba4d23c8a9676c..452f0dc41ebdb0 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libbson", - "version": "1.24.3", + "version": "1.25.1", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/mongo-c-driver/disable-dynamic-when-static.patch b/ports/mongo-c-driver/disable-dynamic-when-static.patch index 4404dfcad42cf3..e40742cdb237be 100644 --- a/ports/mongo-c-driver/disable-dynamic-when-static.patch +++ b/ports/mongo-c-driver/disable-dynamic-when-static.patch @@ -1,37 +1,38 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index bf95bd0c1..c9900b7fa 100644 +index 61cae9c..5f553c5 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -745,6 +745,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) +@@ -812,6 +812,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") endif () - + +if (NOT MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) - target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -786,7 +787,7 @@ target_include_directories ( - set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) - set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") - + if(WIN32) + # Add resource-definition script for Windows shared library (.dll). +@@ -865,7 +866,7 @@ set_target_properties (mongoc_shared PROPERTIES + ) + mongo_generate_pkg_config(mongoc_shared INSTALL RENAME libmongoc-${MONGOC_API_VERSION}.pc) + -if (MONGOC_ENABLE_STATIC_BUILD) +else() add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - if(ENABLE_COVERAGE) - target_compile_options(mongoc_static PRIVATE --coverage) -@@ -840,7 +841,11 @@ if (ENABLE_APPLE_FRAMEWORK) + target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES} mongo::detail::c_dependencies) + if (NOT WIN32 AND ENABLE_PIC) +@@ -934,7 +935,11 @@ if (ENABLE_APPLE_FRAMEWORK) endif () - + add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) +-target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +if (NOT MONGOC_ENABLE_STATIC_BUILD) - target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) ++ target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +else() -+target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) ++ target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) +endif() - + # mongoc-stat works if shared memory performance counters are enabled. if (ENABLE_SHM_COUNTERS) -@@ -1161,7 +1166,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} +@@ -1244,7 +1249,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) if (MONGOC_ENABLE_STATIC_INSTALL) @@ -40,33 +41,19 @@ index bf95bd0c1..c9900b7fa 100644 else () set (TARGETS_TO_INSTALL mongoc_shared) endif () -@@ -1226,10 +1231,12 @@ configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-1.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc - @ONLY) +@@ -1299,6 +1304,7 @@ endif() + # Relative include-path will be given the install prefix: + set_property(TARGET ${TARGETS_TO_INSTALL} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${MONGOC_HEADER_INSTALL_DIR}") + +if(NOT MONGOC_ENABLE_STATIC_INSTALL) - install ( - FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -+endif() - if (MONGOC_ENABLE_STATIC_INSTALL) - configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-static-1.0.pc.in -@@ -1239,7 +1246,7 @@ if (MONGOC_ENABLE_STATIC_INSTALL) - FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-static-1.0.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) --endif () -+else() # Deprecated alias for libmongoc-1.0.pc, see CDRIVER-2086. if (MONGOC_ENABLE_SSL) configure_file ( -@@ -1251,6 +1258,7 @@ if (MONGOC_ENABLE_SSL) +@@ -1310,6 +1316,7 @@ if (MONGOC_ENABLE_SSL) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) endif () -+endif() ++endif () include (CMakePackageConfigHelpers) - set (INCLUDE_INSTALL_DIRS "${MONGOC_HEADER_INSTALL_DIR}") + diff --git a/ports/mongo-c-driver/fix-dependencies.patch b/ports/mongo-c-driver/fix-dependencies.patch index 90c9585c559a48..2cb09d59132c22 100644 --- a/ports/mongo-c-driver/fix-dependencies.patch +++ b/ports/mongo-c-driver/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71c13fd..8464824 100644 +index 1fe4c76..96be699 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -205,11 +205,9 @@ if (ENABLE_BSON STREQUAL SYSTEM) +@@ -347,11 +347,9 @@ if (USE_SYSTEM_LIBBSON) set (USING_SYSTEM_BSON TRUE) if (NOT TARGET mongo::bson_shared) @@ -14,11 +14,39 @@ index 71c13fd..8464824 100644 endif () set (BSON_STATIC_LIBRARIES mongo::bson_static) endif () +diff --git a/build/cmake/libmongoc-1.0-config.cmake.in b/build/cmake/libmongoc-1.0-config.cmake.in +index a068408..d0aeadd 100644 +--- a/build/cmake/libmongoc-1.0-config.cmake.in ++++ b/build/cmake/libmongoc-1.0-config.cmake.in +@@ -24,6 +24,9 @@ set (MONGOC_VERSION_FULL @libmongoc_VERSION_FULL@) + + include(CMakeFindDependencyMacro) + find_dependency (mongoc-1.0) ++if("@ENABLE_SNAPPY@" STREQUAL "ON") ++ find_dependency(Snappy CONFIG) ++endif() + + set(MONGOC_LIBRARY mongo::mongoc_shared) + set(MONGOC_LIBRARIES mongo::mongoc_shared) +diff --git a/build/cmake/libmongoc-static-1.0-config.cmake.in b/build/cmake/libmongoc-static-1.0-config.cmake.in +index bec3163..a32d5f3 100644 +--- a/build/cmake/libmongoc-static-1.0-config.cmake.in ++++ b/build/cmake/libmongoc-static-1.0-config.cmake.in +@@ -24,6 +24,9 @@ set (MONGOC_STATIC_VERSION_FULL @libmongoc_VERSION_FULL@) + + include(CMakeFindDependencyMacro) + find_dependency (mongoc-1.0) ++if("@ENABLE_SNAPPY@" STREQUAL "ON") ++ find_dependency(Snappy CONFIG) ++endif() + + set(MONGOC_STATIC_LIBRARY mongo::mongoc_static) + set(MONGOC_STATIC_LIBRARIES mongo::mongoc_static) diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index d108e5d..a097016 100644 +index 5f553c5..4675313 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -51,7 +51,7 @@ configure_file ( +@@ -50,7 +50,7 @@ endif () set (ZLIB_INCLUDE_DIRS "") if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") message (STATUS "Searching for zlib CMake packages") @@ -27,16 +55,7 @@ index d108e5d..a097016 100644 if (ZLIB_FOUND) message (STATUS " zlib found version \"${ZLIB_VERSION_STRING}\"") message (STATUS " zlib include path \"${ZLIB_INCLUDE_DIRS}\"") -@@ -146,7 +146,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) - if (ENABLE_SSL STREQUAL "OPENSSL" - OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) - # Sets OPENSSL_FOUND on success. -- include (FindOpenSSL) -+ find_package(OpenSSL REQUIRED) - endif () - - if (ENABLE_SSL STREQUAL LIBRESSL) -@@ -364,10 +364,10 @@ else () +@@ -468,10 +468,10 @@ else () endif () # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS. @@ -49,45 +68,17 @@ index d108e5d..a097016 100644 - include_directories ("${SNAPPY_INCLUDE_DIRS}") endif () - set (MONGOC_ENABLE_SHM_COUNTERS 0) -diff --git a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -index feeca02..1ec92ae 100644 ---- a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -+++ b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -@@ -19,6 +19,10 @@ set (MONGOC_MINOR_VERSION @MONGOC_MINOR_VERSION@) - set (MONGOC_MICRO_VERSION @MONGOC_MICRO_VERSION@) - set (MONGOC_VERSION @MONGOC_VERSION@) - -+include(CMakeFindDependencyMacro) -+if("@ENABLE_SNAPPY@" STREQUAL "ON") -+ find_dependency(Snappy CONFIG) -+endif() - find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) - - @PACKAGE_INIT@ -diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -index 6f05b0c..0e388e6 100644 ---- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -+++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -@@ -19,6 +19,10 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@) - set (MONGOC_STATIC_MICRO_VERSION @MONGOC_MICRO_VERSION@) - set (MONGOC_STATIC_VERSION @MONGOC_VERSION@) - -+include(CMakeFindDependencyMacro) -+if("@ENABLE_SNAPPY@" STREQUAL "ON") -+ find_dependency(Snappy CONFIG) -+endif() - find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) - - @PACKAGE_INIT@ + mongo_bool01 (MONGOC_ENABLE_SHM_COUNTERS ENABLE_SHM_COUNTERS) diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake -index 7fe7cf4..12611a3 100644 +index 31e6cbc..365fb5b 100644 --- a/src/libmongoc/src/mongoc-config.cmake +++ b/src/libmongoc/src/mongoc-config.cmake -@@ -1,3 +1,6 @@ +@@ -1,5 +1,8 @@ include(CMakeFindDependencyMacro) + find_dependency(bson-1.0 @libmongoc_VERSION@) +if("@ENABLE_SNAPPY@" STREQUAL "ON") + find_dependency(Snappy CONFIG) +endif() - find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@) - include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") + + # If we need to import a TLS package for our imported targets, do that now: + set(MONGOC_TLS_BACKEND [[@TLS_BACKEND@]]) diff --git a/ports/mongo-c-driver/fix-include-directory.patch b/ports/mongo-c-driver/fix-include-directory.patch index 411604fe36f129..965f1d17a2f5ea 100644 --- a/ports/mongo-c-driver/fix-include-directory.patch +++ b/ports/mongo-c-driver/fix-include-directory.patch @@ -1,8 +1,8 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 86f59ae..d108e5d 100644 +index 4675313..847e073 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -1172,7 +1172,7 @@ else () +@@ -1255,7 +1255,7 @@ else () endif () set (MONGOC_HEADER_INSTALL_DIR @@ -11,23 +11,3 @@ index 86f59ae..d108e5d 100644 ) install ( -diff --git a/src/libmongoc/src/libmongoc-1.0.pc.in b/src/libmongoc/src/libmongoc-1.0.pc.in -index 1b489d8..991603e 100644 ---- a/src/libmongoc/src/libmongoc-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-1.0.pc.in -@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library. - Version: @VERSION@ - Requires: libbson-1.0 - Libs: -L${libdir} -lmongoc-1.0 --Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -+Cflags: -I${includedir} -diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in -index d59ee64..c23bb62 100644 ---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in -@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library. - Version: @VERSION@ - Requires: libbson-static-1.0 - Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@ --Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -DMONGOC_STATIC -+Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC diff --git a/ports/mongo-c-driver/fix-mingw.patch b/ports/mongo-c-driver/fix-mingw.patch index 2695cea12af271..4ff5c8658e4870 100644 --- a/ports/mongo-c-driver/fix-mingw.patch +++ b/ports/mongo-c-driver/fix-mingw.patch @@ -1,55 +1,42 @@ -diff --git a/build/cmake/FindResSearch.cmake b/build/cmake/FindResSearch.cmake -index fcd791b..346f715 100644 ---- a/build/cmake/FindResSearch.cmake -+++ b/build/cmake/FindResSearch.cmake -@@ -2,7 +2,7 @@ include (CheckSymbolExists) - - if (ENABLE_SRV STREQUAL ON OR ENABLE_SRV STREQUAL AUTO) - if (WIN32) -- set (RESOLV_LIBRARIES Dnsapi) -+ set (RESOLV_LIBRARIES dnsapi) - set (MONGOC_HAVE_DNSAPI 1) - set (MONGOC_HAVE_RES_NSEARCH 0) - set (MONGOC_HAVE_RES_NDESTROY 0) diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 2e1f854..95e6b6b 100644 +index 847e073..5338bea 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -688,7 +688,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-secure-channel.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-secure-channel.c - ) -- set (SSL_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib) -+ set (SSL_LIBRARIES secur32.lib crypt32.lib bcrypt.lib) - elseif (LIBRESSL) - message (STATUS "Compiling against LibreSSL") - set (SOURCES ${SOURCES} -@@ -714,7 +714,7 @@ if (MONGOC_ENABLE_SASL) - message (STATUS "Compiling against Windows SSPI") - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cluster-sspi.c) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-sspi.c) -- set (SASL_LIBRARIES secur32.lib crypt32.lib Shlwapi.lib) -+ set (SASL_LIBRARIES secur32.lib crypt32.lib shlwapi.lib) - endif () - else () - message (STATUS "SASL disabled") +@@ -189,7 +189,7 @@ endfunction() + # Per-backend link libs/options: + set(SecureTransport/LINK_LIBRARIES "-framework CoreFoundation" "-framework Security") + set(SecureTransport/pkg_config_LIBS -framework Corefoundation -framework Security) +-set(SecureChannel/LINK_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib) ++set(SecureChannel/LINK_LIBRARIES secur32.lib crypt32.lib bcrypt.lib) + set(SecureChannel/pkg_config_LIBS ${SecureChannel/LINK_LIBRARIES}) + set(LibreSSL/LINK_LIBRARIES LibreSSL::TLS LibreSSL::Crypto) + set(LibreSSL/pkg_config_LIBS -ltls -lcrypto) +@@ -340,7 +340,7 @@ function(_use_sasl libname) + target_link_libraries(_mongoc-dependencies INTERFACE _mongoc-sasl_backend) + install(TARGETS _mongoc-sasl_backend EXPORT mongoc-targets) + if(libname STREQUAL "SSPI") +- target_link_libraries(_mongoc-sasl_backend INTERFACE secur32.lib crypt32.lib Shlwapi.lib) ++ target_link_libraries(_mongoc-sasl_backend INTERFACE secur32.lib crypt32.lib shlwapi.lib) + set(backend "SSPI") + elseif(libname STREQUAL "CYRUS") + find_package(SASL2 2.0 REQUIRED) diff --git a/src/libmongoc/src/mongoc/mongoc-client.c b/src/libmongoc/src/mongoc/mongoc-client.c -index 457c841..7b6d585 100644 +index 15517e6..00cd017 100644 --- a/src/libmongoc/src/mongoc/mongoc-client.c +++ b/src/libmongoc/src/mongoc/mongoc-client.c -@@ -19,8 +19,8 @@ +@@ -18,8 +18,8 @@ #include "mongoc-config.h" #ifdef MONGOC_HAVE_DNSAPI /* for DnsQuery_UTF8 */ -#include -#include +#include -+#include ++#include #include #else #if defined(MONGOC_HAVE_RES_NSEARCH) || defined(MONGOC_HAVE_RES_SEARCH) diff --git a/src/libmongoc/src/mongoc/mongoc-socket.c b/src/libmongoc/src/mongoc/mongoc-socket.c -index e085adb..592bc89 100644 +index a77d805..15d39b4 100644 --- a/src/libmongoc/src/mongoc/mongoc-socket.c +++ b/src/libmongoc/src/mongoc/mongoc-socket.c @@ -25,7 +25,7 @@ diff --git a/ports/mongo-c-driver/pkgconfig.patch b/ports/mongo-c-driver/pkgconfig.patch deleted file mode 100644 index 65a94c20bc8834..00000000000000 --- a/ports/mongo-c-driver/pkgconfig.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 1b32e6c..2e1f854 100644 ---- a/src/libmongoc/CMakeLists.txt -+++ b/src/libmongoc/CMakeLists.txt -@@ -1207,6 +1207,22 @@ set (VERSION "${MONGOC_VERSION}") - set (prefix "${CMAKE_INSTALL_PREFIX}") - set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - -+set(MONGOC_REQUIRES_PRIVATE zlib) -+set(ZLIB_LIBRARIES "") -+if(ENABLE_SSL STREQUAL "OPENSSL") -+ string(APPEND MONGOC_REQUIRES_PRIVATE " openssl") -+ set(SSL_LIBRARIES "") -+endif() -+if(ENABLE_ICU) -+ string(APPEND MONGOC_REQUIRES_PRIVATE " icu-uc") -+ set(ICU_LIBRARIES "") -+endif() -+if(ENABLE_SNAPPY) -+ set(SNAPPY_LIBRARIES "-lsnappy") -+ if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+ string(APPEND SNAPPY_LIBRARIES "d") -+ endif() -+endif() - foreach ( - FLAG - ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} -diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in -index c23bb62..7b38f0a 100644 ---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in -@@ -9,3 +9,4 @@ Version: @VERSION@ - Requires: libbson-static-1.0 - Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@ - Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC -+Requires.private: @MONGOC_REQUIRES_PRIVATE@ diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index f04c6575adb457..5f87c1aa7bb7cb 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 + SHA512 e0f15a8a45ff156136251f1a0e5d0cc2b0253ba9dbf062a6eaef73e02c3b7999d3af31a9eb2ebf2c141e5b2367e356b3ea56b8eb083a5097d88f81bbc4f0be23 HEAD_REF master PATCHES disable-dynamic-when-static.patch - fix-include-directory.patch # vcpkg legacy decision fix-dependencies.patch + fix-include-directory.patch fix-mingw.patch - pkgconfig.patch ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") @@ -56,6 +55,8 @@ vcpkg_cmake_configure( -DENABLE_UNINSTALL=OFF -DENABLE_ZLIB=SYSTEM -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH + MAYBE_UNUSED_VARIABLES + ENABLE_ICU ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index ef533e5213f55c..e22eb9e88ee0e0 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.24.3", + "version": "1.25.1", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/ports/mongo-cxx-driver/fix-dependencies.patch b/ports/mongo-cxx-driver/fix-dependencies.patch index 215a31a05625b7..8d94b5a7f98122 100644 --- a/ports/mongo-cxx-driver/fix-dependencies.patch +++ b/ports/mongo-cxx-driver/fix-dependencies.patch @@ -1,14 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1b60bd..78c6907 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,7 +100,6 @@ if(NEED_DOWNLOAD_C_DRIVER) + set(BUILD_TESTING OFF) + string(REPLACE " -Werror" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -Werror" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") +- add_subdirectory(${mongo-c-driver_SOURCE_DIR} ${mongo-c-driver_BINARY_DIR}) + set(CMAKE_CXX_FLAGS ${OLD_CMAKE_CXX_FLAGS}) + set(CMAKE_C_FLAGS ${OLD_CMAKE_C_FLAGS}) + set(ENABLE_TESTS ${OLD_ENABLE_TESTS}) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index f30aea836..50610ffb1 100644 +index 1e241f5..adf9a27 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt -@@ -215,6 +215,9 @@ if(BSONCXX_BUILD_STATIC) - bsoncxx_install_deprecated_cmake(bsoncxx-static) - list(APPEND bsoncxx_target_list bsoncxx_static) - set(bsoncxx_pkg_dep "find_dependency(bson-1.0 REQUIRED)") -+ if(BSONCXX_POLY_USE_BOOST) -+ string(APPEND bsoncxx_pkg_dep "\nfind_dependency(Boost)") -+ endif() - endif() - if(BSONCXX_POLY_USE_BOOST) - set(bsoncxx_boost_pkg_dep "find_dependency(Boost 1.56.0 REQUIRED)") +@@ -105,7 +105,7 @@ else() + else() + # Require package of old libbson name (with lib). + if(NOT BSONCXX_LINK_WITH_STATIC_MONGOC) +- find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} REQUIRED) ++ find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} REQUIRED) + message(STATUS "found libbson version ${BSON_VERSION}") + set(libbson_target ${BSON_LIBRARIES}) + set(libbson_include_directories ${BSON_INCLUDE_DIRS}) +diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt +index 4fe323f..2e27410 100644 +--- a/src/mongocxx/CMakeLists.txt ++++ b/src/mongocxx/CMakeLists.txt +@@ -41,7 +41,7 @@ if(TARGET mongoc_shared OR TARGET mongoc_static) + set(MONGOCXX_PKG_DEP "find_dependency(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED)") + else() + # Attempt to find libmongoc by new package name (without lib). +- find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} QUIET) ++ find_package(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} CONFIG REQUIRED) + + if(mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_FOUND) + message(STATUS "found libmongoc version ${mongoc-${LIBMONGOC_REQUIRED_ABI_VERSION}_VERSION}") +@@ -56,7 +56,7 @@ else() + else() + # Require package of old libmongoc name (with lib). + if(NOT MONGOCXX_LINK_WITH_STATIC_MONGOC) +- find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} REQUIRED) ++ find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} REQUIRED) + message(STATUS "found libmongoc version ${MONGOC_VERSION}") + set(libmongoc_target ${MONGOC_LIBRARIES}) + set(libmongoc_definitions ${MONGOC_DEFINITIONS}) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index c943f3e4d06b47..de8e1752e196a8 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF "r${VERSION}" - SHA512 f9f0d83ee2ef1f3c2dae1f3663b893d819737d4e646d0137fb623b84663382eb93ab36123c2a85247f43ae979a95276fa231d5da8ad62a6da002ab9daecaa0d4 + SHA512 34ff303d496dd2c9b8cada16dc215c40fddccfe660bdc7fe59c92449861876b820c3ea4e3e5c91029e0322411bbe98a11cb1f3fa046b028d92d3c9a3509ce988 HEAD_REF master PATCHES fix-dependencies.patch @@ -30,6 +30,8 @@ vcpkg_cmake_configure( -DMONGOCXX_HEADER_INSTALL_DIR=include MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Boost + BSONCXX_HEADER_INSTALL_DIR + MONGOCXX_HEADER_INSTALL_DIR ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -38,12 +40,8 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(PACKAGE_NAME "bsoncxx" CONFIG_PATH "lib/cmake/bsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/export.hpp" - "#define BSONCXX_API_H" "#define BSONCXX_API_H\n#ifndef BSONCXX_STATIC\n#define BSONCXX_STATIC\n#endif") vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx-static" CONFIG_PATH "lib/cmake/libbsoncxx-static-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libbsoncxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbsoncxx") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mongocxx/config/export.hpp" - "#define MONGOCXX_API_H" "#define MONGOCXX_API_H\n#ifndef MONGOCXX_STATIC\n#define MONGOCXX_STATIC\n#endif") vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx-static" CONFIG_PATH "lib/cmake/libmongocxx-static-${VERSION}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libmongocxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libmongocxx") else() diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 76231b86e6e257..4cc9f79cf5f8a3 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-cxx-driver", - "version": "3.8.0", + "version": "3.9.0", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d63cb4d05b7326..e1fb2a7402d6c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4081,7 +4081,7 @@ "port-version": 4 }, "libbson": { - "baseline": "1.24.3", + "baseline": "1.25.1", "port-version": 0 }, "libcaer": { @@ -5617,11 +5617,11 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.24.3", + "baseline": "1.25.1", "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.8.0", + "baseline": "3.9.0", "port-version": 0 }, "mongoose": { diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 0fe63b070037c3..97503458d6da80 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cc5cb4ec6ee37e4a07e65f6e8aee04f83f535ec", + "version": "1.25.1", + "port-version": 0 + }, { "git-tree": "3a3f08e9e91a77ee7b6b56f88d1e0013349c34e1", "version": "1.24.3", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index f94ce8b967aaba..e3f820205649b6 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bc0eb795e698bac0f4d77bed4b6ecbde0f57857", + "version": "1.25.1", + "port-version": 0 + }, { "git-tree": "c9ddb78bc06cb779848d6afffa88938870ae8a7b", "version": "1.24.3", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 8808aec2439b76..fe043b3f171e5f 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9682855a28fdd67511a8b454e361f4a7841584a8", + "version": "3.9.0", + "port-version": 0 + }, { "git-tree": "d8fc862744aad29acd0e6a0d947fc5b561d3f5f7", "version": "3.8.0", From 27a4debe0d98e22ec32b8594878e12ee90cf2e50 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:44:07 +0800 Subject: [PATCH 0398/1039] [magic-enum] update to 0.9.5 (#35162) * [magic-enum] update to v0.9.5 * [magic-enum] update versions --- ports/magic-enum/portfile.cmake | 2 +- ports/magic-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 7bd06c05d5b4b7..24e9af0e8243eb 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum REF "v${VERSION}" - SHA512 1c850a87fa8f449b98d748f3e74a82463d9ca5e7ddcd4c318465230d26032f75d5e103b9a27782e1e7d808156241686c22382086b9d553f9d37b32c83115552d + SHA512 f1b412d15e0ef624b4588adba00a18ed12eeb1f0dabc021d53a7c047b8976ecb07701b76040f47c77c75e00151619dbce1f9a75f471db04340156a39044768f3 HEAD_REF master ) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 58bbe96e2a98f6..77ac39562b0680 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.9.4", + "version": "0.9.5", "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 e1fb2a7402d6c3..d519f6be310c96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5337,7 +5337,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.9.4", + "baseline": "0.9.5", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index a736697a7683c5..72f9f591c78b12 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "331117fc7825903e23c611f793c21251148c4458", + "version": "0.9.5", + "port-version": 0 + }, { "git-tree": "3900ab3a53f394e82cc65e071fb7ffc3641024c1", "version": "0.9.4", From 7a1e53592c1601cd3f926ac110bd4a8a981816e2 Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Fri, 17 Nov 2023 04:44:41 +0100 Subject: [PATCH 0399/1039] [nayuki-qr-code-generator] add license (#35155) * [nayuki-qr-code-generator] add license * Update version database --- ports/nayuki-qr-code-generator/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/n-/nayuki-qr-code-generator.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/nayuki-qr-code-generator/vcpkg.json b/ports/nayuki-qr-code-generator/vcpkg.json index f268eccaab050e..960fa947a45c79 100644 --- a/ports/nayuki-qr-code-generator/vcpkg.json +++ b/ports/nayuki-qr-code-generator/vcpkg.json @@ -1,8 +1,10 @@ { "name": "nayuki-qr-code-generator", "version": "1.8.0", + "port-version": 1, "description": "High-quality QR Code generator library in C++", "homepage": "https://github.com/nayuki/QR-Code-generator", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index d519f6be310c96..0b596878b7bf54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5850,7 +5850,7 @@ }, "nayuki-qr-code-generator": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "nccl": { "baseline": "2.4.6", diff --git a/versions/n-/nayuki-qr-code-generator.json b/versions/n-/nayuki-qr-code-generator.json index fc6b80ec3d867a..87812009322df7 100644 --- a/versions/n-/nayuki-qr-code-generator.json +++ b/versions/n-/nayuki-qr-code-generator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f3345b4889287461620da1c6c3220666d8bb8f3", + "version": "1.8.0", + "port-version": 1 + }, { "git-tree": "376b1b6483e138ceda93ab3b1aab6f3e51be74ad", "version": "1.8.0", From 5b0e5e96057e68caaf0dd2821fcaa96623254552 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:44:55 +0800 Subject: [PATCH 0400/1039] [openblas] update to 0.3.25 (#35149) * [openblas] update to 0.3.25 * [openblas] update to 0.3.25 * CI [skip actions] --- ports/openblas/portfile.cmake | 2 +- ports/openblas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index ffdb3a3e09be05..459cb70ad55900 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS REF "v${VERSION}" - SHA512 fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0 + SHA512 69bcf8082575b01ce1734fc9d33454314964a7e81ff29a7c1a764af3083ac0dc24289fd72bbe22c9583398bda7b658d6e4ab1d5036e43412745f0be3c2185b3c HEAD_REF develop PATCHES uwp.patch diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 68a68293ee9bfb..0becc9a8db38af 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openblas", - "version": "0.3.24", + "version": "0.3.25", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 0b596878b7bf54..a56dcdee1c4d7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6173,7 +6173,7 @@ "port-version": 0 }, "openblas": { - "baseline": "0.3.24", + "baseline": "0.3.25", "port-version": 0 }, "opencascade": { diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index dd98295120b9d3..8fce1eb58e290e 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c2a355bc21475a2a4a69f6a3c227f54efc5c425", + "version": "0.3.25", + "port-version": 0 + }, { "git-tree": "c876665c0fa5b8d427ee9cadd4185a1a08d008da", "version": "0.3.24", From 1fd0a713b02336b87e9bd6314814afe13d820604 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 17 Nov 2023 04:48:18 +0100 Subject: [PATCH 0401/1039] [gdal] Update to 3.8.0 (#35115) * [gdal] Update to 3.8.0 * [gdal] Refresh list of tools --- ports/gdal/portfile.cmake | 41 +++++++++++++++++++-------------------- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 5ce1bdd8cd8afa..22ac3ee410de93 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 db23c751aa1bfc9f9f80c4dc900e86fb19579251d3577ef5bd06f9ddf76ba8c74aa404b5477ced5649d011e2111ca8df38d5acc87de6723f7e50f3bb22c9ee8f + SHA512 ae0238b2741c673927f80b3d0765fbb0eb2ddb8699441564e67dd7bb6a429b45e4eac57f9c4e93ecea7a4525f28c05e6f3097828c40d5af6a66dda83d2245242 HEAD_REF master PATCHES find-link-libraries.patch @@ -115,34 +115,33 @@ list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")" if (BUILD_APPS) vcpkg_copy_tools( TOOL_NAMES - gdalinfo - gdalbuildvrt - gdaladdo + gdal_contour + gdal_create + gdal_footprint gdal_grid - gdal_translate gdal_rasterize - gdalsrsinfo - gdalenhance - gdalmanage - gdaltransform - gdaltindex - gdaldem - gdal_create + gdal_translate gdal_viewshed - nearblack - ogrlineref - ogrtindex - gdalwarp - gdal_contour + gdaladdo + gdalbuildvrt + gdaldem + gdalenhance + gdalinfo gdallocationinfo - ogrinfo - ogr2ogr - ogrlineref - nearblack + gdalmanage gdalmdiminfo gdalmdimtranslate + gdalsrsinfo + gdaltindex + gdaltransform + gdalwarp gnmanalyse gnmmanage + nearblack + ogr2ogr + ogrinfo + ogrlineref + ogrtindex sozip AUTO_CLEAN ) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 1dca7f426b8847..be6c2725b01ef2 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.7.3", + "version-semver": "3.8.0", "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 a56dcdee1c4d7e..4555f2f1d1782d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2861,7 +2861,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.7.3", + "baseline": "3.8.0", "port-version": 0 }, "gdcm": { diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 58ac8b8d4dcee0..7e22496c5afbd0 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eb6f65b6e278d02d05adff2de5e9fc0b068dd39", + "version-semver": "3.8.0", + "port-version": 0 + }, { "git-tree": "388e85b332e219ece9bdb669274ca04762500330", "version-semver": "3.7.3", From 98f22593167d1d20a433d9ad09aa40ccd2552749 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Fri, 17 Nov 2023 12:54:49 +0900 Subject: [PATCH 0402/1039] [llgi] create a new port (#34147) * [llgi] create a new port * [llgi] update to latest * [llgi] update baseline * [llgi] create patch for cmake * [llgi] split patch to pull request * [llgi] update baseline * [llgi] fix some details * [llgi] fix vcpkg functions * [llgi] update patch file * [llgi] fix linux build * Update ports/llgi/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/llgi/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/llgi/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * [llgi] update baseline * [llgi] apply upstream change * [llgi] remove working version --------- Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/llgi/fix-cmake-use-vcpkg.patch | 49 ++++++++++++++++++++++++++ ports/llgi/fix-sources.patch | 14 ++++++++ ports/llgi/portfile.cmake | 52 ++++++++++++++++++++++++++++ ports/llgi/vcpkg.json | 35 +++++++++++++++++++ versions/baseline.json | 4 +++ versions/l-/llgi.json | 9 +++++ 6 files changed, 163 insertions(+) create mode 100644 ports/llgi/fix-cmake-use-vcpkg.patch create mode 100644 ports/llgi/fix-sources.patch create mode 100644 ports/llgi/portfile.cmake create mode 100644 ports/llgi/vcpkg.json create mode 100644 versions/l-/llgi.json diff --git a/ports/llgi/fix-cmake-use-vcpkg.patch b/ports/llgi/fix-cmake-use-vcpkg.patch new file mode 100644 index 00000000000000..d5205d41c1b232 --- /dev/null +++ b/ports/llgi/fix-cmake-use-vcpkg.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 30cb2da..dbc051b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -232,8 +232,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL) + spirv-cross-util) + + else() +- list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR} +- ${SPIRVCROSS_INCLUDE_DIR}) ++ # from vcpkg ++ find_package(glslang CONFIG REQUIRED) ++ find_package(spirv_cross_core CONFIG REQUIRED) ++ find_package(spirv_cross_glsl CONFIG REQUIRED) ++ find_package(spirv_cross_hlsl CONFIG REQUIRED) ++ find_package(spirv_cross_msl CONFIG REQUIRED) ++ find_package(spirv_cross_cpp CONFIG REQUIRED) + + endif() + +diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt +index 4ce40d4..d4950ce 100644 +--- a/tools/ShaderTranspilerCore/CMakeLists.txt ++++ b/tools/ShaderTranspilerCore/CMakeLists.txt +@@ -24,6 +24,10 @@ else() + + endif() + ++target_link_libraries(ShaderTranspilerCore PUBLIC ++ glslang::glslang glslang::SPIRV glslang::OSDependent glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits glslang::OGLCompiler glslang::SPVRemapper glslang::HLSL ++ spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl ++) + if(USE_THIRDPARTY_DIRECTORY) + add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross) + endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbc051b..b898b4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,9 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install" + OFF) + option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON) + +-if(LINUX) +- set(BUILD_VULKAN TRUE) +-endif() + + option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON) + diff --git a/ports/llgi/fix-sources.patch b/ports/llgi/fix-sources.patch new file mode 100644 index 00000000000000..90837de54df8a6 --- /dev/null +++ b/ports/llgi/fix-sources.patch @@ -0,0 +1,14 @@ +diff --git a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h +index 269afa6..1d1015f 100644 +--- a/tools/ShaderTranspilerCore/ShaderTranspilerCore.h ++++ b/tools/ShaderTranspilerCore/ShaderTranspilerCore.h +@@ -1,7 +1,7 @@ + + #pragma once +- +-#include ++#include ++#include + + #include "../../src/LLGI.Base.h" + #include diff --git a/ports/llgi/portfile.cmake b/ports/llgi/portfile.cmake new file mode 100644 index 00000000000000..82f84694fb94f4 --- /dev/null +++ b/ports/llgi/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO altseed/LLGI + REF 1b6b59b9f5bc9f81b4c2af2333d69f6e23670b3e + SHA512 c9011dee560897caf5ae53d8fa58869b774bd3bc7ce2e0cc4696ac034fc89a36adf3f5285e82cffe6430ca61f6509fd7fbadf5c77aef896c74e8d70e70ff4312 + HEAD_REF master + PATCHES + fix-cmake-use-vcpkg.patch + fix-sources.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + vulkan BUILD_VULKAN + vulkan BUILD_VULKAN_COMPILER + tool BUILD_TOOL +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" USE_DYNAMIC_RUNTIME) + +# linux build requires x11-xcb +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_TEST=OFF + -DBUILD_EXAMPLE=OFF + -DUSE_CREATE_COMPILER_FUNCTION=ON + -DUSE_THIRDPARTY_DIRECTORY=OFF # prevent ExternalProject_Add + -DUSE_MSVC_RUNTIME_LIBRARY_DLL:BOOL=${USE_DYNAMIC_RUNTIME} + -DGLSLANG_WITHOUT_INSTALL=OFF + -DSPIRVCROSS_WITHOUT_INSTALL=OFF + MAYBE_UNUSED_VARIABLES + USE_MSVC_RUNTIME_LIBRARY_DLL +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake") + +if("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ShaderTranspiler AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/llgi/vcpkg.json b/ports/llgi/vcpkg.json new file mode 100644 index 00000000000000..f7773cd1d66826 --- /dev/null +++ b/ports/llgi/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "llgi", + "version-date": "2023-11-04", + "homepage": "https://github.com/altseed/LLGI", + "license": null, + "supports": "!(uwp | android)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tool": { + "description": "Build ShaderTranspiler", + "dependencies": [ + "glslang", + "spirv-cross" + ] + }, + "vulkan": { + "description": "Build vulkan modules", + "supports": "windows | linux", + "dependencies": [ + "glslang", + "spirv-cross", + "vulkan" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 4555f2f1d1782d..61139ca82a4b2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5196,6 +5196,10 @@ "baseline": "2023-11-06", "port-version": 0 }, + "llgi": { + "baseline": "2023-11-04", + "port-version": 0 + }, "llgl": { "baseline": "2023-03-05", "port-version": 0 diff --git a/versions/l-/llgi.json b/versions/l-/llgi.json new file mode 100644 index 00000000000000..5dbfa458169866 --- /dev/null +++ b/versions/l-/llgi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a0f885d3531458ac1a7748ce8af641b30a80a166", + "version-date": "2023-11-04", + "port-version": 0 + } + ] +} From 40771be0a0fd4bc3346dd041dbb7e19a12a57499 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 18 Nov 2023 03:07:28 +0800 Subject: [PATCH 0403/1039] update to 2023-11-08 (#35150) --- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index c439cb5e66b6fb..9954827036c898 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.07.24.tar.gz" - FILENAME "live.2023.07.24.tar.gz" -SHA512 d0708a087d9252b2f13d7b2e14c47e24e895ac329d5dd640a00756e92c846c57573198f6cc79e88272567babf5b0bb8cb268e750685efe8b9693fd9aec384e70 + URLS "http://live555.com/liveMedia/public/live.2023.11.08.tar.gz" + FILENAME "live.2023.11.08.tar.gz" + SHA512 b9c0c8a96607325b81e5829b0a57917f155d0767f02a0ee4d887ec7985e5f4a2252961dc4f48de6b66a9ea566fa2a3bea87004c44e565da87b8fa06a3e08954d ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 6406ec614cdc92..4eab98d196c4b1 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-07-24", + "version-date": "2023-11-08", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 61139ca82a4b2a..b412c9824fdcf9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5189,7 +5189,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-07-24", + "baseline": "2023-11-08", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 106dbb5981ecb9..a4d0bf7f38b5ff 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "302e545ae4e1386eb3048b429fff813c336ff0c7", + "version-date": "2023-11-08", + "port-version": 0 + }, { "git-tree": "9e83e021123610806240ac1742b68f25bcbc3ff7", "version-date": "2023-07-24", From 4d2b39581315d758d5203efa3b28e225edf47aa8 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Fri, 17 Nov 2023 20:10:18 +0100 Subject: [PATCH 0404/1039] [imgui] Update to 1.90 (#35131) * [imgui] Update to 1.90 * update version --- ports/imgui/portfile.cmake | 8 ++++---- ports/imgui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index ad53a0bfe82101..190999a711ab1e 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF a1b60fc1f5589d498ab1080c2572da725fcbd0e3 - SHA512 ac6117f6adf9418af3a2db5392f1316be50a94c38e78cd1eadc0e0a71dfbb5536507aaf4d9d3b3468b5a30ebf143b806e2774f274e2098e1217ed93080fe81c7 + REF "v${VERSION}-docking" + SHA512 50953097ff809bca0e1cee55268eaa8dad001cf8fae85ae7623f484752d16bdf8e63c04227786361f27e73f7aeda5a8d1f9b0cee83c2aca108ce2712a21b74d9 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v${VERSION} - SHA512 42021b06b611b58222b09fab8db2c34e992c3dc4fbaa175e09833c66c90d04b4a4e7def16a732535335c0ac5ff014d235835511a5d9a76d32b4395b302146919 + REF "v${VERSION}" + SHA512 f6b33027c7050acc617c728b04b04572a13bf11589d4d2cab566901e94d349a3d91f133f7980049857ee44768d4bad426c9b2e53baf953f2efbf1a7951c3ba8a HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index e6531b22799a47..be7e03519c8c40 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.89.9", + "version": "1.90", "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 b412c9824fdcf9..a85d4aea2e6f39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3489,7 +3489,7 @@ "port-version": 1 }, "imgui": { - "baseline": "1.89.9", + "baseline": "1.90", "port-version": 0 }, "imgui-node-editor": { diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 7537260258b711..753bb14734264e 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f570e820b63f5f087134076b2343e390eb62daad", + "version": "1.90", + "port-version": 0 + }, { "git-tree": "37d78911bfdf98548568771acd72f7e6a88d1e58", "version": "1.89.9", From e965edb2c166dacffd8313a392f09a9469236c9f Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Fri, 17 Nov 2023 22:27:31 +0000 Subject: [PATCH 0405/1039] [aom] Bump to 3.7.0 and fix arm-linux build (#34925) Signed-off-by: Vasyl Gello --- ports/aom/aom-rename-static.diff | 45 +++++++++++++++++------- ports/aom/aom-uninitialized-pointer.diff | 26 +++++++------- ports/aom/portfile.cmake | 6 +++- ports/aom/vcpkg.json | 3 +- versions/a-/aom.json | 5 +++ versions/baseline.json | 4 +-- 6 files changed, 59 insertions(+), 30 deletions(-) diff --git a/ports/aom/aom-rename-static.diff b/ports/aom/aom-rename-static.diff index e38c73fb174789..f53502e0bb8b39 100644 --- a/ports/aom/aom-rename-static.diff +++ b/ports/aom/aom-rename-static.diff @@ -1,12 +1,33 @@ -diff -pruN aom-3.0.0.o/CMakeLists.txt aom-3.0.0/CMakeLists.txt ---- aom-3.0.0.o/CMakeLists.txt 2021-04-15 20:05:52.695181200 +0300 -+++ aom-3.0.0/CMakeLists.txt 2021-04-15 22:34:16.147522600 +0300 -@@ -249,7 +249,7 @@ endif() - add_library(aom ${AOM_SOURCES} $) - if(BUILD_SHARED_LIBS) - add_library(aom_static STATIC ${AOM_SOURCES} $) -- set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom) -+ set_target_properties(aom_static PROPERTIES OUTPUT_NAME aom_static) - - if(NOT MSVC) - # Extract version string and set VERSION/SOVERSION for the aom target. +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e5b623..bed61da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,6 +314,15 @@ if(BUILD_SHARED_LIBS) + set_target_properties(aom PROPERTIES SOVERSION ${SO_VERSION}) + set_target_properties(aom PROPERTIES VERSION ${SO_FILE_VERSION}) + endif() ++ ++ # override conditional changes ++ set_target_properties(aom PROPERTIES ++ ARCHIVE_OUTPUT_NAME aom ++ ) ++ set_target_properties(aom_static PROPERTIES ++ ARCHIVE_OUTPUT_NAME aom_static ++ EXCLUDE_FROM_ALL 1 ++ ) + endif() + + if(NOT WIN32 AND NOT APPLE) +diff --git a/build/cmake/aom_install.cmake b/build/cmake/aom_install.cmake +index b02c7b9..c219841 100644 +--- a/build/cmake/aom_install.cmake ++++ b/build/cmake/aom_install.cmake +@@ -79,7 +79,7 @@ macro(setup_aom_install_targets) + endif() + + if(BUILD_SHARED_LIBS) +- set(AOM_INSTALL_LIBS aom aom_static) ++ set(AOM_INSTALL_LIBS aom) + else() + set(AOM_INSTALL_LIBS aom) + endif() diff --git a/ports/aom/aom-uninitialized-pointer.diff b/ports/aom/aom-uninitialized-pointer.diff index b80f2e08ffa328..37a7166cc04694 100644 --- a/ports/aom/aom-uninitialized-pointer.diff +++ b/ports/aom/aom-uninitialized-pointer.diff @@ -1,13 +1,13 @@ -diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake -index 43d60ae..35c510b 100644 ---- a/build/cmake/aom_configure.cmake -+++ b/build/cmake/aom_configure.cmake -@@ -265,6 +265,8 @@ if(MSVC) - - # Disable MSVC warnings that suggest making code non-portable. - add_compiler_flag_if_supported("/wd4996") -+ # Disable MSVC warnings for potentially uninitialized local pointer variable. -+ add_compiler_flag_if_supported("/wd4703") - if(ENABLE_WERROR) - add_compiler_flag_if_supported("/WX") - endif() +diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake +index aaef2c310..5500ad4a3 100644 +--- a/build/cmake/aom_configure.cmake ++++ b/build/cmake/aom_configure.cmake +@@ -309,6 +309,8 @@ if(MSVC) + + # Disable MSVC warnings that suggest making code non-portable. + add_compiler_flag_if_supported("/wd4996") ++ # Disable MSVC warnings for potentially uninitialized local pointer variable. ++ add_compiler_flag_if_supported("/wd4703") + if(ENABLE_WERROR) + add_compiler_flag_if_supported("/WX") + endif() diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 6c3c91f417a8bb..a4ece7670a39ff 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_add_to_path(${PERL_PATH}) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 9a83c6a5a55c176adbce740e47d3512edfc9ae71 # v3.5.0 + REF 6054fae218eda6e53e1e3b4f7ef0fff4877c7bf1 # v3.7.0 PATCHES aom-rename-static.diff aom-uninitialized-pointer.diff @@ -26,6 +26,10 @@ if(VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE set(aom_target_cpu "-DAOM_TARGET_CPU=generic") endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_TARGET_IS_LINUX) + set(aom_target_cpu "-DENABLE_NEON=OFF") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 5398903069e3b4..7fc53a398f6c98 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aom", - "version-semver": "3.5.0", - "port-version": 1, + "version-semver": "3.7.0", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "license": "BSD-2-Clause", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 10580b09983a28..5176361103e707 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71fe99b6007b153a98a5058a2d2212117af8031a", + "version-semver": "3.7.0", + "port-version": 0 + }, { "git-tree": "daaa6d5ccf417cb9e4997d35b9574f18eaa98cd3", "version-semver": "3.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index a85d4aea2e6f39..79a6e5ca4b876e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -153,8 +153,8 @@ "port-version": 2 }, "aom": { - "baseline": "3.5.0", - "port-version": 1 + "baseline": "3.7.0", + "port-version": 0 }, "apache-datasketches": { "baseline": "4.1.0", From dcba1dde66aa32647142cbb242efe6560c73e2c3 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Fri, 17 Nov 2023 23:56:52 +0100 Subject: [PATCH 0406/1039] [tracy] fix manifest mode build (#34874) --- ports/tracy/001-fix-vcxproj-vcpkg.patch | 150 +++++++++++++++++- ...ath.patch => 002-use-internal-imgui.patch} | 15 +- ports/tracy/005-fix-imgui-path-legacy.patch | 13 -- ports/tracy/portfile.cmake | 3 +- ports/tracy/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tracy.json | 5 + 7 files changed, 169 insertions(+), 20 deletions(-) rename ports/tracy/{003-fix-imgui-path.patch => 002-use-internal-imgui.patch} (54%) delete mode 100644 ports/tracy/005-fix-imgui-path-legacy.patch diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch index 8baed20b3717ff..fa7a1c9b3e6635 100644 --- a/ports/tracy/001-fix-vcxproj-vcpkg.patch +++ b/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -1,5 +1,113 @@ +diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj +index be512f84..e810395a 100644 +--- a/capture/build/win32/capture.vcxproj ++++ b/capture/build/win32/capture.vcxproj +@@ -57,12 +57,11 @@ + TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + + + +@@ -77,14 +76,13 @@ + TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + + true + true +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + + + +diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj +index b4adbf68..8715c883 100644 +--- a/csvexport/build/win32/csvexport.vcxproj ++++ b/csvexport/build/win32/csvexport.vcxproj +@@ -57,12 +57,11 @@ + _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + + + +@@ -77,14 +76,13 @@ + NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + + true + true +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + + + +diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj +index 058a2aa3..86c0990b 100644 +--- a/import-chrome/build/win32/import-chrome.vcxproj ++++ b/import-chrome/build/win32/import-chrome.vcxproj +@@ -57,12 +57,11 @@ + TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + + + +@@ -77,14 +76,13 @@ + TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + + true + true +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + + + diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj -index 7be39025..ddb49fbc 100644 +index 7b5d7cde..9a358b4d 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -60,7 +60,7 @@ @@ -7,7 +115,7 @@ index 7be39025..ddb49fbc 100644 true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) -+ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true @@ -27,7 +135,7 @@ index 7be39025..ddb49fbc 100644 true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) - ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) -+ ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) ++ ..\..\..\imgui;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 @@ -42,3 +150,39 @@ index 7be39025..ddb49fbc 100644 true +diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj +index 55f0e55e..cbdf8c35 100644 +--- a/update/build/win32/update.vcxproj ++++ b/update/build/win32/update.vcxproj +@@ -57,12 +57,11 @@ + TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib + + + +@@ -77,14 +76,13 @@ + TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) + AdvancedVectorExtensions2 + stdcpplatest +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone ++ $(VcpkgInstalledDir)\$(VcpkgTriplet)\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\capstone + + + true + true +- ws2_32.lib;capstone.lib;%(AdditionalDependencies) ++ ws2_32.lib;%(AdditionalDependencies) + Console +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib + + + diff --git a/ports/tracy/003-fix-imgui-path.patch b/ports/tracy/002-use-internal-imgui.patch similarity index 54% rename from ports/tracy/003-fix-imgui-path.patch rename to ports/tracy/002-use-internal-imgui.patch index be1bf9a57d0b43..29f6d9af665055 100644 --- a/ports/tracy/003-fix-imgui-path.patch +++ b/ports/tracy/002-use-internal-imgui.patch @@ -1,5 +1,5 @@ diff --git a/profiler/build/unix/build.mk b/profiler/build/unix/build.mk -index 24765f1a..dc2923c8 100644 +index b134432b..42a9ba0a 100644 --- a/profiler/build/unix/build.mk +++ b/profiler/build/unix/build.mk @@ -1,7 +1,7 @@ @@ -10,4 +10,17 @@ index 24765f1a..dc2923c8 100644 +INCLUDES := -I../../../imgui $(shell pkg-config --cflags freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) LIBS := $(shell pkg-config --libs freetype2 capstone wayland-egl egl wayland-cursor xkbcommon) -lpthread -ldl + PROJECT := Tracy +diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk +index 24765f1a..dc2923c8 100644 +--- a/profiler/build/unix/legacy.mk ++++ b/profiler/build/unix/legacy.mk +@@ -1,7 +1,7 @@ + CFLAGS += + CXXFLAGS := $(CFLAGS) -std=c++17 + DEFINES += -DIMGUI_ENABLE_FREETYPE +-INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui ++INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) + LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl + PROJECT := Tracy diff --git a/ports/tracy/005-fix-imgui-path-legacy.patch b/ports/tracy/005-fix-imgui-path-legacy.patch deleted file mode 100644 index a8b5abea241a12..00000000000000 --- a/ports/tracy/005-fix-imgui-path-legacy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk -index 24765f1a..dc2923c8 100644 ---- a/profiler/build/unix/legacy.mk -+++ b/profiler/build/unix/legacy.mk -@@ -1,7 +1,7 @@ - CFLAGS += - CXXFLAGS := $(CFLAGS) -std=c++17 - DEFINES += -DIMGUI_ENABLE_FREETYPE --INCLUDES := $(shell pkg-config --cflags glfw3 freetype2 capstone) -I../../../imgui -+INCLUDES := -I../../../imgui $(shell pkg-config --cflags glfw3 freetype2 capstone) - LIBS := $(shell pkg-config --libs glfw3 freetype2 capstone) -lpthread -ldl - - PROJECT := Tracy diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index 1bf66f41bb6284..81066f2a5ab2b8 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -12,8 +12,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch - 003-fix-imgui-path.patch - 005-fix-imgui-path-legacy.patch + 002-use-internal-imgui.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index fd22aa637accb1..d133f7cd99feb7 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tracy", "version-semver": "0.10.0", + "port-version": 1, "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 79a6e5ca4b876e..b20b66e0c03812 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8530,7 +8530,7 @@ }, "tracy": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "transwarp": { "baseline": "2.2.2", diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 787f817187dd1f..61fd22f1215653 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a85cd6613805e9be8538768a8b03e5f04dabe490", + "version-semver": "0.10.0", + "port-version": 1 + }, { "git-tree": "2ffcc745825c95eec75922bfdf4433ccedf3981d", "version-semver": "0.10.0", From 4751f926b3cfca75867d743b8837ca129dbb5bc6 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 18 Nov 2023 07:00:03 +0800 Subject: [PATCH 0407/1039] [vcpkg baseline][libmysql] fix libmysql and libmariadb are incompatible on x86-windows (#34887) * fix libmysql and libmariadb are incompatible on x86-windows * update --------- Co-authored-by: Billy Robert O'Neal III --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 47c8b4c5239492..ba02522a333d78 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -581,6 +581,7 @@ libmodman:x64-windows-static=fail libmpeg2:arm-neon-android=fail libmpeg2:arm64-android=fail libmpeg2:x64-android=fail +libmysql:x86-windows=skip libodb:x64-linux=fail # dynamic exception specifications libopensp:arm-neon-android=fail libopensp:arm64-android=fail From eba630c8894033004871fe084562a6caaf04f5e5 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 18 Nov 2023 07:01:02 +0800 Subject: [PATCH 0408/1039] [paho-mqtt] update to 1.3.13 (#35177) * [paho-mqtt] update to 1.3.13 * [paho-mqtt] update to 1.3.13 --- ports/paho-mqtt/portfile.cmake | 2 +- ports/paho-mqtt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/paho-mqtt.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 2bb84bd7d6494f..75198458ce931c 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c REF "v${VERSION}" - SHA512 3152b557a8ab7c9b9c80277283e0f5e9965ce4c2ebbdaef0f238908d49e6fa1281aa72932ea112a836144b79656e4abe6e0cbd93840429a52e501a2c6b12d313 + SHA512 0f436470bcff224461ed3227c8db10914f84bc2dcf76e51b55d4a78b80abaa4e636ac8f7a20e517524625888335c738e975283e5d573ae8d59147aa4de7963fc HEAD_REF master PATCHES fix-unresolvedsymbol-arm.patch diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index 76c5ed3104e4ab..49d7a853c80568 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "paho-mqtt", - "version": "1.3.12", - "port-version": 1, + "version": "1.3.13", "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", "homepage": "https://github.com/eclipse/paho.mqtt.c", "license": "EPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b20b66e0c03812..56d7eae53088c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6417,8 +6417,8 @@ "port-version": 2 }, "paho-mqtt": { - "baseline": "1.3.12", - "port-version": 1 + "baseline": "1.3.13", + "port-version": 0 }, "paho-mqttpp3": { "baseline": "1.2.0", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index 151e187570b728..0df488f43ec98d 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afbbb351ea649d52651cd70c71bd133d6527215f", + "version": "1.3.13", + "port-version": 0 + }, { "git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd", "version": "1.3.12", From a6ec0cb23754611ee0db3829030be42bd18c11d9 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 18 Nov 2023 07:01:40 +0800 Subject: [PATCH 0409/1039] [libosip2] update to 5.3.1 (#35176) * [libosip2] update to 5.3.1 * [libosip2] update to 5.3.1 --- ports/libosip2/portfile.cmake | 8 +++----- ports/libosip2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libosip2.json | 5 +++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index c781c771854b39..ed636c21c6ecc2 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -1,9 +1,7 @@ -set(LIBOSIP2_VER "5.2.0") - vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" - FILENAME "libosip2-${LIBOSIP2_VER}.tar.gz" - SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83 + URLS "https://ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${VERSION}.tar.gz" + FILENAME "libosip2-${VERSION}.tar.gz" + SHA512 cd9db7a736cca90c6862b84c4941ef025f5affab8af9bbc02ce0dd3310a2c555e0922c1bfa72d8ac08791fa1441bbcc30b627d52ca8b51f3471573a10ac82a00 ) set(PATCHES) diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index e6bfe4f5d1b9c2..ac9798c9caba49 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libosip2", - "version": "5.2.0", - "port-version": 5, + "version": "5.3.1", "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm) & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 56d7eae53088c8..1e6b127b69ad11 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4609,8 +4609,8 @@ "port-version": 3 }, "libosip2": { - "baseline": "5.2.0", - "port-version": 5 + "baseline": "5.3.1", + "port-version": 0 }, "libosmium": { "baseline": "2.20.0", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 0bebfe36308ba6..df0a6daa2b46c9 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb02960c7156b49272969e224ccb0903c0a42a24", + "version": "5.3.1", + "port-version": 0 + }, { "git-tree": "e2811fe1a0d4cb7faabaebfa4cf47e1296bcddd2", "version": "5.2.0", From 6793733a88d04fdfecb0e4628172ac0cb4b077af Mon Sep 17 00:00:00 2001 From: Bill Avery Date: Fri, 17 Nov 2023 15:03:59 -0800 Subject: [PATCH 0410/1039] [cppgraphqlgen] Update to v4.5.5 (#35180) * [cppgraphqlgen] Update to v4.5.5 * Reformat with vcpkg format-manifest * Run vcpkg x-add-version --- ports/cppgraphqlgen/portfile.cmake | 9 ++++++++- ports/cppgraphqlgen/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 2 +- versions/c-/cppgraphqlgen.json | 5 +++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake index 8d13d570e969ad..d690247cc584de 100644 --- a/ports/cppgraphqlgen/portfile.cmake +++ b/ports/cppgraphqlgen/portfile.cmake @@ -2,10 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/cppgraphqlgen REF "v${VERSION}" - SHA512 0a41306862bc9f370fb369bd0cdc015fd15b95179ac2de60d8d412a26d385044177d1ca6e730e96e2ff0b0ffabcfe0246fdd3d926348641a145cd2894eb9cb7f + SHA512 8079b2690ef4fba491e96ef2ed3da61d0c0b7bee3f61fa6d1fb95c771f1a8220a7b15b489b21bf9b1627e8616f95c65b43b8f63ee93cb0193edac4cb54307b3a HEAD_REF main ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + rapidjson GRAPHQL_USE_RAPIDJSON +) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -13,6 +19,7 @@ vcpkg_cmake_configure( -DGRAPHQL_UPDATE_VERSION=OFF -DGRAPHQL_UPDATE_SAMPLES=OFF -DGRAPHQL_INSTALL_CONFIGURATIONS=Release + ${FEATURE_OPTIONS} OPTIONS_RELEASE -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json index 7b0f0279e5e4d8..3d3521f67f0bad 100644 --- a/ports/cppgraphqlgen/vcpkg.json +++ b/ports/cppgraphqlgen/vcpkg.json @@ -1,13 +1,12 @@ { "name": "cppgraphqlgen", - "version": "4.5.3", + "version": "4.5.5", "description": "C++ GraphQL schema service generator", "homepage": "https://github.com/microsoft/cppgraphqlgen", "license": "MIT", "dependencies": [ "boost-program-options", "pegtl", - "rapidjson", { "name": "vcpkg-cmake", "host": true @@ -16,5 +15,16 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "rapidjson" + ], + "features": { + "rapidjson": { + "description": "Build the graphqljson library with RapidJSON.", + "dependencies": [ + "rapidjson" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 1e6b127b69ad11..8b556c879d4b4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1861,7 +1861,7 @@ "port-version": 3 }, "cppgraphqlgen": { - "baseline": "4.5.3", + "baseline": "4.5.5", "port-version": 0 }, "cppitertools": { diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json index 8bf2f00f8955b4..2dc44001109e1a 100644 --- a/versions/c-/cppgraphqlgen.json +++ b/versions/c-/cppgraphqlgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e5e70f3ccff87b9b39412aaf1f2c0382a3d3274", + "version": "4.5.5", + "port-version": 0 + }, { "git-tree": "8d87ba9b4921a48271c8c6abbe7e9c3f96651b4f", "version": "4.5.3", From 0c20b2a97c390e106150837042d921b0939e7ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Sat, 18 Nov 2023 00:04:49 +0100 Subject: [PATCH 0411/1039] [igraph] update to 0.10.8 (#35175) * [igraph] update to 0.10.8 * [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 ddc06fd5f329cb..a4617a76920abc 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.10.7/igraph-0.10.7.tar.gz" - FILENAME "igraph-0.10.7.tar.gz" - SHA512 72187052de16c791176dce797addaa54c18f14f47b44983374e3d8bb94a664dc70d773fb9296aa4fb1c68dbf5fb3d61803f1c4b167388d9217ce80f38a90f522 + URLS "https://github.com/igraph/igraph/releases/download/0.10.8/igraph-0.10.8.tar.gz" + FILENAME "igraph-0.10.8.tar.gz" + SHA512 e91806750e33a04dc5f18257d40ec6436db60d6bf6eb355bc826939fb547ac3d258c41b014b23d73aa98ca183480405139ae19f2034ddb516c98befe49e5be60 ) vcpkg_extract_source_archive( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 1c1be413a821a8..9b689f2d58c264 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "igraph", - "version": "0.10.7", + "version": "0.10.8", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 8b556c879d4b4d..52a018c510a1bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3461,7 +3461,7 @@ "port-version": 0 }, "igraph": { - "baseline": "0.10.7", + "baseline": "0.10.8", "port-version": 0 }, "iir1": { diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index b9a57503a9a6a9..59161f5441358e 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "252ff6ec89848e702d2d587d52ea161d317a7961", + "version": "0.10.8", + "port-version": 0 + }, { "git-tree": "ebbf67005ba6625597ef12c78cccf2d67854701d", "version": "0.10.7", From 7d9875fcd1d5b13e390486f3b60fde5bbb09f9c9 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 20 Nov 2023 12:13:23 -0800 Subject: [PATCH 0412/1039] [vcpkg baseline][libvpx/libressl] Update status in ci.baseline.txt (#35201) * [vcpkg baseline][libvpx/libressl] Update status in ci.baseline.txt * update --- scripts/ci.baseline.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ba02522a333d78..d97a3323c81422 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -613,6 +613,9 @@ libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip # Conflicts with openssl +libressl:arm-neon-android=fail +libressl:arm64-android=fail +libressl:x64-android=fail libressl:arm64-windows=skip libressl:arm64-uwp=skip libressl:x64-linux=skip @@ -647,7 +650,6 @@ libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip libvmdk:arm64-osx=skip -libvpx:arm-neon-android=fail libwandio:arm-neon-android=fail libwandio:arm64-android=fail libwandio:x64-android=fail From 5062df9228ea072cf694cdae25b2a2e693b4fb67 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Mon, 20 Nov 2023 12:13:39 -0800 Subject: [PATCH 0413/1039] [zlib-ng] Update to 2.1.4 (#35200) * update zlib-ng to 2.1.4 * update baseline --- ports/zlib-ng/portfile.cmake | 2 +- ports/zlib-ng/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/z-/zlib-ng.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 646b8abe8bcc1a..94c23e23231d7f 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng REF "${VERSION}" - SHA512 cb987c0b20a11fca5361dce94e53dead7364e739a984545c38ad4bf0c7fedd83d5d62530d979eca2182da88d7507a9bec8d3f5abff41e92ab5a63ac61001502e + SHA512 5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2 HEAD_REF develop PATCHES fix-cflags.patch diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index d566b33e81448d..aa055b349cd974 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zlib-ng", - "version": "2.1.3", - "port-version": 1, + "version": "2.1.4", "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 52a018c510a1bc..8be8c63c3bc0c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9329,8 +9329,8 @@ "port-version": 0 }, "zlib-ng": { - "baseline": "2.1.3", - "port-version": 1 + "baseline": "2.1.4", + "port-version": 0 }, "zlmediakit": { "baseline": "2023-08-12", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index 5ae306f6008b5e..dbd12a24581f24 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f05a7ce2c95cfcf4720d911a72dc3b60b46eb1c9", + "version": "2.1.4", + "port-version": 0 + }, { "git-tree": "48a2a573758db5e1b96e889043fffaf453fa9cf4", "version": "2.1.3", From 49e62c5f6bbf5b62524efbdc869d532c86a99e35 Mon Sep 17 00:00:00 2001 From: Anton Sviridov Date: Mon, 20 Nov 2023 20:14:26 +0000 Subject: [PATCH 0414/1039] [tree-sitter] fix a typo in pkg-config file (#35199) * [tree-sitter] fix a typo in pkg-config file * [tree-sitter] add port-version * [tree-sitter] add version --- ports/tree-sitter/pkgconfig.patch | 2 +- ports/tree-sitter/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tree-sitter.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/tree-sitter/pkgconfig.patch b/ports/tree-sitter/pkgconfig.patch index b75bbc10e8eea2..88de4eca497bb1 100644 --- a/ports/tree-sitter/pkgconfig.patch +++ b/ports/tree-sitter/pkgconfig.patch @@ -10,7 +10,7 @@ index f98816cb..71a3b4f9 100644 -libdir=@LIBDIR@ -includedir=@INCLUDEDIR@ +prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=${prefix}@/lib ++libdir=${prefix}/lib +includedir=${prefix}/include Name: tree-sitter diff --git a/ports/tree-sitter/vcpkg.json b/ports/tree-sitter/vcpkg.json index 935489c48e3bdb..6941c4db93173d 100644 --- a/ports/tree-sitter/vcpkg.json +++ b/ports/tree-sitter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tree-sitter", "version-semver": "0.20.6", + "port-version": 1, "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 8be8c63c3bc0c5..1eb2969e11231a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8550,7 +8550,7 @@ }, "tree-sitter": { "baseline": "0.20.6", - "port-version": 0 + "port-version": 1 }, "treehh": { "baseline": "3.18", diff --git a/versions/t-/tree-sitter.json b/versions/t-/tree-sitter.json index 9e57b626e1ca20..998b1d0ce26c1f 100644 --- a/versions/t-/tree-sitter.json +++ b/versions/t-/tree-sitter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f818e329af89033c591416456e9c630280bd4ef8", + "version-semver": "0.20.6", + "port-version": 1 + }, { "git-tree": "a96085943d7eb28c30fa8d53eb5452e4dccdfd93", "version-semver": "0.20.6", From 42301f8cb411f8b92416bd5e9a90c1917c3c0f7b Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Mon, 20 Nov 2023 12:15:04 -0800 Subject: [PATCH 0415/1039] [libheif] Update to 1.17.3 (#35195) * update libheif to 1.17.3 * update baseline --- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index dc081bf1c98bab..7d1d7f5fbdbd94 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 a4dbb0b1bcd6957841ce218f931a2d836e58d0b60323753020c684e97e4920f7802316f8979d1276904cd2e5809dc8e0dcf85ff9474d5f70e59380c290716fe7 + SHA512 790f4ac69ccc04b2015fc4f58f4c3b2deb0c123bb443fd90732f3fd9efce7a35b188cbfef36a2ac17fb8137f3a0c06bc3ae5effbd8ef847989e1e122876abd62 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index f0287217dcb3ae..29ec5ff512f3f8 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libheif", - "version": "1.17.1", - "description": "Open h.265 video codec implementation.", + "version": "1.17.3", + "description": "libheif is an HEIF and AVIF file format decoder and encoder.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", "supports": "!xbox", diff --git a/versions/baseline.json b/versions/baseline.json index 1eb2969e11231a..9f13e2a58916ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4349,7 +4349,7 @@ "port-version": 5 }, "libheif": { - "baseline": "1.17.1", + "baseline": "1.17.3", "port-version": 0 }, "libhsplasma": { diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 8b30de1245346a..150b1a92ec560c 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2055d6d66f9ba0a12257bc2fa852b3c9e234091", + "version": "1.17.3", + "port-version": 0 + }, { "git-tree": "32b640f029df01a4322b7d36d9405cf366c7811d", "version": "1.17.1", From 2129047fa7f3899cc5512d48943d1c5fef2a8444 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Mon, 20 Nov 2023 12:16:50 -0800 Subject: [PATCH 0416/1039] [libde265] Update to 1.0.12 (#35194) * update libde265 to 1.0.12 * update baseline --- ports/libde265/fix-lib-version.patch | 11 ----------- ports/libde265/portfile.cmake | 3 +-- ports/libde265/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libde265.json | 5 +++++ 5 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 ports/libde265/fix-lib-version.patch diff --git a/ports/libde265/fix-lib-version.patch b/ports/libde265/fix-lib-version.patch deleted file mode 100644 index 98e5a16e38de07..00000000000000 --- a/ports/libde265/fix-lib-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/libde265/CMakeLists.txt b/libde265/CMakeLists.txt -index 2856f90..ccbc8b6 100644 ---- a/libde265/CMakeLists.txt -+++ b/libde265/CMakeLists.txt -@@ -147,5 +147,6 @@ else() - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - endif() - -+set(VERSION ${PROJECT_VERSION}) # so that the replacement in libde265.pc will work with both autotools and CMake - configure_file(../libde265.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libde265.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 856d2176fc0621..226f739c8df56a 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 REF "v${VERSION}" - SHA512 aa744c521fb15e68940956f70997ab969094aee1c129d404ee9a52f318248353bb8d53250b575b4040402645e44701086b78143f1e1122b61a925e9b6cd07566 + SHA512 52803814edd914352ed8f1c4243636c83969c1d9440d6e045316cd1f978494b3ff366f656cc4e5ae70f8715173f4b6d5cb4c4fbed3e1759faaa1d668eeffee23 HEAD_REF master PATCHES fix-interface-include.patch - fix-lib-version.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index d11d6fa0d4861a..87b5344f23212d 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libde265", - "version": "1.0.11", - "port-version": 2, + "version": "1.0.12", "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 9f13e2a58916ff..726d2c90f91494 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4165,8 +4165,8 @@ "port-version": 1 }, "libde265": { - "baseline": "1.0.11", - "port-version": 2 + "baseline": "1.0.12", + "port-version": 0 }, "libdeflate": { "baseline": "1.19", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index 5112762e3a81c5..59dfa4513bafc2 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59b6113962afdbc8f5c2a06e21b1fdb59b4cf56f", + "version": "1.0.12", + "port-version": 0 + }, { "git-tree": "e24685d5b2c9686f77369463e32b307d03580059", "version": "1.0.11", From d8eea4ca8e039681e9149dcd8308180566d2998e Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:17:46 +0100 Subject: [PATCH 0417/1039] [spirv-*] update versions (#35192) --- ports/spirv-headers/portfile.cmake | 7 +++---- ports/spirv-headers/vcpkg.json | 3 +-- ports/spirv-tools/cmake-config-dir.diff | 6 +++--- ports/spirv-tools/fix-tool-deps.diff | 4 ++-- ports/spirv-tools/portfile.cmake | 4 ++-- ports/spirv-tools/spirv-tools-shared.diff | 14 +++++++------- ports/spirv-tools/vcpkg.json | 3 +-- versions/baseline.json | 8 ++++---- versions/s-/spirv-headers.json | 5 +++++ versions/s-/spirv-tools.json | 5 +++++ 10 files changed, 33 insertions(+), 26 deletions(-) diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake index 0e46e1b45c5d1f..d280ecc01d5083 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.231.1 - SHA512 d2c47127fd81430383e8656917f76933b713ca6cb93b2a9c16c9e0b125e2f62f8c497cab3a4fcc2a711decd911ec5d15f1eb0270add05442aff6672e08c890d7 + REF "sdk-${VERSION}" + SHA512 436c6ce11d918091ce4a5ef2821f51af811c9a289e220b4a2b0bb4417b1f9f3b1f56a6366cfdf56848a9b1fb612ee3ba31d35c3d73d3d24de964ee05f96a7bbc HEAD_REF master ) @@ -17,5 +17,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") vcpkg_fixup_pkgconfig() -# 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/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index e42ce93da355d9..b69a2cf1f67acf 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spirv-headers", - "version": "1.3.231.1", - "port-version": 1, + "version": "1.3.246.1", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers", "dependencies": [ diff --git a/ports/spirv-tools/cmake-config-dir.diff b/ports/spirv-tools/cmake-config-dir.diff index 306269540adbae..65a9e399b4da1d 100644 --- a/ports/spirv-tools/cmake-config-dir.diff +++ b/ports/spirv-tools/cmake-config-dir.diff @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b8fe92..8f3f91a 100644 +index 75830b44..367fe889 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -269,7 +269,7 @@ else() +@@ -270,7 +270,7 @@ else() endif() if(ENABLE_SPIRV_TOOLS_INSTALL) -- if(WIN32) +- if(WIN32 AND NOT MINGW) + if(0) macro(spvtools_config_package_dir TARGET PATH) set(${PATH} ${TARGET}/cmake) diff --git a/ports/spirv-tools/fix-tool-deps.diff b/ports/spirv-tools/fix-tool-deps.diff index ab6fd1227158a6..e842277a4a1fcb 100644 --- a/ports/spirv-tools/fix-tool-deps.diff +++ b/ports/spirv-tools/fix-tool-deps.diff @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2cf1e40..5f2a86c 100644 +index 75830b44..9c9e7ba8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -280,8 +280,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) +@@ -281,8 +281,13 @@ if(ENABLE_SPIRV_TOOLS_INSTALL) endif() macro(spvtools_generate_config_file TARGET) diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 2e0a0228bfc2fd..8e50dfbefff9ab 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.4 - SHA512 d93e97e168c50f545cc42418603ffc5fa6299bb3cc30d927444e4de0d955abc5dd481c9662a59cd49fc379da6bcc6df6fb747947e3dc144cee9b489aff7c4785 + REF "v${VERSION}" + SHA512 988f5e31508e3f19c1dd9d9a013c8e9ff89eba86207a769d7d804f9ee0201c794f412a874c860167b2c040b2c5e1fb1c835ae3684c70feaac86e47f90c1a5010 PATCHES cmake-config-dir.diff spirv-tools-shared.diff diff --git a/ports/spirv-tools/spirv-tools-shared.diff b/ports/spirv-tools/spirv-tools-shared.diff index 75ce3f8a9628c7..e2bf13cae976ab 100644 --- a/ports/spirv-tools/spirv-tools-shared.diff +++ b/ports/spirv-tools/spirv-tools-shared.diff @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8f3f91a..2cf1e40 100644 +index 75830b44..39cc039e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -389,10 +389,14 @@ add_custom_target(spirv-tools-shared-pkg-config ALL +@@ -390,10 +390,14 @@ add_custom_target(spirv-tools-shared-pkg-config ALL # Install pkg-config file if (ENABLE_SPIRV_TOOLS_INSTALL) @@ -19,10 +19,10 @@ index 8f3f91a..2cf1e40 100644 ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endif() diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 668579a..7874c1a 100644 +index acfa0c12..b3286db3 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -421,6 +421,10 @@ if (ANDROID) +@@ -425,6 +425,10 @@ if (ANDROID) endif() if(ENABLE_SPIRV_TOOLS_INSTALL) @@ -30,6 +30,6 @@ index 668579a..7874c1a 100644 + set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES EXCLUDE_FROM_ALL 1) + list(REMOVE_ITEM SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared) + endif() - install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets) + export(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake) + diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index 605b708cf9084c..79e525a05f8141 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spirv-tools", - "version": "2022.4", - "port-version": 1, + "version": "2023.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 726d2c90f91494..ddde15e8152572 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8069,16 +8069,16 @@ "port-version": 2 }, "spirv-headers": { - "baseline": "1.3.231.1", - "port-version": 1 + "baseline": "1.3.246.1", + "port-version": 0 }, "spirv-reflect": { "baseline": "1.3.236.0", "port-version": 0 }, "spirv-tools": { - "baseline": "2022.4", - "port-version": 1 + "baseline": "2023.2", + "port-version": 0 }, "spout2": { "baseline": "2.007.010", diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index 40021d33b891c8..645357860b9b0c 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9745c8474cd0d67262164092fe7283b7ecb36914", + "version": "1.3.246.1", + "port-version": 0 + }, { "git-tree": "1975a40807faf80ae5a8513b15f707ec9d583763", "version": "1.3.231.1", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index 0266269c8d20b8..cca863cb85f1fd 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47e4151499f10ce55584fc6818822bdc4a913353", + "version": "2023.2", + "port-version": 0 + }, { "git-tree": "082a2b7ca21aeafe82dc89765facb7c34675b7b9", "version": "2022.4", From 0a9aa26acd193f1c556c270996a87eb4b7e6dec8 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 21 Nov 2023 04:18:28 +0800 Subject: [PATCH 0418/1039] [vcpkg baseline][status-code] passing remove from fail (#35170) --- scripts/ci.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d97a3323c81422..2ae80fa70ceab2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -667,6 +667,9 @@ live555:x64-android=fail live555:x64-osx=fail live555:arm64-osx=fail live555:x64-uwp=fail +llfio:arm-neon-android=fail +llfio:arm64-android=fail +llfio:x64-android=fail llgl:arm-neon-android=fail llgl:arm64-android=fail llgl:x64-android=fail @@ -1132,9 +1135,6 @@ spdk-isal:x64-linux=skip spscqueue:arm-neon-android=fail spscqueue:arm64-android=fail spscqueue:x64-android=fail -status-code:arm-neon-android=fail -status-code:arm64-android=fail -status-code:x64-android=fail stormlib:arm64-uwp=fail stormlib:x64-uwp=fail stx:arm-neon-android=fail From 32d07fb9f416bbe81d0a08f99cb71d312f00cf0f Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:20:47 +0100 Subject: [PATCH 0419/1039] [glslang] fix tools (#35191) --- ports/glslang/portfile.cmake | 5 +---- ports/glslang/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glslang.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index ab346cf30d0f62..ef14a5acefc7a0 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -45,10 +45,7 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake vcpkg_copy_pdbs() if (ENABLE_GLSLANG_BINARIES) - vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN) - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools(TOOL_NAMES glslang AUTO_CLEAN) - endif() + vcpkg_copy_tools(TOOL_NAMES glslang glslangValidator spirv-remap AUTO_CLEAN) endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 432d78ae07de23..0720cd728a94dc 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glslang", "version": "13.0.0", - "port-version": 1, + "port-version": 2, "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index ddde15e8152572..6bb8e5174a2218 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3010,7 +3010,7 @@ }, "glslang": { "baseline": "13.0.0", - "port-version": 1 + "port-version": 2 }, "glui": { "baseline": "2019-11-30", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 9ae47f89067093..3e0dbfeccdd0a5 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "488d78f12e3a376002a80d0058e3973ac75d4fe7", + "version": "13.0.0", + "port-version": 2 + }, { "git-tree": "c5c6c37e6477580e47bd5645a3760ff534c689f6", "version": "13.0.0", From f740d6f22908ccd8a519228a26b267f7a68dda9c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 20 Nov 2023 21:21:43 +0100 Subject: [PATCH 0420/1039] [libxml2] Update to 2.11.6 (#35189) --- ports/libxml2/portfile.cmake | 2 +- ports/libxml2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxml2.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 9f1cb2c3acc9e7..207d0f68ddfac8 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 REF "v${VERSION}" - SHA512 527e66f6260a399318cfacc06db3ede4b16178ef17492ed0d515884aa00fce685f9e6932cd117df0d83e2440b5a5392c3d5fbe187b601cf19769b495e0865c87 + SHA512 27ce97deb8c60742dcaf95992544dc79342435a55f9a74b479b978a06361a41e902bf269c6ef40b18dae63c2a13c31268f2bb5b0673aca8843ad6ad631e68f9d HEAD_REF master PATCHES disable-docs.patch diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 042db9ebecaf0b..0dd912fcfdd6ac 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxml2", - "version": "2.11.5", - "port-version": 1, + "version": "2.11.6", "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6bb8e5174a2218..14e33e922159f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5069,8 +5069,8 @@ "port-version": 2 }, "libxml2": { - "baseline": "2.11.5", - "port-version": 1 + "baseline": "2.11.6", + "port-version": 0 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 6f2b9ea2b9a1c6..4da178ff3b6031 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a347ee0ddfd928d4f61ec12b3b95c1c7740d46df", + "version": "2.11.6", + "port-version": 0 + }, { "git-tree": "5ce0144d5c48f5140af55d0fbb58396b955d87a3", "version": "2.11.5", From a9dfdc39f0d41f34eb6d8b8746c3de53e8130a7b Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Tue, 21 Nov 2023 05:24:15 +0200 Subject: [PATCH 0421/1039] Add wcslib 8.2.1 (#35213) --- ports/wcslib/portfile.cmake | 6 +++--- ports/wcslib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wcslib.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/wcslib/portfile.cmake b/ports/wcslib/portfile.cmake index 009f449d2cac1c..bb61a0338a5611 100644 --- a/ports/wcslib/portfile.cmake +++ b/ports/wcslib/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(archive - URLS "https://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-7.12.tar.bz2" - FILENAME "wcslib-7.12.tar.bz2" - SHA512 7f38f725992d3c4bd3c1b908d494ac361c17f6b60f091d987fda596211423bb7396b3a5e2f1f6dd6215835016d302083472a7ad0822f17cdfe230c8f556b3e23 + URLS "http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib-8.2.1.tar.bz2" + FILENAME "wcslib-8.2.1.tar.bz2" + SHA512 0d1ab63445974c2a4f425225cde197866187a9e7ae0195a33dcb33ad299018294338bc16ab4cbe6a3a27fb40aded75c60377348eaa91713d16a934cd95532c25 ) vcpkg_extract_source_archive( diff --git a/ports/wcslib/vcpkg.json b/ports/wcslib/vcpkg.json index cbcfa896ed4779..852730641537de 100644 --- a/ports/wcslib/vcpkg.json +++ b/ports/wcslib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wcslib", - "version": "7.12", + "version": "8.2.1", "description": "World Coordinate System (WCS) (Library)", "homepage": "https://www.atnf.csiro.au/people/mcalabre/WCS/", "supports": "!windows" diff --git a/versions/baseline.json b/versions/baseline.json index 14e33e922159f0..3f2a1874b265e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8969,7 +8969,7 @@ "port-version": 1 }, "wcslib": { - "baseline": "7.12", + "baseline": "8.2.1", "port-version": 0 }, "websocketpp": { diff --git a/versions/w-/wcslib.json b/versions/w-/wcslib.json index 988a5185fb3ec4..ac7dbb01608c9a 100644 --- a/versions/w-/wcslib.json +++ b/versions/w-/wcslib.json @@ -4,6 +4,11 @@ "git-tree": "2e33104b54c3db79012234ded4db319a3464885b", "version": "7.12", "port-version": 0 + }, + { + "git-tree": "a68a2412a39e7458698f2e4110d8a50dc8619c96", + "version": "8.2.1", + "port-version": 0 } ] } From 78ec5c9df894ae6f92fbb9018ceeb2395e3c45f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 21 Nov 2023 04:24:32 +0100 Subject: [PATCH 0422/1039] [quill] Update to 3.4.1 (#35211) * [quill] Update to 3.4.1 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 8353285c6b247d..7ab500e96ee509 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 bd42bdb9a377a02aa9d807f26c38d560ae75faca76314cf9c18baeca354e09a5ac4e81ab854ffd7f4715828b39a7e6aef3c67d0d425f983e38b80254b0eeeede + SHA512 9b15c33041b1eaf57106c7cf8924017462598f91c27112178518591f66481bc496f0729ce819112c27c4bdc61db9816f88fd955d0392b313736a0d54cea4f716 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 8203610053cc14..9b0f840f74121e 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.4.0", + "version": "3.4.1", "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 3f2a1874b265e2..28c176bcafdf10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7265,7 +7265,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.4.0", + "baseline": "3.4.1", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index b734ba490a73ea..2be93922a2d56b 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c2da56c7367f81e726a9a9e346b0c718447671b", + "version": "3.4.1", + "port-version": 0 + }, { "git-tree": "97fc8d7f2a2d08df4f1f8b9d69a9e1d28e66aecc", "version": "3.4.0", From 0fd2ad76efa110d3e4b2b98b60cd17ed5051ac43 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 20 Nov 2023 19:26:38 -0800 Subject: [PATCH 0423/1039] [dstorage] Update for version 1.2.2 (#35179) * [dstorage] Update for version 1.2.2 which drops ARM32 * Update baseline * Code review feedback * Update baseline --- ports/dstorage/portfile.cmake | 5 +++-- ports/dstorage/usage | 4 ++++ ports/dstorage/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/d-/dstorage.json | 5 +++++ 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 ports/dstorage/usage diff --git a/ports/dstorage/portfile.cmake b/ports/dstorage/portfile.cmake index a0c36a349e135a..2676c59f37b195 100644 --- a/ports/dstorage/portfile.cmake +++ b/ports/dstorage/portfile.cmake @@ -5,7 +5,7 @@ set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DirectStorage/${VERSION}" FILENAME "directstorage.${VERSION}.zip" - SHA512 5be6219888c89c5f590709d1528b3e6854eabd7b733af5c8f665aa9d7e987fa3bac34472362f845eb902b88d2d6e8afbbcead15e892d72678861a14b0bc13c41 + SHA512 f24f681edf0c5e047573c68ca85ab62e0ffefaf87867d45231d779e9bc8e9525891b56314cc30e58eaef20132335f011f32aba22654d2e7caf23338aeb29c6ce ) vcpkg_extract_source_archive( @@ -25,6 +25,7 @@ file(COPY "${PACKAGE_PATH}/native/bin/${VCPKG_TARGET_ARCHITECTURE}/dstoragecore. file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${PACKAGE_PATH}/LICENSE.txt") configure_file("${CMAKE_CURRENT_LIST_DIR}/dstorage-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/${PORT}-config.cmake" COPYONLY) diff --git a/ports/dstorage/usage b/ports/dstorage/usage new file mode 100644 index 00000000000000..259ccf4da9dd4e --- /dev/null +++ b/ports/dstorage/usage @@ -0,0 +1,4 @@ +The DirectStorage package provides CMake targets: + + find_package(dstorage CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectStorage) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 0e62ec9bd93356..3bd19390b4d14a 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dstorage", - "version": "1.2.0", + "version": "1.2.2", "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "documentation": "https://github.com/microsoft/DirectStorage", "license": null, - "supports": "windows & !uwp & !xbox" + "supports": "windows & !arm32 & !uwp & !xbox" } diff --git a/versions/baseline.json b/versions/baseline.json index 28c176bcafdf10..d67d410e9ca1ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2265,7 +2265,7 @@ "port-version": 1 }, "dstorage": { - "baseline": "1.2.0", + "baseline": "1.2.2", "port-version": 0 }, "dtl": { diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index 65d2476f028065..48bc43cc5443d4 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7577afa856f2cf3d3ce28d32f3272344987f2a71", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "18440695231677ed659b391e4a31c0100996cdb6", "version": "1.2.0", From 43cf47eccfbe27006cf9534a5db809798f8c37fe Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 20 Nov 2023 19:26:53 -0800 Subject: [PATCH 0424/1039] Update vcpkg-tool to 2023-11-16 (#35138) * Update vcpkg-tool to 2023-11-16 https://github.com/microsoft/vcpkg-tool/releases/tag/2023-11-16 --- scripts/ci.baseline.txt | 4 ---- scripts/vcpkg-tool-metadata.txt | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2ae80fa70ceab2..8ffaead838575c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1276,10 +1276,6 @@ xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip -xmlsec:arm64-uwp=fail -xmlsec:x64-uwp=fail -yara:arm64-uwp=fail -yara:x64-uwp=fail zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 45e7e180970c2f..6ebc7fdb8a0f05 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-10-18 -VCPKG_MACOS_SHA=a088881182d89cc8df5d4956eeafb5b1af08d0b5b99e84296796da13572cedaeb7e08c5256585b5417a39bb4b31a0c08323b63754fd75e45de0e5a61f21d6517 -VCPKG_MUSLC_SHA=0e278d8d5fe34f1c1513b18ff9061fe47a46e5d34d0834b1e966e0a7c0e7646af99679e39d6ea0e2b731eb5d0e0cc79e5b893cfeaeced083212d45a44f14a6e7 -VCPKG_GLIBC_SHA=89359cd737d9a19598cde8d27f4cd1e2c52d768ec8d2f8a9d2cd23f1054717cb9881e9e0587fa8726fa754cffd0b93d851b4d48f1e27cec9d9c25d92d1f35cff -VCPKG_TOOL_SOURCE_SHA=ef2f4973c417da1f127dcda4c9ee423fadc518b807d9347920559cf648720c71547bc7cb719209007cd3fda87e3655a85215deb523c4ece71b9147dfd2e52ae4 +VCPKG_TOOL_RELEASE_TAG=2023-11-16 +VCPKG_MACOS_SHA=6f9c10f8d3e3752e654e3d79a93abfb865c5a7c4dcc5c675febff8409b42fa4ea440c4a92b403731cf60f7938f70737e792b91b274770f5d864ebc9621a98ed8 +VCPKG_MUSLC_SHA=d802ab09fca9554646e7db7ad3011c81174d4e56a69d0b516b0bc1801f81b80334a7add58ce8d7caf0915fbdb9147cd537c47cfb87ad2f04d97589f2e78df4ff +VCPKG_GLIBC_SHA=fcb65141efbfff8dced31570079fcc8807e169cf60c0c2ad35605b506bbe7da26fa558eef6516077b2e54cc4ea17636352a91c163db1b77bd1fba42603f202b9 +VCPKG_TOOL_SOURCE_SHA=00da03c332e82c5c474ce241961abe5f4c71179d589a4b76ce30c379f7bafd9384fdd4f99f427bee3f72da34147ccefa367bddd9db3e353cfdc3593ce7e5554f From a42af01b72c28a8e1d7b48107b33e4f286a55ef6 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 21 Nov 2023 12:31:49 +0900 Subject: [PATCH 0425/1039] [libtheora] install pkg-config files (#34904) * [libtheora] create pkg-config files * [libtheora] fix expression * [libtheora] update baseline * [libtheora] provide version from portfile * Update ports/libtheora/CMakeLists.txt Co-authored-by: Kai Pastor * Update ports/libtheora/portfile.cmake Co-authored-by: Kai Pastor * Update ports/libtheora/CMakeLists.txt Co-authored-by: Kai Pastor * [libtheora] update baseline --------- Co-authored-by: Kai Pastor --- ports/libtheora/CMakeLists.txt | 13 +++++++++++++ ports/libtheora/portfile.cmake | 3 ++- ports/libtheora/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtheora.json | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/libtheora/CMakeLists.txt b/ports/libtheora/CMakeLists.txt index 79d88277918080..1e2d4b8a7db5ef 100644 --- a/ports/libtheora/CMakeLists.txt +++ b/ports/libtheora/CMakeLists.txt @@ -141,3 +141,16 @@ install(EXPORT unofficial-theora-targets NAMESPACE unofficial::theora:: DESTINATION "lib/unofficial-theora" ) + +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(libdir "\${prefix}/lib") +set(exec_prefix "\${prefix}") +set(includedir "\${prefix}/include") +configure_file(theora.pc.in theora.pc @ONLY) +configure_file(theoradec.pc.in theoradec.pc @ONLY) +configure_file(theoraenc.pc.in theoraenc.pc @ONLY) + +install( + FILES "${PROJECT_BINARY_DIR}/theora.pc" "${PROJECT_BINARY_DIR}/theoradec.pc" "${PROJECT_BINARY_DIR}/theoraenc.pc" + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig +) diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake index 670fe8a4236bcc..b2e324e2e91de7 100644 --- a/ports/libtheora/portfile.cmake +++ b/ports/libtheora/portfile.cmake @@ -21,12 +21,13 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DVERSION:STRING=${VERSION}" -DUSE_X86=${THEORA_X86_OPT} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/unofficial-theora" PACKAGE_NAME "unofficial-theora") - +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libtheora/vcpkg.json b/ports/libtheora/vcpkg.json index abbc322d3d9c42..a64f03104ab723 100644 --- a/ports/libtheora/vcpkg.json +++ b/ports/libtheora/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtheora", "version-string": "1.2.0alpha1-20170719", - "port-version": 6, + "port-version": 7, "description": "Theora is a free and open video compression format from the Xiph.org Foundation.", "homepage": "https://github.com/xiph/theora", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d67d410e9ca1ed..d63bce37294938 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4866,7 +4866,7 @@ }, "libtheora": { "baseline": "1.2.0alpha1-20170719", - "port-version": 6 + "port-version": 7 }, "libtins": { "baseline": "4.5", diff --git a/versions/l-/libtheora.json b/versions/l-/libtheora.json index 927fce18396b3d..2829cd15d57652 100644 --- a/versions/l-/libtheora.json +++ b/versions/l-/libtheora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6cc1235f841d9f9a7b7d1a278dc63b788c63659", + "version-string": "1.2.0alpha1-20170719", + "port-version": 7 + }, { "git-tree": "66646fe9dde7ac30894403ba659941879387904e", "version-string": "1.2.0alpha1-20170719", From abe01a20d3652f9443eed96bc7ec888d5d194674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Tue, 21 Nov 2023 19:47:32 +0000 Subject: [PATCH 0426/1039] [Glaze] Update version 1.6.0 (#35185) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Glaze version 1.6.0 * Updated database --------- Co-authored-by: Ómar Högni Guðmarsson --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 69af319aa7ef37..98929f2d955e4c 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 4b9fb73790892cb7543ee94e773ff706f9fad46cd95c472b68d1f535413bc2b46c2d36970cbe31858444a5463ec19215ef50f4c37e8efe5f4f23c61acf7a53ed + SHA512 8c39fd370d46251dc528d09145efb7cb0645e02d3590fca1734a2e66ab46ff762128e80bec83abea98827786c475d2d647b5f0a7405f9e0d78f7cf0348bca515 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 1fb63116ca7981..71ff139a4d7cf0 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.5.7", + "version": "1.6.0", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d63bce37294938..92ad698aa4e409 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2961,7 +2961,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.5.7", + "baseline": "1.6.0", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 0d453eb2fe926d..3ddc4a3572c432 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55fc4a50001f9e0da4aecfa3ffb82fd988cde742", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "50a00a801ec368382628caa2da7c8a0f09815456", "version": "1.5.7", From 776bf4317ed4b850cc59d72c61d5f6799686a851 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 21 Nov 2023 13:50:31 -0800 Subject: [PATCH 0427/1039] [glog] Set GLOG_STATIC_DEFINE in export.h (#35173) * fix glog * update version --------- Co-authored-by: Monica --- ports/glog/portfile.cmake | 8 +++++++- ports/glog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glog.json | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 50997e76046563..2363d5c034e071 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -35,4 +35,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/export.h" "#ifdef GLOG_STATIC_DEFINE" "#if 1") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/export.h" "#ifdef GLOG_STATIC_DEFINE" "#if 0") +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 97dd284bdb6c5e..d080e732476915 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glog", "version": "0.6.0", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 92ad698aa4e409..e0c186b7ceaa2f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2998,7 +2998,7 @@ }, "glog": { "baseline": "0.6.0", - "port-version": 2 + "port-version": 3 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 9e2e219869ff06..3bb72a9d3890ac 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e4dcaa54d409ed758073ef4964cf41d57996e90", + "version": "0.6.0", + "port-version": 3 + }, { "git-tree": "cce45164ee522a505686c1794e7c228e44f52d76", "version": "0.6.0", From 3bfa3d4f33c1a722b7d13e02504aad29fcb3831a Mon Sep 17 00:00:00 2001 From: Francesco Bertolaccini Date: Tue, 21 Nov 2023 23:09:20 +0100 Subject: [PATCH 0428/1039] [clap-cleveraudio] New port (#35197) * [clap-cleveraudio] New port * Remove needless options --- ports/clap-cleveraudio/portfile.cmake | 20 ++++++++++++++++++++ ports/clap-cleveraudio/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/clap-cleveraudio.json | 9 +++++++++ 4 files changed, 50 insertions(+) create mode 100644 ports/clap-cleveraudio/portfile.cmake create mode 100644 ports/clap-cleveraudio/vcpkg.json create mode 100644 versions/c-/clap-cleveraudio.json diff --git a/ports/clap-cleveraudio/portfile.cmake b/ports/clap-cleveraudio/portfile.cmake new file mode 100644 index 00000000000000..31f6a7b6b16749 --- /dev/null +++ b/ports/clap-cleveraudio/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO free-audio/clap + REF 1.1.10 + SHA512 50d2b8e35ebcb3dfd4e057ddcf22e92204ca90a700527fe802c7f3ae678e77c970f789f2fbbedd58964a1d1ec72376e7c8d488c10fe03d39fbd1cd5d6a8630a1 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/clap" +) +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/clap-cleveraudio/vcpkg.json b/ports/clap-cleveraudio/vcpkg.json new file mode 100644 index 00000000000000..9d81b5be2c2674 --- /dev/null +++ b/ports/clap-cleveraudio/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "clap-cleveraudio", + "version-semver": "1.1.10", + "description": "CLAP is an audio plugin ABI which defines a standard for Digital Audio Workstations and audio plugins to work together", + "homepage": "https://cleveraudio.org/", + "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 e0c186b7ceaa2f..28e747ef0f99b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1596,6 +1596,10 @@ "baseline": "0.103.0", "port-version": 4 }, + "clap-cleveraudio": { + "baseline": "1.1.10", + "port-version": 0 + }, "clapack": { "baseline": "3.2.1", "port-version": 22 diff --git a/versions/c-/clap-cleveraudio.json b/versions/c-/clap-cleveraudio.json new file mode 100644 index 00000000000000..ca25352d396f13 --- /dev/null +++ b/versions/c-/clap-cleveraudio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "53d2e109c8c510419c0e2ecfc15beb707bb1215a", + "version-semver": "1.1.10", + "port-version": 0 + } + ] +} From 64a8686c41cad282d0a9e4021ea59d8c832f2974 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 21 Nov 2023 23:16:01 +0100 Subject: [PATCH 0429/1039] [dbus] Use port libsystemd (#34333) * [dbus] Fix features * [dbus] Use port libsystemd [skip actions] * [dbus] Fix libsystemd dependency * [dbus] libsystemd include dir via target * [freerdp] Disable libsystemd --- ports/dbus/libsystemd.patch | 15 +++++++++++++++ ports/dbus/portfile.cmake | 3 ++- ports/dbus/vcpkg.json | 18 +++++++++++++++++- ports/freerdp/portfile.cmake | 1 + ports/freerdp/vcpkg.json | 12 +++++++++++- versions/baseline.json | 4 ++-- versions/d-/dbus.json | 5 +++++ versions/f-/freerdp.json | 5 +++++ 8 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 ports/dbus/libsystemd.patch diff --git a/ports/dbus/libsystemd.patch b/ports/dbus/libsystemd.patch new file mode 100644 index 00000000000000..74193dc4075929 --- /dev/null +++ b/ports/dbus/libsystemd.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3ec71b..932066a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,6 +141,10 @@ if(DBUS_LINUX) + if(ENABLE_SYSTEMD AND SYSTEMD_FOUND) + set(DBUS_BUS_ENABLE_SYSTEMD ON) + set(HAVE_SYSTEMD ${SYSTEMD_FOUND}) ++ pkg_check_modules(SYSTEMD libsystemd IMPORTED_TARGET) ++ set(SYSTEMD_LIBRARIES PkgConfig::SYSTEMD CACHE INTERNAL "") ++ else() ++ set(SYSTEMD_LIBRARIES "" CACHE INTERNAL "") + endif() + option(ENABLE_USER_SESSION "enable user-session semantics for session bus under systemd" OFF) + set(DBUS_ENABLE_USER_SESSION ${ENABLE_USER_SESSION}) diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index 740c9d141152b8..1aae5fcddcd307 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -11,10 +11,12 @@ vcpkg_from_gitlab( cmake.dep.patch pkgconfig.patch getpeereid.patch # missing check from configure.ac + libsystemd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS options FEATURES + systemd ENABLE_SYSTEMD x11 DBUS_BUILD_X11 x11 CMAKE_REQUIRE_FIND_PACKAGE_X11 ) @@ -30,7 +32,6 @@ vcpkg_cmake_configure( -DDBUS_INSTALL_SYSTEM_LIBS=OFF #-DDBUS_SERVICE=ON -DDBUS_WITH_GLIB=OFF - -DENABLE_SYSTEMD=ON -DTHREADS_PREFER_PTHREAD_FLAG=ON -DXSLTPROC_EXECUTABLE=FALSE "-DCMAKE_INSTALL_SYSCONFDIR=${CURRENT_PACKAGES_DIR}/etc/${PORT}" diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index 771baacbedfd41..ce20181b817dca 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbus", "version": "1.15.8", - "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", @@ -17,7 +17,23 @@ "host": true } ], + "default-features": [ + { + "name": "systemd", + "platform": "linux" + } + ], "features": { + "systemd": { + "description": "Build with systemd at_console support", + "supports": "linux", + "dependencies": [ + { + "name": "libsystemd", + "platform": "linux" + } + ] + }, "x11": { "description": "Build with X11 autolaunch support", "dependencies": [ diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 0a6ef5311789e4..b83e406b5abd2a 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -57,6 +57,7 @@ vcpkg_cmake_configure( # Can be overriden in custom triplet file -DWITH_ALSA=OFF -DWITH_CAIRO=OFF + -DWITH_LIBSYSTEMD=OFF MAYBE_UNUSED_VARIABLES MSVC_RUNTIME ) diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 3e225b8a07b8cc..a4efbd88b9538f 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freerdp", "version": "2.11.2", + "port-version": 1, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", @@ -46,7 +47,16 @@ }, "server": { "description": "Build server components", - "supports": "!android & !ios & !uwp" + "supports": "!android & !ios & !uwp", + "dependencies": [ + { + "name": "freerdp", + "default-features": false, + "features": [ + "winpr-tools" + ] + } + ] }, "urbdrc": { "description": "USB redirection channel support", diff --git a/versions/baseline.json b/versions/baseline.json index 28e747ef0f99b0..a95c09e7f44056 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2130,7 +2130,7 @@ }, "dbus": { "baseline": "1.15.8", - "port-version": 1 + "port-version": 2 }, "dcmtk": { "baseline": "3.6.7", @@ -2762,7 +2762,7 @@ }, "freerdp": { "baseline": "2.11.2", - "port-version": 0 + "port-version": 1 }, "freetds": { "baseline": "1.3.10", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 0e39a12637cf87..f4bf2e5a93e822 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d91a1718705f5d0d6ba7922cf832759a58469ff8", + "version": "1.15.8", + "port-version": 2 + }, { "git-tree": "9104cc6d890ace8c14067e7cbf29c39f7a93b937", "version": "1.15.8", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index f88b634cbcd6fc..e273fb62262e7c 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "980f914c0856191ef155ede267bc4553ccc49ac2", + "version": "2.11.2", + "port-version": 1 + }, { "git-tree": "90f838d8fb3b7d8d45b9d64f951486cee618ab8e", "version": "2.11.2", From ce8fd9e7246969886ee31cbd76955b6d444289cb Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Tue, 21 Nov 2023 18:24:19 -0800 Subject: [PATCH 0430/1039] [libpng] Update to 1.6.40 (#35193) * update libpng to 1.6.40 * update baseline * fix patch files * update baseline --- ports/libpng/cmake.patch | 20 ++++++++++---------- ports/libpng/fix-export-targets.patch | 10 +++++----- ports/libpng/fix-msa-support-for-mips.patch | 6 +++--- ports/libpng/pkgconfig.patch | 10 +++++----- ports/libpng/portfile.cmake | 6 +++--- ports/libpng/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libpng.json | 5 +++++ 8 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ports/libpng/cmake.patch b/ports/libpng/cmake.patch index 0e00c3b803d63c..66a3731160e069 100644 --- a/ports/libpng/cmake.patch +++ b/ports/libpng/cmake.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8652564..d0681d2 100644 +index e355e4d..6dfe543 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -614,7 +614,7 @@ if(PNG_STATIC) - # MSVC doesn't use a different file extension for shared vs. static - # libs. We are able to change OUTPUT_NAME to remove the _static - # for all other platforms. -- if(NOT MSVC) -+ if(1) - set_target_properties(png_static PROPERTIES - OUTPUT_NAME "${PNG_LIB_NAME}" - CLEAN_DIRECT_OUTPUT 1) +@@ -632,7 +632,7 @@ else() + # We also need to use a custom suffix, in order to distinguish between the + # shared import library name and the static library name. + set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}") +- set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static") ++ set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}") + endif() + + if(PNG_SHARED) diff --git a/ports/libpng/fix-export-targets.patch b/ports/libpng/fix-export-targets.patch index 577dc2f8f0b61f..bea2daaf5afab0 100644 --- a/ports/libpng/fix-export-targets.patch +++ b/ports/libpng/fix-export-targets.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c01cdcb..0ad4ba4 100644 +index e355e4d..3e2f346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1033,6 +1033,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) +@@ -1053,6 +1053,12 @@ if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL) install(EXPORT libpng DESTINATION lib/libpng - FILE lib${PNG_LIB_NAME}.cmake) + FILE libpng${PNGLIB_ABI_VERSION}.cmake) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" " + include(CMakeFindDependencyMacro) + find_dependency(ZLIB) -+ include(\"\${CMAKE_CURRENT_LIST_DIR}/lib${PNG_LIB_NAME}.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/libpng${PNGLIB_ABI_VERSION}.cmake\") + ") -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng") ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libpng-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/libpng") endif() # TODO: Create MSVC import lib for MinGW-compiled shared lib. diff --git a/ports/libpng/fix-msa-support-for-mips.patch b/ports/libpng/fix-msa-support-for-mips.patch index fb41e161ee91ae..163586a5d07537 100644 --- a/ports/libpng/fix-msa-support-for-mips.patch +++ b/ports/libpng/fix-msa-support-for-mips.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a249d42..1176c60 100644 +index e355e4d..990e32a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -171,8 +171,8 @@ endif() +@@ -188,8 +188,8 @@ endif() # Set definitions and sources for MIPS. if(TARGET_ARCH MATCHES "mipsel*" OR TARGET_ARCH MATCHES "mips64el*") @@ -13,7 +13,7 @@ index a249d42..1176c60 100644 CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default") set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES}) -@@ -185,6 +185,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR +@@ -202,6 +202,8 @@ if(TARGET_ARCH MATCHES "mipsel*" OR mips/filter_msa_intrinsics.c) if(${PNG_MIPS_MSA} STREQUAL "on") add_definitions(-DPNG_MIPS_MSA_OPT=2) diff --git a/ports/libpng/pkgconfig.patch b/ports/libpng/pkgconfig.patch index 2a04c192acd87e..ed92a94f1d4aee 100644 --- a/ports/libpng/pkgconfig.patch +++ b/ports/libpng/pkgconfig.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ad4ba4..a249d42 100644 +index e355e4d..b5b9172 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -932,12 +932,15 @@ endif() +@@ -960,12 +960,15 @@ endif() # We use the same files like ./configure, so we have to set its vars. # Only do this on Windows for Cygwin - the files don't make much sense # outside of a UNIX look-alike. @@ -18,13 +18,13 @@ index 0ad4ba4..a249d42 100644 + string(APPEND LIBS "-lm") + endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc + ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc @ONLY) -@@ -1010,6 +1013,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) +@@ -1030,6 +1033,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +elseif(0) # Install the man pages. diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index d4628ac09701ab..dc7ea22cd85b1b 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -13,7 +13,7 @@ if ("apng" IN_LIST FEATURES) vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${LIBPNG_APNG_PATCH_NAME}.gz" FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" - SHA512 97a182da0b3b54aecf735e3655d8e8f1a569ae957b23fc3d7a9c8cc65dcdd26f34f173ce9f60af99b01d5347267b2afefaf787c500ce1005e86bf2810b3d0738 + SHA512 373cc9f0df15f7c77c0a59ddaac22374cfae37174b63a642e68e3a17a6d0bb1015399d771998c7eb6b356b634f157f0009743f4cc659f3b8e480a9533010ef9c ) set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") @@ -32,7 +32,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glennrp/libpng REF v${VERSION} - SHA512 d61408cee5850582baa57166547ccab6cc171bc809076e53494ace26157fd7787c3209e3b757fd68c541bfb95afe309745d887fb5cd2005b2024af7355c809a0 + SHA512 5f36a145c7d41f1c417d5f4e03be0155dae3499d72e67170acaad92c1af418c0bb6bc508e9b4b27ef4206bf0074cbf74978bade3bff28bc291867b8f8c2a38cf HEAD_REF master PATCHES "${LIBPNG_APNG_PATCH_PATH}" @@ -102,4 +102,4 @@ file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${ 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index a5fb4f90be5603..46bb5bca966f5c 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpng", - "version": "1.6.39", - "port-version": 1, + "version": "1.6.40", "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 a95c09e7f44056..20070a16c5ae87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4653,8 +4653,8 @@ "port-version": 1 }, "libpng": { - "baseline": "1.6.39", - "port-version": 1 + "baseline": "1.6.40", + "port-version": 0 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index 55b6f9c28454ee..22ee644dc214b3 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a2a7f489e57c9e55e049b7c5f0a28c8ff4464ed", + "version": "1.6.40", + "port-version": 0 + }, { "git-tree": "af144fe56e6e4c08cd8089d2e1dd46bae60a5062", "version": "1.6.39", From a44d019a38fe7217222a4780a9ed0d62691123ae Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 22 Nov 2023 03:51:28 +0100 Subject: [PATCH 0431/1039] [gflags] Cleanup, fix usage (#35188) * [gflags] Make find_package more regular * [gflags] portfile cleanup * [gflags] Fix pkgconfig * Versions * [gflags] Add license * [gflags] Legacy quirks --- ports/gflags/portfile.cmake | 13 +++++-------- ports/gflags/usage | 3 ++- ports/gflags/vcpkg-cmake-wrapper.cmake | 15 ++++++--------- ports/gflags/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/gflags.json | 5 +++++ 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index fed9053482a6b7..02cb969e4b1005 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -19,15 +19,14 @@ vcpkg_cmake_configure( -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF -DBUILD_gflags_nothreads_LIB:BOOL=OFF - -DGFLAGS_USE_TARGET_NAMESPACE:BOOL=ON - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_pkgconfig() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gflags.pc" "-lgflags" "-lgflags_debug") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -35,8 +34,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.txt") -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() diff --git a/ports/gflags/usage b/ports/gflags/usage index 67fb74789b6786..5d86c434ab3f72 100644 --- a/ports/gflags/usage +++ b/ports/gflags/usage @@ -1,4 +1,5 @@ -The package gflags provides CMake targets: +gflags provides CMake targets: + set(GFLAGS_USE_TARGET_NAMESPACE ON) find_package(gflags CONFIG REQUIRED) target_link_libraries(main PRIVATE gflags::gflags) diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake b/ports/gflags/vcpkg-cmake-wrapper.cmake index 55b3fc8dc54aa5..8fbb208b43057c 100644 --- a/ports/gflags/vcpkg-cmake-wrapper.cmake +++ b/ports/gflags/vcpkg-cmake-wrapper.cmake @@ -1,10 +1,7 @@ -set(GFLAGS_USE_TARGET_NAMESPACE ON) - +if(NOT DEFINED GFLAGS_USE_TARGET_NAMESPACE) + # vcpkg legacy + set(GFLAGS_USE_TARGET_NAMESPACE ON) + _find_package(${ARGS}) + unset(GFLAGS_USE_TARGET_NAMESPACE) +endif() _find_package(${ARGS}) - -foreach(tgt gflags gflags_shared gflags_static) - if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}") - add_library(${tgt} INTERFACE IMPORTED) - target_link_libraries(${tgt} INTERFACE "gflags::${tgt}") - endif() -endforeach(tgt) diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index f39eebb7a3a938..4a63b70a029711 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gflags", "version": "2.2.2", - "port-version": 7, + "port-version": 8, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 20070a16c5ae87..56e3f79067d298 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2930,7 +2930,7 @@ }, "gflags": { "baseline": "2.2.2", - "port-version": 7 + "port-version": 8 }, "ghc-filesystem": { "baseline": "1.5.14", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index e513632c9a7344..81fdd19bf2798d 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "606a0a3ad49f6e6276672e230431e6797d56180e", + "version": "2.2.2", + "port-version": 8 + }, { "git-tree": "1c57a920065312afe80b1b8a3595f82005da61ee", "version": "2.2.2", From a6c7fad33fe587c932cadd734c4c3d26b906dffe Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Tue, 21 Nov 2023 18:52:02 -0800 Subject: [PATCH 0432/1039] [libheif] Update to 1.17.5 (#35232) * update libheif to 1.17.5 * update baseline --- ports/libheif/portfile.cmake | 2 +- ports/libheif/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libheif.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 7d1d7f5fbdbd94..d2472489c6c5c9 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif REF "v${VERSION}" - SHA512 790f4ac69ccc04b2015fc4f58f4c3b2deb0c123bb443fd90732f3fd9efce7a35b188cbfef36a2ac17fb8137f3a0c06bc3ae5effbd8ef847989e1e122876abd62 + SHA512 e17f990fcb4b3ebfec19cbf304ae8f9b00a3d33aaf46802eff8b3c21c614ccd02cb0a92960324b4c579e579021615c88d16efe6df84a171ddbc05313d2c73931 HEAD_REF master PATCHES gdk-pixbuf.patch diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 29ec5ff512f3f8..736bbad7168892 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libheif", - "version": "1.17.3", + "version": "1.17.5", "description": "libheif is an HEIF and AVIF file format decoder and encoder.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 56e3f79067d298..16f4ad79e1beb6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4353,7 +4353,7 @@ "port-version": 5 }, "libheif": { - "baseline": "1.17.3", + "baseline": "1.17.5", "port-version": 0 }, "libhsplasma": { diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 150b1a92ec560c..268de036ccea4b 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5eb0bdc7d44de9fae5e799b6f5a34121daf181f2", + "version": "1.17.5", + "port-version": 0 + }, { "git-tree": "c2055d6d66f9ba0a12257bc2fa852b3c9e234091", "version": "1.17.3", From d54715d44702b0d06563e8a56d13627743e9db5a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 22 Nov 2023 10:56:20 +0800 Subject: [PATCH 0433/1039] [protobuf-c] Fix tools feature compilation error under uwp (#35229) * Fix tools feature compilation error under uwp * update version --- ports/protobuf-c/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/p-/protobuf-c.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/protobuf-c/vcpkg.json b/ports/protobuf-c/vcpkg.json index 315c33c3368533..ae408e4507ef11 100644 --- a/ports/protobuf-c/vcpkg.json +++ b/ports/protobuf-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "protobuf-c", "version-semver": "1.4.1", + "port-version": 1, "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.", "homepage": "https://github.com/protobuf-c/protobuf-c", "dependencies": [ @@ -23,7 +24,8 @@ ] }, "tools": { - "description": "Build tools (protoc-gen-c)." + "description": "Build tools (protoc-gen-c).", + "supports": "!uwp" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 16f4ad79e1beb6..f781e4596841a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6758,7 +6758,7 @@ }, "protobuf-c": { "baseline": "1.4.1", - "port-version": 0 + "port-version": 1 }, "protopuf": { "baseline": "2.2.1", diff --git a/versions/p-/protobuf-c.json b/versions/p-/protobuf-c.json index 8aa97f64a453fe..b7aa0fa3de797c 100644 --- a/versions/p-/protobuf-c.json +++ b/versions/p-/protobuf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32d120b5b3a9225b973b135f632ee82be3e7860b", + "version-semver": "1.4.1", + "port-version": 1 + }, { "git-tree": "f1adcf184e617f9f77bd727e6f5085665e471826", "version-semver": "1.4.1", From dfbe9e7652a43552cb35e38cf5fcde06ed39628f Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Wed, 22 Nov 2023 03:59:24 +0100 Subject: [PATCH 0434/1039] [nethost] Bump to 8.0.0 (#35158) * [nethost] Bump to 8.0.0 * vcpkg x-add-version --all * Apply suggestions in PR * vcpkg x-add-version --all * Fix license install * vcpkg x-add-version --all * Apply suggestions in PR * vcpkg x-add-version --all --- ports/nethost/portfile.cmake | 28 ++++++++++++++-------------- ports/nethost/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nethost.json | 5 +++++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ports/nethost/portfile.cmake b/ports/nethost/portfile.cmake index ae88f9a3418be2..f1421eca2ac66e 100644 --- a/ports/nethost/portfile.cmake +++ b/ports/nethost/portfile.cmake @@ -1,20 +1,23 @@ -set(COMMIT_HASH v7.0.0) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dotnet/runtime - REF ${COMMIT_HASH} - SHA512 59210df1d9541018a21a7e89e0f552ad35c849f49be31cf47e2a85086363cdabd2bf8ce652d2024479977ae059d658c3bd18de3bdaeb8cb3ddd71f2413f266bc + REF "v${VERSION}" + SHA512 a7de43bb294a62b661dd0b8f832c0ee64a6bd4a13deb4f65f51a8a8407cc5094d25cc703223d916451209284e013775a47da226098569e94694f3762a79e1de2 HEAD_REF master PATCHES 0001-nethost-cmakelists.patch ) -set(PRODUCT_VERSION "7.0.0") - -if(NOT VCPKG_TARGET_IS_WINDOWS) - execute_process(COMMAND sh -c "mkdir -p ${SOURCE_PATH}/artifacts/obj && ${SOURCE_PATH}/eng/native/version/copy_version_files.sh") +file(MAKE_DIRECTORY "${SOURCE_PATH}/artifacts/obj") +set(copy_version_files sh -c "${SOURCE_PATH}/eng/native/version/copy_version_files.sh") +if(VCPKG_HOST_IS_WINDOWS) + set(copy_version_files cmd /C "eng\\native\\version\\copy_version_files.cmd") endif() +vcpkg_execute_required_process( + COMMAND ${copy_version_files} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "copy_version_files-${TARGET_TRIPLET}" +) if(VCPKG_TARGET_IS_WINDOWS) set(RID_PLAT "win") @@ -50,12 +53,9 @@ vcpkg_cmake_configure( NO_CHARSET_FLAG OPTIONS "-DSKIP_VERSIONING=1" - "-DCLI_CMAKE_HOST_POLICY_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_HOST_FXR_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_HOST_VER:STRING=${PRODUCT_VERSION}" - "-DCLI_CMAKE_COMMON_HOST_VER:STRING=${PRODUCT_VERSION}" "-DCLI_CMAKE_PKG_RID:STRING=${BASE_RID}" - "-DCLI_CMAKE_COMMIT_HASH:STRING=${COMMIT_HASH}" + "-DCLI_CMAKE_FALLBACK_OS:STRING=${RID_PLAT}" + "-DCLI_CMAKE_COMMIT_HASH:STRING=v${VERSION}" "-DCLR_CMAKE_TARGET_ARCH_${ARCH_NAME}=1" "-DCLR_CMAKE_TARGET_ARCH=${RID_ARCH}" "-DCLR_CMAKE_HOST_ARCH=${RID_ARCH}" @@ -77,5 +77,5 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nethost.h" "#ifdef NETHOST_USE_AS_STATIC" "#if 0") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.TXT") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/nethost/vcpkg.json b/ports/nethost/vcpkg.json index 72d779ff607bb2..2ab3bbff43aac0 100644 --- a/ports/nethost/vcpkg.json +++ b/ports/nethost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nethost", - "version": "7.0.0", + "version": "8.0.0", "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", "homepage": "https://github.com/dotnet/runtime/tree/main/src/native/corehost/nethost", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f781e4596841a8..50a0c36837b1d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5897,7 +5897,7 @@ "port-version": 5 }, "nethost": { - "baseline": "7.0.0", + "baseline": "8.0.0", "port-version": 0 }, "nettle": { diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index de75f4bd818915..2dd791bafa3184 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e306025f6213b286479afaf20f15ab10c5a9d51", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "d0dbe0f8de11978aea0148c9474377cdc8e88aaf", "version": "7.0.0", From 4962638f66ddf59f6a304dd98d3a2dc195133ada Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Wed, 22 Nov 2023 05:05:40 +0200 Subject: [PATCH 0435/1039] [tre] Add CMake config files. (#35134) * [tre] Add CMake config files. * Fix license. * Address PR feedback. Co-authored-by: LilyWangLL <494550702@qq.com> Co-authored-by: Kai Pastor * Update version database. --------- Co-authored-by: LilyWangLL <494550702@qq.com> Co-authored-by: Kai Pastor --- ports/tre/CMakeLists.txt | 9 +++++++++ ports/tre/portfile.cmake | 6 +++++- ports/tre/usage | 4 ++++ ports/tre/vcpkg.json | 7 ++++++- versions/baseline.json | 2 +- versions/t-/tre.json | 5 +++++ 6 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 ports/tre/usage diff --git a/ports/tre/CMakeLists.txt b/ports/tre/CMakeLists.txt index b31aa8c72d415b..bfef8210a3aa81 100644 --- a/ports/tre/CMakeLists.txt +++ b/ports/tre/CMakeLists.txt @@ -30,11 +30,20 @@ if (WIN32) endif() add_library(tre ${SRCS}) +target_include_directories(tre PUBLIC "$") + install( TARGETS tre + EXPORT unofficial-tre-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install( + EXPORT unofficial-tre-targets + NAMESPACE unofficial::tre:: + FILE unofficial-tre-config.cmake + DESTINATION share/unofficial-tre) + install(FILES ${HEADERS} DESTINATION include/tre) diff --git a/ports/tre/portfile.cmake b/ports/tre/portfile.cmake index e6ce5e118e0af8..1bb2e7c90935cf 100644 --- a/ports/tre/portfile.cmake +++ b/ports/tre/portfile.cmake @@ -13,13 +13,17 @@ if(VCPKG_TARGET_IS_MINGW) endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) 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/tre" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tre/usage b/ports/tre/usage new file mode 100644 index 00000000000000..df5d666eb781e4 --- /dev/null +++ b/ports/tre/usage @@ -0,0 +1,4 @@ +tre provides CMake targets: + + find_package(unofficial-tre CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::tre::tre) diff --git a/ports/tre/vcpkg.json b/ports/tre/vcpkg.json index f4402a1c6b5fa9..e4ce1b25f265a6 100644 --- a/ports/tre/vcpkg.json +++ b/ports/tre/vcpkg.json @@ -1,13 +1,18 @@ { "name": "tre", "version": "0.8.0", - "port-version": 5, + "port-version": 6, "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.", "homepage": "https://github.com/laurikari/tre", + "license": "BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 50a0c36837b1d7..4552e1cd2b67de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8546,7 +8546,7 @@ }, "tre": { "baseline": "0.8.0", - "port-version": 5 + "port-version": 6 }, "tree-similarity": { "baseline": "0.1.1", diff --git a/versions/t-/tre.json b/versions/t-/tre.json index ce0b5be280594c..18364696929a4b 100644 --- a/versions/t-/tre.json +++ b/versions/t-/tre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "307fd730a8de00228602333743300ebadc2b301c", + "version": "0.8.0", + "port-version": 6 + }, { "git-tree": "601cf1197e7f531cf374926d949163b9c4bb8331", "version": "0.8.0", From 79656132f722ae89190bb7a645aaa6d700db1d17 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 22 Nov 2023 04:12:26 +0100 Subject: [PATCH 0436/1039] [jkqtplotter] add port (#34715) * [jkqtplotter] add port * format-manifest * v db * fix wrong target being used * Update ports/jkqtplotter/portfile.cmake * Update fix-cmake.patch * v db * adjust config dir. * v db * Update ports/jkqtplotter/portfile.cmake Co-authored-by: Javier Matos Denizac * more formating stuff * v db --------- Co-authored-by: Javier Matos Denizac --- ports/jkqtplotter/fix-cmake.patch | 52 ++++++++++++ ports/jkqtplotter/fix-cmake2.patch | 14 +++ ports/jkqtplotter/portfile.cmake | 131 +++++++++++++++++++++++++++++ ports/jkqtplotter/vcpkg.json | 39 +++++++++ versions/baseline.json | 4 + versions/j-/jkqtplotter.json | 9 ++ 6 files changed, 249 insertions(+) create mode 100644 ports/jkqtplotter/fix-cmake.patch create mode 100644 ports/jkqtplotter/fix-cmake2.patch create mode 100644 ports/jkqtplotter/portfile.cmake create mode 100644 ports/jkqtplotter/vcpkg.json create mode 100644 versions/j-/jkqtplotter.json diff --git a/ports/jkqtplotter/fix-cmake.patch b/ports/jkqtplotter/fix-cmake.patch new file mode 100644 index 00000000000000..2141695f59929e --- /dev/null +++ b/ports/jkqtplotter/fix-cmake.patch @@ -0,0 +1,52 @@ +diff --git a/cmake/FindCImg.cmake b/cmake/FindCImg.cmake +index 38a929e7a..3e8424a9f 100644 +--- a/cmake/FindCImg.cmake ++++ b/cmake/FindCImg.cmake +@@ -83,10 +83,10 @@ if (CIMG_FOUND) + endif (X11_Xrandr_FOUND) + + ### PThread is required when using X11 display engine ### +- find_package (PTHREAD QUIET) +- if (PTHREAD_FOUND) +- set (CIMG_INCLUDE_DIRS ${CIMG_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS}) +- set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${PTHREAD_LIBRARIES}) ++ find_package (Threads QUIET) ++ if (Threads_FOUND) ++ set (CIMG_INCLUDE_DIRS ${CIMG_INCLUDE_DIRS}) ++ set (CIMG_LIBRARIES ${CIMG_LIBRARIES} Threads::Threads) + message(STATUS "FindCImg.cmake: pthread found") + else (PTHREAD_FOUND) + message(STATUS "!!! FindCIMG.cmake !!! pthread NOT found. pthread required by cimg for running X11.") +@@ -100,15 +100,15 @@ if (CIMG_FOUND) + endif (X11_FOUND) + else (UNIX OR APPLE) + if (WIN32) +- find_package(GDI QUIET) +- if (GDI_FOUND) +- set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${GDI_LIBRARIES}) ++ find_library(GDI_LIBRARY gdi32) ++ if (GDI_LIBRARY) ++ set (CIMG_LIBRARIES ${CIMG_LIBRARIES} ${GDI_LIBRARY}) + message(STATUS "FindCImg.cmake: GDI found") +- else (GDI_FOUND) ++ else (GDI_LIBRARY) + message(STATUS "!!! FindCIMG.cmake !!! GDI NOT found.") + message(WARNING "FindCImg.cmake: display disabled") + set (CIMG_DEFINITIONS ${CIMG_DEFINITIONS} -Dcimg_display=0) +- endif (GDI_FOUND) ++ endif (GDI_LIBRARY) + endif (WIN32) + endif (UNIX OR APPLE) + +diff --git a/cmake/jkqtplotter_deployqt.cmake b/cmake/jkqtplotter_deployqt.cmake +index 5a8574591..5dbc8a51d 100644 +--- a/cmake/jkqtplotter_deployqt.cmake ++++ b/cmake/jkqtplotter_deployqt.cmake +@@ -1,6 +1,6 @@ + function(jkqtplotter_deployqt TARGET_NAME) + #use windeploy +- if (WIN32) ++ if (WIN32 AND 0) + # install system runtime lib + include( InstallRequiredSystemLibraries ) + if( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ) diff --git a/ports/jkqtplotter/fix-cmake2.patch b/ports/jkqtplotter/fix-cmake2.patch new file mode 100644 index 00000000000000..5aa7ec3002f719 --- /dev/null +++ b/ports/jkqtplotter/fix-cmake2.patch @@ -0,0 +1,14 @@ + +diff --git a/lib/jkqtmath/CMakeLists.txt b/lib/jkqtmath/CMakeLists.txt +index 716254ac8..835b4e8cb 100644 +--- a/lib/jkqtmath/CMakeLists.txt ++++ b/lib/jkqtmath/CMakeLists.txt +@@ -110,7 +110,7 @@ endif() + if(JKQtPlotter_BUILD_STATIC_LIBS) + add_library(${lib_name} STATIC ${SOURCES} ${HEADERS}) + JKQtCommon_setDefaultLibOptions(${lib_name}) +- target_link_libraries(${libsh_name} PUBLIC JKQTCommonLib) ++ target_link_libraries(${lib_name} PUBLIC JKQTCommonLib) + set_property(TARGET ${lib_name} PROPERTY OUTPUT_NAME "${lib_name_decorated}") + write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${lib_name}Version.cmake + VERSION ${PROJECT_VERSION} diff --git a/ports/jkqtplotter/portfile.cmake b/ports/jkqtplotter/portfile.cmake new file mode 100644 index 00000000000000..587510aa640aa4 --- /dev/null +++ b/ports/jkqtplotter/portfile.cmake @@ -0,0 +1,131 @@ +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JKQtPlotter_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JKQtPlotter_BUILD_STATIC_LIBS) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jkriege2/JKQtPlotter + REF a9bfcab4b96cd7bdeac30902f5d7a31b765c522b + SHA512 04b20eb66c833eac5dcd6a50c966217380b0f3a6e70092e36b80197b94d1ea2858b2b9f09aec5e02df2effab5b9b17059436589d727060bba3601ec1342278a9 + HEAD_REF master + PATCHES + fix-cmake.patch + fix-cmake2.patch +) + +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "add_subdirectory(doc)" "") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "examples" JKQtPlotter_BUILD_EXAMPLES + "tools" JKQtPlotter_BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJKQtPlotter_BUILD_SHARED_LIBS=${JKQtPlotter_BUILD_SHARED_LIBS} + -DJKQtPlotter_BUILD_STATIC_LIBS=${JKQtPlotter_BUILD_STATIC_LIBS} + ${FEATURE_OPTIONS} + -DQT_VERSION_MAJOR=6 + -DCIMG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV:BOOL=ON # only used for some examples + -DOpenCV_FOUND:BOOL=FALSE # wrong find_package call with QUITE instead of QUIET + MAYBE_UNUSED_VARIABLES + OpenCV_FOUND +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +vcpkg_copy_pdbs() +set(tools "") +if("tools" IN_LIST FEATURES) + list(APPEND tools + jkqtmathtext_render + jkqtplotter_doc_imagegenerator + ) +endif() +if("examples" IN_LIST FEATURES) + list(APPEND tools + jkqtplot_test + jkqtptest_advplotstyling + jkqtptest_barchart + jkqtptest_boxplot + jkqtptest_contourplot + jkqtptest_datastore + jkqtptest_datastore_groupedstat + jkqtptest_datastore_iterators + jkqtptest_datastore_regression + jkqtptest_datastore_statistics + jkqtptest_datastore_statistics_2d + jkqtptest_dateaxes + jkqtptest_distributionplot + jkqtptest_errorbarstyles + jkqtptest_evalcurve + jkqtptest_filledgraphs + jkqtptest_functionplot + jkqtptest_geometric + jkqtptest_geo_arrows + jkqtptest_geo_simple + jkqtptest_imageplot + jkqtptest_imageplot_cimg + jkqtptest_imageplot_modifier + jkqtptest_imageplot_nodatastore + jkqtptest_imageplot_userpal + jkqtptest_impulsesplot + jkqtptest_jkqtfastplotter_test + jkqtptest_jkqtmathtext_simpletest + jkqtptest_jkqtmathtext_test + jkqtptest_logaxes + jkqtptest_mandelbrot + jkqtptest_parametriccurve + jkqtptest_paramscatterplot + jkqtptest_paramscatterplot_image + jkqtptest_parsedfunctionplot + jkqtptest_rgbimageplot + jkqtptest_rgbimageplot_cimg + jkqtptest_rgbimageplot_qt + jkqtptest_simpletest + jkqtptest_speed + jkqtptest_stackedbars + jkqtptest_stepplots + jkqtptest_styledboxplot + jkqtptest_styling + jkqtptest_symbols_and_errors + jkqtptest_symbols_and_styles + jkqtptest_ui + jkqtptest_user_interaction + jkqtptest_violinplot + jkqtptest_wiggleplots + jkqtptest_barchart_customdrawfunctor + jkqtptest_barchart_errorbars + jkqtptest_barchart_functorfill + jkqtptest_barchart_twocolor + jkqtptest_filledgraphs_errors + jkqtptest_geo_coordinateaxis0 + jkqtptest_multiplot + jkqtptest_paramscatterplot_customsymbol + jkqtptest_scatter + jkqtptest_scatter_customsymbol + jkqtptest_second_axis + ) +endif() + + + +if(tools) + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) +endif() + +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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/lib/jkqtmathtext/resources/firaMath/LICENSE" + "${SOURCE_PATH}/lib/jkqtmathtext/resources/xits/OFL.txt" +) diff --git a/ports/jkqtplotter/vcpkg.json b/ports/jkqtplotter/vcpkg.json new file mode 100644 index 00000000000000..8da219f5d04f50 --- /dev/null +++ b/ports/jkqtplotter/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "jkqtplotter", + "version-date": "2023-10-24", + "description": "A Qt Plotting Library", + "license": null, + "dependencies": [ + "cimg", + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "jpeg", + "opengl", + "png", + "widgets" + ] + }, + "qtsvg", + { + "name": "vcpkg-cmake", + "host": true, + "default-features": false + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "default-features": false + } + ], + "features": { + "examples": { + "description": "Build examples" + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 4552e1cd2b67de..1a41341ef6c58b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3632,6 +3632,10 @@ "baseline": "2018-05-08", "port-version": 3 }, + "jkqtplotter": { + "baseline": "2023-10-24", + "port-version": 0 + }, "joltphysics": { "baseline": "4.0.0", "port-version": 0 diff --git a/versions/j-/jkqtplotter.json b/versions/j-/jkqtplotter.json new file mode 100644 index 00000000000000..ffd76451af2548 --- /dev/null +++ b/versions/j-/jkqtplotter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87ffb0cb05a71f4338bd068bc14a348770b7d4ff", + "version-date": "2023-10-24", + "port-version": 0 + } + ] +} From 11cbb6b57b502d4864fa3c51b36b1ec88527a036 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 22 Nov 2023 04:51:11 +0100 Subject: [PATCH 0437/1039] [opencascade] Cleanup and fixes (#35119) * [opencascade] Use version for git ref * [opencascade] Skip samples for debug * [opencascade] Drop bin letter d * [opencascade] Don't install scripts * [opencascade] qt not supported by port * [opencascade] Update header fixup * [opencascade] Enable osx and arm * [opencascade] No scripts, again * [opencascade] License * [opencascade] Revise deps * [opencascade] No freetype on uwp * Trace * Fixup * [opencascade] only export include/opencascade because this is what upstream provides in OPENCASCADE_INCLUDE_DIRECTORY * [opencascade] Revise dependency setup * [opencascade] Keep vcpkg legacy include dir * Fixup --- ports/opencascade/dependencies.patch | 112 ++++++++++++++++++++ ports/opencascade/drop-bin-letter-d.patch | 45 ++++++++ ports/opencascade/fix-depend-freetype.patch | 15 --- ports/opencascade/fix-depend-vtk.patch | 16 --- ports/opencascade/fix-dependence.patch | 30 ------ ports/opencascade/fix-find-tbb.patch | 18 ---- ports/opencascade/install-include-dir.patch | 13 +-- ports/opencascade/portfile.cmake | 110 ++++++------------- ports/opencascade/vcpkg.json | 33 +++++- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 + 11 files changed, 229 insertions(+), 170 deletions(-) create mode 100644 ports/opencascade/dependencies.patch create mode 100644 ports/opencascade/drop-bin-letter-d.patch delete mode 100644 ports/opencascade/fix-depend-freetype.patch delete mode 100644 ports/opencascade/fix-depend-vtk.patch delete mode 100644 ports/opencascade/fix-dependence.patch delete mode 100644 ports/opencascade/fix-find-tbb.patch diff --git a/ports/opencascade/dependencies.patch b/ports/opencascade/dependencies.patch new file mode 100644 index 00000000000000..d26a420deb0811 --- /dev/null +++ b/ports/opencascade/dependencies.patch @@ -0,0 +1,112 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bb6ab2db..e58b1afa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -596,7 +596,8 @@ if (CAN_USE_FREETYPE) + if (USE_FREETYPE) + message (STATUS "Info: FreeType is used by OCCT") + add_definitions (-DHAVE_FREETYPE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") ++ find_package(Freetype MODULE REQUIRED) ++ set(CSF_FREETYPE Freetype::Freetype) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") + OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") +@@ -613,7 +614,9 @@ endif() + if (USE_VTK) + add_definitions (-DHAVE_VTK) + set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk") ++ find_package(VTK REQUIRED) ++ set(CSF_VTK VTK::CommonCore) ++ set(IS_VTK_9XX 1) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK") + +@@ -629,7 +632,8 @@ endif() + if (CAN_USE_FREEIMAGE) + if (USE_FREEIMAGE) + add_definitions (-DHAVE_FREEIMAGE) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage") ++ find_package(freeimage CONFIG REQUIRED) ++ set(CSF_FreeImagePlus freeimage::FreeImagePlus) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE") + OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE") +@@ -730,7 +734,8 @@ endif() + if (NOT DEFINED ANDROID AND CAN_USE_TBB) + if (USE_TBB) + add_definitions (-DHAVE_TBB) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb") ++ find_package(TBB CONFIG REQUIRED) ++ set(CSF_TBB TBB::tbb TBB::tbbmalloc) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC") +@@ -750,7 +755,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON) + if (CAN_USE_RAPIDJSON) + if (USE_RAPIDJSON) + add_definitions (-DHAVE_RAPIDJSON) +- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson") ++ find_package(RapidJSON CONFIG REQUIRED) ++ set(CSF_RapidJSON rapidjson) + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON") + OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON") +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake +index c9399159..f707e00f 100644 +--- a/adm/cmake/occt_toolkit.cmake ++++ b/adm/cmake/occt_toolkit.cmake +@@ -475,11 +475,11 @@ else() + endif() + endif() + +-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT) ++if (1) + if(IS_VTK_9XX) + string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}") + endif() +- target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT}) ++ target_link_libraries (${PROJECT_NAME} PRIVATE ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT}) + endif() + + if (USE_QT) +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index c926c499..3b6db678 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -4,6 +4,22 @@ + # + # This file is configured by OpenCASCADE. + # ++include(CMakeFindDependencyMacro) ++if("@USE_FREEIMAGE@") ++ find_dependency(freeimage CONFIG) ++endif() ++if("@USE_FREETYPE@") ++ find_dependency(Freetype MODULE) ++endif() ++if("@USE_RAPIDJSON@") ++ find_package(RapidJSON CONFIG REQUIRED) ++endif() ++if("@USE_TBB@") ++ find_dependency(TBB CONFIG) ++endif() ++if("@USE_VTK@") ++ find_dependency(VTK REQUIRED) ++endif() + + if(OpenCASCADE_ALREADY_INCLUDED) + return() +diff --git a/src/Standard/Standard_MMgrTBBalloc.cxx b/src/Standard/Standard_MMgrTBBalloc.cxx +index 8c7a2df1..8499e1af 100644 +--- a/src/Standard/Standard_MMgrTBBalloc.cxx ++++ b/src/Standard/Standard_MMgrTBBalloc.cxx +@@ -18,7 +18,6 @@ + + // paralleling with Intel TBB + #ifdef HAVE_TBB +-#pragma comment (lib, "tbbmalloc.lib") + #include + using namespace tbb; + #else diff --git a/ports/opencascade/drop-bin-letter-d.patch b/ports/opencascade/drop-bin-letter-d.patch new file mode 100644 index 00000000000000..1e278d523c75df --- /dev/null +++ b/ports/opencascade/drop-bin-letter-d.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2c4e570..8eac318c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +244,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE) + + set (BIN_LETTER "") + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +- set (BIN_LETTER "d") + elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") + set (BIN_LETTER "i") + endif() +@@ -917,6 +916,7 @@ if (WIN32) + set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin") + set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bini") + set (CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bind") ++ set (CMAKE_PDB_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin") + endif() + + string(TIMESTAMP CURRENT_TIME "%H:%M:%S") +diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake +index 9fd3ec4c..dc9ff18b 100644 +--- a/adm/cmake/occt_macros.cmake ++++ b/adm/cmake/occt_macros.cmake +@@ -609,7 +609,7 @@ macro (OCCT_INSERT_CODE_FOR_TARGET) + elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$\") + set (OCCT_INSTALL_BIN_LETTER \"i\") + elseif (\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^([Dd][Ee][Bb][Uu][Gg])$\") +- set (OCCT_INSTALL_BIN_LETTER \"d\") ++ set (OCCT_INSTALL_BIN_LETTER \"\") + endif()") + endmacro() + +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index beb934f7..95cec74a 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -172,7 +172,6 @@ set (CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "" FORCE) + + set (BIN_LETTER "") + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") +- set (BIN_LETTER "d") + elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") + set (BIN_LETTER "i") + endif() diff --git a/ports/opencascade/fix-depend-freetype.patch b/ports/opencascade/fix-depend-freetype.patch deleted file mode 100644 index 4abcddf6db884e..00000000000000 --- a/ports/opencascade/fix-depend-freetype.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fbcede5..66b127d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -563,7 +563,9 @@ if (CAN_USE_FREETYPE) - if (USE_FREETYPE) - message (STATUS "Info: FreeType is used by OCCT") - add_definitions (-DHAVE_FREETYPE) -- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype") -+ find_package(freetype CONFIG REQUIRED) -+ get_target_property(FREETYPE_INCLUDE_DIR freetype INTERFACE_INCLUDE_DIRECTORIES) -+ list (APPEND 3RDPARTY_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR}") - else() - OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") - OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") diff --git a/ports/opencascade/fix-depend-vtk.patch b/ports/opencascade/fix-depend-vtk.patch deleted file mode 100644 index 26e528def72ded..00000000000000 --- a/ports/opencascade/fix-depend-vtk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/adm/cmake/vtk.cmake b/adm/cmake/vtk.cmake -index a81cdf9bb2..f265dc3489 100644 ---- a/adm/cmake/vtk.cmake -+++ b/adm/cmake/vtk.cmake -@@ -98,6 +98,11 @@ if (VTK_FOUND) - # get paths from corresponding variables - if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}") - list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}") -+ else() -+ get_target_property(${VTK_LIBRARY}_INCLUDE_DIRS ${VTK_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES) -+ if (${VTK_LIBRARY}_INCLUDE_DIRS AND EXISTS "${${VTK_LIBRARY}_INCLUDE_DIRS}") -+ list (APPEND 3RDPARTY_VTK_INCLUDE_DIRS "${${VTK_LIBRARY}_INCLUDE_DIRS}") -+ endif() - endif() - - if (${VTK_LIBRARY}_LIBRARY_DIRS AND EXISTS "${${VTK_LIBRARY}_LIBRARY_DIRS}") diff --git a/ports/opencascade/fix-dependence.patch b/ports/opencascade/fix-dependence.patch deleted file mode 100644 index d44ce2961d8636..00000000000000 --- a/ports/opencascade/fix-dependence.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in -index c926c49..a0502cc 100644 ---- a/adm/templates/OpenCASCADEConfig.cmake.in -+++ b/adm/templates/OpenCASCADEConfig.cmake.in -@@ -5,6 +5,8 @@ - # This file is configured by OpenCASCADE. - # - -+include(CMakeFindDependencyMacro) -+ - if(OpenCASCADE_ALREADY_INCLUDED) - return() - endif() -@@ -71,6 +73,16 @@ set (OpenCASCADE_WITH_GLES2 @USE_GLES2@) - @SET_OpenCASCADE_WITH_D3D@ - @SET_OpenCASCADE_WITH_GLX@ - -+if(@USE_FREETYPE@) -+ find_dependency(freetype CONFIG) -+endif() -+ -+find_dependency(OpenGL) -+ -+if(@USE_EIGEN@) -+ find_dependency(Eigen3) -+endif() -+ - # Import OpenCASCADE compile definitions, C and C++ flags for each installed configuration. - file(GLOB CONFIG_FILES "${CMAKE_CURRENT_LIST_DIR}/OpenCASCADECompileDefinitionsAndFlags-*.cmake") - foreach(f ${CONFIG_FILES}) diff --git a/ports/opencascade/fix-find-tbb.patch b/ports/opencascade/fix-find-tbb.patch deleted file mode 100644 index 2732502ac6dab3..00000000000000 --- a/ports/opencascade/fix-find-tbb.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bacca1a48..9c7d924769 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -731,6 +731,13 @@ endif() - if (NOT DEFINED ANDROID AND CAN_USE_TBB) - if (USE_TBB) - add_definitions (-DHAVE_TBB) -+ if (NOT DEFINED 3RDPARTY_TBB_DIR) -+ find_package(TBB REQUIRED) -+ get_target_property(TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES) -+ get_filename_component(MY_DIRECTORY ${TBB_INCLUDE_DIR} DIRECTORY) -+ message(STATUS "TBB_INCLUDE_DIR: ${TBB_INCLUDE_DIR} ${TBB_FOUND} ${MY_DIRECTORY}") -+ set(3RDPARTY_TBB_DIR ${MY_DIRECTORY}) -+ endif() - OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb") - else() - OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") diff --git a/ports/opencascade/install-include-dir.patch b/ports/opencascade/install-include-dir.patch index a568ce8aee300d..9df3678542ee46 100644 --- a/ports/opencascade/install-include-dir.patch +++ b/ports/opencascade/install-include-dir.patch @@ -1,17 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4ec871..59e5134 100644 +index a80e39e6..bb6ab2db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1246,6 +1246,14 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) +@@ -1273,6 +1273,11 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) endforeach() set (OCCT_MODULES_ENABLED ${OCCT_MODULES_ENABLED_SORTED}) -+foreach (OCCT_LIBRARY ${OCCT_LIBRARIES}) -+ target_include_directories( -+ ${OCCT_LIBRARY} -+ INTERFACE -+ $ -+ $) ++foreach (OCCT_LIBRARY IN LISTS OCCT_LIBRARIES) ++ target_include_directories(${OCCT_LIBRARY} INTERFACE $) # OpenCASCADE_INCLUDE_DIR ++ target_include_directories(${OCCT_LIBRARY} INTERFACE $) # vcpkg lock-in +endforeach() + # Add all targets to the build-tree export set diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 29fbac075a147e..cb1b8a8a827c08 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -1,17 +1,16 @@ +string(REPLACE "." "_" VERSION_STR "V${VERSION}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF cec1ecd0c9f3b3d2572c47035d11949e8dfa85e2 #V7.7.2 - SHA512 2fe98eadd7f9b922729bf80b56f260729d1c257c41392e4be4f070667ee77e94e2b286a873430b41ea61076acf1388aee7ba8b91789aa6199db56066796bb2d3 + REF "${VERSION_STR}" + SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee HEAD_REF master PATCHES + dependencies.patch + drop-bin-letter-d.patch fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch - fix-depend-freetype.patch - fix-depend-vtk.patch - fix-dependence.patch - fix-find-tbb.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -22,11 +21,12 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "freeimage" USE_FREEIMAGE - "tbb" USE_TBB - "rapidjson" USE_RAPIDJSON - "samples" INSTALL_SAMPLES - "vtk" USE_VTK + freeimage USE_FREEIMAGE + freetype USE_FREETYPE + rapidjson USE_RAPIDJSON + samples INSTALL_SAMPLES + tbb USE_TBB + vtk USE_VTK ) # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 @@ -38,12 +38,15 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DBUILD_LIBRARY_TYPE=${BUILD_TYPE} -DBUILD_MODULE_Draw=OFF - -DINSTALL_DIR_LAYOUT=Unix - -DBUILD_SAMPLES_MFC=OFF - -DBUILD_SAMPLES_QT=OFF -DBUILD_DOC_Overview=OFF - -DINSTALL_TEST_CASES=OFF -DBUILD_MODULE_DETools=OFF + -DINSTALL_DIR_LAYOUT=Unix + -DINSTALL_DIR_DOC=share/trash + -DINSTALL_DIR_SCRIPT=share/trash # not relocatable + -DINSTALL_TEST_CASES=OFF + -DUSE_TK=OFF + OPTIONS_DEBUG + -DINSTALL_SAMPLES=OFF ) vcpkg_cmake_install() @@ -51,73 +54,26 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade) #make occt includes relative to source_file -list(APPEND ADDITIONAL_HEADERS - "ExprIntrp.tab.h" - "FlexLexer.h" - "glext.h" - "igesread.h" - "NCollection_Haft.h" - "OSD_PerfMeter.h" - "Standard_values.h" - ) - -file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx") +file(GLOB extra_headers + LIST_DIRECTORIES false + RELATIVE "${CURRENT_PACKAGES_DIR}/include/opencascade" + "${CURRENT_PACKAGES_DIR}/include/opencascade/*.h" +) +list(JOIN extra_headers "|" extra_headers) +file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/*.[hgl]xx") foreach(file_name IN LISTS files) file(READ "${file_name}" filedata) - string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") - foreach(extra_header IN LISTS ADDITIONAL_HEADERS) - string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") - endforeach() + string(REGEX REPLACE "(# *include) <([a-zA-Z0-9_]*[.][hgl]xx|${extra_headers})>" [[\1 "\2"]] filedata "${filedata}") file(WRITE "${file_name}" "${filedata}") endforeach() -# Remove libd to lib, libd just has cmake files we dont want too -if( WIN32 ) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib") -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/trash") -if (NOT VCPKG_BUILD_TYPE) - # fix paths in target files - list(APPEND TARGET_FILES - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake" - "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake" - ) - - foreach(TARGET_FILE IN LISTS TARGET_FILES) - file(READ "${TARGET_FILE}" filedata) - string(REGEX REPLACE "/libd" "/lib" filedata "${filedata}") - string(REGEX REPLACE "/bind" "/bin" filedata "${filedata}") - file(WRITE "${TARGET_FILE}" "${filedata}") - endforeach() - -endif() - -if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - # debug creates libd and bind directories that need moving - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") - - # the bin directory ends up with bat files that are noise, let's clean that up - file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat") - file(REMOVE_RECURSE ${BATS}) -else() - # remove scripts in bin dir - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -if (INSTALL_SAMPLES) - foreach(dir "Tutorial" "FuncDemo" "IESample" "OCCTOverview") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencascade/samples/qt/${dir}/env.sh" "${CURRENT_PACKAGES_DIR}/bin/env.sh" "") - endforeach() -endif() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt") +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE_LGPL_21.txt" + "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" +) diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 4cb456768fc519..c4b93778f091bf 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,14 +1,20 @@ { "name": "opencascade", "version": "7.7.2", - "port-version": 1, + "port-version": 2, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", - "license": "LGPL-2.1", - "supports": "!(uwp | xbox | osx | arm)", + "license": "LGPL-2.1-only", + "supports": "!xbox", "dependencies": [ - "fontconfig", - "freetype", + { + "name": "angle", + "platform": "uwp" + }, + { + "name": "opengl", + "platform": "!(android | ios | uwp | wasm32)" + }, { "name": "vcpkg-cmake", "host": true @@ -18,6 +24,12 @@ "host": true } ], + "default-features": [ + { + "name": "freetype", + "platform": "!uwp" + } + ], "features": { "freeimage": { "description": "Enable optional usage of freeimage", @@ -25,6 +37,17 @@ "freeimage" ] }, + "freetype": { + "description": "Use of freetype", + "supports": "!uwp", + "dependencies": [ + "fontconfig", + { + "name": "freetype", + "default-features": false + } + ] + }, "rapidjson": { "description": "Enable optional usage of rapidjson", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1a41341ef6c58b..2ceef8429e2950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6190,7 +6190,7 @@ }, "opencascade": { "baseline": "7.7.2", - "port-version": 1 + "port-version": 2 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index e591990c202648..5d8c462b5d792e 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b1d21c510a4aa414a64ac5e2e46fa0767ff76b1", + "version": "7.7.2", + "port-version": 2 + }, { "git-tree": "8e9c9fb982bef129111ea811c3948ffd570a16dc", "version": "7.7.2", From acc07a121150821396c6d21ea264cd340cfccf98 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 22:37:43 +0100 Subject: [PATCH 0438/1039] [moos-core] no uwp (#35255) --- ports/moos-core/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/m-/moos-core.json | 5 +++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/moos-core/vcpkg.json b/ports/moos-core/vcpkg.json index 6516d65f1b953c..2fc2564e54e37e 100644 --- a/ports/moos-core/vcpkg.json +++ b/ports/moos-core/vcpkg.json @@ -1,11 +1,11 @@ { "name": "moos-core", "version": "10.4.0", - "port-version": 9, + "port-version": 10, "description": "A very light weight, easy to use middleware.", "homepage": "https://sites.google.com/site/moossoftware/", "license": "GPL-2.0-or-later", - "supports": "!xbox", + "supports": "!xbox & !uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8ffaead838575c..35e5fcb4a6590f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -752,8 +752,6 @@ ms-quic:x64-windows=fail ms-quic:x86-windows=fail monkeys-audio:arm64-windows=fail monkeys-audio:x64-windows-static=fail -moos-core:arm64-uwp=fail -moos-core:x64-uwp=fail moos-core:x64-windows-static=fail moos-essential:arm64-windows=fail moos-essential:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2ceef8429e2950..09299e83673321 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5646,7 +5646,7 @@ }, "moos-core": { "baseline": "10.4.0", - "port-version": 9 + "port-version": 10 }, "moos-essential": { "baseline": "10.0.1", diff --git a/versions/m-/moos-core.json b/versions/m-/moos-core.json index 0f06d36aaf4c9d..b46a0b76e52ca3 100644 --- a/versions/m-/moos-core.json +++ b/versions/m-/moos-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21e3020509ccf12a2ef1f855a2761e6a17abc86a", + "version": "10.4.0", + "port-version": 10 + }, { "git-tree": "a409b13d5b8375d40c505f08f7c1d1e43ac54975", "version": "10.4.0", From 7bd20ae2b995a9fc5136633b1c66d269370a4b42 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 22:37:58 +0100 Subject: [PATCH 0439/1039] [luafilesystem] no uwp (#35256) --- ports/luafilesystem/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/l-/luafilesystem.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/luafilesystem/vcpkg.json b/ports/luafilesystem/vcpkg.json index e0ed0a18372391..b5d82852a0b05b 100644 --- a/ports/luafilesystem/vcpkg.json +++ b/ports/luafilesystem/vcpkg.json @@ -1,9 +1,10 @@ { "name": "luafilesystem", "version": "1.8.0", - "port-version": 4, + "port-version": 5, "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.", "homepage": "https://github.com/keplerproject/luafilesystem", + "supports": "!uwp", "dependencies": [ "lua", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 35e5fcb4a6590f..5e6a58a31f8389 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -682,8 +682,6 @@ log4cpp:x64-linux=fail # dynamic exception specifications loguru:arm-neon-android=fail loguru:arm64-android=fail loguru:x64-android=fail -luafilesystem:arm64-uwp=fail -luafilesystem:x64-uwp=fail mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 09299e83673321..efe6f86618f952 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5298,7 +5298,7 @@ }, "luafilesystem": { "baseline": "1.8.0", - "port-version": 4 + "port-version": 5 }, "luajit": { "baseline": "2023-01-04", diff --git a/versions/l-/luafilesystem.json b/versions/l-/luafilesystem.json index 01ac651f4b73fa..b7d9d3d6e96647 100644 --- a/versions/l-/luafilesystem.json +++ b/versions/l-/luafilesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a2e981db39265f79730f1c73502dfa362db30b5", + "version": "1.8.0", + "port-version": 5 + }, { "git-tree": "d399198385c222305569f32166f965843da16cdf", "version": "1.8.0", From 47a7913e515ce0361e1c786f00595879d39eb4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Wed, 22 Nov 2023 23:29:26 +0100 Subject: [PATCH 0440/1039] [ned14-internal-quickcpplib] Update to 2023-11-22 (#35266) --- ports/ned14-internal-quickcpplib/sha_manifest.cmake | 4 ++-- ports/ned14-internal-quickcpplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ned14-internal-quickcpplib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index cc54ee6698a05b..9048e6c24fa553 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 7ca9350ad6eac11ef80b472c33dbd44650b1c2f0) -set(QUICKCPPLIB_SHA512 d3258590502c02bb3ff11eb26bc00004e7ab4bb886a77e5c91ce76546193f37aa665885b6484345df4361a8d0cece2236e7b77a112372f4db4d3ebd2be5fff32) +set(QUICKCPPLIB_REF 2af3839551eacd2152892d7197b27cd5b87deb38) +set(QUICKCPPLIB_SHA512 7e58a4bfc2a9e0e0c4e77c6f6c597724d4824ff1255562ffcf6c903d840bdb6fe40ba96a43782fdb3ca0eb7ba4d794166fb7d7d0f76060179991682b8ae9b3d6) 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 f97f8ac7fc6b07..b6e96e1a823719 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ned14-internal-quickcpplib", - "version-date": "2023-11-06", + "version-date": "2023-11-22", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index efe6f86618f952..f426c195ad559d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5885,7 +5885,7 @@ "port-version": 1 }, "ned14-internal-quickcpplib": { - "baseline": "2023-11-06", + "baseline": "2023-11-22", "port-version": 0 }, "neon2sse": { diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index f5d5d8434fadb4..de227f0f439e06 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd29cd78a6d8aa5689620b077e062c8844d27871", + "version-date": "2023-11-22", + "port-version": 0 + }, { "git-tree": "7be7cf3170221b9393f84ec28a2b940956cabb9f", "version-date": "2023-11-06", From 2b639103296dbee599b712f284d6c40c846673ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Wed, 22 Nov 2023 23:30:27 +0100 Subject: [PATCH 0441/1039] [status-code] Disable building of tests (#35265) `status-code`'s test code makes use of `std::is_literal_type` which has been removed in C++20. Therefore compiling the tests may fail for some compiler toolchains. --- ports/status-code/portfile.cmake | 1 + ports/status-code/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/status-code.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index 06ff0730c5c5a1..2a980f68f3b627 100644 --- a/ports/status-code/portfile.cmake +++ b/ports/status-code/portfile.cmake @@ -13,6 +13,7 @@ set(VCPKG_BUILD_TYPE release) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DBUILD_TESTING=OFF -Dstatus-code_IS_DEPENDENCY=ON -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON MAYBE_UNUSED_VARIABLES diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index 627fe7eb82337e..58adef2d5d92fd 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,6 +1,7 @@ { "name": "status-code", "version-date": "2023-11-06", + "port-version": 1, "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index f426c195ad559d..d9d3fc28fdabde 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8166,7 +8166,7 @@ }, "status-code": { "baseline": "2023-11-06", - "port-version": 0 + "port-version": 1 }, "status-value-lite": { "baseline": "1.1.0", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index 858841bfab4f47..fb4f3cda3c1a14 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0ce8f71e6eb79014ecd92a629a245a1a25870cc", + "version-date": "2023-11-06", + "port-version": 1 + }, { "git-tree": "dca3b484e4be516afae962ee6760d3eef5eb4779", "version-date": "2023-11-06", From cb1f2fe770773fe2c05974d517e0b4b7779d3eb6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:30:45 +0100 Subject: [PATCH 0442/1039] [libuv] no uwp (#35258) --- ports/libuv/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 412b8261225a6e..2bb7f826ae9e96 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,9 +1,11 @@ { "name": "libuv", "version-semver": "1.46.0", + "port-version": 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", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5e6a58a31f8389..a9753409fa7d21 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -639,8 +639,6 @@ libusb:arm64-android=fail libusb:x64-android=fail libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail -libuv:arm64-uwp=fail -libuv:x64-uwp=fail #Skip detection to avoid upstream remove older releases libvmdk:x86-windows=skip libvmdk:x64-windows=skip diff --git a/versions/baseline.json b/versions/baseline.json index d9d3fc28fdabde..d8f644e32e7c84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4962,7 +4962,7 @@ }, "libuv": { "baseline": "1.46.0", - "port-version": 0 + "port-version": 1 }, "libuvc": { "baseline": "2020-11-24", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 79edd423215ff2..60d499a6e98516 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2267bb7c14ae2201b02e2d708631e4a228355543", + "version-semver": "1.46.0", + "port-version": 1 + }, { "git-tree": "0cd421b9c0bc8a89bf76892f99c87560cbde8d93", "version-semver": "1.46.0", From 8a098f6b330ce3f4063c93e89f93c969f54e7b42 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:33:28 +0100 Subject: [PATCH 0443/1039] [nana] no uwp (#35254) --- ports/nana/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/n-/nana.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/nana/vcpkg.json b/ports/nana/vcpkg.json index 4fc982aa00ed6c..6984de0b4e16c3 100644 --- a/ports/nana/vcpkg.json +++ b/ports/nana/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nana", "version": "1.7.4", - "port-version": 4, + "port-version": 5, "description": "Cross-platform library for GUI programming in modern C++ style.", "homepage": "https://github.com/cnjinhao/nana", + "supports": "!uwp", "dependencies": [ { "name": "fontconfig", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a9753409fa7d21..56cfa9ef212757 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -779,12 +779,10 @@ mysql-connector-cpp:arm-neon-android=fail mysql-connector-cpp:arm64-android=fail mysql-connector-cpp:x64-android=fail nana:arm-neon-android=fail -nana:arm64-uwp=fail nana:arm64-android=fail nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail -nana:x64-uwp=fail nanodbc:arm64-uwp=fail nanodbc:x64-uwp=fail nanodbc:x64-linux=skip diff --git a/versions/baseline.json b/versions/baseline.json index d8f644e32e7c84..2adc83c11b3651 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5806,7 +5806,7 @@ }, "nana": { "baseline": "1.7.4", - "port-version": 4 + "port-version": 5 }, "nano-signal-slot": { "baseline": "2.0.1", diff --git a/versions/n-/nana.json b/versions/n-/nana.json index f3cd7e8e51019c..235058fa311415 100644 --- a/versions/n-/nana.json +++ b/versions/n-/nana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d8a6bacbbb014166cfcb552726c9d13f472811a", + "version": "1.7.4", + "port-version": 5 + }, { "git-tree": "9a9b07b69a2b4c5adec89f6de54c4ad45df86b88", "version": "1.7.4", From 0c23c1d09d331389f7fcb9117cd54f8e9a161df3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:33:43 +0100 Subject: [PATCH 0444/1039] [ode] no uwp (#35253) --- ports/ode/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/o-/ode.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json index d5fafb34782c30..8ee139a10054f8 100644 --- a/ports/ode/vcpkg.json +++ b/ports/ode/vcpkg.json @@ -1,9 +1,11 @@ { "name": "ode", "version": "0.16.4", + "port-version": 1, "description": "Open Dynamics Engine", "homepage": "https://bitbucket.org/odedevs/ode/src/master/", "license": "BSD-3-Clause OR LGPL-2.1-or-later", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 56cfa9ef212757..0b2d62754eb370 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -800,8 +800,6 @@ oatpp-libressl:x64-android=fail octomap:arm64-uwp=fail octomap:x64-uwp=fail ode:arm64-windows=fail -ode:arm64-uwp=fail -ode:x64-uwp=fail offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2adc83c11b3651..67db80a9f54bba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6114,7 +6114,7 @@ }, "ode": { "baseline": "0.16.4", - "port-version": 0 + "port-version": 1 }, "offscale-libetcd-cpp": { "baseline": "2019-07-10", diff --git a/versions/o-/ode.json b/versions/o-/ode.json index 265bec42832e7b..79ef9cd1f1333e 100644 --- a/versions/o-/ode.json +++ b/versions/o-/ode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33843f7332287ffa6dab9f56ad9967f0a5afd061", + "version": "0.16.4", + "port-version": 1 + }, { "git-tree": "46b8d731d701f329ee4dd983ea196bddf1e32545", "version": "0.16.4", From fec742156a74702c910a3449d18776d5fa721ab6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:33:56 +0100 Subject: [PATCH 0445/1039] [octomap] no uwp (#35252) --- ports/octomap/vcpkg.json | 2 ++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/o-/octomap.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json index e8275e75296dea..f22b0e8f167602 100644 --- a/ports/octomap/vcpkg.json +++ b/ports/octomap/vcpkg.json @@ -1,9 +1,11 @@ { "name": "octomap", "version": "1.9.8", + "port-version": 1, "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", "homepage": "https://octomap.github.io/", "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0b2d62754eb370..83d9e255458862 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -797,8 +797,6 @@ nrf-ble-driver:arm64-android=fail nrf-ble-driver:x64-android=fail nvtt:x64-android=fail oatpp-libressl:x64-android=fail -octomap:arm64-uwp=fail -octomap:x64-uwp=fail ode:arm64-windows=fail offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 67db80a9f54bba..89c6729c61e7db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6110,7 +6110,7 @@ }, "octomap": { "baseline": "1.9.8", - "port-version": 0 + "port-version": 1 }, "ode": { "baseline": "0.16.4", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index 1d595812f6d7b4..a458c41f908768 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18c703e99a9e7da9184b9ebcee3ddfa80d66502e", + "version": "1.9.8", + "port-version": 1 + }, { "git-tree": "d24dd4ca217fd0e4b7fcb86301556f96d8f8d0c7", "version": "1.9.8", From 37989640e327fe0c015fba61cbc585846aebafb5 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:35:49 +0100 Subject: [PATCH 0446/1039] [tiny-process-library] no uwp (#35250) --- ports/tiny-process-library/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/t-/tiny-process-library.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/tiny-process-library/vcpkg.json b/ports/tiny-process-library/vcpkg.json index 03f4c685807754..6562566b353272 100644 --- a/ports/tiny-process-library/vcpkg.json +++ b/ports/tiny-process-library/vcpkg.json @@ -1,10 +1,11 @@ { "name": "tiny-process-library", "version": "2.0.4", - "port-version": 2, + "port-version": 3, "description": "A small platform independent library to create and stop new processes in C++", "homepage": "https://gitlab.com/eidheim/tiny-process-library/", "license": "MIT", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 83d9e255458862..3aa667763fe74c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1163,8 +1163,6 @@ thorvg:arm64-android=fail thorvg:x64-android=fail tidy-html5:arm64-uwp=fail tidy-html5:x64-uwp=fail -tiny-process-library:arm64-uwp=fail -tiny-process-library:x64-uwp=fail tinycthread:arm-neon-android=fail tinycthread:arm64-android=fail tinycthread:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 89c6729c61e7db..fab8a870620dfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8406,7 +8406,7 @@ }, "tiny-process-library": { "baseline": "2.0.4", - "port-version": 2 + "port-version": 3 }, "tiny-regex-c": { "baseline": "2019-07-31", diff --git a/versions/t-/tiny-process-library.json b/versions/t-/tiny-process-library.json index 9b0533d4c949c0..553b0c48716980 100644 --- a/versions/t-/tiny-process-library.json +++ b/versions/t-/tiny-process-library.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4c8b55f88a72bb2aa2e10189ac5fb24fd0615f4", + "version": "2.0.4", + "port-version": 3 + }, { "git-tree": "f4e81e43ca82620d6c153b707cdd6626ae1705d2", "version": "2.0.4", From f43db1c76a5f7b41682aeb0e848b9cf573e55a02 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 22 Nov 2023 23:36:12 +0100 Subject: [PATCH 0447/1039] [stxxl] no uwp (#35248) --- ports/stxxl/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/s-/stxxl.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json index dce4ff0ed2b41a..6e801f77105582 100644 --- a/ports/stxxl/vcpkg.json +++ b/ports/stxxl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "stxxl", "version-date": "2018-11-15", - "port-version": 6, + "port-version": 7, "description": "Standard Template Library for Extra Large Data Sets", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3aa667763fe74c..ada7dcdb8e118a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1129,8 +1129,6 @@ stx:arm-neon-android=fail stx:arm64-android=fail stx:x64-android=fail stxxl:arm-neon-android=fail -stxxl:arm64-uwp=fail -stxxl:x64-uwp=fail # upstream issue https://github.com/stxxl/stxxl/issues/99 stxxl:x86-windows=skip stxxl:x64-windows=skip diff --git a/versions/baseline.json b/versions/baseline.json index fab8a870620dfc..d03bb1d074ace6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8226,7 +8226,7 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 6 + "port-version": 7 }, "suitesparse": { "baseline": "5.8.0", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index 64edceb7807df1..65ed9247bc36e8 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa0c9adb40f2fa8c67d8d56b3b3e37c37fc55c76", + "version-date": "2018-11-15", + "port-version": 7 + }, { "git-tree": "fa281074458ae24fb9e0cc56746476d52222fc51", "version-date": "2018-11-15", From 6c6ecf3a453a7735fe03624b80ca8d06cc84ed27 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Wed, 22 Nov 2023 14:38:02 -0800 Subject: [PATCH 0448/1039] [libde265] Update to 1.0.14 (#35227) * update libde265 to 1.0.13 * update baseline * update libde265 to 1.0.14 * update baseline * remove interim version --- ports/libde265/portfile.cmake | 10 ++-------- ports/libde265/vcpkg.json | 12 +++--------- versions/baseline.json | 2 +- versions/l-/libde265.json | 5 +++++ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 226f739c8df56a..73be63b9ffb996 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -2,22 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 REF "v${VERSION}" - SHA512 52803814edd914352ed8f1c4243636c83969c1d9440d6e045316cd1f978494b3ff366f656cc4e5ae70f8715173f4b6d5cb4c4fbed3e1759faaa1d668eeffee23 + SHA512 670482a5304635847d338eb49af18732a71bcc72eb52d77ca558f1f60e1fc6caabd293a02a700badc211cac7b5e14715d6c7810d766fa1f132dd0b4dfc22059a HEAD_REF master PATCHES fix-interface-include.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - sse DISABLE_SSE -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON - ${FEATURE_OPTIONS} + -DENABLE_SDL=OFF ) vcpkg_cmake_install() diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json index 87b5344f23212d..7597e680634c8e 100644 --- a/ports/libde265/vcpkg.json +++ b/ports/libde265/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libde265", - "version": "1.0.12", + "version": "1.0.14", "description": "Open h.265 video codec implementation.", "homepage": "https://www.libde265.org/", "license": "LGPL-3.0-only", - "supports": "!uwp & !xbox & !(arm & windows)", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", @@ -14,11 +14,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "sse": { - "description": "Enable SSE optimizations", - "supports": "x86 | x64" - } - } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d03bb1d074ace6..34f8e061e530bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4173,7 +4173,7 @@ "port-version": 1 }, "libde265": { - "baseline": "1.0.12", + "baseline": "1.0.14", "port-version": 0 }, "libdeflate": { diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index 59dfa4513bafc2..7dac553efc9517 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f66d0188266eee664296198145c0380a1557915d", + "version": "1.0.14", + "port-version": 0 + }, { "git-tree": "59b6113962afdbc8f5c2a06e21b1fdb59b4cf56f", "version": "1.0.12", From ff30334f3d5f5ef415753974a939643bb47ea6e9 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Wed, 22 Nov 2023 16:40:00 -0600 Subject: [PATCH 0449/1039] [libassert] New port (#35094) * Initial work to add libassert * Bump * Fix linux build * Bump * Update versions/l-/libassert.json Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> * Update cpptrace dependency specification * Patch cpptrace's config file * Bumps * Format fix * Bump * Remove libdwarf.patch * Bump * No need to list libdwarf as a dependency of libassert * Bump --------- Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Co-authored-by: Monica --- ports/cpptrace/config-dependency.patch | 13 +++++++++ ports/cpptrace/portfile.cmake | 1 + ports/cpptrace/vcpkg.json | 5 +++- ports/libassert/portfile.cmake | 30 +++++++++++++++++++++ ports/libassert/runtime_destination.patch | 13 +++++++++ ports/libassert/target_fix.patch | 33 +++++++++++++++++++++++ ports/libassert/vcpkg.json | 19 +++++++++++++ versions/baseline.json | 4 +++ versions/c-/cpptrace.json | 2 +- versions/l-/libassert.json | 9 +++++++ 10 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 ports/cpptrace/config-dependency.patch create mode 100644 ports/libassert/portfile.cmake create mode 100644 ports/libassert/runtime_destination.patch create mode 100644 ports/libassert/target_fix.patch create mode 100644 ports/libassert/vcpkg.json create mode 100644 versions/l-/libassert.json diff --git a/ports/cpptrace/config-dependency.patch b/ports/cpptrace/config-dependency.patch new file mode 100644 index 00000000000000..a527239b7a8005 --- /dev/null +++ b/ports/cpptrace/config-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/cpptrace-config.cmake.in b/cmake/cpptrace-config.cmake.in +index ccc959e..d3e5d09 100644 +--- a/cmake/cpptrace-config.cmake.in ++++ b/cmake/cpptrace-config.cmake.in +@@ -1,3 +1,8 @@ + @PACKAGE_INIT@ + ++if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@) ++ include(CMakeFindDependencyMacro) ++ find_dependency(libdwarf REQUIRED) ++endif() ++ + include(${CMAKE_CURRENT_LIST_DIR}/cpptrace_targets.cmake) diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index 20983cb7a63010..eca81775be909a 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( libdwarf_fixes.patch uintptr_fix.patch runtime_destination.patch + config-dependency.patch ) vcpkg_list(SET options -DCPPTRACE_USE_SYSTEM_LIBDWARF=On) diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index 9c25b596615fb6..084cf6cb4f5b7b 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -6,7 +6,10 @@ "license": "MIT", "supports": "!uwp", "dependencies": [ - "libdwarf", + { + "name": "libdwarf", + "platform": "!windows | mingw" + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/libassert/portfile.cmake b/ports/libassert/portfile.cmake new file mode 100644 index 00000000000000..d3ed3f19c1c716 --- /dev/null +++ b/ports/libassert/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jeremy-rifkin/libassert + REF "v${VERSION}" + SHA512 e59a5876d160cb06eae11b8d61f4047372475c2ba7f1b161457e42f463f3c819efa18b5073e29033323497984fceafd53bed1047815227dd396adfe832c8c109 + HEAD_REF main + PATCHES + target_fix.patch + runtime_destination.patch +) + +vcpkg_list(SET options -DASSERT_USE_EXTERNAL_CPPTRACE=On) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_list(APPEND options -DASSERT_STATIC=On) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${options} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "libassert" + CONFIG_PATH "lib/cmake/assert" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libassert/runtime_destination.patch b/ports/libassert/runtime_destination.patch new file mode 100644 index 00000000000000..ae93937b7b6602 --- /dev/null +++ b/ports/libassert/runtime_destination.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ccc959e..d3e5d09 100644 +--- a/CMakeLists.txt 2023-11-13 15:53:51.177963300 -0500 ++++ b/CMakeLists.txt 2023-11-13 16:10:15.969939100 -0500 +@@ -112,7 +112,7 @@ + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION bin + ) + + install( diff --git a/ports/libassert/target_fix.patch b/ports/libassert/target_fix.patch new file mode 100644 index 00000000000000..b0f5e600139f7e --- /dev/null +++ b/ports/libassert/target_fix.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e52096f..09fe6e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,7 @@ target_compile_options( + + if(ASSERT_USE_EXTERNAL_CPPTRACE) + find_package(cpptrace REQUIRED) +- target_link_libraries(assert PRIVATE cpptrace::cpptrace) ++ set(ASSERT_CPPTRACE_TARGET_NAME cpptrace::cpptrace) + else() + FetchContent_Declare( + cpptrace +@@ -79,8 +79,9 @@ else() + GIT_TAG v0.2.1 + ) + FetchContent_MakeAvailable(cpptrace) +- target_link_libraries(assert PRIVATE cpptrace) ++ set(ASSERT_CPPTRACE_TARGET_NAME cpptrace) + endif() ++target_link_libraries(assert PRIVATE ${ASSERT_CPPTRACE_TARGET_NAME}) + + if(ASSERT_DECOMPOSE_BINARY_LOGICAL) + target_compile_definitions(assert PUBLIC ASSERT_DECOMPOSE_BINARY_LOGICAL) +@@ -165,7 +166,7 @@ if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) + add_custom_command( + TARGET assert POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different +- $ ++ $ + $ + ) + endif() diff --git a/ports/libassert/vcpkg.json b/ports/libassert/vcpkg.json new file mode 100644 index 00000000000000..221666dd1623ea --- /dev/null +++ b/ports/libassert/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libassert", + "version": "1.2.1", + "description": "The most over-engineered and overpowered C++ assertion library.", + "homepage": "https://github.com/jeremy-rifkin/libassert", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "cpptrace", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 34f8e061e530bb..3612c2c7c677c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4064,6 +4064,10 @@ "baseline": "0.17.1", "port-version": 0 }, + "libassert": { + "baseline": "1.2.1", + "port-version": 0 + }, "libassuan": { "baseline": "2.5.6", "port-version": 0 diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index 7f106e46dc082e..722fe268e15a67 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7a8eab508d6690313d144800e08a7baadebebdb8", + "git-tree": "c91d65da151c8d10bd59b6980c5a98c797e68679", "version": "0.2.1", "port-version": 0 } diff --git a/versions/l-/libassert.json b/versions/l-/libassert.json new file mode 100644 index 00000000000000..bb11da0b9e2b84 --- /dev/null +++ b/versions/l-/libassert.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4e767d8be1af178c0ed841aa70839076e025aca0", + "version": "1.2.1", + "port-version": 0 + } + ] +} From 0bcc935733c0cb81f6a8add2758028253e94eae8 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 23 Nov 2023 06:41:13 +0800 Subject: [PATCH 0450/1039] [aws-sdk-cpp] Remove feature gamesparks (#35221) --- ports/aws-sdk-cpp/vcpkg.json | 4 +--- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 726944b0127367..55cbd7b75a4912 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.201", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -454,9 +455,6 @@ "gamelift": { "description": "C++ SDK for the AWS gamelift service" }, - "gamesparks": { - "description": "C++ SDK for the AWS gamesparks service" - }, "glacier": { "description": "C++ SDK for the AWS glacier service" }, diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index d1a2985b410fe7..1be1f631ffde26 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f669bd77e23c643da0c15162dc46d84b924938a0", + "version": "1.11.201", + "port-version": 1 + }, { "git-tree": "7e0ba4822d4dcc90eac626f351d7a3fd215a68a8", "version": "1.11.201", diff --git a/versions/baseline.json b/versions/baseline.json index 3612c2c7c677c6..abeeff7043d059 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -406,7 +406,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.201", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "2023-03-23", From 23ceb9cbf9b6d32f485cf039547b70102a6ef9d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni?= Date: Thu, 23 Nov 2023 00:34:48 +0000 Subject: [PATCH 0451/1039] [Glaze] Update version 1.6.1 (#35273) * Update glaze to 1.6.1 * update git tree --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 98929f2d955e4c..8f96dec8f2ea35 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 8c39fd370d46251dc528d09145efb7cb0645e02d3590fca1734a2e66ab46ff762128e80bec83abea98827786c475d2d647b5f0a7405f9e0d78f7cf0348bca515 + SHA512 654dd5d4ac1dbc022ad7ad6fb94b144757c7740ab34954c1153552e13ec7721fc754b3723b30ea350127a00ce2b98c2ac5cfa786dfc93e597d7a55706448fa70 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 71ff139a4d7cf0..2620d3d58ce5c0 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.6.0", + "version": "1.6.1", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index abeeff7043d059..82d51d86e22f9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2965,7 +2965,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.6.0", + "baseline": "1.6.1", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 3ddc4a3572c432..6923bcb71b97d4 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62292c7ec8c2e2d5ad2b5b3197cbf1647cbee342", + "version": "1.6.1", + "port-version": 0 + }, { "git-tree": "55fc4a50001f9e0da4aecfa3ffb82fd988cde742", "version": "1.6.0", From f316aa8ae1a377198db77448912dba4a3ee43cc3 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 23 Nov 2023 22:52:49 -0800 Subject: [PATCH 0452/1039] [vcpkg baseline][czmq] Disable build with systemd (#35297) * [vcpkg baseline][czmq] Disable build with systemd * update version --- ports/czmq/portfile.cmake | 3 ++- ports/czmq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/czmq.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake index 9ff3878daac823..491831897ac5fe 100644 --- a/ports/czmq/portfile.cmake +++ b/ports/czmq/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/czmq - REF v4.2.1 + REF "v${VERSION}" SHA512 65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01 HEAD_REF master PATCHES @@ -40,6 +40,7 @@ vcpkg_cmake_configure( OPTIONS -DCZMQ_BUILD_SHARED=${BUILD_SHARED} -DCZMQ_BUILD_STATIC=${BUILD_STATIC} + -DCZMQ_WITH_SYSTEMD=OFF -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} ) diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json index ecda439d66d333..6cbe67481560c9 100644 --- a/ports/czmq/vcpkg.json +++ b/ports/czmq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "czmq", "version-semver": "4.2.1", - "port-version": 3, + "port-version": 4, "description": "High-level C binding for ZeroMQ", "homepage": "https://github.com/zeromq/czmq", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 82d51d86e22f9f..ab19b32746151b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2062,7 +2062,7 @@ }, "czmq": { "baseline": "4.2.1", - "port-version": 3 + "port-version": 4 }, "d3d12-memory-allocator": { "baseline": "2021-05-05", diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json index cdeb4e677b97ad..e5f1d914fb8e97 100644 --- a/versions/c-/czmq.json +++ b/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c4f3cb55eecf90232bdaabef1fd9b6d0426c7c", + "version-semver": "4.2.1", + "port-version": 4 + }, { "git-tree": "ec9f27596e7ff9e8b8aa401f27525075abec28ea", "version-semver": "4.2.1", From 00360d60f52d61ae6b5bb030b688f58a736c40fa Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 23 Nov 2023 22:54:01 -0800 Subject: [PATCH 0453/1039] [vcpkg baseline][libressl] Update status from fail to skip on android (#35295) --- scripts/ci.baseline.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ada7dcdb8e118a..ab719b5f5886fb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -613,9 +613,9 @@ libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip # Conflicts with openssl -libressl:arm-neon-android=fail -libressl:arm64-android=fail -libressl:x64-android=fail +libressl:arm-neon-android=skip +libressl:arm64-android=skip +libressl:x64-android=skip libressl:arm64-windows=skip libressl:arm64-uwp=skip libressl:x64-linux=skip From cd5e746ec203c8c3c61647e0886a8df8c1e78e41 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 24 Nov 2023 07:54:52 +0100 Subject: [PATCH 0454/1039] [nanodbc] no uwp (#35251) --- ports/nanodbc/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/n-/nanodbc.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json index 3afcedb0e52644..296e352833afa4 100644 --- a/ports/nanodbc/vcpkg.json +++ b/ports/nanodbc/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nanodbc", "version": "2.13.0", - "port-version": 7, + "port-version": 8, "description": "A small C++ wrapper for the native C ODBC API.", "homepage": "https://github.com/nanodbc/nanodbc", + "supports": "!uwp", "dependencies": [ { "name": "unixodbc", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ab719b5f5886fb..1b78af3c24e1ed 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -783,8 +783,6 @@ nana:arm64-android=fail nana:x64-android=fail nana:x64-linux=fail nana:x64-osx=fail -nanodbc:arm64-uwp=fail -nanodbc:x64-uwp=fail nanodbc:x64-linux=skip netcdf-cxx4:x64-windows-static-md=fail ngspice:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index ab19b32746151b..3e624a3d18d932 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5822,7 +5822,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 7 + "port-version": 8 }, "nanoflann": { "baseline": "1.5.0", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 67f1d1b65bdb31..834645fbcd8923 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47782a521b53acaa6ee44a2956a2e98d17a20e50", + "version": "2.13.0", + "port-version": 8 + }, { "git-tree": "b57473b86bc71733209e195206d253f1dd3658b2", "version": "2.13.0", From 13c3c0fcc203d179f4443fe48d252e3ff220cbeb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 27 Nov 2023 08:41:27 +0100 Subject: [PATCH 0455/1039] [jkqtplotter] Fix Qt version selection (#35319) --- ports/jkqtplotter/portfile.cmake | 2 +- ports/jkqtplotter/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/j-/jkqtplotter.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/jkqtplotter/portfile.cmake b/ports/jkqtplotter/portfile.cmake index 587510aa640aa4..f595e8407b9658 100644 --- a/ports/jkqtplotter/portfile.cmake +++ b/ports/jkqtplotter/portfile.cmake @@ -26,7 +26,7 @@ vcpkg_cmake_configure( -DJKQtPlotter_BUILD_SHARED_LIBS=${JKQtPlotter_BUILD_SHARED_LIBS} -DJKQtPlotter_BUILD_STATIC_LIBS=${JKQtPlotter_BUILD_STATIC_LIBS} ${FEATURE_OPTIONS} - -DQT_VERSION_MAJOR=6 + -DCMAKE_IGNORE_PATH=${CURRENT_INSTALLED_DIR}/share/cmake/Qt5 -DCIMG_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV:BOOL=ON # only used for some examples -DOpenCV_FOUND:BOOL=FALSE # wrong find_package call with QUITE instead of QUIET diff --git a/ports/jkqtplotter/vcpkg.json b/ports/jkqtplotter/vcpkg.json index 8da219f5d04f50..b393e50e0ea855 100644 --- a/ports/jkqtplotter/vcpkg.json +++ b/ports/jkqtplotter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jkqtplotter", "version-date": "2023-10-24", + "port-version": 1, "description": "A Qt Plotting Library", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3e624a3d18d932..9c0ff7d872a254 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3634,7 +3634,7 @@ }, "jkqtplotter": { "baseline": "2023-10-24", - "port-version": 0 + "port-version": 1 }, "joltphysics": { "baseline": "4.0.0", diff --git a/versions/j-/jkqtplotter.json b/versions/j-/jkqtplotter.json index ffd76451af2548..0e2e354090264d 100644 --- a/versions/j-/jkqtplotter.json +++ b/versions/j-/jkqtplotter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6818df9457df540c1c0fd88b1ff2da3c844c8fa", + "version-date": "2023-10-24", + "port-version": 1 + }, { "git-tree": "87ffb0cb05a71f4338bd068bc14a348770b7d4ff", "version-date": "2023-10-24", From 516147648a72867876a0c10d9293e833b66af82e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 28 Nov 2023 01:54:46 +0100 Subject: [PATCH 0456/1039] [vcpkg_find_acquire_program] Find pkg-config in /opt/homebrew/bin (#34776) * [vcpkg_find_acquire_program(PKGCONFIG)] /opt/homebrew/bin * PREPEND arm osx path --- scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake index d6ef8a21cf5193..4c514af0b44e5f 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake @@ -41,4 +41,7 @@ else() set(brew_package_name pkg-config) set(apt_package_name pkg-config) set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") + if(VCPKG_HOST_IS_OSX) + vcpkg_list(PREPEND paths_to_search "/opt/homebrew/bin") + endif() endif() From de5e71ea0c3f6bc650eb7a469f0552e6237f73dd Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:07:46 +0800 Subject: [PATCH 0457/1039] update to 5.0 (#35345) --- ports/raylib/fix-project-version.patch | 14 -------------- ports/raylib/portfile.cmake | 3 +-- ports/raylib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/raylib.json | 5 +++++ 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 ports/raylib/fix-project-version.patch diff --git a/ports/raylib/fix-project-version.patch b/ports/raylib/fix-project-version.patch deleted file mode 100644 index a89ce733b4ac28..00000000000000 --- a/ports/raylib/fix-project-version.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9087f8e..5092bdf 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,7 +1,7 @@ - # Setup the project and settings - project(raylib C) --set(PROJECT_VERSION 4.2.0) --set(API_VERSION 420) -+set(PROJECT_VERSION 4.5.0) -+set(API_VERSION 450) - - include(GNUInstallDirs) - include(JoinPaths) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index c55b47f88f269a..abf58697290605 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -22,10 +22,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib REF "${VERSION}" - SHA512 a959abbb577a8951251a469d6505093fd20988444dcf055e26cb0b484ef4024211b2cca45187accbd465c56bc50e02d450b6f7f7cfde2cdaedcdce422f80dcbc + SHA512 5956bc1646b99baac6eb1652c4d72e96af874337158672155ba144f131de8a4fd19291a58335a92fcaaa2fc818682f93ff4230af0f815efb8b49f7d2a162e9b0 HEAD_REF master PATCHES - fix-project-version.patch #Upstream change https://github.com/raysan5/raylib/commit/0d4db7ad7f6fd442ed165ebf8ab8b3f4033b04e7, please remove in next update. ${patches} ) diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index d3224442f75744..ee0e96be26f4d5 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "raylib", - "version-semver": "4.5.0", - "port-version": 2, + "version": "5.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 9c0ff7d872a254..ef255cd90e662f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7353,8 +7353,8 @@ "port-version": 0 }, "raylib": { - "baseline": "4.5.0", - "port-version": 2 + "baseline": "5.0", + "port-version": 0 }, "rbdl": { "baseline": "3.3.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 4af11939dfe519..bc644a7317a8bd 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cf5ce249c066d11ea5afe9ed15972663992c0f2", + "version": "5.0", + "port-version": 0 + }, { "git-tree": "8481bb808a6e0cdd0862e22df7b59cc0e13542cc", "version-semver": "4.5.0", From 2a01db703fec3cdd13ca884a6a84d1505df2d235 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 28 Nov 2023 02:19:37 +0100 Subject: [PATCH 0458/1039] [seal] Minor fixes (#35343) * [seal] Minor fixes * version --- ports/seal/portfile.cmake | 28 +++++++++++++++------------- ports/seal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/seal.json | 5 +++++ 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index ae3684625bbee4..b0832165fc8205 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -1,10 +1,12 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 206648d0e4634e5c61dcf9370676630268290b59 #v4.1.1 - SHA512 8aa2dd06766bbc482c0e10d1c8a8379b3cd9bdc08ed93ae24f5c996ff2417f2df228e576309c521e2bd2c452d50014376f8183d2272c3af74bcc6f292ae7408b + REF "v${VERSION}" + SHA512 717393b2428cd0b88a0cf75dbee6abfc92a89935664b7606dd18c17fa573c8053f24e08d530f2d63a3730e7737c0f2ca91d0002bc02a1cfecd19cf1521312823 HEAD_REF main PATCHES shared-zstd.patch @@ -28,23 +30,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DSEAL_BUILD_DEPS=OFF" - "-DSEAL_BUILD_EXAMPLES=OFF" - "-DSEAL_BUILD_TESTS=OFF" - "-DSEAL_BUILD_SEAL_C=OFF" + -DSEAL_BUILD_DEPS=OFF + -DSEAL_BUILD_EXAMPLES=OFF + -DSEAL_BUILD_TESTS=OFF + -DSEAL_BUILD_SEAL_C=OFF ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/SEAL-4.1") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SEAL-4.1) -vcpkg_fixup_pkgconfig() +# provides pkgconfig files only on UNIX +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_fixup_pkgconfig() +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") - -vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index b098b246ee493a..95a855627f3f5f 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "seal", "version": "4.1.1", + "port-version": 1, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ef255cd90e662f..7fcffb8f44fa1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7746,7 +7746,7 @@ }, "seal": { "baseline": "4.1.1", - "port-version": 0 + "port-version": 1 }, "seasocks": { "baseline": "1.4.6", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 78286d0eccb597..90d127f54338e2 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b40b9aa4145e13facd191ec957a4cefa586d6f7f", + "version": "4.1.1", + "port-version": 1 + }, { "git-tree": "7a0927f22f4552984e2f651ea11c7c14f030d879", "version": "4.1.1", From 71283c8cd4a3d015383bbd728117224a8313e85e Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 28 Nov 2023 07:43:33 +0100 Subject: [PATCH 0459/1039] [nghttp3] udpdate to 1.1.0 (#35364) --- ports/nghttp3/portfile.cmake | 2 +- ports/nghttp3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index e78ad3f5b6c771..0566d2698b6dc3 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 REF v${VERSION} - SHA512 a2f02342bdff8a39d9c95e061eaac068d92af3c93aaddc0119dfef4b4c4b545f2e434ef5e00d6901e5ecffb1f5e9fa6589b838543dbfcb3917255fba04589910 + SHA512 7eb776612ddd30b94b9e2b51097038026873c1ca6d8f20565a03674ba648a11833eeb37d1ddd00981f687669e5f3521b61ef5c01dfdbed4f7222046399bd6270 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index a71c5c8b9a6494..2259729f5d5d71 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp3", - "version": "1.0.0", + "version": "1.1.0", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7fcffb8f44fa1c..f46569020a32ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5925,7 +5925,7 @@ "port-version": 1 }, "nghttp3": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 14d3de6dba0818..522ddfcb89d08b 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e17655971ccd459fb7886958988cf1334bc5572c", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "9552b83f2dfc8fc3211ce4e18708570193d9625f", "version": "1.0.0", From 58ac85fb2f867c38bffc55989c2d8eeaf856157a Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Mon, 27 Nov 2023 22:45:18 -0800 Subject: [PATCH 0460/1039] [zlib-ng] Update to 2.1.5 (#35363) * update zlib-ng to 2.1.5 * update baseline --- ports/zlib-ng/fix-cflags.patch | 24 ------------------------ ports/zlib-ng/portfile.cmake | 4 +--- ports/zlib-ng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zlib-ng.json | 5 +++++ 5 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 ports/zlib-ng/fix-cflags.patch diff --git a/ports/zlib-ng/fix-cflags.patch b/ports/zlib-ng/fix-cflags.patch deleted file mode 100644 index 6d2a3511201560..00000000000000 --- a/ports/zlib-ng/fix-cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a645ad6e..fbc2bdba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1159,6 +1159,9 @@ else() - endif() - - set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib${SUFFIX}.pc) -+if(WITH_GZFILEOP) -+ set(PKG_CONFIG_CFLAGS "-DWITH_GZFILEOP") -+endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein - ${ZLIB_PC} @ONLY) - configure_file(${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein -diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein -index 3d440ce6..df8bf9f0 100644 ---- a/zlib.pc.cmakein -+++ b/zlib.pc.cmakein -@@ -11,4 +11,4 @@ Version: @ZLIB_FULL_VERSION@ - - Requires: - Libs: -L${libdir} -L${sharedlibdir} -lz@SUFFIX@ --Cflags: -I${includedir} -+Cflags: -I${includedir} @PKG_CONFIG_CFLAGS@ diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 94c23e23231d7f..62dfbcb823aa23 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng REF "${VERSION}" - SHA512 5afda5ea4be84f7d7b016416a6eed18e2aab6c698f006cdfbc8f8b43ce3dc73c7994ab9d1ca090c1b93cb1aadc8747bfd8216afb22b44633d49127f01b77cfa2 + SHA512 9212d87c63a2da4e5355a7a1c75380aeba40fbd0ea3d71d3784cb3eac94237f9bea2a1b7993a08f39d4197725c4c133087d3a9d213d3944aa48a7559de2be920 HEAD_REF develop - PATCHES - fix-cflags.patch ) vcpkg_cmake_configure( diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index aa055b349cd974..33050061324a49 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib-ng", - "version": "2.1.4", + "version": "2.1.5", "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 f46569020a32ad..9c0cfbf5e7aa2c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9341,7 +9341,7 @@ "port-version": 0 }, "zlib-ng": { - "baseline": "2.1.4", + "baseline": "2.1.5", "port-version": 0 }, "zlmediakit": { diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index dbd12a24581f24..f1c5cef7b45f5f 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e612211a2cf602a9a95796202f9cba452c6f5ebc", + "version": "2.1.5", + "port-version": 0 + }, { "git-tree": "f05a7ce2c95cfcf4720d911a72dc3b60b46eb1c9", "version": "2.1.4", From 79156b6b93850713f473744330e7988a7ac848e8 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 28 Nov 2023 07:45:48 +0100 Subject: [PATCH 0461/1039] [ngtcp2] Update to 1.1.0 (#35362) --- ports/ngtcp2/portfile.cmake | 2 +- ports/ngtcp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ngtcp2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ngtcp2/portfile.cmake b/ports/ngtcp2/portfile.cmake index 09d022103e6154..2c647ad9fbe860 100644 --- a/ports/ngtcp2/portfile.cmake +++ b/ports/ngtcp2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/ngtcp2 REF "v${VERSION}" - SHA512 c76ede7546d0d7056281002149441e5722147c31c934266dbb50c821ba6c1c493c798e636c84b2d76e925a9cdf7f5b34dd7e9fa1f0ba674453ece26130acc9cf + SHA512 6411bdbce6995df68987a011ca7d604d5f942e1b8f6bea4a86f1ad7d1695400ef75fd3132d33a9d43b668529b83e726cec24cb41633bb849ab917e408daf7b61 HEAD_REF master PATCHES export-unofficical-target.patch diff --git a/ports/ngtcp2/vcpkg.json b/ports/ngtcp2/vcpkg.json index 7c6281457e9c2c..4d65f2ab04da58 100644 --- a/ports/ngtcp2/vcpkg.json +++ b/ports/ngtcp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ngtcp2", - "version": "1.0.1", + "version": "1.1.0", "description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.", "homepage": "https://github.com/ngtcp2/ngtcp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9c0cfbf5e7aa2c..75368fe97c21e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5933,7 +5933,7 @@ "port-version": 0 }, "ngtcp2": { - "baseline": "1.0.1", + "baseline": "1.1.0", "port-version": 0 }, "nifly": { diff --git a/versions/n-/ngtcp2.json b/versions/n-/ngtcp2.json index 304d661a0eae66..990ac05fc3a017 100644 --- a/versions/n-/ngtcp2.json +++ b/versions/n-/ngtcp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c373297464e5a9b8bc18bd89703571e3ebf2417d", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "b2b2e40609c45b92b199a998590bb1074f1226d4", "version": "1.0.1", From e9fee44c87c38ebb5ef026ccc1023757fc284d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 28 Nov 2023 07:47:00 +0100 Subject: [PATCH 0462/1039] [quill] Update to 3.5.0 (#35361) * [quill] Update to 3.5.0 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 7ab500e96ee509..c361c5ece3e5f3 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 9b15c33041b1eaf57106c7cf8924017462598f91c27112178518591f66481bc496f0729ce819112c27c4bdc61db9816f88fd955d0392b313736a0d54cea4f716 + SHA512 fa945fa584d9771b44349b5e7322e41e5a6c0d623159ccb6e8fe9094382136d1dce7fcf72f55e7b37d9d0e19cd11cf6c2fbc02d407b1d18b6448bc72b6100d24 HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 9b0f840f74121e..d68e76ff17625e 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.4.1", + "version": "3.5.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 75368fe97c21e8..6eb5ddb04fca07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7277,7 +7277,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.4.1", + "baseline": "3.5.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 2be93922a2d56b..07ba0bbf1239f6 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a01ed0ad565d67bf90a71b996c45b767e4f88ba", + "version": "3.5.0", + "port-version": 0 + }, { "git-tree": "8c2da56c7367f81e726a9a9e346b0c718447671b", "version": "3.4.1", From 568a4e5ae35355e754802e67f7224e40d009710e Mon Sep 17 00:00:00 2001 From: An Tao Date: Tue, 28 Nov 2023 14:48:28 +0800 Subject: [PATCH 0463/1039] Bump drogon to 1.9.1 and trantor to 1.5.15 (#35356) --- ports/drogon/portfile.cmake | 2 +- ports/drogon/vcpkg.json | 3 +-- ports/trantor/000-fix-deps.patch | 10 +++++----- ports/trantor/portfile.cmake | 2 +- ports/trantor/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/d-/drogon.json | 5 +++++ versions/t-/trantor.json | 5 +++++ 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 54d7508872743f..fc8adb4ba77eb5 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon REF "v${VERSION}" - SHA512 a49b032689869e97505612570285d21c0a68604c70e379f95c70fd5d8014f6890809283956b1b83fda4551c01c526ab2b575351c23a3e58fb4f920c9e1b7e92b + SHA512 05666166e0b03a6f349a3811ea1014f6e7d8a42a5e749e478502461722a647c6170f5538a4cba9820c3135551d577276094cd96eb0997946c3a37787b531ac49 HEAD_REF master PATCHES 0001-vcpkg.patch diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index a23057c4dc9508..89e688af2d2b07 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,7 +1,6 @@ { "name": "drogon", - "version": "1.8.7", - "port-version": 1, + "version-semver": "1.9.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/000-fix-deps.patch b/ports/trantor/000-fix-deps.patch index 49cff8b3d74021..48d66f2106bdad 100644 --- a/ports/trantor/000-fix-deps.patch +++ b/ports/trantor/000-fix-deps.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index efa0434..b87a1a3 100755 +index 4ec5461..eca26c6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -190,7 +190,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE TRANTOR_TLS_PROVIDER=${TRANTO +@@ -212,7 +212,7 @@ endif(HAVE_SPDLOG) set(HAVE_C-ARES NO) if (BUILD_C-ARES) @@ -11,7 +11,7 @@ index efa0434..b87a1a3 100755 if(c-ares_FOUND) message(STATUS "c-ares found!") set(HAVE_C-ARES TRUE) -@@ -198,7 +198,7 @@ if (BUILD_C-ARES) +@@ -220,7 +220,7 @@ if (BUILD_C-ARES) endif () if(HAVE_C-ARES) @@ -21,7 +21,7 @@ index efa0434..b87a1a3 100755 ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) diff --git a/cmake/templates/TrantorConfig.cmake.in b/cmake/templates/TrantorConfig.cmake.in -index 8c62924..dd243d0 100644 +index 61007bd..c5dd363 100644 --- a/cmake/templates/TrantorConfig.cmake.in +++ b/cmake/templates/TrantorConfig.cmake.in @@ -17,7 +17,7 @@ if(@Botan_FOUND@) @@ -32,4 +32,4 @@ index 8c62924..dd243d0 100644 + find_dependency(c-ares CONFIG) endif() find_dependency(Threads) - # Compute paths + if(@spdlog_FOUND@) diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 04f5ea3464a441..1757b77153bf36 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor REF "v${VERSION}" - SHA512 468e5ffe9b47537992b9852ddec7714fb6e63147ff51ecfade7e1b0af02f5231ebc50b71d48d77c188f8d2af77c64c40fcbdc907f4f8d45d488aa2966f9406f9 + SHA512 f08bba448229d8121534cade55b74ac0d9cf5deb1c1116794c21fee37f8f8c3b3d5e6618d0806942a9bcf5eb30c87879ddaf1104417fb3fe14de0827670e03e8 HEAD_REF master PATCHES 000-fix-deps.patch diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 6aff8ecd4f58ac..09b4027b951b1d 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.14", + "version-semver": "1.5.15", "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 6eb5ddb04fca07..55105c5ad1f0b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2265,8 +2265,8 @@ "port-version": 0 }, "drogon": { - "baseline": "1.8.7", - "port-version": 1 + "baseline": "1.9.1", + "port-version": 0 }, "dstorage": { "baseline": "1.2.2", @@ -8549,7 +8549,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.14", + "baseline": "1.5.15", "port-version": 0 }, "tre": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 69d1c4f29de96d..e97555bc2b999f 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72953f06e1c7a3195daa8549c9d2b46d42125822", + "version-semver": "1.9.1", + "port-version": 0 + }, { "git-tree": "3dc8fd6d40ad624513353e295fbd39a0dd237c91", "version": "1.8.7", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 975874d1e33ebe..f25fe513e96d52 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47ee2615e8883f1daf13ffd3a32964782cf9b1c0", + "version-semver": "1.5.15", + "port-version": 0 + }, { "git-tree": "d8c48e0f8f1877f0392dcb0f1d1d31011c9db957", "version-semver": "1.5.14", From ba87a82f3d8396cd326a7c29d3be025baa199a05 Mon Sep 17 00:00:00 2001 From: sandro97git <30286744+sandro97git@users.noreply.github.com> Date: Tue, 28 Nov 2023 07:49:34 +0100 Subject: [PATCH 0464/1039] [sdbus-cpp] fixup config package name (#35354) Co-authored-by: Sandro Scherer --- ports/sdbus-cpp/portfile.cmake | 2 +- ports/sdbus-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdbus-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/sdbus-cpp/portfile.cmake b/ports/sdbus-cpp/portfile.cmake index f9b952ad66460d..d561f9eb7786dc 100644 --- a/ports/sdbus-cpp/portfile.cmake +++ b/ports/sdbus-cpp/portfile.cmake @@ -22,7 +22,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sdbus-c++) +vcpkg_cmake_config_fixup(PACKAGE_NAME sdbus-c++ CONFIG_PATH lib/cmake/sdbus-c++) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/sdbus-cpp/vcpkg.json b/ports/sdbus-cpp/vcpkg.json index 3895a5f0e7a27a..10b4b0652851b1 100644 --- a/ports/sdbus-cpp/vcpkg.json +++ b/ports/sdbus-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdbus-cpp", "version": "1.3.0", + "port-version": 1, "description": "High-level C++ D-Bus library for Linux designed to provide easy-to-use yet powerful API in modern C++", "homepage": "https://github.com/Kistler-Group/sdbus-cpp", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 55105c5ad1f0b5..5afbd97ca3fad0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7678,7 +7678,7 @@ }, "sdbus-cpp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "sdformat10": { "baseline": "10.0.0", diff --git a/versions/s-/sdbus-cpp.json b/versions/s-/sdbus-cpp.json index 6fdcf9ad52cc73..b069067cc50950 100644 --- a/versions/s-/sdbus-cpp.json +++ b/versions/s-/sdbus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c0a3bedc3ced9d4ffdeb92b241546f13b9a1fc", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "cae6cd5686aeefb86b4b97cda6d258d80a9eb5b6", "version": "1.3.0", From 65a0e9b3eace27914e616d2a7ffdfad60da22bbe Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 27 Nov 2023 22:52:24 -0800 Subject: [PATCH 0465/1039] [oatpp-sqlite] fix usage of oatpp-sqlite (#35353) * [oatpp-sqlite] fix usage of oatpp-sqlite * update version * update patch * update version * update patch * update version --------- Co-authored-by: vzhli17 --- ports/oatpp-sqlite/fix-usage.patch | 14 ++++++++++++++ ports/oatpp-sqlite/portfile.cmake | 4 +++- ports/oatpp-sqlite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/oatpp-sqlite.json | 5 +++++ 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ports/oatpp-sqlite/fix-usage.patch diff --git a/ports/oatpp-sqlite/fix-usage.patch b/ports/oatpp-sqlite/fix-usage.patch new file mode 100644 index 00000000000000..eeec7adb3c7ce6 --- /dev/null +++ b/ports/oatpp-sqlite/fix-usage.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/module-config.cmake.in b/cmake/module-config.cmake.in +index 5cc12b0..5d94df8 100644 +--- a/cmake/module-config.cmake.in ++++ b/cmake/module-config.cmake.in +@@ -1,5 +1,9 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++find_dependency(oatpp CONFIG) ++find_dependency(unofficial-sqlite3 CONFIG) ++ + if(NOT TARGET oatpp::@OATPP_MODULE_NAME@) + include("${CMAKE_CURRENT_LIST_DIR}/@OATPP_MODULE_NAME@Targets.cmake") + endif() diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index 81bd1a5e208caf..56727375d99beb 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF ${OATPP_VERSION} SHA512 8a208145ee10ed858767b4b56c220b6befd83e6858759128103ce679b889e6218a95ed6627af5098e4d26367be8add82de26e1f1f8ef581b1913b8386f9d56de HEAD_REF master + PATCHES + fix-usage.patch ) vcpkg_cmake_configure( @@ -21,4 +23,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp-sqlite CONFIG_PATH lib/cmake/oatpp-s vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/oatpp-sqlite/vcpkg.json b/ports/oatpp-sqlite/vcpkg.json index c192d7b2e78f4e..1f7d8812e89031 100644 --- a/ports/oatpp-sqlite/vcpkg.json +++ b/ports/oatpp-sqlite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "oatpp-sqlite", "version": "1.3.0", - "port-version": 1, + "port-version": 2, "description": "Oat++ SQLite adapter for Oat++ ORM.", "homepage": "https://github.com/oatpp/oatpp-sqlite", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5afbd97ca3fad0..cf5993ab94b8a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6082,7 +6082,7 @@ }, "oatpp-sqlite": { "baseline": "1.3.0", - "port-version": 1 + "port-version": 2 }, "oatpp-ssdp": { "baseline": "1.3.0", diff --git a/versions/o-/oatpp-sqlite.json b/versions/o-/oatpp-sqlite.json index c1022009071528..cb55ebcdbc1e9e 100644 --- a/versions/o-/oatpp-sqlite.json +++ b/versions/o-/oatpp-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bde9ba480ed1c17d74a09b924c849595f795b9c", + "version": "1.3.0", + "port-version": 2 + }, { "git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5", "version": "1.3.0", From 716138a6453d763efa7451630c14c5505f493ca6 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 28 Nov 2023 07:57:15 +0100 Subject: [PATCH 0466/1039] [kuku] Minor fixes (#35337) * [kuku] Minor fixes * version * Restore DISABLE_PARALLEL_CONFIGURE * version --- ports/kuku/portfile.cmake | 13 +++++++------ ports/kuku/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/k-/kuku.json | 5 +++++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ports/kuku/portfile.cmake b/ports/kuku/portfile.cmake index 72d97bfe877a3b..0cfe1ebf447481 100644 --- a/ports/kuku/portfile.cmake +++ b/ports/kuku/portfile.cmake @@ -1,11 +1,13 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/Kuku - REF 1338c4ae2211ab4c739022ff57f48ce5a76531d5 - SHA512 6cba13b7fc8c453acbfcb4921ee3acc9c3e91d4bba0e01480ea396e17f85288d0179342090111a2e3c056b6918c7b09ec63c41116eb4021e63c54acc19631156 - HEAD_REF master + REF "v${VERSION}" + SHA512 4b0f0cae191c70d20337fb1581fa06a8fe363a942cf3a3b6be59fbef551b70446405fb1e4e5e7ec917d5519e8d2ad0ea59bd59c36dbf917e838fc1a1cd6a3bef + HEAD_REF main ) vcpkg_cmake_configure( @@ -18,5 +20,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kuku-2.1) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/kuku/vcpkg.json b/ports/kuku/vcpkg.json index dfdc17885e3f28..df16f989c046e6 100644 --- a/ports/kuku/vcpkg.json +++ b/ports/kuku/vcpkg.json @@ -1,9 +1,9 @@ { "name": "kuku", - "version": "2.1", - "port-version": 3, - "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.", + "version": "2.1.0", + "description": "Kuku is a compact and convenient cuckoo hashing library written in C++.", "homepage": "https://github.com/microsoft/Kuku", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index cf5993ab94b8a6..c9018d47d43aa8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3941,8 +3941,8 @@ "port-version": 1 }, "kuku": { - "baseline": "2.1", - "port-version": 3 + "baseline": "2.1.0", + "port-version": 0 }, "kvasir-mpl": { "baseline": "2019-08-06", diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index dfac4be8c2545e..7257778ae18295 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d5b6509ad53b413c0f4bd71a15f71ab79d8c8b", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "1a78898dbb7cbacda021768b5468af708035474b", "version": "2.1", From 51f0aa0b54383156ffba754479dffbbce3f92d23 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 28 Nov 2023 07:59:35 +0100 Subject: [PATCH 0467/1039] [jsoncpp] Disable distributing obj files (#35334) * [jsoncpp] Disable distributing obj files * version --- ports/jsoncpp/portfile.cmake | 8 ++++---- ports/jsoncpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/j-/jsoncpp.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index aaed28616a3e45..e257f7637dae06 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-source-parsers/jsoncpp - REF 1.9.5 + REF "${VERSION}" SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 HEAD_REF master ) @@ -19,6 +19,7 @@ vcpkg_cmake_configure( -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF + -DBUILD_OBJECT_LIBS=OFF ) vcpkg_cmake_install() @@ -28,7 +29,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() - -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/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index b7e65e6f7760a6..fc31291aeea502 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "jsoncpp", "version": "1.9.5", - "port-version": 1, + "port-version": 2, "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", "homepage": "https://github.com/open-source-parsers/jsoncpp", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c9018d47d43aa8..2d1951122d68ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3682,7 +3682,7 @@ }, "jsoncpp": { "baseline": "1.9.5", - "port-version": 1 + "port-version": 2 }, "jsonifier": { "baseline": "0.9.91", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index eccacde2a2fe60..2fe36b86ea1c20 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "203c873c5425a71cb8a0d0ada6e5263a3bd13ff4", + "version": "1.9.5", + "port-version": 2 + }, { "git-tree": "0213314186f58bfac60d8dee9895c137291db35d", "version": "1.9.5", From 8161f655436492669adc8eb6f269dc41392ffa70 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:02:41 +0100 Subject: [PATCH 0468/1039] [flatbuffers] Only build tool in release mode (#35333) * [flatbuffers] Only build tools in release mode * version * Remove headers for PCH * version --- ports/flatbuffers/portfile.cmake | 4 +++- ports/flatbuffers/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/flatbuffers.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 4adaf46459806b..3be02cc5041826 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -25,6 +25,8 @@ vcpkg_cmake_configure( -DFLATBUFFERS_BUILD_TESTS=OFF -DFLATBUFFERS_BUILD_GRPCTEST=OFF ${options} + OPTIONS_DEBUG + -DFLATBUFFERS_BUILD_FLATC=OFF ) vcpkg_cmake_install() @@ -40,8 +42,8 @@ else() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/flatbuffers/pch") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -# Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index f52dbbb3c04148..d4f55f4114997e 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,6 +1,7 @@ { "name": "flatbuffers", "version": "23.5.26", + "port-version": 1, "description": [ "Memory Efficient Serialization Library", "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility." diff --git a/versions/baseline.json b/versions/baseline.json index 2d1951122d68ff..239bf5bd1bd99c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2658,7 +2658,7 @@ }, "flatbuffers": { "baseline": "23.5.26", - "port-version": 0 + "port-version": 1 }, "flatbush": { "baseline": "1.2.0", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 9bf9340f37876d..d2e5996c1190a6 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f827d9a5f37614af7cdb44c15075dbaac88d740", + "version": "23.5.26", + "port-version": 1 + }, { "git-tree": "5146d5516c8570263780a1cdf73df98d70936e07", "version": "23.5.26", From 64ca152891d6ab135c6c27881e7eb0ac2fa15bba Mon Sep 17 00:00:00 2001 From: KRM7 <70973547+KRM7@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:11:18 +0100 Subject: [PATCH 0469/1039] [gapp] New port (#35330) * [gapp] new port * update versions/g-/gapp.json --------- Co-authored-by: KRM7 --- ports/gapp/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/gapp/usage | 4 ++++ ports/gapp/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gapp.json | 9 +++++++++ 5 files changed, 64 insertions(+) create mode 100644 ports/gapp/portfile.cmake create mode 100644 ports/gapp/usage create mode 100644 ports/gapp/vcpkg.json create mode 100644 versions/g-/gapp.json diff --git a/ports/gapp/portfile.cmake b/ports/gapp/portfile.cmake new file mode 100644 index 00000000000000..eae57505e1d1fe --- /dev/null +++ b/ports/gapp/portfile.cmake @@ -0,0 +1,29 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KRM7/gapp + REF "v${VERSION}" + SHA512 463d36c3c41d14a9615dc48b43aebfccdf28177db766941607c2bdb2fed9ae5e876ae7b0bca541809503b35e9ce250a5d3b7246342c035f4a079d50539589ac2 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGAPP_BUILD_TESTS=OFF + -DGAPP_USE_LTO=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gapp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc/gapp/api") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/gapp/usage b/ports/gapp/usage new file mode 100644 index 00000000000000..bcfbbdff6f35cf --- /dev/null +++ b/ports/gapp/usage @@ -0,0 +1,4 @@ +gapp provides CMake targets: + + find_package(gapp CONFIG REQUIRED) + target_link_libraries(main PRIVATE gapp::gapp) diff --git a/ports/gapp/vcpkg.json b/ports/gapp/vcpkg.json new file mode 100644 index 00000000000000..178b75c8aaa307 --- /dev/null +++ b/ports/gapp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gapp", + "version": "0.2.0", + "description": "A genetic algorithms library in C++ for single- and multi-objective optimization.", + "homepage": "https://github.com/KRM7/gapp", + "license": "MIT", + "supports": "(windows | linux) & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 239bf5bd1bd99c..d127daa1611aa2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2848,6 +2848,10 @@ "baseline": "gamma-2018-01-27", "port-version": 6 }, + "gapp": { + "baseline": "0.2.0", + "port-version": 0 + }, "gasol": { "baseline": "2018-01-04", "port-version": 4 diff --git a/versions/g-/gapp.json b/versions/g-/gapp.json new file mode 100644 index 00000000000000..6f25cf3e64cf06 --- /dev/null +++ b/versions/g-/gapp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "31fc6c2ca0e58b6133db03eeaa3e31398810ccc2", + "version": "0.2.0", + "port-version": 0 + } + ] +} From e13d13cf841ad493556995832ed5663f1856aedb Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 29 Nov 2023 13:40:40 +0800 Subject: [PATCH 0470/1039] update to 1.5.1 (#35388) --- ports/nanoflann/portfile.cmake | 2 +- ports/nanoflann/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nanoflann.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index 4ac280eb6a8a4f..0fea664f073181 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann REF "v${VERSION}" - SHA512 2248eed37872737c1f3c031e65d2f892024e35aa81ccf14cf8222289cfe12b5ca3fe461749e060ff822ca9e40dd9cb918216468c1343a42305f7adf780888c50 + SHA512 bc4cdb285708f605ac202af41a66140d49b0fb54a96ce19642ab18e22ee0ffea6374ad1de08988ad4cef6aae8a65aad2a824b95b1c03fc0d762ccc783732b2ee HEAD_REF master ) diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index b256753c725d88..30879ab853e976 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nanoflann", - "version": "1.5.0", + "version": "1.5.1", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d127daa1611aa2..a24b17242a96e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5829,7 +5829,7 @@ "port-version": 8 }, "nanoflann": { - "baseline": "1.5.0", + "baseline": "1.5.1", "port-version": 0 }, "nanogui": { diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index 4884c7db9f99e6..86f6f26283a444 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2d0d87e714fc8a7ec923469a4bf2ae0ceb405c3", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "23c05262f235796a1f01174f1dedc48c346e96af", "version": "1.5.0", From 2e702554a15985ff442d8055ca6946234f34eeec Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 06:41:58 +0100 Subject: [PATCH 0471/1039] [gflags] Fix release-only build (#35373) --- ports/gflags/portfile.cmake | 4 +++- ports/gflags/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gflags.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 02cb969e4b1005..7fa6a86079111f 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -26,7 +26,9 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags) if(NOT VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_pkgconfig() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gflags.pc" "-lgflags" "-lgflags_debug") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gflags.pc" "-lgflags" "-lgflags_debug") + endif() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index 4a63b70a029711..32d0edbab20321 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gflags", "version": "2.2.2", - "port-version": 8, + "port-version": 9, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a24b17242a96e0..bcfa431019ca5f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "gflags": { "baseline": "2.2.2", - "port-version": 8 + "port-version": 9 }, "ghc-filesystem": { "baseline": "1.5.14", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 81fdd19bf2798d..ce83cff9e9e403 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5da46db14e97a98ba1469ae46d14ce80308d5a8", + "version": "2.2.2", + "port-version": 9 + }, { "git-tree": "606a0a3ad49f6e6276672e230431e6797d56180e", "version": "2.2.2", From c01832ef8391b5a3545cf053991bc8bc9760e9b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Wed, 29 Nov 2023 05:43:32 +0000 Subject: [PATCH 0472/1039] [Glaze] Update version 1.8.0 (#35360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update glaze verison 1.8.0 * update database --------- Co-authored-by: Ómar Högni Guðmarsson --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 8f96dec8f2ea35..6f74cb75fc44b1 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 654dd5d4ac1dbc022ad7ad6fb94b144757c7740ab34954c1153552e13ec7721fc754b3723b30ea350127a00ce2b98c2ac5cfa786dfc93e597d7a55706448fa70 + SHA512 288775a9c9eaeffe7fe8294c7ac1cb89df1898b6cbcad3c174d530f6d35943f41dc65d675efaac8c2bea4dd54d882719ec039e257193e2a272939fcf3c336252 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 2620d3d58ce5c0..469360976d15b8 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.6.1", + "version": "1.8.0", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bcfa431019ca5f..b0ccae12396a47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2969,7 +2969,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.6.1", + "baseline": "1.8.0", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 6923bcb71b97d4..d2c96f661467e2 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69ee3541bd226042e5dab58f37f9b89ade5be622", + "version": "1.8.0", + "port-version": 0 + }, { "git-tree": "62292c7ec8c2e2d5ad2b5b3197cbf1647cbee342", "version": "1.6.1", From 16eaa5d37f7eb0c68724dcc24a68c2e0850989eb Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:52:21 -0500 Subject: [PATCH 0473/1039] Updating the necessary files. (#35358) --- ports/discordcoreapi/portfile.cmake | 2 +- ports/discordcoreapi/vcpkg.json | 2 +- ports/jsonifier/portfile.cmake | 4 ++-- ports/jsonifier/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 6 +++--- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 1d772dd10a8d9b..232672b5e8113d 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 678f2cf892139582cf5d77a33d4f03cfb2d264d5f0af3912ffd378ab05ee40f27703c9ad5496a72af68fb8ea2ab66192701f911b0d1bfff53542fd1d7e9ec65e + SHA512 12302c6ef374ee7e88538c4f736642ab15b6455f3db08ffd2028a84c843c0c13300f3ee300f5e12d3c7621fa9f914d3ceb29da52587ed678f6d0ce41c3d9e0d5 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 4c3039947111b3..26b3062d758527 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.2", + "version": "2.0.3", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 777b29f5c04547..a7af2bf0ccd9e8 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier - REF "v${VERSION}" - SHA512 e2611b116cd6d73426b32fea11b3b52527466e7e59d8e8c842ccca9dac2b42679457d7ad77e11512c15fb319e650c74bbee0dce3ae7d24c127b756790eebf020 + REF "v${VERSION}" + SHA512 436dc66699ef924ca953e4d05b035ff7279fbbae932e74902eed0c6b9fd3e2bf282425c82f0d7d65392307602b5c603cf956d513df4c080c76566d4d9c61b373 HEAD_REF main PATCHES uninstall-head.patch diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 3776d434b89e0a..370186fce6f1ef 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,7 +1,6 @@ { "name": "jsonifier", - "version": "0.9.91", - "port-version": 1, + "version": "0.9.92", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1b78af3c24e1ed..f9392abee1be81 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -282,6 +282,7 @@ directxsdk:x64-windows=skip directxsdk:x64-windows-static-md=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail +discordcoreapi:x64-linux=fail discordcoreapi:x64-osx=fail discount:x64-android=fail drogon:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index b0ccae12396a47..25b8e7637bcafc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2205,7 +2205,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0.2", + "baseline": "2.0.3", "port-version": 0 }, "discount": { @@ -3689,8 +3689,8 @@ "port-version": 2 }, "jsonifier": { - "baseline": "0.9.91", - "port-version": 1 + "baseline": "0.9.92", + "port-version": 0 }, "jsonnet": { "baseline": "0.20.0", diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index ed78b31e2593f6..c7bf7a26e01307 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a836f4645f8f1dd567ed87160f62c4026b8db784", + "version": "2.0.3", + "port-version": 0 + }, { "git-tree": "4105594f2f8aef84bb0aa20917d473727e0d9700", "version": "2.0.2", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 0d75479c467e2d..5fb5c6e2bcdc61 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58dc6092ed3ff864e9b96b10b265586bffac3eeb", + "version": "0.9.92", + "port-version": 0 + }, { "git-tree": "be9213f10f70e56d8f7fad547c9691558f9babc9", "version": "0.9.91", From c8586fdc33ff889a873807bc014687006ba3829b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 29 Nov 2023 06:56:08 +0100 Subject: [PATCH 0474/1039] [ada-url] Update to 2.7.4 (#35349) * [ada-url] Update to 2.7.4 * version --- ports/ada-url/no-cpm.patch | 31 +++++++++++++++++++++++++++++++ ports/ada-url/portfile.cmake | 8 ++++++-- ports/ada-url/vcpkg.json | 8 ++++++-- versions/a-/ada-url.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 ports/ada-url/no-cpm.patch diff --git a/ports/ada-url/no-cpm.patch b/ports/ada-url/no-cpm.patch new file mode 100644 index 00000000000000..ee0ad358635928 --- /dev/null +++ b/ports/ada-url/no-cpm.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b206edb6..1db4099d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,7 +30,6 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING}) + # errors due to CPM, so this is here to support disabling all the testing + # and tooling for ada if one only wishes to use the ada library. + if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS) +- include(cmake/CPM.cmake) + # CPM requires git as an implicit dependency + find_package(Git QUIET) + # We use googletest in the tests +diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt +index ff57220b..a6d90f29 100644 +--- a/tools/cli/CMakeLists.txt ++++ b/tools/cli/CMakeLists.txt +@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS) + "$" # <--this is in-file + "$") # <--this is out-file path + endif() +-CPMAddPackage("gh:fmtlib/fmt#7.1.3") +-CPMAddPackage( +- GITHUB_REPOSITORY jarro2783/cxxopts +- VERSION 3.1.1 +- OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES" +-) ++find_package(fmt CONFIG REQUIRED) ++find_package(cxxopts CONFIG REQUIRED) + target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt) + + if(MSVC OR MINGW) diff --git a/ports/ada-url/portfile.cmake b/ports/ada-url/portfile.cmake index 4ae225547876fb..caf8c53bd0b752 100644 --- a/ports/ada-url/portfile.cmake +++ b/ports/ada-url/portfile.cmake @@ -2,8 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ada-url/ada REF "v${VERSION}" - SHA512 bd9af16dee99a2b3f43e823b9ae6f8893741172d63ffe38337a4b3eab632167241b95df56d4220bc3240a3593e751df6a562e52e31b73e0ba99d41f5bf9922d5 + SHA512 1814365f98cc85e97fe135a840241c66ddd8a9d6d10f0be548f72bc22b840673ea30291633e4d90e2023b99b59533fa7c77eab65ed41bf9c2bf79fd261cfeba0 HEAD_REF main + PATCHES + no-cpm.patch ) vcpkg_check_features( @@ -14,11 +16,13 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DADA_BENCHMARKS=OFF -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON ${FEATURE_OPTIONS} + OPTIONS_DEBUG + -DADA_TOOLS=OFF ) vcpkg_cmake_install() diff --git a/ports/ada-url/vcpkg.json b/ports/ada-url/vcpkg.json index 9f9e0dd0652a4c..1fa33bb079a251 100644 --- a/ports/ada-url/vcpkg.json +++ b/ports/ada-url/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ada-url", - "version": "2.6.8", + "version": "2.7.4", "description": "WHATWG-compliant and fast URL parser written in modern C++", "homepage": "https://ada-url.com/", "license": "MIT", @@ -17,7 +17,11 @@ "features": { "tools": { "description": "Build CLI tools (adaparse)", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "cxxopts", + "fmt" + ] } } } diff --git a/versions/a-/ada-url.json b/versions/a-/ada-url.json index 83cd687770cd7c..63a53371750195 100644 --- a/versions/a-/ada-url.json +++ b/versions/a-/ada-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da619020bc25fc94014a434ab3e2ea77937d00f8", + "version": "2.7.4", + "port-version": 0 + }, { "git-tree": "793a12bdf6a056b11297c61d8129764722fd04b0", "version": "2.6.8", diff --git a/versions/baseline.json b/versions/baseline.json index 25b8e7637bcafc..32f652fca74402 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -37,7 +37,7 @@ "port-version": 15 }, "ada-url": { - "baseline": "2.6.8", + "baseline": "2.7.4", "port-version": 0 }, "ade": { From 07039e2f12dbcaf2e6703672fe65a7df4516324d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 29 Nov 2023 06:59:27 +0100 Subject: [PATCH 0475/1039] [log4cplus] Update to 2.1.1 (#35339) * [log4cplus] Update to 2.1.1 * version * Fix debug pc file * version --- ports/log4cplus/portfile.cmake | 15 ++++++++++----- ports/log4cplus/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/log4cplus.json | 5 +++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index ddc9756078bd66..938e87e15849ec 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF REL_2_1_0 - SHA512 fd26ae73e898af6896046e5e567bfc664bc8e81568c8cdbe5ff6316054b875af7fa946f7b1f011a96b0d3b53dc3f7f9411cbc2ffa07b674777cb0def2743ede8 + REF REL_2_1_1 + SHA512 ddc63ad574aed7d13980308c1f4d3a31a7fa9c7d4a14de923f9b3a851492d17f64f34166b6be77fc8584c0e98cd1f34ed3d9ba268e7456fd1ff3b7d8125dbe3a HEAD_REF master ) @@ -42,11 +42,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus) - vcpkg_copy_pdbs() +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/log4cplus.pc" "-llog4cplus" "-llog4cplusD") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/ChangeLog" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/README.md") -# 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/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index 0b0bf070f5743b..2d3bd2f320eba1 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -1,8 +1,9 @@ { "name": "log4cplus", - "version": "2.1.0", + "version": "2.1.1", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", + "license": "Apache-2.0 AND BSD-2-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 32f652fca74402..dd2f099e3ac238 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5245,7 +5245,7 @@ "port-version": 0 }, "log4cplus": { - "baseline": "2.1.0", + "baseline": "2.1.1", "port-version": 0 }, "log4cpp-log4cpp": { diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index 8c6f6e4e161462..b9feeb216e8b04 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "450db8aa0bcccc8479b3f3d2d1c63b71510c5dd4", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "c0a2d8577299ff33c61cbb08d3eb4d4616e4e392", "version": "2.1.0", From 11817569c059ee6837878899bd916e1a9f82de48 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 07:45:03 +0100 Subject: [PATCH 0476/1039] [vcpkg-scripts] Update msys2, add x64 PKGCONFIG (#35331) * [vcpkg-scripts] Update msys2 * Don't update to pkgconf 2.0 * Missed SHA * Limit CI * [vcpkg_find_acquire_program] Update PKGCONFIG to 2.1.0 * Update msys2 * Fixup * Revert "Limit CI" This reverts commit aa270376dfe1d03c28030d8ad749dca932814026. * Fix PKGCONFIG program version * Add x64 pkgconf --- scripts/cmake/vcpkg_acquire_msys.cmake | 208 +++++++++--------- ...cpkg_find_acquire_program(PKGCONFIG).cmake | 26 ++- scripts/cmake/vcpkg_find_fortran.cmake | 104 ++++----- 3 files changed, 176 insertions(+), 162 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 546281af5fecd9..fe9a1d25748703 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -267,13 +267,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS autoconf2.71 bash sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/autoconf2.71-2.71-1-any.pkg.tar.zst" - SHA512 bf725b7d4440764fb21061c066b765193801a03c7ded03cf19ae85aee87ea54059c4283e56877e4e2a54cfec9ef65874160c2cb76de0d08f2550c6032f07c36e + URL "https://mirror.msys2.org/msys/x86_64/autoconf2.71-2.71-3-any.pkg.tar.zst" + SHA512 dd312c428b2e19afd00899eb53ea4255794dea4c19d1d6dea2419cb6a54209ea2130d48abbc20af12196b9f628143436f736fbf889809c2c2291be0c69c0e306 DEPS awk bash diffutils m4 perl sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/autoconf-archive-2022.09.03-1-any.pkg.tar.zst" - SHA512 d8567215c405632cd9ce232982c79aa1e8c063d13aac7c64a0ba84901c26710f0254ab72ab9ab464a9ec3fb7163ed60cb950b1f0509880f3378066b073a83d80 + URL "https://mirror.msys2.org/msys/x86_64/autoconf-archive-2023.02.20-1-any.pkg.tar.zst" + SHA512 0dbdba67934402eeb974e6738eb9857d013342b4e3a11200710b87fbf085d5bebf49b29b6a14b6ff2511b126549919a375b68f19cc22aa18f6ba23c57290ac72 ) z_vcpkg_acquire_msys_declare_package( URL "https://mirror.msys2.org/msys/x86_64/automake-wrapper-20221207-1-any.pkg.tar.zst" @@ -288,13 +288,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) PATCHES "${Z_VCPKG_AUTOMAKE_CLANG_CL_PATCH}" ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.015-1-x86_64.pkg.tar.zst" - SHA512 2a1e35ccabe023332454cc58f6b9d8c4fdf9fb823f4c8a99127fcf69ab6f7aca35a3d7ea0f4f97378c4f696ef397f48bd30c2379f41d8b5dffd2de0d6177e612 + URL "https://mirror.msys2.org/msys/x86_64/bash-5.2.021-1-x86_64.pkg.tar.zst" + SHA512 ae487f08549ba269a55b7c4b184f4c02bb1c41711e3c6d112fa8ae62ca7a67e2b2ad41eca7828821119e815010ab83669293252d31ac46d3025f3aa8fcf3016e PROVIDES sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/binutils-2.40-1-x86_64.pkg.tar.zst" - SHA512 d7f00f93b54fd77102cc2e535303902d0958664eeacf09865a92e572a5bdca11e0782b7b89eb6412c3340a02fc581cbfeb074a5be1b75537422a2b28ed0e6773 + URL "https://mirror.msys2.org/msys/x86_64/binutils-2.41-3-x86_64.pkg.tar.zst" + SHA512 37f579643039564b7ec12da8ff81142d1877145bfe717e40a9a3de19ce5a4369d4098e64f91f9a3cd79ced8dd25082dae432f58affd4e7fe64acb96dcf99dc22 DEPS libiconv libintl zlib ) z_vcpkg_acquire_msys_declare_package( @@ -308,13 +308,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS libiconv libintl gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/diffutils-3.9-1-x86_64.pkg.tar.zst" - SHA512 5858c7cfa84b2f79b8e61a34901f43af441cf6e792f534532aeafced4cee470241e72d117cffa5136ffa6ad1b04e2a4e0963080df1b380e9b2657dc7dd9bd193 + URL "https://mirror.msys2.org/msys/x86_64/diffutils-3.10-1-x86_64.pkg.tar.zst" + SHA512 7ed406370a699be98bff4eeb156a063de80ac8e332fb1873639e0b95b2e72e626351e24c5ca0021af9c0e56c4a3d91bd6669e6245b21c9d4ebdbb36888d8e39d DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/file-5.44-5-x86_64.pkg.tar.zst" - SHA512 68d1df9eb548af935b4f3e7f32d0bb3599bf6d59219e229a0501e531b78c6fbecba620c8854f504b44acc48c9bacc4c2420975c598a396ae7f6ae56c742ab6d2 + URL "https://mirror.msys2.org/msys/x86_64/file-5.45-1-x86_64.pkg.tar.zst" + SHA512 fae01c7e2c88357be024aa09dba7b805d596cec7cde5c29a46c3ab209c67de64a005887e346edaad84b5173c033cb6618997d864f7fad4a7555bd38a3f7831c5 DEPS gcc-libs libbz2 liblzma libzstd zlib ) z_vcpkg_acquire_msys_declare_package( @@ -323,29 +323,29 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS libintl libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gawk-5.2.1-2-x86_64.pkg.tar.zst" - SHA512 0d056ae2bd906badc4e8ac362bd848800ec0fbe53137c74eb20667b86fa18c7fc0da291c5baec129a8fdfba31216d8500d827475b8ad0e8bcbfb2a0e46ddb95e + URL "https://mirror.msys2.org/msys/x86_64/gawk-5.3.0-1-x86_64.pkg.tar.zst" + SHA512 01a65153ffa109c51f05ef014534feecde9fc3e83ab4f5fc7f0ae957ea8a0bad2756fc65a86e20ab87a063c92161f7a7fccc8232b51c44c6ee506b7cff3762e7 PROVIDES awk DEPS libintl libreadline mpfr sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gcc-libs-11.3.0-3-x86_64.pkg.tar.zst" # 05-Jul-2022 - SHA512 eb8dccfa7939f3cb86a585a71d3083dda814bb38ee8484446147533a355520862989716b5ff3e483741496c594314367759646153cb6a4fedc0b44a87373a3fc + URL "https://mirror.msys2.org/msys/x86_64/gcc-libs-13.2.0-2-x86_64.pkg.tar.zst" # 05-Jul-2022 + SHA512 0bf8d56516ed7f14db2d1a991ccced0977d33a560f1844b114b62b2cd93d96374d3b85c5257adc0c4f141c3f3533bc4e8914349547092d607c22dea3bdbbbd0d ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gettext-0.21-2-x86_64.pkg.tar.zst" - SHA512 2f6b95686e6c9cabfdac22994cbd6402dc22da71ab9582205874e7967452be65a25bf73b8994cce679ef43b26a29dec25eb3f233f7126d8c4b2f5ddd28588bd4 + URL "https://mirror.msys2.org/msys/x86_64/gettext-0.22.4-1-x86_64.pkg.tar.zst" + SHA512 7bd1dc50df8a973a075286fdf115fa30c8a78aa23d2845e2bdeb6068bf3391321d9b3ce3241626453bb660d1a57563bea44eebadf81cb2f98f15fbaf266648ec DEPS libasprintf libgettextpo libintl ) # This package shouldn't be a here z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gettext-devel-0.21-2-x86_64.pkg.tar.zst" - SHA512 c8852c4c8cf7810434dab18c7a002e59c2248de93b575097a30a31f4e7f41719855c0f3cf55356173576aab03119139f71dce758df1421b3f23c1ca3520e4261 + URL "https://mirror.msys2.org/msys/x86_64/gettext-devel-0.22.4-1-x86_64.pkg.tar.zst" + SHA512 e7748736014b0aa47f2bc740189a5e8e1bcc99a82ccd02d6f75e226b041704e4f353107df175c0547651a05f5a352ec474a7af693fb33d42a8885e47ac371d2e DEPS gettext # libiconv-devel ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gmp-6.2.1-2-x86_64.pkg.tar.zst" - SHA512 b2df273243ba08ed2b1117d2b4826900706859c51c1c39ca6e47df2b44b006b2512f7db801738fdbb9411594bc8bc67d308cf205f7fa1aab179863844218e513 + URL "https://mirror.msys2.org/msys/x86_64/gmp-6.3.0-1-x86_64.pkg.tar.zst" + SHA512 d4e8549e55d4088eca30753f867bf82d9287955209766f488f2a07ecc71bc63ef2c50fcc9d47470ea3b0d2f149f1648d9c2453e366e3eb2c2e2d60939f311a40 ) z_vcpkg_acquire_msys_declare_package( URL "https://mirror.msys2.org/msys/x86_64/grep-1~3.0-6-x86_64.pkg.tar.zst" @@ -353,13 +353,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS libiconv libintl libpcre sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/gzip-1.12-2-x86_64.pkg.tar.zst" - SHA512 107754050a4b0f8633d680fc05aae443ff7326f67517f0542ce2d81b8a1eea204a0006e8dcf3de42abb3be3494b7107c30aba9a4d3d03981e9cacdc9a32ea854 + URL "https://mirror.msys2.org/msys/x86_64/gzip-1.13-1-x86_64.pkg.tar.zst" + SHA512 4dbcfe5df7c213b10f003fc2a15123a5ed0d1a6d09638c467098f7b7db2e4fdd75a7ceee03b3a26c2492ae485267d626db981c5b9167e3acb3d7436de97d0e97 DEPS bash ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libasprintf-0.21-2-x86_64.pkg.tar.zst" - SHA512 e583ae8a6611f11ce56bdd8c0e420854d253070072776c78358ee052260fb3c7b1a7a53eed5e3f1e555e883fa489bb6154679ffe91c88e0390596805b1799d71 + URL "https://mirror.msys2.org/msys/x86_64/libasprintf-0.22.4-1-x86_64.pkg.tar.zst" + SHA512 06f353d2020d1e7168f4084e9fc17856a158a67a61098314e4b1d7db075542eb29dfe8a84bd154dad28942ee8eaae1e13a6510a4d2caab4509d9f3ea22db6d87 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -368,13 +368,8 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libcrypt-2.1-4-x86_64.pkg.tar.zst" - SHA512 8bd56a777326dc8793df8bc7bc837bbfd9fb888d678fbfded8c37449fcc85aa3e318b5a249f773aa38ef4e12d8c58f080dce7db9c322b649702bdba292708ebc - DEPS gcc-libs - ) - z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libgettextpo-0.21-2-x86_64.pkg.tar.zst" - SHA512 e5736e2d5b8a7f0df02bab3a4c0e09f5a83069f4ff5554fa176f832b455fe836210686428172a34951db7f4ce6f20ec5428440af06d481fcaa90d632aac4afd2 + URL "https://mirror.msys2.org/msys/x86_64/libgettextpo-0.22.4-1-x86_64.pkg.tar.zst" + SHA512 7552bc873331f07a4c006f27fe9f72186eed9717d68c4cbf54a75ff65c9445f874c43ccced2f9fa75ff1602c1209f6f1f4335a6ae6bf9bd5e951292584db7539 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -383,24 +378,24 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS gcc-libs libintl ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libintl-0.21-2-x86_64.pkg.tar.zst" - SHA512 fd066ea0fa9bc67fe3bcb09ba4d9dd4524611840bb3179e521fa3049dc88ba5e49851cc04cb76d8f0394c4ec1a6bf45c3f6ce6231dc5b0d3eb1f91d983b7f93b + URL "https://mirror.msys2.org/msys/x86_64/libintl-0.22.4-1-x86_64.pkg.tar.zst" + SHA512 07f41f7fa53967bb5b0aca72255c70d7aeed58ea86b67bd0e765e08c20c50187ef2e775b630c0d48b3afbe62203754f7e8653a5f2e1a87a38b4af5753c7bd232 DEPS gcc-libs libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/liblzma-5.4.1-1-x86_64.pkg.tar.zst" - SHA512 298a49e0c26587899e37c894f61c9e9c4702548bcc181610fc8408b773097cc3e042b5ae24a4e01ee0b592b68c8f24152f9dcc298b7d1860ffa6562c2513274d + URL "https://mirror.msys2.org/msys/x86_64/liblzma-5.4.5-1-x86_64.pkg.tar.zst" + SHA512 3597c5dfb68eb6cdc06904d3d9e00c446bd9f1459d6ff78aae148bf27e879bd32a326556c68b91603d04b20b1af6ac02808dc5aedc8ca1510b294b658ec6ce87 # This package installs only a DLL. No extra deps. DEPS # gettext libiconv sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libpcre-8.45-3-x86_64.pkg.tar.zst" - SHA512 566a2723f5b078a586d80c077f9267afb7badf3640386640a098d76ef9142797e7fa8acef5e638b962d9479206fb443c924750eec00a26bccdc39fb49094963f + URL "https://mirror.msys2.org/msys/x86_64/libpcre-8.45-4-x86_64.pkg.tar.zst" + SHA512 e1eb5cb38dce22012527bba2e92f908bf23c7725d77dcbd7fa14597af0f5b413319e0a7dd66555370afffc3b55d6074b8b83fd3c384d31ac505b74db246d54ac DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libreadline-8.2.001-3-x86_64.pkg.tar.zst" - SHA512 fe8fa6c0d9fd81eab945855b83b9ee8ae224159b3c5eb550424645f2a611e82fd92744093cbcd560a2e2717a142b0dbb3f3cbb627bf41a309483241d3340a9c3 + URL "https://mirror.msys2.org/msys/x86_64/libreadline-8.2.007-1-x86_64.pkg.tar.zst" + SHA512 f25d667448de47640636a44dfadfc4b9a0fb6ce51e9d61fce87989f3d307e98c41d37ea3a5b5de47efeb259ef2582ac7ae6774bf619aa5adcf7cff462707fbbb DEPS ncurses ) z_vcpkg_acquire_msys_declare_package( @@ -411,8 +406,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) awk findutils grep sed ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/libzstd-1.5.4-1-x86_64.pkg.tar.zst" - SHA512 5aed6a9b2e40759144878f1b5f888f221016fe3fb23ba04f17d515ca51b78c592f79747d90fcc096c735d74cccfeb22c19f2154dfa49d14bedc6c306f0c07759 + URL "https://mirror.msys2.org/msys/x86_64/libxcrypt-4.4.36-1-x86_64.pkg.tar.zst" + SHA512 457320daebd1aa45461788fb52dd4772fe91c34902201fac81d94ee2cbbfa216b02b3831a3e32a5ac638a3f12ac31fcec94ee95b19696fec6624e10e3dc5ffff + DEPS gcc-libs + ) + z_vcpkg_acquire_msys_declare_package( + URL "https://mirror.msys2.org/msys/x86_64/libzstd-1.5.5-1-x86_64.pkg.tar.zst" + SHA512 c3d491f90bef0cbd7447303ff6f5a647e9fcf7bb0af9116cfe5fe421180e2283ec9403c768caa9434e9b158ce6ebde1a4750c56db8f67dfac4d6282d0ac30413 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -426,17 +426,17 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/mpfr-4.2.0-2-x86_64.pkg.tar.zst" - SHA512 a294154a0c48bbf6673e87f5f38eda9f8a0c99f8300a795c14cd2ec4ae18b39b158b2e76ca1cda51fa76575bd70339cb3b24c4ccf8f265f0e59515f5e457b040 + URL "https://mirror.msys2.org/msys/x86_64/mpfr-4.2.1-1-x86_64.pkg.tar.zst" + SHA512 7417bb02a0f1073b8c1a64732463ec178d28f75eebd9621d02117cda1d214aff3e28277bd20e1e4731e191daab26e38333ace007ed44459ce3e2feae27aedc00 DEPS gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.4.6-1-x86_64.pkg.tar.zst" - SHA512 fbdcf2572d242b14ef3b39f29a6119ee58705bad651c9da48ffd11e80637e8d767d20ed5d562f67d92eecd01f7fc3bc351af9d4f84fb9b321d2a9aff858b3619 + URL "https://mirror.msys2.org/msys/x86_64/msys2-runtime-3.4.9-3-x86_64.pkg.tar.zst" + SHA512 2695dd70a7f93926cc7077dc6f57a273a408aa3943a44268870d01096b6537904890fc302838f036ecc13ffa662f4ed7d56f9fc146b41fd777390c9cbf0b6a77 ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/ncurses-6.4-1-x86_64.pkg.tar.zst" - SHA512 48093633b6506f4217fbe37b43d4e128874a01e5e56f817de38112e5a5b8d3ee4f77e99fb3cd63b55616e3ae84edbc49ac78d90968a24c25dfa368103d208897 + URL "https://mirror.msys2.org/msys/x86_64/ncurses-6.4-2-x86_64.pkg.tar.zst" + SHA512 31d1e75071158aae970209de79adc3b3ff1d189ffc18460b3f1c818784e571ff3e0ff2767013516f9bb3fd0e62c2038444f1e8c1816db357d57e31f8663f4420 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -444,13 +444,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) SHA512 eb484156e6e93da061645437859531f7b04abe6fef9973027343302f088a8681d413d87c5635a10b61ddc4a3e4d537af1de7552b3a13106639e451b95831ec91 ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/perl-5.36.0-1-x86_64.pkg.tar.zst" - SHA512 fa83a0451b949155bdba53d71d51381d99e4a28dc0f872c53912c8646a5e1858495b8dcfdb0c235975e41de57bc2464eb1e71ffeab96a25c4aa5327cdaa03414 - DEPS coreutils libcrypt sh + URL "https://mirror.msys2.org/msys/x86_64/perl-5.36.1-2-x86_64.pkg.tar.zst" + SHA512 0aead6f3df994c880726bec4c32b80f09b01ad0acaeb58f6a37d073f3278d7362eca70f6cdd1276a3838e9fc0b2f11f62e135a1139eef3f7b0ddd2520addff3b + DEPS coreutils libxcrypt sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/pkgconf-1.9.4-1-x86_64.pkg.tar.zst" - SHA512 0a5f0d69eec591a00d1aee985458dd855100184ec845b076d8f22ca51ba106964b8cf5b0061df288cdd611aa6a6e5fcb98eafded1c46536a0d17253240966f15 + URL "https://mirror.msys2.org/msys/x86_64/pkgconf-2.1.0-1-x86_64.pkg.tar.zst" + SHA512 4376aba6fd2c118b1cb7e2008a23724aae62e9c972849b984a087079eaff1a29f423d3dedc3d7cfa682d931eb9a72891c8630196507a4a2cbe15f80a359bfa58 PROVIDES pkg-config ) z_vcpkg_acquire_msys_declare_package( @@ -459,13 +459,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/tar-1.34-3-x86_64.pkg.tar.zst" - SHA512 19e063393ef0f7eb18df2755798985e78a171f9aa4a747490a357b108d02a9a6a76cae514dd58da0e48a7dd66857dc251be30535677d9fa02e1640bc165cc004 + URL "https://mirror.msys2.org/msys/x86_64/tar-1.35-2-x86_64.pkg.tar.zst" + SHA512 86269fe17729e5381f8236a0251088110725c3eb930215b8378b6673e5ee136847997bb6a667fe0398b65b85e3f3a7e4679a0fd4bb2ebcb9429a5d7273a02d54 DEPS libiconv libintl sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/texinfo-7.0.2-1-x86_64.pkg.tar.zst" - SHA512 f3fc972bb4f738d3a6a736285ee2574262989fdb7bec0f4a260abb1bbfeb94f3fb3795986ba121cf623a96c60eccea2ff67906275acd466c640eae2fe18a2158 + URL "https://mirror.msys2.org/msys/x86_64/texinfo-7.1-1-x86_64.pkg.tar.zst" + SHA512 19b985991b92ba6cc7d5057b27488d770a056dc6c68a6af6c83d9814dbf8ea289b5c770a17564b1eddceb10e80c31146556e2a766921624fa1b81fecc52a1bab DEPS perl sh ) z_vcpkg_acquire_msys_declare_package( @@ -479,20 +479,20 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS sh ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/xz-5.4.1-1-x86_64.pkg.tar.zst" - SHA512 5a04e8c244c05926da4bcc63f4fdc731b508c37396629c33e98833c7b6e10c0784b1b0de72f6f11f7f2bdab5ac8eafe2e1613081efd0f973b558200c6ccb6d90 + URL "https://mirror.msys2.org/msys/x86_64/xz-5.4.5-1-x86_64.pkg.tar.zst" + SHA512 a594d11653ebf59a6325de3d1c51a6cc5584b3b81a9e3e94995e3af82d5a113022ad7b847177528dc549e32dd6c0f7be43e678c71df2867495b5b2273a25fb61 DEPS libiconv libintl liblzma ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/msys/x86_64/zlib-1.2.13-1-x86_64.pkg.tar.zst" - SHA512 8dc7525091cf94b1c0646fd21a336cd984385e7e163f925b1f3f786c8be8b884f6cb9b68f55fdb932104c0eb4c8e270fc8df2ec4742404d2dcd0ad9c3e29e7e8 + URL "https://mirror.msys2.org/msys/x86_64/zlib-1.3-1-x86_64.pkg.tar.zst" + SHA512 365ab41ce28a4cfcd2dd62824381baca0dd15be6e7f4028db54503c7a30c849c2139333118c845ca84d7052c4ef38dcaf0f103ceee2f127c2474a9d38a196695 DEPS gcc-libs ) # mingw64 subsystem z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst" - SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-bzip2-1.0.8-3-any.pkg.tar.zst" + SHA512 fb1ae524d7b04e1f35c3101c318136dbe08da8093bda98f6aea7e6c2564fec5f8533fb61cac5001b6425105cd982511964ec04099c6651f990dc3b8baf7f7057 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -505,24 +505,24 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) SHA512 b49ec84750387af5b73a78d654673d62cf0e2cb2b59b4d25acb7eca3830018f7a2aefe600d67d843417cfbdd97db81ecfd49a8811e312f53b42c21fb106b230d ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst" - SHA512 0fbe2b01a22c327affcf1581b33912494731ac32c58cc94df740604f6f5a284f89f13508f977f4e15a1345c81e3e8ada3ff5c55bff0a907631d27ed7c0f74677 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.2.0-2-any.pkg.tar.zst" + SHA512 206eb7c19060b13286be4966611fe30d4c8a3e17df42aa9ebc5a18da384f16ad149504721b89c615c3cd1579f6744932ea0578ae3c16479472d70ce1a2441e30 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst" - SHA512 94b001fa5a2cba5a5fc4b27887cf1dfc930a67dd03a889247b15d51f11280af01c509fe63b7412ec36b549a5a302e1f4d98a13685d1d10068e7d12a4446777a4 - PROVIDES mingw-w64-x86_64-libssp mingw-w64-x86_64-omp + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-2-any.pkg.tar.zst" + SHA512 28965ec13cd1006955c7182589d0896f92b7eb29c7d42434fcdc9b93450b51f32b4ce28dc830700e3aa735133facb6db6808db2ac0fae494d601cf3f4a7739e2 + PROVIDES mingw-w64-x86_64-omp DEPS mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.21.1-1-any.pkg.tar.zst" - SHA512 9002289afe530706912eb5b8feffe1d7adb23e01d6b79516ff5deef2faec1577b31890dda15426cc4cc2f30b5f12e55166a4bad492db533234b44cc89fe81117 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.22.4-3-any.pkg.tar.zst" + SHA512 faf6975be9ab7c8099900985ac3f89e188d0d578958dfef029d63ba808c9a1ae52c8f3bfda61ce49a4930d0b3633f590a8d86e0727e761ef617da2a7214a7abe DEPS mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libiconv ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst" - SHA512 7d884ef1186bd6942f7a7ace28963aae679bb6c6c77c05f186323c44b11894b80f53203a6fad55a0ae112fec41b4e1a624e67021e5f2f529a7fedf35c2755245 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.3.0-2-any.pkg.tar.zst" + SHA512 38ab150051d787e44f1c75b3703d6c8deb429d244acb2a973ee232043b708e6c9e29a1f9e28f12e242c136d433e8eb5a5133a4d9ac7b87157a9749a8d215d2f0 ) z_vcpkg_acquire_msys_declare_package( URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libffi-3.4.4-1-any.pkg.tar.zst" @@ -550,13 +550,13 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst" - SHA512 e79bb2c93f4c9426c5a5400cd0d3a871c39c56db7068d45b208778fce19a9adb18229ee826397ee2fe8e68df0c554281490315687b3f50b48d6c7f2a6a68ec4b + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + SHA512 d8e1032fa82283bc1acab5aa1273a94f11ce42ac34c9c656b11acb2e06a400cc15a9fee9f97d99f7c11803d66948c6840051ef7a6a8d9ba1d1cb0d5cb2682cef PROVIDES mingw-w64-x86_64-libwinpthread ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" - SHA512 57b86866e2439baa21f296ecb5bdfd624a155dbd260ffe157165e2f8b20bc6fbd5cc446d25dee61e9ed8c28aca941e6f478be3c2d70393f160ed5fd8438e9683 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-2-any.pkg.tar.zst" + SHA512 3fe183d4af3b3935a4394502eab75a8f7b7692f551fd44e54c67935a4691388d23a021ee1147f0345ed27ffe8a8db3e9e7e37caf2348df3413e0acd519c12a0c DEPS mingw-w64-x86_64-gmp mingw-w64-x86_64-mpfr ) z_vcpkg_acquire_msys_declare_package( @@ -565,40 +565,40 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst" - SHA512 5c8edf4f5ab59afa51cbf1c5ae209583feebaea576e7e3abb59d7e448fe13e143993e6f35117c26ccc221bc6efc44568119c2e25d469c726a592a026b2498d92 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.1-2-any.pkg.tar.zst" + SHA512 03a727e1622b09ed0b6e0cb93a6b1040c31c9504c3f14bd1a2e12b8293153609796bc99882393b343c4d96e45f402f847317a3a65212b972ff96a964e5e52815 DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-gmp ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20230211-1-any.pkg.tar.zst" - SHA512 3a86a851805646939dadd9dc4756fea45ffdbd89dec32f8452513d6aa491760861850eec68efb6a48b8b99953d7904547c6d55ff4fd67f20fd2641591781b53c + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20230708-1-any.pkg.tar.zst" + SHA512 7d0acb481c8bc60381b8255a611a0ea19827f5d540e71532e4077ad91755f8069cb7826d9249ec113ae13e6db348d5253d2378739a11882e0faac43656fce9f2 DEPS mingw-w64-x86_64-libsystre ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.21-7-any.pkg.tar.zst" - SHA512 e1e49f477cb44f00b5f8760f9c25bd24746844fd076ca0c490b882cfe31204ae100692387e83de22cd89093c102ae751b99bca9dd2d328aaf5de0e401a531e8a + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openblas-0.3.25-1-any.pkg.tar.zst" + SHA512 f93988ca6d99cb07776923a3458cb132bc6991592b24e1a4bab65dbfb8a9854f1654c203fe595840fee9129e93a0695da6999b2ec18980d4822ef787d3e6176e PROVIDES mingw-w64-x86_64-OpenBLAS DEPS mingw-w64-x86_64-gcc-libgfortran mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libwinpthread mingw-w64-x86_64-omp ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.1.0-1-any.pkg.tar.zst" - SHA512 f146d0f2b31b767422c767f4ea39312cbe90eac86e8b248e24d28595069e6cc450351280dd5b837e27ffdd743fb7eb4880360a658f0d2b3709b8a170be3e37d2 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.2.0-1-any.pkg.tar.zst" + SHA512 e95127a442d6b0ee6f7919287a8ebbf16e71135b39d1fd0ed38fb2c53b52f95e8dac831fb797bd36531c8f5834b51164b1384c6c8211bcdd278b1ccef8db8360 #DEPS mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.24.1-5-any.pkg.tar.zst" - SHA512 cbdecf7bf56ce64605a77b3c700c30322f7b0fbc8efbe2cb7007ae4108815ef96530a57db5631c788b41f1d20fbcad202de92066871bb76c78ea27ea07c848e0 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-p11-kit-0.25.3-1-any.pkg.tar.zst" + SHA512 2e1aae91f0f103e745a10557cb83062ed87910a1142c8bfd756bad5ce3789ff88823cd03b6b7be920dc367e5b240724fd0e7a6a203b7a6269b2f1d4657a37726 DEPS mingw-w64-x86_64-gettext mingw-w64-x86_64-libffi mingw-w64-x86_64-libtasn1 ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.10.10-1-any.pkg.tar.zst" - SHA512 be778ecfd0d4a0f186f0628dab8959596c83b1f1cfaf8554fef63e3b9fd6c5506fa30cf84ad16bbb1eed6793b1f62a5770eff71fa53de6304c0c63d3bb164b00 - PROVIDES mingw-w64-x86_64-python3 mingw-w64-x86_64-python3.10 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.11.6-2-any.pkg.tar.zst" + SHA512 93d1a4e3476219027da5e70bc7744deda085aba61527315315c824030b70d984a774e3f759306ba3af575492ad13f6a7b5786e83b89b31e845d15b5eba15ebef + PROVIDES mingw-w64-x86_64-python3 mingw-w64-x86_64-python3.11 DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.2-1-any.pkg.tar.zst" - SHA512 0c651815fc7d553430c577d350f460f74b731951125bf44cdbf148c705cb45801c032b98b53315cf98fbf57be3c8f5b598a148f0fbf93dd55079361e05445e7e + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.26.2-1-any.pkg.tar.zst" + SHA512 3fb60137a7fe558e543d843cb5c6d7a0218dc763e6dee05db5b55e89d0ad05892c585d82ee56ee30390ea27c85fb5e2bc06a327a15f564ed8d0475f5ae5ee9a4 PROVIDES mingw-w64-x86_64-python3-numpy DEPS mingw-w64-x86_64-openblas mingw-w64-x86_64-python ) @@ -608,33 +608,33 @@ macro(z_vcpkg_acquire_msys_declare_all_packages) DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-termcap ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.41.1-1-any.pkg.tar.zst" - SHA512 efa7ddcb9326bf25abcac35db36d461fb0817d40f5a6ffc1b412b627df5030a1494b0c87d2f0d0231bc962362d213e6c8eaad7cf057e88f51a0cdd8d2377d327 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.44.0-1-any.pkg.tar.zst" + SHA512 c598d7a0dfb40adc4faf1fa6e496e398f7ead02fd6ea4a448c686fa93a8c6d669be66389fd5045f852a93446271962820d6f61738770f148d9d3d651d90bad27 PROVIDES mingw-w64-x86_64-sqlite mingw-w64-x86_64-sqlite-analyzer DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-readline mingw-w64-x86_64-tcl mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-6-any.pkg.tar.zst" - SHA512 602d182ba0f1e20c4c51ae09b327c345bd736e6e4f22cd7d58374ac68c705dd0af97663b9b94d41870457f46bb9110abb29186d182196133618fc460f71d1300 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-termcap-1.3.1-7-any.pkg.tar.zst" + SHA512 2610355be441fd933f660f8181a5ad074057361a9aadeaad85961230dcf6df5d5165b94ccf9887144c91812485be57c2d79f39e8191ff525889bdff042d34ce6 DEPS mingw-w64-x86_64-gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-1-any.pkg.tar.zst" - SHA512 145e4a1e3093da20cd6755ca8d2b04f7ace87e3ac952d3593880d57f6719a4767ca315543a4f82ee5cb37cff311ff29c446b36484568f65fb6d0c58706763b9b + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-2-any.pkg.tar.zst" + SHA512 d65cb39c2d17bb19f3a8511564a75217adc8f1b7a993038832347e06fb8eb3f61870f6214c751d524888985d923b704f8337be39f8ac62cf6d43db5d454b38ea DEPS mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-zlib ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.12-1-any.pkg.tar.zst" - SHA512 d3eb26a0fa4986ba4f6c77baf48d6fa9d623500f0b72aac9a385ff3c242dc8842eb80b563490995c162869fe3366e8b89d65561b4810b6b661ebbff2161428bf + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tk-8.6.12-2-any.pkg.tar.zst" + SHA512 832c98f2bb8963540d175bc6511f00747483d86b0e0d3219c7b6e5b0bd5e7d038018db08875bf26b3fbe6082b4ff1958777e5cfd1920f5d235493f0a1ce071b2 DEPS mingw-w64-x86_64-tcl ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.1-1-any.pkg.tar.zst" - SHA512 93e01ebade4de60f06f4485f083accd9c9e212d2fa2de63acca6d7d31f009a4fb89720da23101018fd74b99415e1fb661cc3f3a7ba4be3cea49dadd768826f33 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.5-1-any.pkg.tar.zst" + SHA512 cff9da4be195a4d614f18fe8404425180f2fd8af0ff07d8e4681b62b1dfbce8349ca86ae2f08ddc752ba0e08930010bbef208429d467ac27ee1b210245263b73 DEPS mingw-w64-x86_64-gettext ) z_vcpkg_acquire_msys_declare_package( - URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst" - SHA512 c07bea5fcc78016da74756612827b662b5dd4901d27f3a3390acc3c39b767806f48b09bd231140a40e3cd7aba76e5d869ed18278c720277e55f831f0c7809d54 + URL "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.3-1-any.pkg.tar.zst" + SHA512 21191eead4133b5c329ca3e6d1a1b9f724680ddead111ff1f9f544c844a8c66ed8739b19a9f0253f61ce1d40feb0e5354cf692ee5840e0053826996d6cc2ab5a ) endmacro() diff --git a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake index 4c514af0b44e5f..cc27ce10ef30a6 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PKGCONFIG).cmake @@ -16,21 +16,35 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") set(version_command --version) elseif(CMAKE_HOST_WIN32) if(NOT EXISTS "${PKGCONFIG}") - set(program_version 1.8.0) - if("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "ARM64") + set(program_version 2.1.0) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") + endif() + + if("${host_arch}" STREQUAL "ARM64") vcpkg_acquire_msys(PKGCONFIG_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~1.8.0-2-any.pkg.tar.zst" - f682bbeb4588a169a26d3c9c1ce258c0022954fa11a64e05cd803bcbb8c4e2442022c0c6bc7e54d3324359c80ea67904187d4cb3b682914f5f14a03251daae7c + "https://mirror.msys2.org/mingw/clangarm64/mingw-w64-clang-aarch64-pkgconf-1~2.1.0-1-any.pkg.tar.zst" + d988b6a9d3704d63d0dfa21f5388b3de8b74d84533491e2facc2ce4e67e8efac611ebf4df422e90476ec2624fe766da441ad7b0fe0a3ee99ff9fd3ae84b18292 ) set("${program}" "${PKGCONFIG_ROOT}/clangarm64/bin/pkg-config.exe" CACHE INTERNAL "") + elseif("${host_arch}" MATCHES "64") + vcpkg_acquire_msys(PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.1.0-1-any.pkg.tar.zst" + 1567ba9fc947b3a1a983f5a23dcc0982950190cd92d7527684ba219253c5fa4b340b315f25ee695be1cdf6bfbb2cc5c3bdf7a5758b1d66b761748b5aad9afe39 + ) + set("${program}" "${PKGCONFIG_ROOT}/mingw64/bin/pkg-config.exe" CACHE INTERNAL "") else() vcpkg_acquire_msys(PKGCONFIG_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~1.8.0-2-any.pkg.tar.zst" - e5217d9c55ede4c15706b4873761cc6e987eabc1308120a3e8406571ae2993907f3776f2b2bba18d7aaec80ef97227696058cedc1b67a773530dc1e6077b95e6 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-pkgconf-1~2.1.0-1-any.pkg.tar.zst" + 55626f0b7a6c950da75c4f7579b94859027f127c075042ab1f65b5387659eceb9e4c73dd3b79f54227772bd39a5759fbe10aa024cd38c8ac76677d0aec8458c1 ) set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") endif() diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index cc0e02ad52eeba..2ad801d9878705 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -22,39 +22,39 @@ function(vcpkg_find_fortran out_var) NO_DEFAULT_PACKAGES DIRECT_PACKAGES # root package - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-fortran-13.1.0-6-any.pkg.tar.zst" - 7eb61f1d9216c3a9e2bd88afaf82c6057eb72f20ff19bc8e5bfef5cbb851247a480887cb2dc27c610e9f9c0e1830683c0c0be9521f252d106068fc3bbf2e13e3 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-fortran-13.2.0-2-any.pkg.tar.zst" + 4820fbd4d927f8378a6e801496364c9bba2e48527a6bff547d6d0b8e248a794f960220827cfb99441eaf97395a18a557cdbb9a337dc52f6af44d4bc32397916b # dependencies, alphabetically - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-binutils-2.40-4-any.pkg.tar.zst" - 4ebba5195f34f9a3dc67f640f793e4916f0e82680dbba010bb3720faab3a08e1b7fe800959fd523cf250d5bd3ba5df9a07ead4c40c02e89002e4df61d824d7cd - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 4705c51aed87b74c32f8ea93f0a5ed2011de10ae1d1111c11b05ac6f1621fb99b204a3eb4d19778701f9378990522e65ae514186489acb14d10cc25007f5715b - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-13.1.0-6-any.pkg.tar.zst" - add77dc0d7554316cbcb1042630c03757db92176bccf5b506b51eeccccb13f5c9b0a5bcdfb8cfccb5c4f776c97820f2e4ed1f537f6520f6f3179ee87860a8c1f - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libgfortran-13.1.0-6-any.pkg.tar.zst" - e65603558e13bf8135050a014dfe2ab0d0fa34f4f34a4d13996b75a88247f64abf57842f592f590992e531253f68c6b392adb4ce03e41631e81db7ae9eaff2c7 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-13.1.0-6-any.pkg.tar.zst" - d85674dc026dae7f79d232b36d731fa147d1644b3bde90f5c529875272bd9cec8012530c84ed2490ee4dc913dd9bda169684d340ba87380b8b4963950b55c7de - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.2.1-5-any.pkg.tar.zst" - d576eb3457e26d61cd5b12b62734fbf740d26ab4127db033505474bcf4b701e06f2414121931d49b1665c5c95521c42ae08955c12e1a715e22d4c9d9eea42e27 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-headers-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 8e866a3b22039fae102af371e4ea0e75dc6ffe9c89798345e5d334b386c1f48295dd54fcd8e537f30313a72d38da95d8d98cb129a5fa3bff3aa66722e3fa697f + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-binutils-2.41-2-any.pkg.tar.zst" + 2f67e5caf6d5ee8995772831bf6cf7a8a24a824d36cc3cb0d4c147bb10261b67f0ec611ef9dc6f9f9642be596973ed04802322101b05afa8f41fcbe3f63bc1c7 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-crt-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + 0f96ab127d9579728d608057a9940682fd6ccfdb153750e8a9b132bac8ee2e87fa6a406b389f319eec2ca7317e97c0dc604f7b1d0697bf07f9c3fb54b2732966 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-13.2.0-2-any.pkg.tar.zst" + 267f853849351280a5942ae4931df43269c6ea58fcf90fce729766179d318ae75f9cf54da41987e6a5e6f3ef6ad0045085722f01336aab981b275ec17a0602f2 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libgfortran-13.2.0-2-any.pkg.tar.zst" + 207c72336fcf965e52e73eae823b8407d0ffa53d8f4e3c544bd4bfa8bd6fb17a6413007d02d71eac911bee48735a0889fbe7a50fa7430725f401ca255ca2b0a6 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gcc-libs-13.2.0-2-any.pkg.tar.zst" + 6d09c0868c96a532dd1e1dc92e2b5e3c5776af21bd13e6c6de90afc1f705028525550bf909c0d8e80017819cd71acfe64f56838df3d13e571ed4adc7b66b0fae + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-gmp-6.3.0-2-any.pkg.tar.zst" + 4a9e0ace05ea441fe6cd69b1b1af4c29e35727069ab1f22d0da7febc7aaba219502b5b4dea8b1aa070cb2c8b731da112429c3339fd03fe77828d9fa262b4a818 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-headers-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + c17e1642d1dc9e8d9eca93834bcd48c5052ebe3e50b29b3469fdbc48178dae6ddd852641c55cb1a05a95757f54ba01f6a176ff546ff994ceae36e08b80c3ee79 "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-isl-0.26-1-any.pkg.tar.zst" 2011de9ac6ed85fa4346f9c9b39136854f049a9e21fb2fbd8db066ccf443301a65ab0c7aa7daed6730d5163ca70ebf25fd39209bd5226f2b70f000ce9de0df8d "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libiconv-1.17-3-any.pkg.tar.zst" 36ec45b311ac0e281c5272516b2138364b1b1c0db78a83b26218d50c643345fdb3f75bf4935e8520d839c99f2ec4cb72a324017f11a717bdab06f8c243ccb108 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 60eccb7030039f7a42a6c6377d2cad9957c2f4693ecfa7672417a145fae21a62129475279deece9eb3e892a69a6f3d6d7e10e3fb9deda47e123e3e3d4f610d9d - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.3.1-1-any.pkg.tar.zst" - e2597ccdd430530e98c6c4b34deed4d8d423dad144691e5ebe353f8d3f0fde3ad231347086843e5a97b74b5218bc3994bbd3b65db81a68c7b3fcd02e17e9f435 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.2.0.p9-1-any.pkg.tar.zst" - e9f1f5727989919950958bc82841c7072cc0ba8a50c8781c0953267acc192dc8dfb4fd6bde599eb505ff6dd2ac94e28ac71e46c5e1c839f0546faa2f86c3e042 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-libwinpthread-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + 3560884d47d07bbacb640774a3f293c8204f652272f4f0041f6be4eb3c20f6ad410248854367b966fe4aa7defa918af654e0f22e765b29b312c80c901b9c24c2 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpc-1.3.1-2-any.pkg.tar.zst" + 936acdedea20b9892f90ebdb0b75250d1ed3d65487316ee986b8672683b01d4e1f2922387f18ea8d6befb71bf273995d4940ff55b645d07996c98bd50c9382ae + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-mpfr-4.2.1-2-any.pkg.tar.zst" + 0de842b6c3b68c0f743aa4d4a08ca2c9c3f1a1cb426950365e885a55add3966eb545a0634177857e077545ae97950acd49613768bdc13305f08041637e27f8f6 "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-windows-default-manifest-6.4-4-any.pkg.tar.zst" 103f8437e13fb2a839c5eb89f49f5888c71f7934771cf3b2dcca46d520277fe7f7d4841c9d415b454a6a581c6d1f806d6be7f614027df0484f2642ef2563e889 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-winpthreads-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 0622f9595709a17c464f2be01b19a40dfb218c36f779e35ef883ae80db26bac4eb2b2ef35d5e87cf5db5a1fe79a8390c586b7248224f468b9f0beadd516cf540 - "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-1.2.13-3-any.pkg.tar.zst" - 3f4136bbe96025d897848fc30c087cea70c6713684e23a804928bf5957d70f708876a47318ddd9d3841debb57e7f3e550756e3c4e99698f91dd1ab27da837787 + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-winpthreads-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + 095dd47d97599247b6d369bc251a2e4028f072d0c04c6964e30dbf7c3bcbfe3bcc27572a9d100a280bc1106ab721dbb11897bd6482f6cd1f6038d9c07be30a7f + "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zlib-1.3-1-any.pkg.tar.zst" + 76866c1f2e4f7589473784f1d25938ad5c2a3adc5a2f63d448053b45c40af83f1fe6f5a2dd79ca0dbc96cf9886a1414163b2983f8c3241252f6ca794e872461f "https://mirror.msys2.org/mingw/mingw32/mingw-w64-i686-zstd-1.5.5-1-any.pkg.tar.zst" 415be9f2ef78d72109f5888c31248b328ba96f1e2472d488bf45da4fe969875e0e3020a77ceb10cd885f50a18954105e06ce9d122d8c47dc9848944ea71ac49c ) @@ -65,39 +65,39 @@ function(vcpkg_find_fortran out_var) NO_DEFAULT_PACKAGES DIRECT_PACKAGES # root package - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-fortran-13.1.0-6-any.pkg.tar.zst" - 8c72bb5d15fead9559487d14279d802b1948c5a911efdb1cf3908dae8e63c26bd1e539870b7a0bbe73e4229485b66094852c0a49e4f8da8c92a9615885fcfd76 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-fortran-13.2.0-2-any.pkg.tar.zst" + 29d4122e078b6d6b2468682a9fa46d1b6196cb014673f1addb6ba09f4fb90c6b4d5f94863b3e5924f4f5a6df3e74024aee1534c6782fc5d10de1022dcf8a3012 # dependencies, alphabetically - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.40-4-any.pkg.tar.zst" - 2f51c5fbb292df0655c8f30dbbb9891eb40bef1152de68e3e05e1dd614c5b5f91c35547ef737e95d6bc83aa2336a96589a83badb068301d478a09e3f769d0e85 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 0016ed126b6d666872796852200af8e5f7e6156986e419bd5a40693ceafae5ce0d3fb341f05ada6640725ee104c4ddc8df295447a5e78bcf67ddcbe26455bdfd - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.1.0-6-any.pkg.tar.zst" - 9b838c1f38ff311645f9ffeb2e129c637c98fec87c4442607c29284ae91964586d702d7cd194f47c730fe0bcb039dbcaf958b89485cd8d7b73de66f15b68fd1c - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.1.0-6-any.pkg.tar.zst" - 313841c9df8be664fe4bc37c528ebc7aeaf1c828aa561e7014dc329a03a57263cdf3f232021210f749139eac78a7e66c4b367f2a160f9123abe53af41efe8c2c - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.1.0-6-any.pkg.tar.zst" - 526c64dcab261e5ed453f3fb455a05e4241f0fec358bc988c46e3f6c3007dec9f9ab9580dbfd3a0b009d606cadc517f58e7f1ff487cfb802b52396b014f36b50 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst" - 7d884ef1186bd6942f7a7ace28963aae679bb6c6c77c05f186323c44b11894b80f53203a6fad55a0ae112fec41b4e1a624e67021e5f2f529a7fedf35c2755245 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - f5fcce6b2460a35a1d3f22ecd7028e3989cedac948eacb49ccf534418c0cc221f02392aaa62bc137e0298e38c9887642301c7098ef122035ad349f4055d418f9 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.41-2-any.pkg.tar.zst" + 86fb9c1857c696b93d950fc63156aa2a67af9da1aec15329dcc31846bf46e6bcb1c394d253899ca24a223e571f608d2397b6131c60c2b7e0a3cbb79e48f43f4e + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + d46ceb9f10b146cba6a916c684e6e6a53fe36f4b8d894be22c9958bb9f0368a09482b08f97e0a2ffca0939dc7b8244f9a9f3732e7af76ce0037e92ef7f96d38f + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.2.0-2-any.pkg.tar.zst" + 19db5d64d5ffeafd482106ef23b06856f7e6b9bdd119c345d2e814816d409f0d7d92d35f237eb18ca962ec492b1a3d911412ec50e744917eda1783b4e26083f0 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.2.0-2-any.pkg.tar.zst" + 206eb7c19060b13286be4966611fe30d4c8a3e17df42aa9ebc5a18da384f16ad149504721b89c615c3cd1579f6744932ea0578ae3c16479472d70ce1a2441e30 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.2.0-2-any.pkg.tar.zst" + 28965ec13cd1006955c7182589d0896f92b7eb29c7d42434fcdc9b93450b51f32b4ce28dc830700e3aa735133facb6db6808db2ac0fae494d601cf3f4a7739e2 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.3.0-2-any.pkg.tar.zst" + 38ab150051d787e44f1c75b3703d6c8deb429d244acb2a973ee232043b708e6c9e29a1f9e28f12e242c136d433e8eb5a5133a4d9ac7b87157a9749a8d215d2f0 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + f5176ffef5639add3672324da289b3b2a9a2d52168197007c9ac6a32b4c26c470b2dc894993f11aa96399b4b97f9d1c32d7270022e0dc0f625195d71c8508b09 "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.26-1-any.pkg.tar.zst" 2c715b50807ea2c134784210553d0c725f8eeb1221d64f0510c76f7538098d8400ac1ef329656a2fcb0bda270f9e1d82917d00b9ba11a985ce64ae7c3bf24977 "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst" 57221118a6ed975ddde322e0d34487d4752c18c62c6184e9ed77ca14fe0a3a78a78aefe628cda3285294a5564d87cd057c56f4864b12fa8580d68b8e8a805e16 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - 5c8c36bf5b5517f66615aca412570af41e079d2325443051743de0408d7827e24ca9bff38a6dc0c5bb0aa1f5989ebd36eafbd3f593f7e9e766f45c3f1bfb4a40 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-1-any.pkg.tar.zst" - 57b86866e2439baa21f296ecb5bdfd624a155dbd260ffe157165e2f8b20bc6fbd5cc446d25dee61e9ed8c28aca941e6f478be3c2d70393f160ed5fd8438e9683 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0.p9-1-any.pkg.tar.zst" - a247bdc1d1715cd63d3cf026d429811bd11ed000b4047e36b3452d647892136c9f754eb63c692134e856aca129e063cfb409306ff0e766755c51982c9bd4f9ba + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + d8e1032fa82283bc1acab5aa1273a94f11ce42ac34c9c656b11acb2e06a400cc15a9fee9f97d99f7c11803d66948c6840051ef7a6a8d9ba1d1cb0d5cb2682cef + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpc-1.3.1-2-any.pkg.tar.zst" + 3fe183d4af3b3935a4394502eab75a8f7b7692f551fd44e54c67935a4691388d23a021ee1147f0345ed27ffe8a8db3e9e7e37caf2348df3413e0acd519c12a0c + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.1-2-any.pkg.tar.zst" + 03a727e1622b09ed0b6e0cb93a6b1040c31c9504c3f14bd1a2e12b8293153609796bc99882393b343c4d96e45f402f847317a3a65212b972ff96a964e5e52815 "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-windows-default-manifest-6.4-4-any.pkg.tar.zst" d7e1e4c79f6c7db3bd97305ff89e407a32d3ce9f2a18083b9674538d018651e889efb6fdef00cc79c78f8c07852eab63d7fc705e9567b1ad5684f0a704adeaf3 - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-11.0.0.r18.g9df2e604d-1-any.pkg.tar.zst" - bd30fa84ebe6ff734534e133c023aff7c86b6931a053296896b0bcccb939d854e47b5a0365878ab94258553fbb4f12b42db2841fb39bb6c739e0e154029ea76c - "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst" - c07bea5fcc78016da74756612827b662b5dd4901d27f3a3390acc3c39b767806f48b09bd231140a40e3cd7aba76e5d869ed18278c720277e55f831f0c7809d54 + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-11.0.0.r404.g3a137bd87-1-any.pkg.tar.zst" + 5d63760987204badc7401a79a5431624a5d3cfafdaab513c194445a0610960915e57162f816560cc46b088de6fe8ad6e5021b0fb8e8462f86bd28f504a0f80ee + "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.3-1-any.pkg.tar.zst" + 21191eead4133b5c329ca3e6d1a1b9f724680ddead111ff1f9f544c844a8c66ed8739b19a9f0253f61ce1d40feb0e5354cf692ee5840e0053826996d6cc2ab5a "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.5-1-any.pkg.tar.zst" bc03e39ac48f40e53e2cbff9d48770d8267793608aa6698ddd01371872544e2c023f4be68c638aa349a4c006b6967ac9bf45ce927cf4e4a156c39fa7cb8c27d1 ) From 8b4801fb4aba2e5f5667aa89d958d94cfc17c1d0 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 29 Nov 2023 07:50:03 +0100 Subject: [PATCH 0477/1039] [apsi] Update to 0.11.0 (#35329) * [apsi] Update to 0.11.0 * version * Restore patch to avoid baseline regressions in the future * version * Fix patch * version * update patch * Fix quoting issue * version * Fix x86 build * version --- ports/apsi/fix-c2398.patch | 15 +++++++++++ ...find_package.patch => fix-find-seal.patch} | 26 +++++++++---------- ports/apsi/portfile.cmake | 21 +++++++-------- ports/apsi/vcpkg.json | 14 +++++----- versions/a-/apsi.json | 5 ++++ versions/baseline.json | 4 +-- 6 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 ports/apsi/fix-c2398.patch rename ports/apsi/{fix-find_package.patch => fix-find-seal.patch} (63%) diff --git a/ports/apsi/fix-c2398.patch b/ports/apsi/fix-c2398.patch new file mode 100644 index 00000000000000..b044e1423c2593 --- /dev/null +++ b/ports/apsi/fix-c2398.patch @@ -0,0 +1,15 @@ +diff --git a/sender/apsi/util/cuckoo_filter.cpp b/sender/apsi/util/cuckoo_filter.cpp +index be5aead..e242796 100644 +--- a/sender/apsi/util/cuckoo_filter.cpp ++++ b/sender/apsi/util/cuckoo_filter.cpp +@@ -246,8 +246,8 @@ CuckooFilter CuckooFilter::Load(istream &in, size_t &bytes_read) + + bytes_read = in_data.size(); + return CuckooFilter{ move(cuckoo_filter_table), +- cuckoo_filter_fbs->num_items(), +- cuckoo_filter_fbs->overflow()->index(), ++ static_cast(cuckoo_filter_fbs->num_items()), ++ static_cast(cuckoo_filter_fbs->overflow()->index()), + cuckoo_filter_fbs->overflow()->tag(), + cuckoo_filter_fbs->overflow()->used() }; + } diff --git a/ports/apsi/fix-find_package.patch b/ports/apsi/fix-find-seal.patch similarity index 63% rename from ports/apsi/fix-find_package.patch rename to ports/apsi/fix-find-seal.patch index 7a4d0d796aedc1..21e015122a4273 100644 --- a/ports/apsi/fix-find_package.patch +++ b/ports/apsi/fix-find-seal.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0951577..c5efa1e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,7 +117,7 @@ set(APSI_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/APSI-${APSI_VERSION_MA - # find_package might throw a FATAL_ERROR before"xxx: not found", e.g. with vcpkg.cmake. - - # Microsoft SEAL --find_package(SEAL 4 QUIET REQUIRED) -+find_package(SEAL 4.1 QUIET REQUIRED) - if(NOT SEAL_FOUND) - message(FATAL_ERROR "Microsoft SEAL: not found") - else() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78d54a6..4d3f338 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ set(APSI_INCLUDES_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/APSI-${APSI_VERSION_MA + # find_package might throw a FATAL_ERROR before"xxx: not found", e.g. with vcpkg.cmake. + + # Microsoft SEAL +-find_package(SEAL 4.1 QUIET REQUIRED) ++find_package(SEAL QUIET REQUIRED) + if(NOT SEAL_FOUND) + message(FATAL_ERROR "Microsoft SEAL: not found") + else() diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index ad9dfee9baa787..e3b37acea83fd0 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 2dff8dcd39c361527ea3b320f87cb8e71dd4f777 #0.9.0 - SHA512 16c52642719f1d67dfaa70d963ba8795ac618f250752a1f95d91d4b1db8b51b2598999dcc9a9a7a3dbe8537943a3c3bf2ec684cd2697fca88135b01009961213 + REF "v${VERSION}" + SHA512 ad49e169970921175728705c6f5fe8062e74900a601ea25e9f836840a221175bfbb3169717787b1ca7e2e1a0b26630690dcef9bc91c0123877b856ea927e9e68 HEAD_REF main PATCHES - fix-find_package.patch + fix-find-seal.patch + fix-c2398.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -19,7 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS set(CROSSCOMP_OPTIONS "") if (VCPKG_CROSSCOMPILING) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="") + set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT='') endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1) @@ -28,20 +29,18 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DAPSI_BUILD_TESTS=OFF" - "-DAPSI_BUILD_CLI=OFF" + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON + -DAPSI_BUILD_TESTS=OFF + -DAPSI_BUILD_CLI=OFF ${FEATURE_OPTIONS} ${CROSSCOMP_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-0.9") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/APSI-0.11") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") - -vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index cf3ac0c7bbef4e..4616fb5a682277 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "apsi", - "version-semver": "0.9.0", - "port-version": 2, + "version-semver": "0.11.0", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "license": "MIT", @@ -11,8 +10,11 @@ "kuku", { "name": "seal", + "default-features": false, "features": [ - "no-throw-tran" + "ms-gsl", + "no-throw-tran", + "zstd" ] }, { @@ -35,8 +37,7 @@ { "name": "seal", "features": [ - "hexl", - "no-throw-tran" + "hexl" ], "platform": "x64" } @@ -51,7 +52,8 @@ "zeromq": { "description": "Use ZeroMQ for networking.", "dependencies": [ - "cppzmq" + "cppzmq", + "zeromq" ] } } diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 17218069702dbf..a4b3eda20ca4bf 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d846cf4ccf985e33eea10fa2ac4ff44da9086dad", + "version-semver": "0.11.0", + "port-version": 0 + }, { "git-tree": "6a3eba819cf2ad5252c8ecae5c0d23f77238d98f", "version-semver": "0.9.0", diff --git a/versions/baseline.json b/versions/baseline.json index dd2f099e3ac238..3963498ee6d57b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -173,8 +173,8 @@ "port-version": 0 }, "apsi": { - "baseline": "0.9.0", - "port-version": 2 + "baseline": "0.11.0", + "port-version": 0 }, "arb": { "baseline": "2.21.1", From cabba0d0379b78e34d0a0d37edb4c459c5a03337 Mon Sep 17 00:00:00 2001 From: simolis3 <31894010+simolis3@users.noreply.github.com> Date: Wed, 29 Nov 2023 08:56:17 +0200 Subject: [PATCH 0478/1039] [libusb] Add disable-udev feature (#35328) * [libusb] Add disable-udev feature * fix commented problems. Comments still to be removed * Update libusb port version * Updated libusb port-version * Remove commented lines * Update version database * Update version database * fix suggestion to portfile.cmake --- ports/libusb/portfile.cmake | 9 +++++++++ ports/libusb/vcpkg-cmake-wrapper.cmake | 4 +--- ports/libusb/vcpkg.json | 16 ++++++++++++++-- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 2e9a4381377081..0438794ed2643d 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -41,9 +41,18 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" " -lusb-1.0" " -llibusb-1.0") endif() else() + vcpkg_list(SET MAKE_OPTIONS) + vcpkg_list(SET LIBUSB_LINK_LIBRARIES) + if("udev" IN_LIST FEATURES) + vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev") + vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev) + else() + vcpkg_list(APPEND MAKE_OPTIONS "--disable-udev") + endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + OPTIONS ${MAKE_OPTIONS} ) vcpkg_install_make() endif() diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake index 8e8c28806c4b46..5efe90d4686c10 100644 --- a/ports/libusb/vcpkg-cmake-wrapper.cmake +++ b/ports/libusb/vcpkg-cmake-wrapper.cmake @@ -8,9 +8,7 @@ select_library_configurations(LIBUSB) set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}") -if (@VCPKG_TARGET_IS_LINUX@) - list(APPEND LIBUSB_LIBRARIES udev) -endif() +list(APPEND LIBUSB_LIBRARIES @LIBUSB_LINK_LIBRARIES@) if (@VCPKG_TARGET_IS_OSX@) list(APPEND LIBUSB_LIBRARIES "-framework Cocoa") diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index ac5715c29adca6..810f16e4dc34bf 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", - "port-version": 3, + "port-version": 4, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", @@ -12,5 +12,17 @@ "host": true, "platform": "windows" } - ] + ], + "default-features": [ + { + "name": "udev", + "platform": "linux" + } + ], + "features": { + "udev": { + "description": "Enable udev", + "supports": "linux" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 3963498ee6d57b..2a72fabe25365e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4954,7 +4954,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 3 + "port-version": 4 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 43db031de5ec87..f1dd0c3ab566b1 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e6400f24988b86ad461447df4eef8efc56a919f", + "version": "1.0.26.11791", + "port-version": 4 + }, { "git-tree": "d286a5e0a74eda464b96375fe35cba969dfc2545", "version": "1.0.26.11791", From 12018d5fa38ca9c9f31928f644d45637ee53146e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:17:15 +0100 Subject: [PATCH 0479/1039] [libssh] no alternatives in features (#35324) --- ports/libssh/portfile.cmake | 1 - ports/libssh/vcpkg.json | 45 +++---------------------------------- versions/baseline.json | 2 +- versions/l-/libssh.json | 5 +++++ 4 files changed, 9 insertions(+), 44 deletions(-) diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index 21747388a5307b..bac05c0d634276 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_extract_source_archive(SOURCE_PATH vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - mbedtls WITH_MBEDTLS zlib WITH_ZLIB ) diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 3d756a52afaf22..dc6a38f1d6e169 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,18 +1,15 @@ { "name": "libssh", "version": "0.10.5", + "port-version": 1, "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "license": "LGPL-2.1-only", "supports": "!uwp & !xbox", "dependencies": [ { - "name": "libssh", - "default-features": false, - "features": [ - "mbedtls" - ], - "platform": "android" + "name": "openssl", + "default-features": false }, { "name": "vcpkg-cmake", @@ -23,43 +20,7 @@ "host": true } ], - "default-features": [ - "crypto" - ], "features": { - "crypto": { - "description": "Default crypto backend", - "dependencies": [ - { - "name": "libssh", - "features": [ - "mbedtls" - ] - } - ] - }, - "mbedtls": { - "description": "Crypto support (mbedTLS)", - "dependencies": [ - { - "name": "mbedtls", - "default-features": false - }, - { - "name": "mbedtls", - "features": [ - "pthreads" - ], - "platform": "!android" - } - ] - }, - "openssl": { - "description": "Crypto support (OpenSSL)", - "dependencies": [ - "openssl" - ] - }, "zlib": { "description": "libssh with zlib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2a72fabe25365e..3ba7722918d6bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4842,7 +4842,7 @@ }, "libssh": { "baseline": "0.10.5", - "port-version": 0 + "port-version": 1 }, "libssh2": { "baseline": "1.11.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index fe66450574cbd8..bb8db009244ccf 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "000173abb6b45433339e0c85179bd3b4e4a36684", + "version": "0.10.5", + "port-version": 1 + }, { "git-tree": "d6af07ebaeb4ab52ff509bc7637ad1d278d3d16b", "version": "0.10.5", From ab76a78f72132f174e66923d644ee9fd518f85b3 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 29 Nov 2023 17:19:13 +0900 Subject: [PATCH 0480/1039] Update async-mqtt port to 3.0.0. (#35389) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 774741ce498ec4..053e9492298c98 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 0bcb0bc3a08329a11ebe3efee4f919efc7bb8192373efd924f29f63c3bc7ca3ddd2c6e669f5800baf2fb3c5d67ae423e89cc802275d088848da83b2f343f7318 + SHA512 5eba3e50c7d48871d94babe72a0da1c4e128748d42365b4042f38baf1a6d375b0b97f08eba51a7d72bb93e840f5778737cd6519af58257cca7a1dabe0db31a85 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index 469131298febea..d08aa353eb5b34 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "2.0.0", + "version": "3.0.0", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index c1a7b3fcf497b9..f292597c5065cd 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54a9da56ebb673479269e266208e7b1133ff128a", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "1785cef2cfd89416b423c3a67c5ef0ef29c76100", "version": "2.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3ba7722918d6bf..1b40f94f0b1c6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -273,7 +273,7 @@ "port-version": 3 }, "async-mqtt": { - "baseline": "2.0.0", + "baseline": "3.0.0", "port-version": 0 }, "asynch": { From 253f8fffd7aecf372e796ea00365494d9ec22bd0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:21:41 +0100 Subject: [PATCH 0481/1039] [valijson] update to 1.0.1 (#35322) * [valijson] update to 1.0.1 * format * v db --- ports/valijson/fix-optional.patch | 12 ----------- ports/valijson/fix-picojson.patch | 34 ------------------------------- ports/valijson/portfile.cmake | 31 ++++++++++++++-------------- ports/valijson/vcpkg.json | 14 +++++++++++-- versions/baseline.json | 2 +- versions/v-/valijson.json | 5 +++++ 6 files changed, 33 insertions(+), 65 deletions(-) delete mode 100644 ports/valijson/fix-optional.patch delete mode 100644 ports/valijson/fix-picojson.patch diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch deleted file mode 100644 index 307d630a57574c..00000000000000 --- a/ports/valijson/fix-optional.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp -index c9bc47b..c73c7fb 100644 ---- a/include/valijson/internal/optional.hpp -+++ b/include/valijson/internal/optional.hpp -@@ -9,6 +9,6 @@ namespace opt = std; - # endif - # endif - #else --# include -+# include - namespace opt = std::experimental; - #endif diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch deleted file mode 100644 index ae276f8ebec948..00000000000000 --- a/ports/valijson/fix-picojson.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp -index 4f5e5b6..0da2bf2 100644 ---- a/include/valijson/adapters/picojson_adapter.hpp -+++ b/include/valijson/adapters/picojson_adapter.hpp -@@ -29,10 +29,10 @@ - - #ifdef _MSC_VER - #pragma warning(disable: 4706) --#include -+#include - #pragma warning(default: 4706) - #else --#include -+#include - #endif - - #include -diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp -index 36420d2..8660c30 100644 ---- a/include/valijson/utils/picojson_utils.hpp -+++ b/include/valijson/utils/picojson_utils.hpp -@@ -4,10 +4,10 @@ - - #ifdef _MSC_VER - #pragma warning(disable: 4706) --#include -+#include - #pragma warning(default: 4706) - #else --#include -+#include - #endif - - #include diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake index 3481d8678f51a7..8f81ff82bc1b9e 100644 --- a/ports/valijson/portfile.cmake +++ b/ports/valijson/portfile.cmake @@ -1,24 +1,23 @@ -#header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tristanpenman/valijson - REF v0.6 - SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749 + REF v${VERSION} + SHA512 a1f9aabfcd150a36ed16c5642027a9c524ec044dd1eb636a81a75f2226b7b665cc3d2f4cd375786be8fc9dadf2c6938df17d6e6fa13f27c621fe2ca35e0d13ee HEAD_REF master - PATCHES fix-picojson.patch - fix-optional.patch ) -# Copy the header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/include/valijson/*) -file(COPY ${HEADER_FILES} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson - REGEX "\.(gitattributes|gitignore)$" EXCLUDE) +set(VCPKG_BUILD_TYPE release) # headers only -file(COPY ${SOURCE_PATH}/include/compat/optional.hpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include/valijson/compat) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dvalijson_BUILD_TESTS:BOOL=OFF +) +vcpkg_cmake_install() + + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/valijson") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/valijson) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/valijson/LICENSE ${CURRENT_PACKAGES_DIR}/share/valijson/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug/lib") diff --git a/ports/valijson/vcpkg.json b/ports/valijson/vcpkg.json index f78a85c401e423..c416b790607a43 100644 --- a/ports/valijson/vcpkg.json +++ b/ports/valijson/vcpkg.json @@ -1,5 +1,15 @@ { "name": "valijson", - "version": "0.6", - "description": "Header-only C++ library for JSON Schema validation" + "version": "1.0.1", + "description": "Header-only C++ library for JSON Schema validation", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1b40f94f0b1c6f..0242e06607b6fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8761,7 +8761,7 @@ "port-version": 6 }, "valijson": { - "baseline": "0.6", + "baseline": "1.0.1", "port-version": 0 }, "value-ptr-lite": { diff --git a/versions/v-/valijson.json b/versions/v-/valijson.json index e63eb9a9d3dc7d..09ccc00daf5bbd 100644 --- a/versions/v-/valijson.json +++ b/versions/v-/valijson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a05a76802a936f7549eec49d032a5e6fa220cfb", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529", "version": "0.6", From 56db7a786e210af3b70f93e98c8280c7ee08748f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 09:36:40 +0100 Subject: [PATCH 0482/1039] [eigen3] Cleanup (#35320) * [eigen3] Cleanup * Restore debug/lib/pkgconfig/eigen3.pc --- ports/eigen3/portfile.cmake | 22 ++++---- ports/eigen3/remove_configure_checks.patch | 61 +++++++++++++--------- ports/eigen3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/eigen3.json | 5 ++ 5 files changed, 56 insertions(+), 36 deletions(-) diff --git a/ports/eigen3/portfile.cmake b/ports/eigen3/portfile.cmake index d6725d44a06a2d..76379deb27855b 100644 --- a/ports/eigen3/portfile.cmake +++ b/ports/eigen3/portfile.cmake @@ -1,10 +1,13 @@ vcpkg_buildpath_length_warning(37) +block(SCOPE_FOR VARIABLES PROPAGATE SOURCE_PATH) +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_from_gitlab( GITLAB_URL https://gitlab.com OUT_SOURCE_PATH SOURCE_PATH REPO libeigen/eigen - REF 3.4.0 + REF "${VERSION}" SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a HEAD_REF master PATCHES @@ -16,22 +19,23 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DEIGEN_BUILD_DOC=OFF -DEIGEN_BUILD_PKGCONFIG=ON - OPTIONS_RELEASE - -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3 - -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig - OPTIONS_DEBUG - -DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/share/eigen3 - -DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig + "-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3" + "-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup() +endblock() + +if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/eigen3.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() vcpkg_fixup_pkgconfig() file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*") # Copy the eigen header files to conventional location for user-wide MSBuild integration file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.README") diff --git a/ports/eigen3/remove_configure_checks.patch b/ports/eigen3/remove_configure_checks.patch index 3e434a40521ccc..c5e30c7e7597cc 100644 --- a/ports/eigen3/remove_configure_checks.patch +++ b/ports/eigen3/remove_configure_checks.patch @@ -1,37 +1,48 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3e69b845..12fb2188d 100644 +index f3e69b8..f32ffee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,12 +66,14 @@ option(EIGEN_TEST_CXX11 "Enable testing with C++11 and C++11 features (e.g. Tens +@@ -59,6 +59,7 @@ include(CheckCXXCompilerFlag) + include(GNUInstallDirs) + include(CMakeDependentOption) ++if(0) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - macro(ei_add_cxx_compiler_flag FLAG) -+ if(FALSE) # Since eigen3 is header only and vcpkg does not build tests this can be disabled by default. - string(REGEX REPLACE "-" "" SFLAG1 ${FLAG}) - string(REGEX REPLACE "\\+" "p" SFLAG ${SFLAG1}) - check_cxx_compiler_flag(${FLAG} COMPILER_SUPPORT_${SFLAG}) - if(COMPILER_SUPPORT_${SFLAG}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") - endif() -+ endif() - endmacro() - check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11) -@@ -142,7 +144,7 @@ endif() +@@ -419,6 +420,7 @@ endif() + set(EIGEN_CUDA_COMPUTE_ARCH 30 CACHE STRING "The CUDA compute architecture level to target when compiling CUDA code") - set(EIGEN_TEST_MAX_SIZE "320" CACHE STRING "Maximal matrix/vector size, default is 320") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ++endif() --if(NOT MSVC) -+if(NOT MSVC AND FALSE) - # We assume that other compilers are partly compatible with GNUCC + # Backward compatibility support for EIGEN_INCLUDE_INSTALL_DIR + if(EIGEN_INCLUDE_INSTALL_DIR) +@@ -495,6 +497,7 @@ if(BUILD_TESTING) + add_subdirectory(failtest) + endif() - # clang outputs some warnings for unknown flags that are not caught by check_cxx_compiler_flag -@@ -330,7 +332,7 @@ if(NOT MSVC) - endif() ++if(0) + if(EIGEN_LEAVE_TEST_IN_ALL_TARGET) + add_subdirectory(blas) + add_subdirectory(lapack) +@@ -532,9 +535,11 @@ if(EIGEN_TEST_SYCL) + add_definitions(-DEIGEN_DONT_VECTORIZE_SYCL=1) endif() + endif() ++endif() + + add_subdirectory(unsupported) + ++if(0) + add_subdirectory(demos EXCLUDE_FROM_ALL) --else() -+elseif(FALSE) + # must be after test and unsupported, for configuring buildtests.in +@@ -554,6 +559,7 @@ configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY) + if(BUILD_TESTING) + ei_testing_print_summary() + endif() ++endif() - # C4127 - conditional expression is constant - # C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively) + message(STATUS "") + message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}") diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json index 30bf5aa3e13680..bb2c9cc60ae623 100644 --- a/ports/eigen3/vcpkg.json +++ b/ports/eigen3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "eigen3", "version": "3.4.0", - "port-version": 2, + "port-version": 3, "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", "homepage": "http://eigen.tuxfamily.org", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0242e06607b6fa..259ee59f2a26c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2406,7 +2406,7 @@ }, "eigen3": { "baseline": "3.4.0", - "port-version": 2 + "port-version": 3 }, "elements": { "baseline": "2022-12-07", diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 850e31dcc879a6..cb5c467371d6d2 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38fc865a94dea7a84f8b1350936ed4fcc3e638cc", + "version": "3.4.0", + "port-version": 3 + }, { "git-tree": "250d10d414a5542aaf832350264498ba727c4c03", "version": "3.4.0", From e3470088867d254dfd966bb1fe0d108858819912 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 09:38:04 +0100 Subject: [PATCH 0483/1039] [botan] Fix android and emscripten (#35318) * [botan] Fix android and emscripten * CI --- ports/botan/portfile.cmake | 19 ++++++++++++++----- ports/botan/vcpkg.json | 1 + scripts/ci.baseline.txt | 3 --- versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 7d265ba541360a..c22752e397b823 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan @@ -53,7 +52,9 @@ if("zlib" IN_LIST FEATURES) x_vcpkg_pkgconfig_get_modules(LIBS PREFIX "ZLIB" MODULES "zlib" ${pkgconfig_syntax}) endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") +if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND configure_arguments --cpu=wasm) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") vcpkg_list(APPEND configure_arguments --cpu=x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_list(APPEND configure_arguments --cpu=x86_64) @@ -109,11 +110,17 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN) vcpkg_copy_pdbs() else() - if(VCPKG_TARGET_IS_MINGW) + if(VCPKG_TARGET_IS_ANDROID) + vcpkg_list(APPEND configure_arguments --os=android) + elseif(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND configure_arguments --os=emscripten) + elseif(VCPKG_TARGET_IS_MINGW) vcpkg_list(APPEND configure_arguments --os=mingw) endif() - if(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND configure_arguments --cc=emcc) + elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID STREQUAL "GNU") vcpkg_list(APPEND configure_arguments --cc=gcc) elseif(VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "Clang") vcpkg_list(APPEND configure_arguments --cc=clang) @@ -141,7 +148,9 @@ else() "ZLIB_LIBS_RELEASE=${ZLIB_LIBS_RELEASE}" "ZLIB_LIBS_DEBUG=${ZLIB_LIBS_DEBUG}" ) - vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) + if(NOT VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) + endif() endif() file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-3/botan" "${CURRENT_PACKAGES_DIR}/include/botan") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 067569ba68f380..8c9fe75aee7c8f 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,6 +1,7 @@ { "name": "botan", "version": "3.1.1", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f9392abee1be81..1df2de4d6c5913 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -100,9 +100,6 @@ boringssl:x64-windows=skip boringssl:x64-windows-static=skip boringssl:x64-windows-static-md=skip boringssl:x86-windows=skip -botan:arm-neon-android=fail -botan:arm64-android=fail -botan:x64-android=fail brpc:x64-android=fail buck-yeh-bux:x64-android=fail c4core:arm-neon-android=fail diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 7ee8c91e54d24a..012914ab7c153a 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c031a70866fae7751496d7edfd01caad2773dd08", + "version": "3.1.1", + "port-version": 1 + }, { "git-tree": "d66e60d97a7a4e77df4e559fed1926a45dac3f52", "version": "3.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 259ee59f2a26c0..232ea0cf664f12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1302,7 +1302,7 @@ }, "botan": { "baseline": "3.1.1", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", From 352d062274f876e6a721d9d012edbf993508bf68 Mon Sep 17 00:00:00 2001 From: i-curve Date: Wed, 29 Nov 2023 16:42:11 +0800 Subject: [PATCH 0484/1039] [copypp] New port #35309 (#35310) * [copypp] New port #35309 * update version. #35309 Signed-off-by: i-curve * [copypp] modify the style as suggested #35309 Signed-off-by: i-curve * [copypp] update the version (#35309) * [copypp] modify file format (#35309) Signed-off-by: i-curve * [copypp] update the version (#35309) Signed-off-by: i-curve * [copypp] remove deprecated function (#35309) Signed-off-by: i-curve * [copypp] update version (#35309) Signed-off-by: i-curve --------- Signed-off-by: i-curve --- ports/copypp/portfile.cmake | 25 +++++++++++++++++++++++++ ports/copypp/usage | 4 ++++ ports/copypp/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/copypp.json | 9 +++++++++ 5 files changed, 59 insertions(+) create mode 100644 ports/copypp/portfile.cmake create mode 100644 ports/copypp/usage create mode 100644 ports/copypp/vcpkg.json create mode 100644 versions/c-/copypp.json diff --git a/ports/copypp/portfile.cmake b/ports/copypp/portfile.cmake new file mode 100644 index 00000000000000..ba1157c08a4eaf --- /dev/null +++ b/ports/copypp/portfile.cmake @@ -0,0 +1,25 @@ +set(VCPKG_BUILD_TYPE release) # header-only + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO i-curve/copypp + REF "v${VERSION}" + SHA512 a13a3ee105b3802f585c086846dbce7d5e9c23d11bf55fcc0c63e1a4b21fc6798f1a324cfb3da66b715dfc22a4f1f7ba51a2f4e10db331f7d4fd6b20a9be6d41 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DCOPYPP_TEST=OFF" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/copypp) + +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/copypp/usage b/ports/copypp/usage new file mode 100644 index 00000000000000..17bb740b9ed508 --- /dev/null +++ b/ports/copypp/usage @@ -0,0 +1,4 @@ +copypp provides CMake targets: + + find_package(copypp CONFIG REQUIRED) + target_link_libraries(main PRIVATE icurve::copypp) diff --git a/ports/copypp/vcpkg.json b/ports/copypp/vcpkg.json new file mode 100644 index 00000000000000..db04c31a8ac2e8 --- /dev/null +++ b/ports/copypp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "copypp", + "version": "0.1.0", + "description": "support field copy in different c++ struct.", + "homepage": "https://github.com/i-curve/copypp", + "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 232ea0cf664f12..f45fe00771238b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1788,6 +1788,10 @@ "baseline": "6.4.3", "port-version": 3 }, + "copypp": { + "baseline": "0.1.0", + "port-version": 0 + }, "coroutine": { "baseline": "1.5.0", "port-version": 5 diff --git a/versions/c-/copypp.json b/versions/c-/copypp.json new file mode 100644 index 00000000000000..87186d964cc05b --- /dev/null +++ b/versions/c-/copypp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "30342b837d13819393c9f898e82f5c2cf25bed32", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 8f21bde7df900152235bd3505b00c0332ab52868 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 29 Nov 2023 00:43:43 -0800 Subject: [PATCH 0485/1039] [poco] Update to 1.12.5.1 (#35307) --- ports/poco/portfile.cmake | 4 ++-- ports/poco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/poco.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index b16f6bdad5a8e9..bb821c6b6e081c 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF "poco-${VERSION}-release" - SHA512 dfb7bc3241c78216ebd9eeacd6d091c069a342a7f92e73b348b07ff817997a16c8452fdb954954a182f65140567fc2e910036efb50d55d327a4de8063bac005b + REF "poco-1.12.5p1-release" + SHA512 9cf885f67d87b86d3d5337aa2a3247a5828e071bba04304dfb79f7e00d94cd245e5def5191400a5753eebe0611b7f120c470cb0e0ab9b120f1d8b5f202d7d3d7 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index c756717df3a693..531585d210ead1 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "poco", - "version": "1.12.5", + "version": "1.12.5.1", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index f45fe00771238b..8de00c44696b88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6665,7 +6665,7 @@ "port-version": 0 }, "poco": { - "baseline": "1.12.5", + "baseline": "1.12.5.1", "port-version": 0 }, "podofo": { diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 523a588c280652..fee58e5d531028 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d77c1da4e506a178da0c3d87acde20b8cb0dd550", + "version": "1.12.5.1", + "port-version": 0 + }, { "git-tree": "baaee315b717f3b0a819aed2f78b8a2059cb1726", "version": "1.12.5", From 8af96e6c2e7d65703ab86b5f8992b47b6964e2ec Mon Sep 17 00:00:00 2001 From: Denis Barkar Date: Wed, 29 Nov 2023 11:48:28 +0300 Subject: [PATCH 0486/1039] [sdl2-mixer-ext] Update to v2.6.0, add pxtone support (#35284) --- ports/sdl2-mixer-ext/fix-dependencies.patch | 162 ++++++++++---------- ports/sdl2-mixer-ext/portfile.cmake | 7 +- ports/sdl2-mixer-ext/vcpkg.json | 6 +- versions/baseline.json | 4 +- versions/s-/sdl2-mixer-ext.json | 5 + 5 files changed, 97 insertions(+), 87 deletions(-) diff --git a/ports/sdl2-mixer-ext/fix-dependencies.patch b/ports/sdl2-mixer-ext/fix-dependencies.patch index a662dcf9ce54f5..f232788546ff3a 100644 --- a/ports/sdl2-mixer-ext/fix-dependencies.patch +++ b/ports/sdl2-mixer-ext/fix-dependencies.patch @@ -1,5 +1,68 @@ +diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in +index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644 +--- a/SDL2_mixer_extConfig.cmake.in ++++ b/SDL2_mixer_extConfig.cmake.in +@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES + + @PACKAGE_INIT@ + ++set(SDL_MIXER_X_USE_OGG_VORBIS @USE_OGG_VORBIS@) ++set(SDL_MIXER_X_USE_OPUS @USE_OPUS@) ++set(SDL_MIXER_X_USE_USE_FLAC @USE_FLAC@) ++set(SDL_MIXER_X_USE_USE_WAVPACK @USE_WAVPACK@) ++set(SDL_MIXER_X_USE_MP3_MPG123 @USE_MP3_MPG123@) ++set(SDL_MIXER_X_USE_XMP @USE_XMP@) ++set(SDL_MIXER_X_USE_MIDI_ADLMIDI @USE_MIDI_ADLMIDI@) ++set(SDL_MIXER_X_USE_MIDI_OPNMIDI @USE_MIDI_OPNMIDI@) ++set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH @USE_MIDI_FLUIDSYNTH@) ++ + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") + endif() + + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") ++ include(CMakeFindDependencyMacro) ++ ++ if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile) ++ find_dependency(Vorbis CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile) ++ find_dependency(OpusFile CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC) ++ find_dependency(FLAC CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack) ++ find_dependency(WavPack CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123) ++ find_dependency(MPG123 CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static) ++ find_dependency(libxmp CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static) ++ find_dependency(libADLMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static) ++ find_dependency(libOPNMIDI CONFIG) ++ endif() ++ ++ if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth) ++ find_dependency(FluidSynth CONFIG) ++ endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") + endif() diff --git a/src/codecs/music_ffmpeg.cmake b/src/codecs/music_ffmpeg.cmake -index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac430ca50d 100644 +index 285d54df037a1bb126f3c680102ca08d27e83d6e..d2305f39b7c5bfeba6b9fc566764320354833765 100644 --- a/src/codecs/music_ffmpeg.cmake +++ b/src/codecs/music_ffmpeg.cmake @@ -3,7 +3,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) @@ -9,11 +72,11 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac - find_package(FFMPEG QUIET) + find_package(FFMPEG REQUIRED) message("FFMPEG: [${FFMPEG_avcodec_FOUND}] ${FFMPEG_INCLUDE_DIRS} ${FFMPEG_swresample_LIBRARY} ${FFMPEG_avformat_LIBRARY} ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avutil_LIBRARY}") + if(USE_FFMPEG_DYNAMIC) - list(APPEND SDL_MIXER_DEFINITIONS -@@ -16,10 +16,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) - message("Dynamic FFMPEG: ${FFMPEG_avutil_DYNAMIC_LIBRARY} ${FFMPEG_avcodec_DYNAMIC_LIBRARY} ${FFMPEG_avformat_DYNAMIC_LIBRARY} ${FFMPEG_swresample_DYNAMIC_LIBRARY}") +@@ -18,10 +18,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) endif() + set(FFMPEG_LINK_LIBRARIES - ${FFMPEG_swresample_LIBRARY} - ${FFMPEG_avformat_LIBRARY} @@ -23,7 +86,7 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac ) else() message(WARNING "FFMPEG libraries are not a part of AudioCodecs yet. Using any available from the system.") -@@ -41,7 +38,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) +@@ -43,7 +40,7 @@ if(USE_FFMPEG AND MIXERX_LGPL) set(FFMPEG_swresample_FOUND 1) endif() @@ -33,7 +96,7 @@ index c4f69f9dfba4cf77d6f7ba513ff0a6bdb7a7fb71..a6a6bb8cd382ee0cb3d5eb05ed97d2ac endif() diff --git a/src/codecs/music_flac.cmake b/src/codecs/music_flac.cmake -index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd21f06c3c 100644 +index 1a39a4984c6bb36c8a09978540ebdd3b8031d7ef..6726655de7ef622fbb872660cfc0a3d49b00a058 100644 --- a/src/codecs/music_flac.cmake +++ b/src/codecs/music_flac.cmake @@ -3,7 +3,10 @@ if(USE_FLAC) @@ -49,7 +112,7 @@ index 8fb69ed54894dc2657e6da326015a606f567eb9d..9caf2b1a817258b957416f20aa57a5cd if(USE_FLAC_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DFLAC_DYNAMIC=\"${FLAC_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_fluidsynth.cmake b/src/codecs/music_fluidsynth.cmake -index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e330379b2c 100644 +index 8dd54447317cba97928f320ce2bd5cc8364a8967..ad7a302173e06302d8a5313302445151f9c14c70 100644 --- a/src/codecs/music_fluidsynth.cmake +++ b/src/codecs/music_fluidsynth.cmake @@ -6,7 +6,10 @@ if(USE_MIDI_FLUIDSYNTH AND NOT USE_MIDI_FLUIDLITE AND MIXERX_LGPL) @@ -65,7 +128,7 @@ index ee90c2708aa3857514dd4154dcc94ec17a8f22ec..d4d8d921e9863857a4bdce45b87b30e3 if(USE_MIDI_FLUIDSYNTH_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DFLUIDSYNTH_DYNAMIC=\"${FluidSynth_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_gme.cmake b/src/codecs/music_gme.cmake -index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15eae166b96 100644 +index e8a455391489080a88685e4501250f37138b38d6..124d3f3e63eff2e125cbce8139a2958a78088b15 100644 --- a/src/codecs/music_gme.cmake +++ b/src/codecs/music_gme.cmake @@ -3,7 +3,14 @@ if(USE_GME AND MIXERX_LGPL) @@ -85,7 +148,7 @@ index 7e0df24427f4793bd19f2def937853d949957340..a407ccb4c41eb3c900e3a07687e2a15e if(USE_GME_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DGME_DYNAMIC=\"${GME_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_midi_adl.cmake b/src/codecs/music_midi_adl.cmake -index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d8eea1a9f 100644 +index c8f7bbdbfdb62e1fd0a20e5006c4a4d1b4ab8452..0be6f3b9e761263857dba8c1931e84cf22640535 100644 --- a/src/codecs/music_midi_adl.cmake +++ b/src/codecs/music_midi_adl.cmake @@ -3,7 +3,15 @@ if(USE_MIDI_ADLMIDI AND MIXERX_GPL) @@ -103,10 +166,10 @@ index 0d3b302f1d73ba01ec6a3b187559f1892f8a4c76..26864407f0e26d2affde07829d28407d + set(ADLMIDI_LIBRARIES ${_adlmidi}) + set(ADLMIDI_FOUND 1) message("ADLMIDI: [${ADLMIDI_FOUND}] ${ADLMIDI_INCLUDE_DIRS} ${ADLMIDI_LIBRARIES}") + if(USE_MIDI_ADLMIDI_DYNAMIC) - list(APPEND SDL_MIXER_DEFINITIONS -DADLMIDI_DYNAMIC=\"${ADLMIDI_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_midi_opn.cmake b/src/codecs/music_midi_opn.cmake -index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf946c9132 100644 +index 62b9dda0c2771ef25a7bc91949cdce0c55ea5250..26bb304d720f7d93eb3d8b24fd81dbc33df513cc 100644 --- a/src/codecs/music_midi_opn.cmake +++ b/src/codecs/music_midi_opn.cmake @@ -3,7 +3,15 @@ if(USE_MIDI_OPNMIDI AND MIXERX_GPL) @@ -124,8 +187,8 @@ index 34169046fe51bd6d1b27d314733b2a13209b7968..3dc4409dc7ea6b6a340f7082c0567bbf + set(OPNMIDI_LIBRARIES ${_opnmidi}) + set(OPNMIDI_FOUND 1) message("OPNMIDI: [${OPNMIDI_FOUND}] ${OPNMIDI_INCLUDE_DIRS} ${OPNMIDI_LIBRARIES}") + if(USE_MIDI_OPNMIDI_DYNAMIC) - list(APPEND SDL_MIXER_DEFINITIONS -DOPNMIDI_DYNAMIC=\"${OPNMIDI_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_modplug.cmake b/src/codecs/music_modplug.cmake index 555bcd91574d1c65761121648b331715a5fe8dad..ad065be36cd0176aa7f08631a6df48e857f76e42 100644 --- a/src/codecs/music_modplug.cmake @@ -171,7 +234,7 @@ index e7930f9c7e1a583f77306f6838933b991382872f..33a8a59e72e30e3cabd4e834895a23ae find_package(OGG REQUIRED) else() diff --git a/src/codecs/music_ogg_vorbis.cmake b/src/codecs/music_ogg_vorbis.cmake -index 475c7ea67663d114a4fc0fef243e15fbf66a00c1..66fa87521c91d1f25fc335b026078b384509dc6a 100644 +index 0de2bec5d9327af7b38f09993dd884be786f3a5b..42b94340956fb8b28a03485ddc68282e3cf57ee9 100644 --- a/src/codecs/music_ogg_vorbis.cmake +++ b/src/codecs/music_ogg_vorbis.cmake @@ -10,7 +10,10 @@ if(USE_OGG_VORBIS) @@ -203,11 +266,11 @@ index 61fb32e7ec1bcb4e21cb77607399f1f36317c481..44e0b5da00146492a2b34a65ab0c1684 if(USE_OPUS_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DOPUS_DYNAMIC=\"${OpusFile_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_wavpack.cmake b/src/codecs/music_wavpack.cmake -index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daedc1916c12 100644 +index f93acdb4315e0f44311efdbc254a3fcd69964151..95d0372e2b8d0503864edf41f01977cf28a480f9 100644 --- a/src/codecs/music_wavpack.cmake +++ b/src/codecs/music_wavpack.cmake -@@ -3,7 +3,10 @@ if(USE_WAVPACK) - option(USE_WAVPACK_DYNAMIC "Use dynamical loading of WAVPACK" OFF) +@@ -4,7 +4,10 @@ if(USE_WAVPACK) + option(USE_WAVPACK_DSD "Enable WavPack DSD music support" OFF) if(USE_SYSTEM_AUDIO_LIBRARIES) - find_package(WavPack QUIET) @@ -219,10 +282,10 @@ index ab841b8c8c9720d50ce15534361cc4ba80e6595d..688f7459789eae14df641e53c003daed if(USE_WAVPACK_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DWAVPACK_DYNAMIC=\"${WavPack_DYNAMIC_LIBRARY}\") diff --git a/src/codecs/music_xmp.cmake b/src/codecs/music_xmp.cmake -index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0aa7c9d9f 100644 +index 52f2048b0b8cb9c72a27f16777fb7d9112be1c2d..2eab53c039e875733f18fc2f20b2e9f178371425 100644 --- a/src/codecs/music_xmp.cmake +++ b/src/codecs/music_xmp.cmake -@@ -19,7 +19,15 @@ if(USE_XMP) +@@ -25,7 +25,15 @@ if(USE_XMP) set(XMP_LIBRARIES ${XMPLITE_LIBRARIES}) set(XMP_FOUND ${XMPLITE_FOUND}) else() @@ -239,66 +302,3 @@ index 2b41037b9cdb4160515982eb8511500baf9961ce..698c34fa2dc8fb8175d8b1ab61255bd0 message("XMP: [${XMP_FOUND}] ${XMP_INCLUDE_DIRS} ${XMP_LIBRARIES}") if(USE_XMP_DYNAMIC) list(APPEND SDL_MIXER_DEFINITIONS -DXMP_DYNAMIC=\"${XMP_DYNAMIC_LIBRARY}\") -diff --git a/SDL2_mixer_extConfig.cmake.in b/SDL2_mixer_extConfig.cmake.in -index 997d4e828150d10fa4113b3341220ca185fc29a5..2d781528151075385a2e837df3863900b8d36573 100644 ---- a/SDL2_mixer_extConfig.cmake.in -+++ b/SDL2_mixer_extConfig.cmake.in -@@ -6,10 +6,58 @@ set_package_properties(SDL2_mixer_ext PROPERTIES - - @PACKAGE_INIT@ - -+set(SDL_MIXER_X_USE_OGG_VORBIS @USE_OGG_VORBIS@) -+set(SDL_MIXER_X_USE_OPUS @USE_OPUS@) -+set(SDL_MIXER_X_USE_USE_FLAC @USE_FLAC@) -+set(SDL_MIXER_X_USE_USE_WAVPACK @USE_WAVPACK@) -+set(SDL_MIXER_X_USE_MP3_MPG123 @USE_MP3_MPG123@) -+set(SDL_MIXER_X_USE_XMP @USE_XMP@) -+set(SDL_MIXER_X_USE_MIDI_ADLMIDI @USE_MIDI_ADLMIDI@) -+set(SDL_MIXER_X_USE_MIDI_OPNMIDI @USE_MIDI_OPNMIDI@) -+set(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH @USE_MIDI_FLUIDSYNTH@) -+ - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-shared-targets.cmake") - endif() - - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") -+ include(CMakeFindDependencyMacro) -+ -+ if(SDL_MIXER_X_USE_OGG_VORBIS AND NOT TARGET Vorbis::vorbisfile) -+ find_dependency(Vorbis CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_OPUS AND NOT TARGET OpusFile::opusfile) -+ find_dependency(OpusFile CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_USE_FLAC AND NOT TARGET FLAC::FLAC) -+ find_dependency(FLAC CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_USE_WAVPACK AND NOT TARGET WavPack::WavPack) -+ find_dependency(WavPack CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_MP3_MPG123 AND NOT TARGET MPG123::libmpg123) -+ find_dependency(MPG123 CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_XMP AND NOT TARGET libxmp::xmp_static) -+ find_dependency(libxmp CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_MIDI_ADLMIDI AND NOT TARGET libADLMIDI::ADLMIDI_static) -+ find_dependency(libADLMIDI CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_MIDI_OPNMIDI AND NOT TARGET libOPNMIDI::OPNMIDI_static) -+ find_dependency(libOPNMIDI CONFIG) -+ endif() -+ -+ if(SDL_MIXER_X_USE_MIDI_FLUIDSYNTH AND NOT TARGET FluidSynth::libfluidsynth) -+ find_dependency(FluidSynth CONFIG) -+ endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/SDL2_mixer_ext-static-targets.cmake") - endif() diff --git a/ports/sdl2-mixer-ext/portfile.cmake b/ports/sdl2-mixer-ext/portfile.cmake index 8a1242081bbaba..5f92bfb1eab28f 100644 --- a/ports/sdl2-mixer-ext/portfile.cmake +++ b/ports/sdl2-mixer-ext/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO WohlSoft/SDL-Mixer-X - REF 1bd1111949036645e92cf0f7aa635e904c590318 - SHA512 b3c87580ff639b015d0e3f00d584878f141896ac812ec036945025416019f7849e952a76135095358f427eb2d04ed8f68fd9721e1869dade78517f7372ad2f9c + REF "${VERSION}" + SHA512 bdb39122ecf8492723615421c37c0d2a8d5958110d7bf2f0a01f5c54cc1f3f6e9a54887df7d348e9dc7e34906cff67794b0f5d61ca6fe5e4019f84ed88cf07e5 HEAD_REF master PATCHES fix-dependencies.patch @@ -24,6 +24,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libxmp USE_XMP libgme USE_GME ffmpeg USE_FFMPEG + pxtone USE_PXTONE cmd USE_CMD libadlmidi USE_MIDI_ADLMIDI libopnmidi USE_MIDI_OPNMIDI @@ -59,12 +60,14 @@ vcpkg_cmake_configure( -DUSE_SYSTEM_AUDIO_LIBRARIES=ON -DUSE_OGG_VORBIS_STB=OFF -DUSE_DRFLAC=OFF + -USE_WAVPACK_DSD=ON -DUSE_MP3_DRMP3=OFF -DUSE_FFMPEG_DYNAMIC=OFF -DUSE_MIDI=${USE_MIDI} -DUSE_MIDI_EDMIDI=OFF -DUSE_MIDI_FLUIDLITE=OFF MAYBE_UNUSED_VARIABLES + USE_WAVPACK_DSD USE_FFMPEG_DYNAMIC USE_CMD USE_MIDI_NATIVE diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json index bb60a677880c9f..d45124ea3b0c52 100644 --- a/ports/sdl2-mixer-ext/vcpkg.json +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2-mixer-ext", - "version-date": "2023-05-04", - "port-version": 1, + "version": "2.6.0", "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", @@ -109,6 +108,9 @@ "opusfile" ] }, + "pxtone": { + "description": "Use pxtone to play PPTUNE and PTCOP audio formats." + }, "timidity": { "description": "Use Timidity to play MIDI audio format." }, diff --git a/versions/baseline.json b/versions/baseline.json index 8de00c44696b88..37961674b7fb19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7733,8 +7733,8 @@ "port-version": 1 }, "sdl2-mixer-ext": { - "baseline": "2023-05-04", - "port-version": 1 + "baseline": "2.6.0", + "port-version": 0 }, "sdl2-net": { "baseline": "2.2.0", diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json index 9b2c960d29193e..9c12d86166fffe 100644 --- a/versions/s-/sdl2-mixer-ext.json +++ b/versions/s-/sdl2-mixer-ext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4585bc468e6fbd0b8315dfa4dddbc2501945fbf8", + "version": "2.6.0", + "port-version": 0 + }, { "git-tree": "72599d1d3f046b10ba695a83a5de68a98bf86ec8", "version-date": "2023-05-04", From aeabfa93866e1b288d40b98dcd5c129bbacc85dc Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:49:34 +0800 Subject: [PATCH 0487/1039] [tbb] update to 2021.11.0 (#35282) * [tbb] update to 2021.11.0 * [tbb] update versions --- ports/tbb/portfile.cmake | 2 +- ports/tbb/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tbb.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index 595eca81407c59..af090a1642ef34 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneTBB REF "v${VERSION}" - SHA512 d71cf317e7f78948c1ea20977cfcfba1eff72cb20c457c87e624cb3aaa3215a1c24eeeec11ed6ed99cf118c577d956234202458bb5e0215c9c317099d9c3b732 + SHA512 4779141b7602f2fa3a509fdd346824ba270a3a568df3649ce8cb51264d233df5cec5e5cb67b91319dd11d3d5e054697b4ed345e07216107985ddb6e1e7ef94e5 HEAD_REF onetbb_2021 ) diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index a2a9cdb7bc1219..1849a17993c28a 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tbb", - "version": "2021.10.0", - "port-version": 3, + "version": "2021.11.0", "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 37961674b7fb19..0aaee08bb954ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8301,8 +8301,8 @@ "port-version": 0 }, "tbb": { - "baseline": "2021.10.0", - "port-version": 3 + "baseline": "2021.11.0", + "port-version": 0 }, "tcb-span": { "baseline": "2022-06-15", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index b3f2497a118304..0b89c7450e52ac 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4b70addeb87d3ab6ded6936566176ca31138f33", + "version": "2021.11.0", + "port-version": 0 + }, { "git-tree": "b4cde1e2a3654b8540b76ac295675a37bdbca311", "version": "2021.10.0", From 4b129ae0e767473e90e91f9353f1c7cade2c7f7f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 09:51:30 +0100 Subject: [PATCH 0488/1039] [libconfig] Fix static usage (#35280) * [libconfig] Fix static usage * [libconfig] Update patch --- ports/libconfig/portfile.cmake | 1 + ports/libconfig/static-build.diff | 34 +++++++++++++++++++++++++++++++ ports/libconfig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libconfig.json | 5 +++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 ports/libconfig/static-build.diff diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index d4022d721edd8a..f9362db4580478 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES libconfig++-cmake-export.diff + static-build.diff ) vcpkg_cmake_configure( diff --git a/ports/libconfig/static-build.diff b/ports/libconfig/static-build.diff new file mode 100644 index 00000000000000..1b1a0f420ce141 --- /dev/null +++ b/ports/libconfig/static-build.diff @@ -0,0 +1,34 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 233c89f..8164b41 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -25,7 +25,6 @@ set(libinc_cpp + libconfig.hh) + + set(libsrc_cpp +- ${libsrc} + libconfigcpp.cc) + + if(MSVC) +@@ -55,8 +54,10 @@ set_target_properties(${libname}++ + #check_symbol_exists(freelocale "locale.h" HAVE_FREELOCALE) + + if(BUILD_SHARED_LIBS) ++ target_sources(${libname}++ PRIVATE ${libsrc}) + target_compile_definitions(${libname}++ PRIVATE LIBCONFIG_STATIC) + else() ++ target_link_libraries(${libname}++ PRIVATE ${libname}) + target_compile_definitions(${libname} PUBLIC LIBCONFIG_STATIC) + target_compile_definitions(${libname}++ PUBLIC LIBCONFIGXX_STATIC) + endif() +@@ -91,8 +92,8 @@ if(MSVC) + endif() + + if(WIN32) +- target_link_libraries(${libname} shlwapi) +- target_link_libraries(${libname}++ shlwapi) ++ target_link_libraries(${libname} PRIVATE shlwapi) ++ target_link_libraries(${libname}++ PRIVATE shlwapi) + endif() + + target_include_directories(${libname} diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 794e91f4642103..fba3d05e5d2c01 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfig", "version": "1.7.3", - "port-version": 4, + "port-version": 5, "description": "C/C++ library for processing configuration files", "homepage": "https://github.com/hyperrealm/libconfig", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0aaee08bb954ef..aa67dd70c622ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4130,7 +4130,7 @@ }, "libconfig": { "baseline": "1.7.3", - "port-version": 4 + "port-version": 5 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 38ee00e4698c22..c140962e037476 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb011bd374885434cf90d445526e42aca185c1e7", + "version": "1.7.3", + "port-version": 5 + }, { "git-tree": "378d40ce036cf220dfaedf27f625a28d6e72d3e9", "version": "1.7.3", From ca595d3733a2f4cef1be7c50f175dab120c57e3a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 29 Nov 2023 00:52:25 -0800 Subject: [PATCH 0489/1039] [libbson] Fix libbson when Python3 isn't on the PATH (#35276) Probably broken by https://github.com/microsoft/vcpkg/pull/34994 Detected in https://github.com/microsoft/vcpkg/pull/35116 where this REGEX is expected to be output from the python script ``` CMake Error at build/cmake/LoadVersion.cmake:9 (string): string sub-command REGEX, mode MATCHALL needs at least 5 arguments total to command. Call Stack (most recent call first): CMakeLists.txt:20 (LoadVersion) ``` --- ports/libbson/portfile.cmake | 1 + ports/libbson/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libbson.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index cc936f85419ce3..e615cb7cf270ed 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -25,6 +25,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DBUILD_VERSION=${VERSION}" -DENABLE_BSON=ON -DENABLE_EXAMPLES=OFF -DENABLE_ICU=OFF diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index 452f0dc41ebdb0..06a9579d8b7b78 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libbson", "version": "1.25.1", + "port-version": 1, "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index aa67dd70c622ce..755b0875f6c6a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4102,7 +4102,7 @@ }, "libbson": { "baseline": "1.25.1", - "port-version": 0 + "port-version": 1 }, "libcaer": { "baseline": "3.3.15", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 97503458d6da80..43426bf14ca68d 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4", + "version": "1.25.1", + "port-version": 1 + }, { "git-tree": "9cc5cb4ec6ee37e4a07e65f6e8aee04f83f535ec", "version": "1.25.1", From 29782549d077eb2cbd61125714fabf59ed037c2a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 29 Nov 2023 16:53:34 +0800 Subject: [PATCH 0490/1039] [rtabmap] Fix link octomap failure (#35278) * fix link octomap failure * update version --- ports/rtabmap/fix_link.patch | 15 +++++++++++++++ ports/rtabmap/portfile.cmake | 1 + ports/rtabmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rtabmap.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/rtabmap/fix_link.patch diff --git a/ports/rtabmap/fix_link.patch b/ports/rtabmap/fix_link.patch new file mode 100644 index 00000000000000..474da494a31a16 --- /dev/null +++ b/ports/rtabmap/fix_link.patch @@ -0,0 +1,15 @@ +diff --git a/corelib/src/OctoMap.cpp b/corelib/src/OctoMap.cpp +index 8a1e1bb..d7b60da 100644 +--- a/corelib/src/OctoMap.cpp ++++ b/corelib/src/OctoMap.cpp +@@ -278,10 +278,8 @@ RtabmapColorOcTree::StaticMemberInitializer::StaticMemberInitializer() { + AbstractOcTree::registerTreeType(tree); + } + +-#ifndef _WIN32 + // On Windows, the app freezes on start if the following is defined + RtabmapColorOcTree::StaticMemberInitializer RtabmapColorOcTree::RtabmapColorOcTreeMemberInit; +-#endif + + + ////////////////////////////////////// diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 2147226e9d6e83..b06cf79e3be8bb 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_autouic.patch + fix_link.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index 959dd994bfdf98..66e28a8da5cab9 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtabmap", "version": "0.21.0", - "port-version": 2, + "port-version": 3, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 755b0875f6c6a0..5b092084f6162c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7554,7 +7554,7 @@ }, "rtabmap": { "baseline": "0.21.0", - "port-version": 2 + "port-version": 3 }, "rtaudio": { "baseline": "2021-11-16", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index 439729dfcc7fab..0ec172c88ac3a6 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9764edeececed7fb37c356a6e00cb3f983dbf1fb", + "version": "0.21.0", + "port-version": 3 + }, { "git-tree": "63d580588bb49ec2767eed209af0c854cc2d5da2", "version": "0.21.0", From 785d3e453671e0f673a1ad5e966b41a7c2510705 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Wed, 29 Nov 2023 10:01:24 +0100 Subject: [PATCH 0491/1039] [baresip-libre] update to version 3.7.0 (#35272) * bump to version 3.7.0 * bump versions --- ports/baresip-libre/portfile.cmake | 2 +- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index f12363af7df727..092fd14656e727 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 054227c3cbd41d8801d1d0aed38029adb63d52e33e8becafbdba3e973d55863e40e9be0463b6a2d91b34b3b2aea7d80e9d7ec7adadd5e63ca844e416f4d6c411 + SHA512 95bfc11d73e8eda76ece51b0e91550e3cb45fc91927d01d024318e74bb0c3893b5bb0716582672490e0131be0314abd1bf2dfd815960b00741e78a55b2a0bbd4 HEAD_REF main PATCHES fix-static-library-build.patch diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 179965277df84b..5840b18f5c7b32 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.6.0", + "version": "3.7.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index ba045299788b10..839e14ff75e105 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e34b5bc2855e62826520ee68fb21d063d42b53d4", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "00dc0e14dfa16f98420ac3a15b9b158af7cf87f8", "version": "3.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5b092084f6162c..3ddaeabbf28ad5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,7 +517,7 @@ "port-version": 1 }, "baresip-libre": { - "baseline": "3.6.0", + "baseline": "3.7.0", "port-version": 0 }, "basisu": { From 3d8e23f8bcc657498963cda9880c1283e56c6d26 Mon Sep 17 00:00:00 2001 From: fwcd <30873659+fwcd@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:02:00 +0000 Subject: [PATCH 0492/1039] [soundtouch] Update SHA512 checksum (#35269) --- ports/soundtouch/portfile.cmake | 2 +- ports/soundtouch/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/soundtouch.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake index 501094ddd2f3b9..6290fad978648c 100644 --- a/ports/soundtouch/portfile.cmake +++ b/ports/soundtouch/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( GITHUB_HOST https://codeberg.org REPO soundtouch/soundtouch REF ${VERSION} - SHA512 93f757b2c1abe16be589e0d191e6c0416c5980843bd416cd5cb820b65a705d98081c0fc7ca0d9880af54b5343318262c77ba39a096bb240ceec084e93ceef964 + SHA512 3d4d6314d6fccb3cb899aee36b90799bb9bf7cf1aad9ff2fff6b18c73e68be7e0e00a3f4e31d5dd340c979236f5474b7ef95d51ddb813f353dde920bdef4cb51 HEAD_REF master ) diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json index 8decad7f834b57..6b68d46f7c8184 100644 --- a/ports/soundtouch/vcpkg.json +++ b/ports/soundtouch/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soundtouch", "version": "2.3.2", + "port-version": 1, "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", "homepage": "https://www.surina.net/soundtouch", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 3ddaeabbf28ad5..374dc83fb6f6b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8018,7 +8018,7 @@ }, "soundtouch": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "soxr": { "baseline": "0.1.3", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 07f765b229b83f..428a6f97649332 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2f43b08cb75d26f5756e611a64f5708dcbfb0a1", + "version": "2.3.2", + "port-version": 1 + }, { "git-tree": "a50336df269c13ab5d50f840fdc02afbfda7244c", "version": "2.3.2", From 522c29c421e61063b6ef43f3bd2f0c0835782f7e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:05:51 +0100 Subject: [PATCH 0493/1039] [magnum-plugins] fix build of features (#35246) --- ports/magnum-plugins/portfile.cmake | 18 ++++++++++++++---- ports/magnum-plugins/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/m-/magnum-plugins.json | 5 +++++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index 1cc3719d2d4610..744db775c672c3 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -53,10 +53,14 @@ endif() # Head only features set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) if(NOT VCPKG_USE_HEAD_VERSION) - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cgltfimporter glslangshaderconverter - ktximageconverter ktximporter openexrimageconverter openexrimporter - spirvtoolsshaderconverter stbdxtimageconverter) - message(WARNING "Features cgltfimporter, glslangshaderconverter, ktximageconverter, ktximporter, openexrimageconverter, openexrimporter, spirvtoolsshaderconverter and stbdxtimageconverter are not available when building non-head version.") + set(head_only cgltfimporter glslangshaderconverter ktximageconverter ktximporter openexrimageconverter openexrimporter spirvtoolsshaderconverter stbdxtimageconverter) + foreach(_feature ${head_only}) + if("${_feature}" IN_LIST FEATURES) + list(JOIN head_only ", " features_list) + message(FATAL_ERROR "Features ${features_list} are not avaliable when building non-head version.") + endif() + endforeach() + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES ${head_only}) endif() set(_COMPONENTS "") @@ -128,8 +132,14 @@ else() # We delete the import libraries here to avoid the auto-magic linking # for plugins which are loaded at runtime. if(WIN32) + set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/magnum") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d") + file(GLOB maybe_empty "${CURRENT_PACKAGES_DIR}/lib/*") + if(maybe_empty STREQUAL "") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/") + endif() endif() endif() diff --git a/ports/magnum-plugins/vcpkg.json b/ports/magnum-plugins/vcpkg.json index 5daaf11f28e888..c78dd83840e822 100644 --- a/ports/magnum-plugins/vcpkg.json +++ b/ports/magnum-plugins/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum-plugins", "version-string": "2020.06", - "port-version": 11, + "port-version": 12, "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, @@ -20,11 +20,8 @@ } ], "default-features": [ - "cgltfimporter", "ddsimporter", "icoimporter", - "ktximageconverter", - "ktximporter", "miniexrimageconverter", "opengeximporter", "stanfordimporter", diff --git a/versions/baseline.json b/versions/baseline.json index 374dc83fb6f6b7..a2a398f3f7c3db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5382,7 +5382,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 11 + "port-version": 12 }, "mailio": { "baseline": "0.23.0", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index d912efa23eb2e4..69b9b44ae93b2b 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1a7c4da316314fb8973e23a20c65fa926a96d44", + "version-string": "2020.06", + "port-version": 12 + }, { "git-tree": "73324e7e695dd281c2813fc17b709af7cc2eed58", "version-string": "2020.06", From 2cb6ec989f5f853a25792b1be23adfea79cb24c1 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Wed, 29 Nov 2023 04:09:30 -0500 Subject: [PATCH 0494/1039] [cpptrace] Add v0.3.0 (#35240) * Initial work to add 0.3.0 * Bump * Bump hash * Bump * Bump hash * Bump * Bump * Bump * More changes * Bump * Bump hash * Bump * Add an option * Cleanup * Bump * Set to 0.3.0 * Bump * Suggestions from dg0yt * Bump * Bump tag hash * Bump git tree * Delete patch from merge * Bump * Try to fix libassert build * Bump * Try again * Bump * Undo attempts to set cpptrace version for libassert * Bump * Add libassert 1.2.2 * Update libassert's vcpkg.json * Bump * Forgot to update SHA, also remove a patch that's not needed * Bump * Add patch for cpptrace::nullable * Bump --- ports/cpptrace/config-dependency.patch | 13 ------ ports/cpptrace/libdwarf_fixes.patch | 55 ------------------------ ports/cpptrace/nullable_export.patch | 13 ++++++ ports/cpptrace/portfile.cmake | 14 ++---- ports/cpptrace/runtime_destination.patch | 22 ---------- ports/cpptrace/uintptr_fix.patch | 13 ------ ports/cpptrace/vcpkg.json | 2 +- ports/libassert/portfile.cmake | 3 +- ports/libassert/target_fix.patch | 33 -------------- ports/libassert/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/c-/cpptrace.json | 5 +++ versions/l-/libassert.json | 5 +++ 13 files changed, 31 insertions(+), 153 deletions(-) delete mode 100644 ports/cpptrace/config-dependency.patch delete mode 100644 ports/cpptrace/libdwarf_fixes.patch create mode 100644 ports/cpptrace/nullable_export.patch delete mode 100644 ports/cpptrace/runtime_destination.patch delete mode 100644 ports/cpptrace/uintptr_fix.patch delete mode 100644 ports/libassert/target_fix.patch diff --git a/ports/cpptrace/config-dependency.patch b/ports/cpptrace/config-dependency.patch deleted file mode 100644 index a527239b7a8005..00000000000000 --- a/ports/cpptrace/config-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/cpptrace-config.cmake.in b/cmake/cpptrace-config.cmake.in -index ccc959e..d3e5d09 100644 ---- a/cmake/cpptrace-config.cmake.in -+++ b/cmake/cpptrace-config.cmake.in -@@ -1,3 +1,8 @@ - @PACKAGE_INIT@ - -+if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@) -+ include(CMakeFindDependencyMacro) -+ find_dependency(libdwarf REQUIRED) -+endif() -+ - include(${CMAKE_CURRENT_LIST_DIR}/cpptrace_targets.cmake) diff --git a/ports/cpptrace/libdwarf_fixes.patch b/ports/cpptrace/libdwarf_fixes.patch deleted file mode 100644 index 9b2ec05aefecdf..00000000000000 --- a/ports/cpptrace/libdwarf_fixes.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccc959e..d3e5d09 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -297,8 +297,8 @@ - if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) - target_compile_definitions(cpptrace PUBLIC CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) - if(CPPTRACE_USE_SYSTEM_LIBDWARF) -- find_package(libdwarf REQUIRED) -- target_link_libraries(cpptrace PRIVATE libdwarf) -+ find_package(libdwarf CONFIG REQUIRED) -+ target_link_libraries(cpptrace PRIVATE $,libdwarf::dwarf-static,libdwarf::dwarf-shared>) - else() - add_subdirectory(bundled/libdwarf) - target_link_libraries(cpptrace PRIVATE dwarf) -@@ -379,7 +379,7 @@ - include(CMakePackageConfigHelpers) - - if(CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF) -- set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace dwarf) -+ set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace) - else() - set(CPPTRACE_STATIC_EXPORT_TARGETS cpptrace) - endif() -diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp -index ce5dbcf..085a1aa 100644 ---- a/src/symbols/symbols_with_libdwarf.cpp -+++ b/src/symbols/symbols_with_libdwarf.cpp -@@ -20,8 +20,8 @@ - #include - #include - --#include --#include -+#include -+#include - - // It's been tricky to piece together how to handle all this dwarf stuff. Some resources I've used are - // https://www.prevanders.net/libdwarf.pdf - -diff --git a/src/platform/dwarf.hpp b/src/platform/dwarf.hpp -index ce5dbcf..085a1aa 100644 ---- a/src/platform/dwarf.hpp -+++ b/src/platform/dwarf.hpp -@@ -9,8 +9,8 @@ - #include - #include - --#include --#include -+#include -+#include - - namespace cpptrace { - namespace detail { diff --git a/ports/cpptrace/nullable_export.patch b/ports/cpptrace/nullable_export.patch new file mode 100644 index 00000000000000..d75b21cd35c7f0 --- /dev/null +++ b/ports/cpptrace/nullable_export.patch @@ -0,0 +1,13 @@ +diff --git a/include/cpptrace/cpptrace.hpp b/include/cpptrace/cpptrace.hpp +index b35bed1..27b626b 100644 +--- a/include/cpptrace/cpptrace.hpp ++++ b/include/cpptrace/cpptrace.hpp +@@ -90,7 +90,7 @@ namespace cpptrace { + // This is used over std::optional because the library is C++11 and also std::optional is a bit heavy-duty for this + // use. + template::value, int>::type = 0> +- struct CPPTRACE_EXPORT nullable { ++ struct nullable { + T raw_value; + nullable& operator=(T value) { + raw_value = value; diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index eca81775be909a..c82ac7eedae89c 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -2,23 +2,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/cpptrace REF "v${VERSION}" - SHA512 207b01d8b9114806a98f04b769082ba9ef3c66bad11972279b337ec794a14839715aee9b1f22883208e42b23289f1c8b7c842f2ac1c9973d8e2de48621623760 + SHA512 10b3106eb10b16ec7459ebd7f5e10c08238c553ed8718aa0f9e5e83a921d970f742eef214148ddd33d0d20e7cb14489ae24bc5b70f0523dc0a3abb139a8357a8 HEAD_REF main PATCHES - libdwarf_fixes.patch - uintptr_fix.patch - runtime_destination.patch - config-dependency.patch + nullable_export.patch ) -vcpkg_list(SET options -DCPPTRACE_USE_SYSTEM_LIBDWARF=On) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_list(APPEND options -DCPPTRACE_STATIC=On) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${options} + OPTIONS -DCPPTRACE_USE_EXTERNAL_LIBDWARF=ON -DCPPTRACE_VCPKG=ON ) vcpkg_cmake_install() diff --git a/ports/cpptrace/runtime_destination.patch b/ports/cpptrace/runtime_destination.patch deleted file mode 100644 index c6c95c65e62b02..00000000000000 --- a/ports/cpptrace/runtime_destination.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ccc959e..d3e5d09 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -391,7 +391,7 @@ - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION bin - ) - else() - install( -@@ -400,7 +400,7 @@ - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION bin - ) - endif() - diff --git a/ports/cpptrace/uintptr_fix.patch b/ports/cpptrace/uintptr_fix.patch deleted file mode 100644 index 67a0f094f87fdd..00000000000000 --- a/ports/cpptrace/uintptr_fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/platform/utils.hpp b/src/platform/utils.hpp -index ccc959e..d3e5d09 100644 ---- a/src/platform/utils.hpp -+++ b/src/platform/utils.hpp -@@ -334,7 +334,7 @@ namespace detail { - return static_cast(t); - } - template -- unsigned long long to_uintptr(T t) { -+ uintptr_t to_uintptr(T t) { - return static_cast(t); - } - diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index 084cf6cb4f5b7b..dad621d9897de5 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpptrace", - "version": "0.2.1", + "version": "0.3.0", "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", "homepage": "https://github.com/jeremy-rifkin/cpptrace", "license": "MIT", diff --git a/ports/libassert/portfile.cmake b/ports/libassert/portfile.cmake index d3ed3f19c1c716..76473094db9bcd 100644 --- a/ports/libassert/portfile.cmake +++ b/ports/libassert/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/libassert REF "v${VERSION}" - SHA512 e59a5876d160cb06eae11b8d61f4047372475c2ba7f1b161457e42f463f3c819efa18b5073e29033323497984fceafd53bed1047815227dd396adfe832c8c109 + SHA512 beba94e033f7e43c84123736a32725a333c915392d5dc57c26a63f832a507564d79f290a151cb136de8bded3d8d343dad3c4bf2efec9977d878df3c9a8677554 HEAD_REF main PATCHES - target_fix.patch runtime_destination.patch ) diff --git a/ports/libassert/target_fix.patch b/ports/libassert/target_fix.patch deleted file mode 100644 index b0f5e600139f7e..00000000000000 --- a/ports/libassert/target_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e52096f..09fe6e5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,7 +71,7 @@ target_compile_options( - - if(ASSERT_USE_EXTERNAL_CPPTRACE) - find_package(cpptrace REQUIRED) -- target_link_libraries(assert PRIVATE cpptrace::cpptrace) -+ set(ASSERT_CPPTRACE_TARGET_NAME cpptrace::cpptrace) - else() - FetchContent_Declare( - cpptrace -@@ -79,8 +79,9 @@ else() - GIT_TAG v0.2.1 - ) - FetchContent_MakeAvailable(cpptrace) -- target_link_libraries(assert PRIVATE cpptrace) -+ set(ASSERT_CPPTRACE_TARGET_NAME cpptrace) - endif() -+target_link_libraries(assert PRIVATE ${ASSERT_CPPTRACE_TARGET_NAME}) - - if(ASSERT_DECOMPOSE_BINARY_LOGICAL) - target_compile_definitions(assert PUBLIC ASSERT_DECOMPOSE_BINARY_LOGICAL) -@@ -165,7 +166,7 @@ if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - add_custom_command( - TARGET assert POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different -- $ -+ $ - $ - ) - endif() diff --git a/ports/libassert/vcpkg.json b/ports/libassert/vcpkg.json index 221666dd1623ea..bb5639e1dc6187 100644 --- a/ports/libassert/vcpkg.json +++ b/ports/libassert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libassert", - "version": "1.2.1", + "version": "1.2.2", "description": "The most over-engineered and overpowered C++ assertion library.", "homepage": "https://github.com/jeremy-rifkin/libassert", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a2a398f3f7c3db..99be109f3a18ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1901,7 +1901,7 @@ "port-version": 4 }, "cpptrace": { - "baseline": "0.2.1", + "baseline": "0.3.0", "port-version": 0 }, "cppunit": { @@ -4073,7 +4073,7 @@ "port-version": 0 }, "libassert": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "libassuan": { diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index 722fe268e15a67..a30ab3d753bbc5 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "620e293efe2a80f6abdf9499855b09718cd8a051", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "c91d65da151c8d10bd59b6980c5a98c797e68679", "version": "0.2.1", diff --git a/versions/l-/libassert.json b/versions/l-/libassert.json index bb11da0b9e2b84..d9299f72152d0d 100644 --- a/versions/l-/libassert.json +++ b/versions/l-/libassert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b67ed1f09482482afcb344d882f99fa6fa53caf4", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "4e767d8be1af178c0ed841aa70839076e025aca0", "version": "1.2.1", From 00d762bd8c6992c55437805df8c7ee4486613a69 Mon Sep 17 00:00:00 2001 From: Pravila Date: Wed, 29 Nov 2023 09:11:55 +0000 Subject: [PATCH 0495/1039] [thomasmonkman-filewatch] Add patch for fixing Unix version (#35236) * Add patch * Add patch * Update version * Add port-version 1 * Add version * Restore git-tree --------- Co-authored-by: Pablo Rodriguez Avila --- .../fix-unix-listen.patch | 37 +++++++++++++++++++ ports/thomasmonkman-filewatch/portfile.cmake | 2 + ports/thomasmonkman-filewatch/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/thomasmonkman-filewatch.json | 5 +++ 5 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 ports/thomasmonkman-filewatch/fix-unix-listen.patch diff --git a/ports/thomasmonkman-filewatch/fix-unix-listen.patch b/ports/thomasmonkman-filewatch/fix-unix-listen.patch new file mode 100644 index 00000000000000..0e526dd9528da5 --- /dev/null +++ b/ports/thomasmonkman-filewatch/fix-unix-listen.patch @@ -0,0 +1,37 @@ +diff --git a/FileWatch.hpp b/FileWatch.hpp +index 4eba08b..2c0ff6d 100644 +--- a/FileWatch.hpp ++++ b/FileWatch.hpp +@@ -276,7 +276,7 @@ namespace filewatch { + + FolderInfo _directory; + +- const std::uint32_t _listen_filters = IN_MODIFY | IN_CREATE | IN_DELETE; ++ const std::uint32_t _listen_filters = IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE; + + const static std::size_t event_size = (sizeof(struct inotify_event)); + #endif // __unix__ +@@ -604,7 +604,7 @@ namespace filewatch { + } + }(); + +- const auto watch = inotify_add_watch(folder, watch_path.c_str(), IN_MODIFY | IN_CREATE | IN_DELETE); ++ const auto watch = inotify_add_watch(folder, watch_path.c_str(), IN_MODIFY | IN_CREATE | IN_DELETE | IN_MOVE); + if (watch < 0) + { + throw std::system_error(errno, std::system_category()); +@@ -644,6 +644,14 @@ namespace filewatch { + { + parsed_information.emplace_back(StringType{ changed_file }, Event::modified); + } ++ else if (event->mask & IN_MOVED_FROM) ++ { ++ parsed_information.emplace_back(T{ changed_file }, Event::renamed_old); ++ } ++ else if (event->mask & IN_MOVED_TO) ++ { ++ parsed_information.emplace_back(T{ changed_file }, Event::renamed_new); ++ } + } + } + i += event_size + event->len; diff --git a/ports/thomasmonkman-filewatch/portfile.cmake b/ports/thomasmonkman-filewatch/portfile.cmake index e64a4c24c0000f..4b045ba41416ed 100644 --- a/ports/thomasmonkman-filewatch/portfile.cmake +++ b/ports/thomasmonkman-filewatch/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF a59891baf375b73ff28144973a6fafd3fe40aa21 SHA512 9a110b42a499ed7047bb8a79029134943582b388db810974ad6b5f91d1ec720e45a9a3543c4a56ee97d51439f5a34222bada0fb43281dcbc2e65bdee38f836d5 HEAD_REF master + PATCHES + fix-unix-listen.patch ) file(COPY "${SOURCE_PATH}/FileWatch.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/thomasmonkman-filewatch") diff --git a/ports/thomasmonkman-filewatch/vcpkg.json b/ports/thomasmonkman-filewatch/vcpkg.json index 8ce8e5bc7a95ea..50da66e19857f0 100644 --- a/ports/thomasmonkman-filewatch/vcpkg.json +++ b/ports/thomasmonkman-filewatch/vcpkg.json @@ -1,6 +1,7 @@ { "name": "thomasmonkman-filewatch", "version-date": "2023-01-16", + "port-version": 1, "description": "File watcher in C++.", "homepage": "https://github.com/ThomasMonkman/filewatch", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 99be109f3a18ad..531b9901ab9b6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8374,7 +8374,7 @@ }, "thomasmonkman-filewatch": { "baseline": "2023-01-16", - "port-version": 0 + "port-version": 1 }, "thor": { "baseline": "2022-04-16", diff --git a/versions/t-/thomasmonkman-filewatch.json b/versions/t-/thomasmonkman-filewatch.json index 5e210f5a94c3a2..586cad78b79833 100644 --- a/versions/t-/thomasmonkman-filewatch.json +++ b/versions/t-/thomasmonkman-filewatch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dede6ba1ac505ea4bd64c60bf97edfe7b8d5647", + "version-date": "2023-01-16", + "port-version": 1 + }, { "git-tree": "09215796e0a4591e54d9aa37ab46dc5edc7bd491", "version-date": "2023-01-16", From 599b80d35205da3dfa787ccc12067985f43e0469 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 29 Nov 2023 01:12:59 -0800 Subject: [PATCH 0496/1039] [ffmpeg] Support cross compile with QNX (#35228) * [ffmpeg] Support cross compile with QNX * update version --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 604a147aeda224..9852edd0c6ff96 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg @@ -59,7 +58,8 @@ elseif(VCPKG_TARGET_IS_OSX) string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") string(APPEND OPTIONS " --target-os=android") -else() +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "QNX") + string(APPEND OPTIONS " --target-os=qnx") endif() if(VCPKG_TARGET_IS_OSX) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 1f997616a0ae13..f94124b8ffbccc 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version": "6.1", + "port-version": 1, "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 531b9901ab9b6f..dd67f7537ddb26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2598,7 +2598,7 @@ }, "ffmpeg": { "baseline": "6.1", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "11.1.5.3", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 1f0e1edd4a4871..2b881a9e9aa249 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa26e2742d2c653f1f74843dce3120c753376f50", + "version": "6.1", + "port-version": 1 + }, { "git-tree": "e350faae831bb8d75c4ebcee81d9161484aecdba", "version": "6.1", From 567d3b650d2225f2fe3ca63c687f18c2f9b46b39 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:15:20 +0800 Subject: [PATCH 0497/1039] [CImg] Update and install the header files (#35222) * [CImg] Update and install the header files * version * update portfile.cmake * version --- ports/cimg/CMakeLists.txt | 3 +++ ports/cimg/portfile.cmake | 17 +++++++++-------- ports/cimg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cimg.json | 5 +++++ 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ports/cimg/CMakeLists.txt b/ports/cimg/CMakeLists.txt index 75ae59cd5ef546..0d63a9fba4dc7e 100644 --- a/ports/cimg/CMakeLists.txt +++ b/ports/cimg/CMakeLists.txt @@ -19,3 +19,6 @@ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/CImg.h DESTINATION include ) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/plugins DESTINATION include) diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 8e128a33e64244..04be6464f19e47 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -1,7 +1,9 @@ +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO dtschump/CImg - REF b33dcc8f9f1acf1f276ded92c04f8231f6c23fcd # v2.9.9 - SHA512 327c72320e7cac386ba72d417c45b9e8b40df34650370c34e687c362731919af1b447b2ee498f21278d4af155f0d9dbfabd222856d5f18c2e05569fa638a5909 + REF "v.${VERSION}" + SHA512 c38910e8b93bcb65fbfd7fe11a036bae9f22e229d903cd044c26223473b02ec48ec46b3ad398e2cc02f25184e16a2e27a687f18479d3ae7edaee2bab69028ae9 HEAD_REF master ) @@ -13,9 +15,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# Move cmake files, ensuring they will be 3 directories up the import prefix -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") - -file(INSTALL "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright2) +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt" + "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt" +) diff --git a/ports/cimg/vcpkg.json b/ports/cimg/vcpkg.json index cc1c448bd89e83..02794016ca869d 100644 --- a/ports/cimg/vcpkg.json +++ b/ports/cimg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cimg", - "version": "2.9.9", + "version": "3.3.2", "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing", "homepage": "https://github.com/dtschump/CImg", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dd67f7537ddb26..89a68acbca32d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1573,7 +1573,7 @@ "port-version": 0 }, "cimg": { - "baseline": "2.9.9", + "baseline": "3.3.2", "port-version": 0 }, "cista": { diff --git a/versions/c-/cimg.json b/versions/c-/cimg.json index 7f900ec6171836..07f2b86171f58d 100644 --- a/versions/c-/cimg.json +++ b/versions/c-/cimg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b73bf0046233dd69f0dc7962a7e0c3f961be2bc", + "version": "3.3.2", + "port-version": 0 + }, { "git-tree": "2eac332b873f6a2b9108c3e71e59feec8efe5026", "version": "2.9.9", From f5531da2512017673a9a8d3eaf8de6ddb6317c67 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:18:10 +0800 Subject: [PATCH 0498/1039] [opentelemetry-cpp] Fix otlp-grpc feature does not support uwp (#35204) * Add unsupported platforms * update version * uwp * udpate version --- ports/opentelemetry-cpp/portfile.cmake | 6 +++--- ports/opentelemetry-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 8ed469db0860c7..abf959e27b09ed 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -29,12 +29,12 @@ 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.19.0") +if(WITH_OTLP_GRPC) + set(OTEL_PROTO_VERSION "1.0.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 b6d47aaa90ff934eb24047757d5fdb8a5be62963a49b632460511155f09a725937fb7535cf34f738b81cc799600adbbc3809442aba584d760891c0a1f0ce8c03 + SHA512 74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0 ) vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index fd5ddc26c63d55..5ac8f88894746f 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.12.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." diff --git a/versions/baseline.json b/versions/baseline.json index 89a68acbca32d3..ab1ec713d27940 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6338,7 +6338,7 @@ }, "opentelemetry-cpp": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 1 }, "opentelemetry-fluentd": { "baseline": "2.0.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index e38bfde60ebffe..1fbfbd2d19b476 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71dd31a63ee43f477bad710ccce04ffac2be5238", + "version-semver": "1.12.0", + "port-version": 1 + }, { "git-tree": "5fd8cacd9fd3aaa30b0ad133f2de052ba3ff869f", "version-semver": "1.12.0", From 4fd593458447e8cfa5ea423d14797d469485730d Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 29 Nov 2023 01:19:13 -0800 Subject: [PATCH 0499/1039] [libzip] Update to 1.10.1 (#35167) * [libzip] Update to 1.10.1 * update version * update patch * update version --- ports/libzip/fix-dependency.patch | 68 +++++-------------------------- ports/libzip/portfile.cmake | 6 +-- ports/libzip/use-requires.patch | 37 +++++++++-------- ports/libzip/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libzip.json | 5 +++ 6 files changed, 40 insertions(+), 83 deletions(-) diff --git a/ports/libzip/fix-dependency.patch b/ports/libzip/fix-dependency.patch index da3d799a8038e8..f2c1a06bd309bd 100644 --- a/ports/libzip/fix-dependency.patch +++ b/ports/libzip/fix-dependency.patch @@ -1,62 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d00a4f9f..cf85fc4b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -197,7 +197,7 @@ if(ENABLE_LZMA) - endif(ENABLE_LZMA) - - if(ENABLE_ZSTD) -- find_package(Zstd 1.3.6) -+ find_package(Zstd NAMES zstd 1.3.6) - if(Zstd_FOUND) - set(HAVE_LIBZSTD 1) - else() -@@ -301,7 +301,7 @@ foreach(LIB ${LIBS_PRIVATE}) - endforeach() - string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS}) - string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS}) --string(REGEX REPLACE "-lZstd::Zstd" "-lzstd" LIBS ${LIBS}) -+string(REGEX REPLACE "-l$,zstd::libzstd_shared,zstd::libzstd_static>" "-lzstd" LIBS ${LIBS}) - string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS}) - string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS}) - string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS}) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 1213fa0a..b6446cbd 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -147,7 +147,7 @@ endif() - - if(HAVE_LIBZSTD) - target_sources(zip PRIVATE zip_algorithm_zstd.c) -- target_link_libraries(zip PRIVATE Zstd::Zstd) -+ target_link_libraries(zip PRIVATE $,zstd::libzstd_shared,zstd::libzstd_static>) - endif() - - if(HAVE_COMMONCRYPTO) diff --git a/libzip-config.cmake.in b/libzip-config.cmake.in -index 5b9aa558..f9adc538 100644 +index 8061530..81a38bb 100644 --- a/libzip-config.cmake.in +++ b/libzip-config.cmake.in -@@ -1,8 +1,20 @@ - @PACKAGE_INIT@ +@@ -2,7 +2,7 @@ + + # We need to supply transitive dependencies if this config is for a static library + set(IS_SHARED @BUILD_SHARED_LIBS@) +-if (NOT IS_SHARED) ++if (1) + include(CMakeFindDependencyMacro) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/modules") - # only needed for static library, and doesn't work as-is --#include(CMakeFindDependencyMacro) --#find_dependency(ZLIB::ZLIB) -+include(CMakeFindDependencyMacro) -+if(@ENABLE_BZIP2@) -+ find_dependency(BZip2) -+endif() -+if(@ENABLE_LZMA@) -+ find_dependency(LibLZMA) -+endif() -+if(@ENABLE_ZSTD@) -+ find_dependency(zstd) -+endif() -+if(@ENABLE_OPENSSL@) -+ find_dependency(OpenSSL) -+endif() -+find_dependency(ZLIB) - # how to handle the optional dependencies? - # Provide all our library targets to users. - include("${CMAKE_CURRENT_LIST_DIR}/libzip-targets.cmake") + \ No newline at end of file diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index daad8957269f19..18b491382ea02f 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 5532f9baa0c44cc5435ad135686a4ea009075b9a #v1.9.2 - SHA512 1105bc48c8a554a7fce84028197427b02ff53508592889b37e81cc419eb208d91112b98df2bf2d6f5629887e4418230ee36e3bf03c9ae39cdc39cfa90e7e3e7f + REF "v${VERSION}" + SHA512 1b0bffe579de5d2c52b23075f5351a5670e9f7a364c14a876ca3c490a85c0c9b1ebd9a97e729c5c7e71d496a3a0a8f28505bfadd7d8423954d3547a9a8f63841 HEAD_REF master PATCHES fix-dependency.patch @@ -46,4 +46,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Copy copright information -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/libzip/use-requires.patch b/ports/libzip/use-requires.patch index b39bcb4480174c..3d4debe2d389bb 100644 --- a/ports/libzip/use-requires.patch +++ b/ports/libzip/use-requires.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf85fc4b7..90615fec9 100644 +index b2e7724..0af7929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -41,12 +41,14 @@ endif() +@@ -43,12 +43,14 @@ endif() if(ENABLE_GNUTLS) find_package(Nettle 3.0) find_package(GnuTLS) @@ -17,16 +17,15 @@ index cf85fc4b7..90615fec9 100644 endif() if(WIN32) if(ENABLE_WINDOWS_CRYPTO) -@@ -177,7 +179,7 @@ int main(int argc, char *argv[]) { }" HAVE_NULLABLE) +@@ -191,6 +193,7 @@ int main(int argc, char *argv[]) { }" HAVE_NULLABLE) test_big_endian(WORDS_BIGENDIAN) find_package(ZLIB 1.1.2 REQUIRED) -- +list(APPEND REQUIRES zlib) - if(ENABLE_BZIP2) - find_package(BZip2) - if(BZIP2_FOUND) -@@ -185,6 +187,7 @@ if(ENABLE_BZIP2) + # so developers on systems where zlib is named differently (Windows, sometimes) + # can override the name used in the pkg-config file + if (NOT ZLIB_LINK_LIBRARY_NAME) +@@ -227,6 +230,7 @@ if(ENABLE_BZIP2) else() message(WARNING "-- bzip2 library not found; bzip2 support disabled") endif(BZIP2_FOUND) @@ -34,7 +33,7 @@ index cf85fc4b7..90615fec9 100644 endif(ENABLE_BZIP2) if(ENABLE_LZMA) -@@ -194,6 +197,7 @@ if(ENABLE_LZMA) +@@ -236,6 +240,7 @@ if(ENABLE_LZMA) else() message(WARNING "-- lzma library not found; lzma/xz support disabled") endif(LIBLZMA_FOUND) @@ -42,26 +41,28 @@ index cf85fc4b7..90615fec9 100644 endif(ENABLE_LZMA) if(ENABLE_ZSTD) -@@ -203,6 +207,7 @@ if(ENABLE_ZSTD) +@@ -250,6 +255,7 @@ if(ENABLE_ZSTD) else() message(WARNING "-- zstd library not found; zstandard support disabled") - endif(Zstd_FOUND) + endif(zstd_FOUND) + list(APPEND REQUIRES libzstd) endif(ENABLE_ZSTD) if (COMMONCRYPTO_FOUND) -@@ -299,13 +304,14 @@ foreach(LIB ${LIBS_PRIVATE}) - endif() +@@ -347,15 +353,16 @@ foreach(LIB ${LIBS_PRIVATE}) set(LIBS "${LIBS} -l${LIB}") endforeach() + STRING(CONCAT zlib_link_name "-l" ${ZLIB_LINK_LIBRARY_NAME}) -string(REGEX REPLACE "-lBZip2::BZip2" "-lbz2" LIBS ${LIBS}) -string(REGEX REPLACE "-lLibLZMA::LibLZMA" "-llzma" LIBS ${LIBS}) --string(REGEX REPLACE "-l$,zstd::libzstd_shared,zstd::libzstd_static>" "-lzstd" LIBS ${LIBS}) --string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS}) --string(REGEX REPLACE "-lZLIB::ZLIB" "-lz" LIBS ${LIBS}) +string(REGEX REPLACE "-lBZip2::BZip2" "" LIBS ${LIBS}) +string(REGEX REPLACE "-lLibLZMA::LibLZMA" "" LIBS ${LIBS}) -+string(REGEX REPLACE "-l$,zstd::libzstd_shared,zstd::libzstd_static>" "" LIBS ${LIBS}) + if(ENABLE_ZSTD) +- string(REGEX REPLACE "-l${zstd_TARGET}" "-lzstd" LIBS ${LIBS}) ++ string(REGEX REPLACE "-l${zstd_TARGET}" "" LIBS ${LIBS}) + endif() +-string(REGEX REPLACE "-lOpenSSL::Crypto" "-lssl -lcrypto" LIBS ${LIBS}) +-string(REGEX REPLACE "-lZLIB::ZLIB" ${zlib_link_name} LIBS ${LIBS}) +string(REGEX REPLACE "-lOpenSSL::Crypto" "" LIBS ${LIBS}) +string(REGEX REPLACE "-lZLIB::ZLIB" "" LIBS ${LIBS}) string(REGEX REPLACE "-lGnuTLS::GnuTLS" "-lgnutls" LIBS ${LIBS}) @@ -71,7 +72,7 @@ index cf85fc4b7..90615fec9 100644 if(LIBZIP_DO_INSTALL) install(FILES ${PROJECT_BINARY_DIR}/libzip.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/libzip.pc.in b/libzip.pc.in -index d51b0ab63..755685c03 100644 +index d51b0ab..07b3b50 100644 --- a/libzip.pc.in +++ b/libzip.pc.in @@ -9,6 +9,7 @@ zipcmp=${bindir}/zipcmp diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index 5a3ab4fe82ae9e..7ff39ae3641b05 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libzip", - "version": "1.9.2", - "port-version": 2, + "version": "1.10.1", "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 ab1ec713d27940..78ef15faa26488 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5169,8 +5169,8 @@ "port-version": 2 }, "libzip": { - "baseline": "1.9.2", - "port-version": 2 + "baseline": "1.10.1", + "port-version": 0 }, "libzippp": { "baseline": "7.0-1.10.1", diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index 11f6e351d69662..4e233d6ef19fa4 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f4b7231355f6774a5b6915dace3826173b76cee", + "version": "1.10.1", + "port-version": 0 + }, { "git-tree": "59242c6974f6245813fa69d09f9c6df6c501b895", "version": "1.9.2", From 063d942f8d0855ba246a45cfc3d448dcf1c0cca2 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:21:21 +0800 Subject: [PATCH 0500/1039] [onnx,onnx-optimizer] update to 1.15.0,0.3.18 (#35152) * [onnx] update to 1.15.0 * [onnx] update to 1.15.0 * fix post build * [onnx-optimizer] update to 0.3.18 * [onnx-optimizer] update to 0.3.18 --- ports/onnx-optimizer/portfile.cmake | 3 ++- .../remove-outdate-headers.patch | 24 +++++++++++++++++++ ports/onnx-optimizer/vcpkg.json | 2 +- ports/onnx/portfile.cmake | 4 +++- ports/onnx/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/onnx-optimizer.json | 5 ++++ versions/o-/onnx.json | 5 ++++ 8 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 ports/onnx-optimizer/remove-outdate-headers.patch diff --git a/ports/onnx-optimizer/portfile.cmake b/ports/onnx-optimizer/portfile.cmake index b4c4e02427a836..8f8fc1f8505c98 100644 --- a/ports/onnx-optimizer/portfile.cmake +++ b/ports/onnx-optimizer/portfile.cmake @@ -4,10 +4,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/optimizer REF "v${VERSION}" - SHA512 919790201f0d4d3eb107de9ed34c71d289d3c442f38f62721c838c9f60067a8c3478e991682983d8dad59476cab93466e2d23cc6d10b8b921282b939c29a1ad7 + SHA512 419aeaac60fa27f54708c864a2f907777aaa4de882725c83cade33053dec546ede6f95f7f133b50991e3b9b17e300c1a108729cad00ac99dc5ba5d2982b09737 HEAD_REF master PATCHES fix-cmakelists.patch + remove-outdate-headers.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) diff --git a/ports/onnx-optimizer/remove-outdate-headers.patch b/ports/onnx-optimizer/remove-outdate-headers.patch new file mode 100644 index 00000000000000..ea1d3f6bf4e617 --- /dev/null +++ b/ports/onnx-optimizer/remove-outdate-headers.patch @@ -0,0 +1,24 @@ +diff --git a/onnxoptimizer/optimize.h b/onnxoptimizer/optimize.h +index f25e6c3f..506e2554 100644 +--- a/onnxoptimizer/optimize.h ++++ b/onnxoptimizer/optimize.h +@@ -9,7 +9,6 @@ + + #include "onnx/common/ir.h" + #include "onnx/common/ir_pb_converter.h" +-#include "onnx/common/stl_backports.h" + #include "onnx/proto_utils.h" + + #include "onnxoptimizer/pass_manager.h" +diff --git a/onnxoptimizer/pass_registry.h b/onnxoptimizer/pass_registry.h +index 51a2c161..b8dc26f9 100644 +--- a/onnxoptimizer/pass_registry.h ++++ b/onnxoptimizer/pass_registry.h +@@ -12,7 +12,6 @@ + + #include "onnx/common/ir.h" + #include "onnx/common/ir_pb_converter.h" +-#include "onnx/common/stl_backports.h" + #include "onnx/proto_utils.h" + #include "onnxoptimizer/passes/adjust_add.h" + #include "onnxoptimizer/passes/adjust_slice_and_matmul.h" diff --git a/ports/onnx-optimizer/vcpkg.json b/ports/onnx-optimizer/vcpkg.json index 2a99c3f8da72b5..3dfc675137b75e 100644 --- a/ports/onnx-optimizer/vcpkg.json +++ b/ports/onnx-optimizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnx-optimizer", - "version-semver": "0.3.17", + "version-semver": "0.3.18", "description": "Actively maintained ONNX Optimizer", "homepage": "https://github.com/onnx/optimizer", "license": "Apache-2.0", diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index ea4ed43372ea17..a739b707b8b507 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx REF "v${VERSION}" - SHA512 8a525b365fd203f0a59bcf82fa7f2e29d7e0563885ebe38269c596cd4eb949bcfc65d848b92b7abafa7ddecedcfc019f8779097ffcb5087f06037cace24462fc + SHA512 b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd PATCHES fix-cmakelists.patch fix-dependency-protobuf.patch @@ -73,6 +73,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/onnx/bin" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/image" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn" @@ -82,6 +83,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/text" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml" "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training" "${CURRENT_PACKAGES_DIR}/include/onnx/examples" diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 7b7f52aec5290b..69d003f9c42f1f 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnx", - "version-semver": "1.14.0", + "version-semver": "1.15.0", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 78ef15faa26488..086e7682c8a934 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6169,11 +6169,11 @@ "port-version": 1 }, "onnx": { - "baseline": "1.14.0", + "baseline": "1.15.0", "port-version": 0 }, "onnx-optimizer": { - "baseline": "0.3.17", + "baseline": "0.3.18", "port-version": 0 }, "onnxruntime-gpu": { diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json index 8c204d1a695083..8833f7dc14c161 100644 --- a/versions/o-/onnx-optimizer.json +++ b/versions/o-/onnx-optimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e574f424edd5d2fd9ca36c5058f96163d9018725", + "version-semver": "0.3.18", + "port-version": 0 + }, { "git-tree": "0bc5be29ebb8c6a63883d7e76fab6c2613273384", "version-semver": "0.3.17", diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index d07e3e0e8b6520..cf05c47567c7b3 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c143b899cbe396d82182568746203a3375fc23df", + "version-semver": "1.15.0", + "port-version": 0 + }, { "git-tree": "1937b77767085a7447df95efbe366e1d098a9b53", "version-semver": "1.14.0", From 5b60364b3a027fb4c6f33143898dd9305b48f279 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:24:08 +0800 Subject: [PATCH 0501/1039] [libressl] Update to 3.8.2 and added usage (#35146) * add usage * update version * update version * add patch * update version * fix EOL * update version --- .../0001-enable-ocspcheck-on-msvc.patch | 73 +++++++------------ .../0002-suppress-msvc-warnings.patch | 32 ++++---- ports/libressl/portfile.cmake | 12 +-- ports/libressl/vcpkg.json | 7 +- versions/baseline.json | 4 +- versions/l-/libressl.json | 5 ++ 6 files changed, 55 insertions(+), 78 deletions(-) diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch index 05444ca3e26031..6ae51b3dd70e39 100644 --- a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch +++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch @@ -1,16 +1,10 @@ diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt -index 2dddb6e..fd35685 100644 +index 9cf7a8b..67ace03 100644 --- a/apps/ocspcheck/CMakeLists.txt +++ b/apps/ocspcheck/CMakeLists.txt -@@ -1,5 +1,3 @@ --if(NOT MSVC) -- - set( - OCSPCHECK_SRC - http.c -@@ -13,13 +11,27 @@ else() - set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) - endif() +@@ -4,6 +4,20 @@ set( + ocspcheck.c + ) +check_function_exists(getopt HAVE_GETOPT) +if(HAVE_GETOPT) @@ -26,23 +20,33 @@ index 2dddb6e..fd35685 100644 + set(FTRUNCATE_SRC compat/ftruncate.c) +endif() + - if(NOT "${OPENSSLDIR}" STREQUAL "") - add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\") - else() + check_function_exists(memmem HAVE_MEMMEM) + if(HAVE_MEMMEM) + add_definitions(-DHAVE_MEMMEM) +@@ -17,7 +31,7 @@ else() add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\") endif() -add_executable(ocspcheck ${OCSPCHECK_SRC}) +add_executable(ocspcheck ${OCSPCHECK_SRC} ${GETOPT_SRC} ${FTRUNCATE_SRC}) - target_include_directories(ocspcheck PUBLIC ../../include) - target_include_directories(ocspcheck PRIVATE . ./compat ../../include/compat) - target_link_libraries(ocspcheck tls ${OPENSSL_LIBS}) -@@ -29,5 +41,3 @@ if(ENABLE_LIBRESSL_INSTALL) - install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) + target_include_directories(ocspcheck + PRIVATE + ../../include/compat +diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c +index 516642b..3afb68b 100644 +--- a/apps/ocspcheck/ocspcheck.c ++++ b/apps/ocspcheck/ocspcheck.c +@@ -561,6 +561,10 @@ main(int argc, char **argv) + ssize_t written, w; + short port; - endif(ENABLE_LIBRESSL_INSTALL) -- --endif() ++#ifndef HAVE_GETOPT ++#include "getopt.h" ++#endif ++ + while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) { + switch (ch) { + case 'C': diff --git a/apps/ocspcheck/compat/ftruncate.c b/apps/ocspcheck/compat/ftruncate.c new file mode 100644 index 0000000..e825e50 @@ -225,30 +229,3 @@ index 0000000..ada142e + +#endif \ No newline at end of file -diff --git a/apps/ocspcheck/ocspcheck.c b/apps/ocspcheck/ocspcheck.c -index 551a8fa..c608578 100644 ---- a/apps/ocspcheck/ocspcheck.c -+++ b/apps/ocspcheck/ocspcheck.c -@@ -519,6 +519,10 @@ main(int argc, char **argv) - ssize_t written, w; - short port; - -+#ifndef HAVE_GETOPT -+#include "getopt.h" -+#endif -+ - while ((ch = getopt(argc, argv, "C:i:No:v")) != -1) { - switch (ch) { - case 'C': -diff --git a/include/compat/unistd.h b/include/compat/unistd.h -index f521b94..f11db44 100644 ---- a/include/compat/unistd.h -+++ b/include/compat/unistd.h -@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset); - #include - #include - -+#define STDIN_FILENO 0 - #define STDOUT_FILENO 1 - #define STDERR_FILENO 2 - diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch index 79d756622b42b4..28d76c9aa81143 100644 --- a/ports/libressl/0002-suppress-msvc-warnings.patch +++ b/ports/libressl/0002-suppress-msvc-warnings.patch @@ -1,47 +1,45 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a6a7554..b20fd4b 100644 +index 2f0dfa0..594c56f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -111,6 +111,11 @@ if(WIN32) - set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt) +@@ -136,6 +136,10 @@ if(WIN32) + endif() + set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 ntdll bcrypt) endif() - +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912) + message(STATUS "Setting /Qspectre switch") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre") +endif() -+ + if(MSVC) add_definitions(-Dinline=__inline) - message(STATUS "Using [${CMAKE_C_COMPILER_ID}] compiler") -@@ -123,16 +128,29 @@ if(MSVC) +@@ -149,16 +153,29 @@ if(MSVC) "C4127" # conditional expression is constant "C4146" # unary minus operator applied to unsigned type, - # result still unsigned + # result still unsigned + "C4242" # 'identifier' : conversion from 'type1' to 'type2', -+ # possible loss of data ++ # possible loss of data "C4244" # 'argument' : conversion from 'type1' to 'type2', - # possible loss of data + # possible loss of data "C4245" # 'conversion' : conversion from 'type1' to 'type2', - # signed/unsigned mismatch + # signed/unsigned mismatch + "C4255" # 'function' : no function prototype given: -+ # converting '()' to '(void)' ++ # converting '()' to '(void)' "C4267" # 'var' : conversion from 'size_t' to 'type', - # possible loss of data + # possible loss of data + "C4388" # 'expression': signed/unsigned mismatch "C4389" # 'operator' : signed/unsigned mismatch + "C4464" # relative include path contains '..' + "C4668" # 'symbol' is not defined as a preprocessor macro, -+ # replacing with '0' for 'directives' ++ # replacing with '0' for 'directives' "C4706" # assignment within conditional expression + "C4710" # 'function' : function not inlined + "C4711" # function 'function' selected for inline expansion + "C4820" # 'bytes' bytes padding added after construct 'member_name' "C4996" # The POSIX name for this item is deprecated. - # Instead, use the ISO C and C++ conformant name + # Instead, use the ISO C and C++ conformant name + "C5045" # Compiler will insert Spectre mitigation for memory load -+ # if /Qspectre switch specified ++ # if /Qspectre switch specified ) elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") add_definitions(-D_CRT_SUPPRESS_RESTRICT) - diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7b50024e039bbd..fe9a826fa0a626 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_download_distfile( URLS "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${PORT}-${VERSION}.tar.gz" "https://ftp.fau.de/openbsd/LibreSSL/${PORT}-${VERSION}.tar.gz" FILENAME "${PORT}-${VERSION}.tar.gz" - SHA512 8fc81e05d1c9f9259d06508ca97d5a1ba5d46b857088c273c20e6b242921f7eac58a1136564ad9831c923758ee63f7b0897c8c6c7b1e53ab8132a995cc559aeb + SHA512 81765174fdd60223529182fab96249a28978c1d02b5894313d9b0b3aa365a1da2f7e5906403ab368114bdcba2fa861d1ad69b752f8344e6ea61d44666b483122 ) vcpkg_extract_source_archive( @@ -59,11 +59,5 @@ vcpkg_copy_pdbs() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_fixup_pkgconfig() - -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") - foreach(LIB ${LIBS}) - string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") - file(CREATE_LINK "${LIB}" "${LINK}") - endforeach() -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/LibreSSL") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 27b6ccf3ece978..ca9456f0ccd3c2 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,13 +1,16 @@ { "name": "libressl", - "version": "3.6.2", - "port-version": 2, + "version": "3.8.2", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "license": "ISC", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 086e7682c8a934..01bc7e6e36ed03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4733,8 +4733,8 @@ "port-version": 0 }, "libressl": { - "baseline": "3.6.2", - "port-version": 2 + "baseline": "3.8.2", + "port-version": 0 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 293402c9ec22fc..e38541f9d04452 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0c1bbd2daed29ca5fcc86c53b276db8df36e6be", + "version": "3.8.2", + "port-version": 0 + }, { "git-tree": "213551b173db269dfd275c34a776ab7d093c5012", "version": "3.6.2", From e942b5ddcf5b74ffb8c497601af91121089daceb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 29 Nov 2023 13:29:22 +0400 Subject: [PATCH 0502/1039] [openvino] 2023.2.0 release (#35125) * openvino: 2023.2.0 version * updated version database * opencv: updated openvino usage * updated version database * test * vdb --------- Co-authored-by: Frank <1433351828@qq.com> Co-authored-by: Monica --- ports/opencv4/vcpkg.json | 9 +- ports/openvino/001-disable-tools.patch | 6 +- ports/openvino/002-git-version.patch | 31 + ports/openvino/003-fix-find-onnx.patch | 13 - .../openvino/004-compilation-with-cpp17.patch | 16 - ports/openvino/005-tflite-search.patch | 12 - ports/openvino/007-macos-14.patch | 12 - ports/openvino/008-dynamic-protubuf.patch | 156 ---- ports/openvino/009-tensorflow-proto-odr.patch | 746 ------------------ ports/openvino/portfile.cmake | 47 +- ports/openvino/usage | 6 + ports/openvino/vcpkg.json | 12 +- versions/baseline.json | 6 +- versions/o-/opencv4.json | 5 + versions/o-/openvino.json | 5 + 15 files changed, 82 insertions(+), 1000 deletions(-) create mode 100644 ports/openvino/002-git-version.patch delete mode 100644 ports/openvino/003-fix-find-onnx.patch delete mode 100644 ports/openvino/004-compilation-with-cpp17.patch delete mode 100644 ports/openvino/005-tflite-search.patch delete mode 100644 ports/openvino/007-macos-14.patch delete mode 100644 ports/openvino/008-dynamic-protubuf.patch delete mode 100644 ports/openvino/009-tensorflow-proto-odr.patch diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 87b25cdec1be60..067849b02b2c6d 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 10, + "port-version": 11, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -251,7 +251,7 @@ }, "openvino": { "description": "OpenVINO support for OpenCV DNN", - "supports": "!uwp", + "supports": "!uwp & !x86", "dependencies": [ { "name": "opencv4", @@ -267,8 +267,7 @@ "auto", "cpu", "hetero" - ], - "platform": "!uwp" + ] }, { "name": "openvino", @@ -276,7 +275,7 @@ "features": [ "gpu" ], - "platform": "x64 & !(osx | uwp) & !static" + "platform": "x64 & !(osx | uwp)" } ] }, diff --git a/ports/openvino/001-disable-tools.patch b/ports/openvino/001-disable-tools.patch index 7cd391d6714b53..a74fba2663b0c5 100644 --- a/ports/openvino/001-disable-tools.patch +++ b/ports/openvino/001-disable-tools.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3182d12693..db70cca198 100644 +index e4d31492a4..38c009b3cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -134,7 +134,7 @@ if (ENABLE_TESTS OR ENABLE_TEMPLATE) - endif() +@@ -151,7 +151,7 @@ endif() + include(cmake/extra_modules.cmake) add_subdirectory(docs) -add_subdirectory(tools) diff --git a/ports/openvino/002-git-version.patch b/ports/openvino/002-git-version.patch new file mode 100644 index 00000000000000..36844097643e05 --- /dev/null +++ b/ports/openvino/002-git-version.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/developer_package/version.cmake b/cmake/developer_package/version.cmake +index 1b71befe44..b78f44995a 100644 +--- a/cmake/developer_package/version.cmake ++++ b/cmake/developer_package/version.cmake +@@ -5,7 +5,7 @@ + find_package(Git QUIET) + + function(ov_branch_name VAR REPO_ROOT) +- if(GIT_FOUND) ++ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD + WORKING_DIRECTORY ${REPO_ROOT} +@@ -16,7 +16,7 @@ function(ov_branch_name VAR REPO_ROOT) + endfunction() + + function(ov_commit_hash VAR REPO_ROOT) +- if(GIT_FOUND) ++ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-parse --short=11 HEAD + WORKING_DIRECTORY ${REPO_ROOT} +@@ -27,7 +27,7 @@ function(ov_commit_hash VAR REPO_ROOT) + endfunction() + + function(ov_commit_number VAR REPO_ROOT) +- if(GIT_FOUND) ++ if(GIT_FOUND AND EXISTS "${REPO_ROOT}/.git") + execute_process( + COMMAND ${GIT_EXECUTABLE} rev-list --count --first-parent HEAD + WORKING_DIRECTORY ${REPO_ROOT} diff --git a/ports/openvino/003-fix-find-onnx.patch b/ports/openvino/003-fix-find-onnx.patch deleted file mode 100644 index 7a8989a795f446..00000000000000 --- a/ports/openvino/003-fix-find-onnx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index e815baa..c0ccaaa 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -580,7 +580,7 @@ endif() - # - - if(ENABLE_OV_ONNX_FRONTEND) -- find_package(ONNX 1.13.1 EXACT QUIET COMPONENTS onnx onnx_proto NO_MODULE) -+ find_package(ONNX 1.13.1 QUIET COMPONENTS onnx onnx_proto NO_MODULE) - - if(ONNX_FOUND) - # conan and vcpkg create imported targets 'onnx' and 'onnx_proto' diff --git a/ports/openvino/004-compilation-with-cpp17.patch b/ports/openvino/004-compilation-with-cpp17.patch deleted file mode 100644 index da6548b7c91159..00000000000000 --- a/ports/openvino/004-compilation-with-cpp17.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/plugins/intel_cpu/src/cpu_tensor.cpp b/src/plugins/intel_cpu/src/cpu_tensor.cpp -index 48d8fdd4be..815edd9309 100644 ---- a/src/plugins/intel_cpu/src/cpu_tensor.cpp -+++ b/src/plugins/intel_cpu/src/cpu_tensor.cpp -@@ -68,8 +68,9 @@ void Tensor::update_strides() const { - OPENVINO_ASSERT(blocked_desc, "not a valid blocked memory descriptor."); - auto& strides = blocked_desc->getStrides(); - m_strides.resize(strides.size()); -- std::transform(strides.cbegin(), strides.cend(), m_strides.begin(), -- std::bind1st(std::multiplies(), m_element_type.size())); -+ std::transform(strides.cbegin(), strides.cend(), m_strides.begin(), [this] (const size_t stride) { -+ return stride * m_element_type.size(); -+ }); - } - - void* Tensor::data(const element::Type& element_type) const { diff --git a/ports/openvino/005-tflite-search.patch b/ports/openvino/005-tflite-search.patch deleted file mode 100644 index 40efb3f0ec8e51..00000000000000 --- a/ports/openvino/005-tflite-search.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp -index 2fa59398b1..fa917dadb1 100644 ---- a/src/frontends/common/src/manager.cpp -+++ b/src/frontends/common/src/manager.cpp -@@ -49,6 +49,7 @@ public: - {"ir", "ir"}, - {"onnx", "onnx"}, - {"tf", "tensorflow"}, -+ {"tflite", "tensorflow_lite"}, - {"paddle", "paddle"}, - {"pytorch", "pytorch"}, - }; diff --git a/ports/openvino/007-macos-14.patch b/ports/openvino/007-macos-14.patch deleted file mode 100644 index 77a0f321ff6c7c..00000000000000 --- a/ports/openvino/007-macos-14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/plugins/intel_cpu/src/nodes/mha.cpp b/src/plugins/intel_cpu/src/nodes/mha.cpp -index d4405be5d468d..19cf63ac727cb 100644 ---- a/src/plugins/intel_cpu/src/nodes/mha.cpp -+++ b/src/plugins/intel_cpu/src/nodes/mha.cpp -@@ -16,6 +16,7 @@ - #include "common/cpu_convert.h" - #include "transformations/cpu_opset/x64/op/mha.hpp" - #include "dnnl_extension_utils.h" -+#include "utils/bfloat16.hpp" - #include - - using namespace InferenceEngine; diff --git a/ports/openvino/008-dynamic-protubuf.patch b/ports/openvino/008-dynamic-protubuf.patch deleted file mode 100644 index 60f5835a1eb700..00000000000000 --- a/ports/openvino/008-dynamic-protubuf.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/src/frontends/common/src/manager.cpp b/src/frontends/common/src/manager.cpp -index fa917dadb1..6194fca758 100644 ---- a/src/frontends/common/src/manager.cpp -+++ b/src/frontends/common/src/manager.cpp -@@ -20,11 +20,6 @@ class FrontEndManager::Impl { - std::mutex m_loading_mutex; - std::vector m_plugins; - -- /// \brief map of shared object per frontend -- static std::unordered_map> m_shared_objects_map; -- /// \brief Mutex to guard access the shared object map -- static std::mutex m_shared_objects_map_mutex; -- - public: - Impl() { - search_all_plugins(); -@@ -36,10 +31,6 @@ public: - auto fe_obj = std::make_shared(); - fe_obj->m_shared_object = std::make_shared(plugin.get_so_pointer()); - fe_obj->m_actual = plugin.get_creator().m_creator(); -- -- std::lock_guard guard(m_shared_objects_map_mutex); -- m_shared_objects_map.emplace(plugin.get_creator().m_name, fe_obj->m_shared_object); -- - return fe_obj; - } - -@@ -128,8 +119,8 @@ public: - } - - static void shutdown() { -- std::lock_guard guard(m_shared_objects_map_mutex); -- m_shared_objects_map.clear(); -+ std::lock_guard guard(get_shared_objects_mutex()); -+ get_shared_objects_map().clear(); - } - - private: -@@ -154,6 +145,7 @@ private: - {".xml", {"ir", "ir"}}, - {".onnx", {"onnx", "onnx"}}, - {".pb", {"tf", "tensorflow"}}, -+ {".pbtxt", {"tf", "tensorflow"}}, - {".tflite", {"tflite", "tensorflow_lite"}}, - {".pdmodel", {"paddle", "paddle"}}, - // {".ts", {"pytorch", "pytorch"}}, -@@ -224,9 +216,6 @@ private: - } - }; - --std::unordered_map> FrontEndManager::Impl::m_shared_objects_map{}; --std::mutex FrontEndManager::Impl::m_shared_objects_map_mutex{}; -- - FrontEndManager::FrontEndManager() : m_impl(new Impl()) {} - - FrontEndManager::FrontEndManager(FrontEndManager&&) noexcept = default; -diff --git a/src/frontends/common/src/plugin_loader.cpp b/src/frontends/common/src/plugin_loader.cpp -index a044152d8d..a98eff766b 100644 ---- a/src/frontends/common/src/plugin_loader.cpp -+++ b/src/frontends/common/src/plugin_loader.cpp -@@ -16,17 +16,32 @@ - - #include - --#include - #include - #include - - #include "openvino/util/file_util.hpp" -+#include "openvino/util/log.hpp" - #include "openvino/util/shared_object.hpp" - #include "plugin_loader.hpp" - - using namespace ov; - using namespace ov::frontend; - -+// Note, static methods below are required to create an order of initialization of static variables -+// e.g. if users (not encouraged) created ov::Model globally, we need to ensure proper order of initialization -+ -+/// \return map of shared object per frontend -+std::unordered_map>& ov::frontend::get_shared_objects_map() { -+ static std::unordered_map> shared_objects_map; -+ return shared_objects_map; -+} -+ -+/// \return Mutex to guard access the shared object map -+std::mutex& ov::frontend::get_shared_objects_mutex() { -+ static std::mutex shared_objects_map_mutex; -+ return shared_objects_map_mutex; -+} -+ - #ifdef OPENVINO_STATIC_LIBRARY - - # include "ov_frontends.hpp" -@@ -131,6 +146,10 @@ bool PluginInfo::load() { - m_load_failed = true; - return false; - } -+ -+ std::lock_guard guard(get_shared_objects_mutex()); -+ get_shared_objects_map().emplace(get_creator().m_name, get_so_pointer()); -+ - return true; - } - -diff --git a/src/frontends/common/src/plugin_loader.hpp b/src/frontends/common/src/plugin_loader.hpp -index 93e6a5cc2e..dccf8ddf7a 100644 ---- a/src/frontends/common/src/plugin_loader.hpp -+++ b/src/frontends/common/src/plugin_loader.hpp -@@ -4,7 +4,12 @@ - - #pragma once - --#include -+#include -+#include -+#include -+#include -+ -+#include "openvino/frontend/manager.hpp" - - #ifdef _WIN32 - static const char PathSeparator[] = ";"; -@@ -15,6 +20,9 @@ static const char PathSeparator[] = ":"; - namespace ov { - namespace frontend { - -+std::unordered_map>& get_shared_objects_map(); -+std::mutex& get_shared_objects_mutex(); -+ - /// \brief Internal data structure holding by each frontend. Includes library handle and extensions. - class FrontEndSharedData { - friend inline void add_extension_to_shared_data(std::shared_ptr& obj, -diff --git a/thirdparty/dependencies.cmake b/thirdparty/dependencies.cmake -index 12b72d52a2..111eea7c28 100644 ---- a/thirdparty/dependencies.cmake -+++ b/thirdparty/dependencies.cmake -@@ -415,14 +415,14 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND - if(CMAKE_VERBOSE_MAKEFILE) - set(Protobuf_DEBUG ON) - endif() -- if(OV_VCPKG_BUILD) -- set(protobuf_config CONFIG) -- endif() - # try to find newer version first (major is changed) - # see https://protobuf.dev/support/version-support/ and - # https://github.com/protocolbuffers/protobuf/commit/d61f75ff6db36b4f9c0765f131f8edc2f86310fa -- find_package(Protobuf 4.22.0 QUIET ${protobuf_config}) -+ find_package(Protobuf 4.22.0 QUIET CONFIG) - if(NOT Protobuf_FOUND) -+ if(OV_VCPKG_BUILD) -+ set(protobuf_config CONFIG) -+ endif() - # otherwise, fallback to existing default - find_package(Protobuf 3.20.3 REQUIRED ${protobuf_config}) - endif() diff --git a/ports/openvino/009-tensorflow-proto-odr.patch b/ports/openvino/009-tensorflow-proto-odr.patch deleted file mode 100644 index 5bd4ef8ec0c6b8..00000000000000 --- a/ports/openvino/009-tensorflow-proto-odr.patch +++ /dev/null @@ -1,746 +0,0 @@ -diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake -index df3586474b..ed603ca765 100644 ---- a/cmake/developer_package/frontends/frontends.cmake -+++ b/cmake/developer_package/frontends/frontends.cmake -@@ -125,19 +125,26 @@ macro(ov_add_frontend) - source_group("public include" FILES ${LIBRARY_PUBLIC_HEADERS}) - - # Generate protobuf file on build time for each '.proto' file in src/proto -- file(GLOB proto_files ${frontend_root_dir}/src/proto/*.proto) -+ set(protofiles_root_dir "${frontend_root_dir}/src/proto") -+ file(GLOB_RECURSE proto_files ${protofiles_root_dir}/*.proto) - -- foreach(INFILE IN LISTS proto_files) -- get_filename_component(FILE_DIR ${INFILE} DIRECTORY) -- get_filename_component(FILE_WE ${INFILE} NAME_WE) -- set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.cc) -- set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${FILE_WE}.pb.h) -- set(GENERATED_PROTO ${INFILE}) -+ foreach(proto_file IN LISTS proto_files) -+ # filter out standard google proto files -+ if(proto_file MATCHES ".*google.*") -+ continue() -+ endif() -+ -+ file(RELATIVE_PATH proto_file_relative "${CMAKE_SOURCE_DIR}" "${proto_file}") -+ get_filename_component(FILE_WE ${proto_file} NAME_WE) -+ file(RELATIVE_PATH relative_path ${protofiles_root_dir} ${proto_file}) -+ get_filename_component(relative_path ${relative_path} DIRECTORY) -+ set(OUTPUT_PB_SRC ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.cc) -+ set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) - add_custom_command( - OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" -- COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${FILE_DIR} ${FILE_WE}.proto -- DEPENDS ${PROTOC_DEPENDENCY} ${GENERATED_PROTO} -- COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${GENERATED_PROTO}" -+ COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} -+ DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} -+ COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" - VERBATIM - COMMAND_EXPAND_LISTS) - list(APPEND PROTO_SRCS "${OUTPUT_PB_SRC}") -diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp -index b51b8c91b3..f8a85bf4f5 100644 ---- a/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp -+++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.cpp -@@ -7,7 +7,7 @@ - #include "checkpoint_utils.hpp" - #include "openvino/frontend/exception.hpp" - #include "openvino/util/file_util.hpp" --#include "saved_tensor_slice.pb.h" -+#include "ov_tensorflow/saved_tensor_slice.pb.h" - #include "tf_utils.hpp" - - #ifdef ENABLE_SNAPPY_COMPRESSION -diff --git a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp -index bfae3b139a..1171fd6a68 100644 ---- a/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp -+++ b/src/frontends/tensorflow/src/checkpoint_v1_reader.hpp -@@ -12,9 +12,9 @@ - #include "checkpoint_utils.hpp" - #include "openvino/core/any.hpp" - #include "openvino/frontend/exception.hpp" --#include "saved_tensor_slice.pb.h" --#include "tensor_shape.pb.h" --#include "types.pb.h" -+#include "ov_tensorflow/saved_tensor_slice.pb.h" -+#include "ov_tensorflow/tensor_shape.pb.h" -+#include "ov_tensorflow/types.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/decoder_argdef.cpp b/src/frontends/tensorflow/src/decoder_argdef.cpp -index 3430bcbe5e..ce7fc44a91 100644 ---- a/src/frontends/tensorflow/src/decoder_argdef.cpp -+++ b/src/frontends/tensorflow/src/decoder_argdef.cpp -@@ -5,11 +5,11 @@ - #include "decoder_argdef.hpp" - - #include "decoder_proto.hpp" --#include "op_def.pb.h" -+#include "ov_tensorflow/op_def.pb.h" - #include "openvino/frontend/tensorflow/node_context.hpp" - #include "openvino/frontend/tensorflow/special_types.hpp" - #include "tf_utils.hpp" --#include "types.pb.h" -+#include "ov_tensorflow/types.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/decoder_proto.cpp b/src/frontends/tensorflow/src/decoder_proto.cpp -index 2488973c10..cf6049cdbc 100644 ---- a/src/frontends/tensorflow/src/decoder_proto.cpp -+++ b/src/frontends/tensorflow/src/decoder_proto.cpp -@@ -4,12 +4,12 @@ - - #include "decoder_proto.hpp" - --#include "attr_value.pb.h" --#include "node_def.pb.h" -+#include "ov_tensorflow/attr_value.pb.h" -+#include "ov_tensorflow/node_def.pb.h" - #include "openvino/frontend/tensorflow/node_context.hpp" - #include "openvino/frontend/tensorflow/special_types.hpp" - #include "tf_utils.hpp" --#include "types.pb.h" -+#include "ov_tensorflow/types.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/decoder_proto.hpp b/src/frontends/tensorflow/src/decoder_proto.hpp -index 338bfdecce..9d22e273e1 100644 ---- a/src/frontends/tensorflow/src/decoder_proto.hpp -+++ b/src/frontends/tensorflow/src/decoder_proto.hpp -@@ -9,7 +9,7 @@ - - #include "openvino/core/type/element_type.hpp" - #include "openvino/frontend/tensorflow/decoder.hpp" --#include "types.pb.h" -+#include "ov_tensorflow/types.pb.h" - - namespace tensorflow { - class GraphDef; -diff --git a/src/frontends/tensorflow/src/graph_iterator_meta.cpp b/src/frontends/tensorflow/src/graph_iterator_meta.cpp -index 8bc41fbaef..06f2d31f38 100644 ---- a/src/frontends/tensorflow/src/graph_iterator_meta.cpp -+++ b/src/frontends/tensorflow/src/graph_iterator_meta.cpp -@@ -10,8 +10,8 @@ - #include - - #include "openvino/core/type/element_type.hpp" --#include "tensor_bundle.pb.h" --#include "trackable_object_graph.pb.h" -+#include "ov_tensorflow/tensor_bundle.pb.h" -+#include "ov_tensorflow/trackable_object_graph.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/graph_iterator_proto.hpp b/src/frontends/tensorflow/src/graph_iterator_proto.hpp -index 8b073b0837..85d9a3767a 100644 ---- a/src/frontends/tensorflow/src/graph_iterator_proto.hpp -+++ b/src/frontends/tensorflow/src/graph_iterator_proto.hpp -@@ -10,7 +10,7 @@ - #include "checkpoint_v1_reader.hpp" - #include "decoder_argdef.hpp" - #include "decoder_proto.hpp" --#include "graph.pb.h" -+#include "ov_tensorflow/graph.pb.h" - #include "openvino/frontend/exception.hpp" - #include "openvino/frontend/graph_iterator.hpp" - #include "openvino/frontend/tensorflow/decoder.hpp" -diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp -index ece0148d19..803e7d694b 100644 ---- a/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp -+++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.cpp -@@ -10,8 +10,8 @@ - #include - - #include "openvino/core/type/element_type.hpp" --#include "tensor_bundle.pb.h" --#include "trackable_object_graph.pb.h" -+#include "ov_tensorflow/tensor_bundle.pb.h" -+#include "ov_tensorflow/trackable_object_graph.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp -index 511f2a0a5b..4cb385e66f 100644 ---- a/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp -+++ b/src/frontends/tensorflow/src/graph_iterator_saved_model.hpp -@@ -8,7 +8,7 @@ - - #include "graph_iterator_proto.hpp" - #include "openvino/util/file_util.hpp" --#include "saved_model.pb.h" -+#include "ov_tensorflow/saved_model.pb.h" - #include "variables_index.hpp" - - namespace ov { -diff --git a/src/frontends/tensorflow/src/op/var_handle.cpp b/src/frontends/tensorflow/src/op/var_handle.cpp -index 50a5b73c44..0c86041440 100644 ---- a/src/frontends/tensorflow/src/op/var_handle.cpp -+++ b/src/frontends/tensorflow/src/op/var_handle.cpp -@@ -10,7 +10,7 @@ - #include "ngraph/runtime/shared_buffer.hpp" - #include "openvino/opsets/opset8.hpp" - #include "openvino/util/mmap_object.hpp" --#include "tensor_bundle.pb.h" -+#include "ov_tensorflow/tensor_bundle.pb.h" - - using namespace std; - using namespace ov::opset8; -diff --git a/src/frontends/tensorflow/src/proto/any.proto b/src/frontends/tensorflow/src/proto/google/protobuf/any.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/any.proto -rename to src/frontends/tensorflow/src/proto/google/protobuf/any.proto -diff --git a/src/frontends/tensorflow/src/proto/wrappers.proto b/src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/wrappers.proto -rename to src/frontends/tensorflow/src/proto/google/protobuf/wrappers.proto -diff --git a/src/frontends/tensorflow/src/proto/allocation_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/allocation_description.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/allocation_description.proto -diff --git a/src/frontends/tensorflow/src/proto/api_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto -similarity index 99% -rename from src/frontends/tensorflow/src/proto/api_def.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto -index 810aabc5a2..cbb581973d 100644 ---- a/src/frontends/tensorflow/src/proto/api_def.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/api_def.proto -@@ -21,7 +21,7 @@ option java_outer_classname = "ApiDefProtos"; - option java_multiple_files = true; - option java_package = "org.tensorflow.framework"; - option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/api_def_go_proto"; --import "attr_value.proto"; -+import "ov_tensorflow/attr_value.proto"; - - // Used to specify and override the default API & behavior in the - // generated code for client languages, from what you would get from -diff --git a/src/frontends/tensorflow/src/proto/attr_value.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto -similarity index 96% -rename from src/frontends/tensorflow/src/proto/attr_value.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto -index 3028176c02..b903c30cf9 100644 ---- a/src/frontends/tensorflow/src/proto/attr_value.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/attr_value.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor.proto"; --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/tensor.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "AttrValueProtos"; -diff --git a/src/frontends/tensorflow/src/proto/cost_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto -similarity index 97% -rename from src/frontends/tensorflow/src/proto/cost_graph.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto -index dad93a029b..8e4d9788f4 100644 ---- a/src/frontends/tensorflow/src/proto/cost_graph.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/cost_graph.proto -@@ -14,8 +14,8 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "CostGraphProtos"; -diff --git a/src/frontends/tensorflow/src/proto/dataset_options.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/dataset_options.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/dataset_options.proto -diff --git a/src/frontends/tensorflow/src/proto/device_attributes.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/device_attributes.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/device_attributes.proto -diff --git a/src/frontends/tensorflow/src/proto/function.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/function.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto -index 65a2acb3b9..9e84731c98 100644 ---- a/src/frontends/tensorflow/src/proto/function.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/function.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "attr_value.proto"; --import "node_def.proto"; --import "op_def.proto"; -+import "ov_tensorflow/attr_value.proto"; -+import "ov_tensorflow/node_def.proto"; -+import "ov_tensorflow/op_def.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "FunctionProtos"; -diff --git a/src/frontends/tensorflow/src/proto/graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto -similarity index 95% -rename from src/frontends/tensorflow/src/proto/graph.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto -index c52e84022f..e047abeafe 100644 ---- a/src/frontends/tensorflow/src/proto/graph.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "function.proto"; --import "node_def.proto"; --import "versions.proto"; -+import "ov_tensorflow/function.proto"; -+import "ov_tensorflow/node_def.proto"; -+import "ov_tensorflow/versions.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "GraphProtos"; -diff --git a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/graph_transfer_info.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto -index e42c135369..9e7d598e34 100644 ---- a/src/frontends/tensorflow/src/proto/graph_transfer_info.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/graph_transfer_info.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "types.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "GraphTransferInfoProto"; -diff --git a/src/frontends/tensorflow/src/proto/kernel_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/kernel_def.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto -index 5e6b839d31..88142d3de9 100644 ---- a/src/frontends/tensorflow/src/proto/kernel_def.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/kernel_def.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "attr_value.proto"; -+import "ov_tensorflow/attr_value.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "KernelDefProtos"; -diff --git a/src/frontends/tensorflow/src/proto/log_memory.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/log_memory.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto -index 96dac4c9ca..62489f0e0b 100644 ---- a/src/frontends/tensorflow/src/proto/log_memory.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/log_memory.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor_description.proto"; -+import "ov_tensorflow/tensor_description.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "LogMemoryProtos"; -diff --git a/src/frontends/tensorflow/src/proto/meta_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto -similarity index 97% -rename from src/frontends/tensorflow/src/proto/meta_graph.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto -index b6918fa853..255fb6efeb 100644 ---- a/src/frontends/tensorflow/src/proto/meta_graph.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/meta_graph.proto -@@ -14,14 +14,14 @@ syntax = "proto3"; - - package tensorflow; - --import "any.proto"; --import "graph.proto"; --import "op_def.proto"; --import "tensor_shape.proto"; --import "types.proto"; --import "saved_object_graph.proto"; --import "saver.proto"; --import "struct.proto"; -+import "google/protobuf/any.proto"; -+import "ov_tensorflow/graph.proto"; -+import "ov_tensorflow/op_def.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; -+import "ov_tensorflow/saved_object_graph.proto"; -+import "ov_tensorflow/saver.proto"; -+import "ov_tensorflow/struct.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "MetaGraphProtos"; -diff --git a/src/frontends/tensorflow/src/proto/model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/model.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/model.proto -diff --git a/src/frontends/tensorflow/src/proto/node_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto -similarity index 99% -rename from src/frontends/tensorflow/src/proto/node_def.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto -index 573d0f901d..b8f3a017a3 100644 ---- a/src/frontends/tensorflow/src/proto/node_def.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/node_def.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "attr_value.proto"; -+import "ov_tensorflow/attr_value.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "NodeProto"; -diff --git a/src/frontends/tensorflow/src/proto/op_def.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/op_def.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto -index 4d5c66c39e..31493fed26 100644 ---- a/src/frontends/tensorflow/src/proto/op_def.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/op_def.proto -@@ -18,9 +18,10 @@ option java_outer_classname = "OpDefProtos"; - option java_multiple_files = true; - option java_package = "org.tensorflow.framework"; - option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/framework/op_def_go_proto"; --import "attr_value.proto"; --import "types.proto"; --import "resource_handle.proto"; -+ -+import "ov_tensorflow/attr_value.proto"; -+import "ov_tensorflow/types.proto"; -+import "ov_tensorflow/resource_handle.proto"; - - // Defines an operation. A NodeDef in a GraphDef specifies an Op by - // using the "op" field which should match the name of a OpDef. -diff --git a/src/frontends/tensorflow/src/proto/reader_base.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/reader_base.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/reader_base.proto -diff --git a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto -similarity index 94% -rename from src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto -index abfcfdbec0..3b17878e12 100644 ---- a/src/frontends/tensorflow/src/proto/remote_fused_graph_execute_info.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/remote_fused_graph_execute_info.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "graph.proto"; --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/graph.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "RemoteFusedGraphExecuteInfoProto"; -diff --git a/src/frontends/tensorflow/src/proto/resource_handle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto -similarity index 96% -rename from src/frontends/tensorflow/src/proto/resource_handle.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto -index 4d872b6d9d..19b4dcc3b8 100644 ---- a/src/frontends/tensorflow/src/proto/resource_handle.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/resource_handle.proto -@@ -14,8 +14,8 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "ResourceHandle"; -diff --git a/src/frontends/tensorflow/src/proto/saved_model.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto -similarity index 97% -rename from src/frontends/tensorflow/src/proto/saved_model.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto -index 0034fdfd46..f866065522 100644 ---- a/src/frontends/tensorflow/src/proto/saved_model.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_model.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "meta_graph.proto"; -+import "ov_tensorflow/meta_graph.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "SavedModelProtos"; -diff --git a/src/frontends/tensorflow/src/proto/saved_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto -similarity index 97% -rename from src/frontends/tensorflow/src/proto/saved_object_graph.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto -index 671441075c..d0b2170044 100644 ---- a/src/frontends/tensorflow/src/proto/saved_object_graph.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_object_graph.proto -@@ -14,13 +14,13 @@ syntax = "proto3"; - - package tensorflow; - --import "any.proto"; --import "tensor_shape.proto"; --import "types.proto"; --import "variable.proto"; --import "versions.proto"; --import "struct.proto"; --import "trackable_object_graph.proto"; -+import "google/protobuf/any.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; -+import "ov_tensorflow/variable.proto"; -+import "ov_tensorflow/versions.proto"; -+import "ov_tensorflow/struct.proto"; -+import "ov_tensorflow/trackable_object_graph.proto"; - - option cc_enable_arenas = true; - option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; -diff --git a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto -similarity index 94% -rename from src/frontends/tensorflow/src/proto/saved_tensor_slice.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto -index 4645b2bdca..9e628752bb 100644 ---- a/src/frontends/tensorflow/src/proto/saved_tensor_slice.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/saved_tensor_slice.proto -@@ -35,11 +35,11 @@ option java_outer_classname = "SavedTensorSliceProtos"; - option java_multiple_files = true; - option java_package = "org.tensorflow.util"; - --import "tensor_shape.proto"; --import "tensor_slice.proto"; --import "tensor.proto"; --import "types.proto"; --import "versions.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/tensor_slice.proto"; -+import "ov_tensorflow/tensor.proto"; -+import "ov_tensorflow/types.proto"; -+import "ov_tensorflow/versions.proto"; - - // Metadata describing the set of slices of the same tensor saved in a - // checkpoint file. -diff --git a/src/frontends/tensorflow/src/proto/saver.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/saver.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/saver.proto -diff --git a/src/frontends/tensorflow/src/proto/step_stats.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto -similarity index 97% -rename from src/frontends/tensorflow/src/proto/step_stats.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto -index 04e0864a5a..027a1d79ee 100644 ---- a/src/frontends/tensorflow/src/proto/step_stats.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/step_stats.proto -@@ -14,8 +14,8 @@ syntax = "proto3"; - - package tensorflow; - --import "allocation_description.proto"; --import "tensor_description.proto"; -+import "ov_tensorflow/allocation_description.proto"; -+import "ov_tensorflow/tensor_description.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "StepStatsProtos"; -diff --git a/src/frontends/tensorflow/src/proto/struct.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/struct.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto -index d03201b685..4126bd98c4 100644 ---- a/src/frontends/tensorflow/src/proto/struct.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/struct.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor.proto"; --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/tensor.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; - -diff --git a/src/frontends/tensorflow/src/proto/summary.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto -similarity index 99% -rename from src/frontends/tensorflow/src/proto/summary.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto -index 9e4b95f4bc..ce32617694 100644 ---- a/src/frontends/tensorflow/src/proto/summary.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/summary.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor.proto"; -+import "ov_tensorflow/tensor.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "SummaryProtos"; -diff --git a/src/frontends/tensorflow/src/proto/tensor.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto -similarity index 96% -rename from src/frontends/tensorflow/src/proto/tensor.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto -index c2e1fd7eb6..42f063536e 100644 ---- a/src/frontends/tensorflow/src/proto/tensor.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "resource_handle.proto"; --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/resource_handle.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "TensorProtos"; -diff --git a/src/frontends/tensorflow/src/proto/tensor_bundle.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto -similarity index 94% -rename from src/frontends/tensorflow/src/proto/tensor_bundle.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto -index 43fea749b4..21af38195c 100644 ---- a/src/frontends/tensorflow/src/proto/tensor_bundle.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_bundle.proto -@@ -14,10 +14,10 @@ syntax = "proto3"; - - package tensorflow; - --import "tensor_shape.proto"; --import "tensor_slice.proto"; --import "types.proto"; --import "versions.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/tensor_slice.proto"; -+import "ov_tensorflow/types.proto"; -+import "ov_tensorflow/versions.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "TensorBundleProtos"; -diff --git a/src/frontends/tensorflow/src/proto/tensor_description.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto -similarity index 90% -rename from src/frontends/tensorflow/src/proto/tensor_description.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto -index 3ab9c310a6..c03e1311c1 100644 ---- a/src/frontends/tensorflow/src/proto/tensor_description.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_description.proto -@@ -14,9 +14,9 @@ syntax = "proto3"; - - package tensorflow; - --import "allocation_description.proto"; --import "tensor_shape.proto"; --import "types.proto"; -+import "ov_tensorflow/allocation_description.proto"; -+import "ov_tensorflow/tensor_shape.proto"; -+import "ov_tensorflow/types.proto"; - - option cc_enable_arenas = true; - option java_outer_classname = "TensorDescriptionProtos"; -diff --git a/src/frontends/tensorflow/src/proto/tensor_shape.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/tensor_shape.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_shape.proto -diff --git a/src/frontends/tensorflow/src/proto/tensor_slice.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/tensor_slice.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/tensor_slice.proto -diff --git a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto -similarity index 98% -rename from src/frontends/tensorflow/src/proto/trackable_object_graph.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto -index f4a8e4da34..f0a9617432 100644 ---- a/src/frontends/tensorflow/src/proto/trackable_object_graph.proto -+++ b/src/frontends/tensorflow/src/proto/ov_tensorflow/trackable_object_graph.proto -@@ -14,7 +14,7 @@ syntax = "proto3"; - - package tensorflow; - --import "wrappers.proto"; -+import "google/protobuf/wrappers.proto"; - - option cc_enable_arenas = true; - option go_package = "github.com/tensorflow/tensorflow/tensorflow/go/core/protobuf/for_core_protos_go_proto"; -diff --git a/src/frontends/tensorflow/src/proto/types.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/types.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/types.proto -diff --git a/src/frontends/tensorflow/src/proto/variable.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/variable.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/variable.proto -diff --git a/src/frontends/tensorflow/src/proto/versions.proto b/src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto -similarity index 100% -rename from src/frontends/tensorflow/src/proto/versions.proto -rename to src/frontends/tensorflow/src/proto/ov_tensorflow/versions.proto -diff --git a/src/frontends/tensorflow/src/tf_utils.hpp b/src/frontends/tensorflow/src/tf_utils.hpp -index a7a80a522b..5c4a97a5da 100644 ---- a/src/frontends/tensorflow/src/tf_utils.hpp -+++ b/src/frontends/tensorflow/src/tf_utils.hpp -@@ -4,8 +4,8 @@ - - #pragma once - --#include "attr_value.pb.h" --#include "node_def.pb.h" -+#include "ov_tensorflow/attr_value.pb.h" -+#include "ov_tensorflow/node_def.pb.h" - #include "openvino/core/node.hpp" - #include "openvino/core/partial_shape.hpp" - #include "openvino/core/runtime_attribute.hpp" -@@ -13,9 +13,9 @@ - #include "openvino/core/type/element_type.hpp" - #include "openvino/frontend/node_context.hpp" - #include "openvino/runtime/tensor.hpp" --#include "tensor.pb.h" --#include "tensor_shape.pb.h" --#include "types.pb.h" -+#include "ov_tensorflow/tensor.pb.h" -+#include "ov_tensorflow/tensor_shape.pb.h" -+#include "ov_tensorflow/types.pb.h" - - namespace ov { - namespace frontend { -diff --git a/src/frontends/tensorflow/src/variables_index.cpp b/src/frontends/tensorflow/src/variables_index.cpp -index c24ffd8112..2dcf3faf9e 100644 ---- a/src/frontends/tensorflow/src/variables_index.cpp -+++ b/src/frontends/tensorflow/src/variables_index.cpp -@@ -11,8 +11,8 @@ - #include "graph_iterator_saved_model.hpp" - #include "openvino/core/type/element_type.hpp" - #include "openvino/util/mmap_object.hpp" --#include "tensor_bundle.pb.h" --#include "trackable_object_graph.pb.h" -+#include "ov_tensorflow/tensor_bundle.pb.h" -+#include "ov_tensorflow/trackable_object_graph.pb.h" - - #ifdef ENABLE_SNAPPY_COMPRESSION - # include "snappy.h" -diff --git a/src/frontends/tensorflow/src/variables_index.hpp b/src/frontends/tensorflow/src/variables_index.hpp -index df852a6279..aa805b264b 100644 ---- a/src/frontends/tensorflow/src/variables_index.hpp -+++ b/src/frontends/tensorflow/src/variables_index.hpp -@@ -9,7 +9,7 @@ - #include "graph_iterator_proto.hpp" - #include "openvino/util/file_util.hpp" - #include "openvino/util/mmap_object.hpp" --#include "saved_model.pb.h" -+#include "ov_tensorflow/saved_model.pb.h" - - namespace ov { - namespace frontend { diff --git a/ports/openvino/portfile.cmake b/ports/openvino/portfile.cmake index 3556c5d285c4d4..0828fe0bb592f4 100644 --- a/ports/openvino/portfile.cmake +++ b/ports/openvino/portfile.cmake @@ -2,24 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openvinotoolkit/openvino REF "${VERSION}" - SHA512 29ee621c1428808607ce499e527b5943b8a2172769cb7315ef25253db818f54f2da4bbf5539198c012e25e78c8c830205b46f6e6a83032e732e82a7d00d46312 + SHA512 d44aa06763b18fabb6e9fb52834cbe9b6c91384541177093741519c7cf6f209720cb9aabf0b4a2b2b32625399ca2076d7b1a3430ea00dadeda86255fb8baf720 PATCHES # vcpkg specific patch, because OV creates a file in source tree, which is prohibited 001-disable-tools.patch - # from https://github.com/openvinotoolkit/openvino/pull/18359 - 003-fix-find-onnx.patch - # from https://github.com/openvinotoolkit/openvino/pull/19629 - 004-compilation-with-cpp17.patch - # from https://github.com/openvinotoolkit/openvino/pull/19599 - 005-tflite-search.patch - # # from https://github.com/openvinotoolkit/openvino/pull/19946 - 007-macos-14.patch - # from https://github.com/openvinotoolkit/openvino/pull/19758 - # and https://github.com/openvinotoolkit/openvino/pull/20612 - 008-dynamic-protubuf.patch - # from https://github.com/openvinotoolkit/openvino/pull/20588 - # and https://github.com/openvinotoolkit/openvino/pull/20636 - 009-tensorflow-proto-odr.patch + # https://github.com/openvinotoolkit/openvino/pull/19628 + 002-git-version.patch HEAD_REF master) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -41,17 +29,20 @@ if(ENABLE_INTEL_GPU) # python is required for conversion of OpenCL source files into .cpp. vcpkg_find_acquire_program(PYTHON3) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # remove 'rapidjson' directory and use vcpkg's one to comply with ODR + file(REMOVE_RECURSE ${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/rapidjson) + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND ENABLE_INTEL_CPU) message(WARNING "OneDNN for GPU is not available for static build, which is required for dGPU." - "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\".") - list(APPEND FEATURE_OPTIONS "-DENABLE_ONEDNN_FOR_GPU=OFF") + "Please, consider using VCPKG_LIBRARY_LINKAGE=\"dynamic\" or disable CPU plugin," + "which uses another flavor of oneDNN.") else() vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO oneapi-src/oneDNN - REF ec0b2ee85fc2a2dbdeec10035c5ef5813d8fb5ea - SHA512 abc09c9ab190cc043ba675fdcaf2da0069eacce14aad6e788a9957d8b6704cfcefe5a707e78d544d25acac35bc83217660ee64528150311f577d2ccbdd165de1 + REF 284ad4574939fa784e4ddaa1f4aa577b8eb7a017 + SHA512 b8b003659b5972ce7a4d5cfd6bcac9377d06055fa67bd2830af0780b2272d2faed3d1d58fb1cbd5aa8bee68c9d6005ac5ae63381b5f80c3ac86442f88cce73a3 PATCHES 006-onednn-gpu-build.patch ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_gpu/thirdparty/onednn_gpu") @@ -59,23 +50,23 @@ if(ENABLE_INTEL_GPU) list(APPEND FEATURE_OPTIONS "-DENABLE_SYSTEM_OPENCL=ON" - "-DPYTHON_EXECUTABLE=${PYTHON3}") + "-DPython3_EXECUTABLE=${PYTHON3}") endif() if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/oneDNN - REF a1aa20ca8f19465dc2fd18389953ed83798b2fd3 - SHA512 0ff5b235a6f349ad94f52a3b8282f5c825eac7275ad784986d7f533863ace7a4ed71094b9f5cac85d473d2678e197727c1cb33dee5cf75cd793ded7be58f946e + REF 2ead5d4fe5993a797d9a7a4b8b5557b96f6ec90e + SHA512 e254f331275e174e7f191f99bf2abcea73aa5954efd0984e1a8418ffa73d2de1ad148e77314b4be04f36ac293202e01835be0ac6e65a6af1391258987aaa8dc4 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/onednn") vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO openvinotoolkit/mlas - REF c7c8a631315000f17c650af34431009d2f22129c - SHA512 4146598ce6b30a3eaea544d6703b949061118398e67b773aa11a3c0f3e8fbcc446d09ea893b9879f8869e977162bcada0d4895cb225cf2e2469fb71cd5942e53 + REF f6425b1394334822390fcd9da12788c9cd0d11da + SHA512 3b7fc28ad80a85a459f3370ba84acf79355c3d14be68df57c436e8e0f7b8a3e37ef192fc9b0db2f751dac458f3ef2e9ccb8dbe08e2d31c4636ea30eb970628fe ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/mlas") @@ -93,8 +84,8 @@ if(ENABLE_INTEL_CPU) vcpkg_from_github( OUT_SOURCE_PATH DEP_SOURCE_PATH REPO ARM-software/ComputeLibrary - REF v23.02.1 - SHA512 ee9439e0804bacd365f079cedc548ffe2c12b0d4a86780e0783186884eb5a6d7aa7ceac11c504e242bedc55c3d026b826c90adaafbdbd3e5cfa2562a1c4ee04d + REF v23.08 + SHA512 8379fdf804732ef4e69a3e91807810d413f35855d035cfde9d81059679f62cd625c0347f07dc1f76468dc82c06217a5ae8df25b4581a29558ac32b2a4f7d8af4 ) file(COPY "${DEP_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/plugins/intel_cpu/thirdparty/ComputeLibrary") endif() @@ -128,7 +119,6 @@ vcpkg_cmake_configure( "-DENABLE_PYTHON=OFF" "-DENABLE_GAPI_PREPROCESSING=OFF" "-DCPACK_GENERATOR=VCPKG" - "-DCMAKE_DISABLE_FIND_PACKAGE_pybind11=ON" ) vcpkg_cmake_install() @@ -140,6 +130,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + vcpkg_install_copyright( FILE_LIST "${SOURCE_PATH}/LICENSE" diff --git a/ports/openvino/usage b/ports/openvino/usage index 27e68898dc2706..ede01545d213d5 100644 --- a/ports/openvino/usage +++ b/ports/openvino/usage @@ -2,3 +2,9 @@ The package OpenVINO can be used in cmake scripts as: find_package(OpenVINO REQUIRED) target_link_libraries(main PRIVATE openvino::runtime) + +Note: static build of Intel GPU plugin disables usage of oneDNN for GPU, which is important +for decent performance on discrete GPU devices. If you want to levarage performance of dGPU, +please, consider either option: +- Building with 'VCPKG_LIBRARY_LINKAGE=dynamic' +- Disable Intel CPU plugin, because it uses different oneDNN flavor diff --git a/ports/openvino/vcpkg.json b/ports/openvino/vcpkg.json index 60d03bc889eccf..16453bdec9101c 100644 --- a/ports/openvino/vcpkg.json +++ b/ports/openvino/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "openvino", - "version": "2023.1.0", - "port-version": 4, + "version": "2023.2.0", "maintainers": "OpenVINO Developers ", "summary": "This is a port for Open Visual Inference And Optimization toolkit for AI inference", "description": [ @@ -15,7 +14,7 @@ "homepage": "https://github.com/openvinotoolkit/openvino", "documentation": "https://docs.openvino.ai/latest/index.html", "license": "Apache-2.0", - "supports": "!uwp", + "supports": "!uwp & !x86", "dependencies": [ { "name": "pkgconf", @@ -53,7 +52,7 @@ }, { "name": "gpu", - "platform": "x64 & !(osx | uwp) & !static" + "platform": "x64 & !(osx | uwp)" }, "hetero", "ir", @@ -76,9 +75,10 @@ }, "gpu": { "description": "Enables GPU plugin for inference", - "supports": "x64 & !(osx | uwp) & !static", + "supports": "x64 & !(osx | uwp)", "dependencies": [ - "opencl" + "opencl", + "rapidjson" ] }, "hetero": { diff --git a/versions/baseline.json b/versions/baseline.json index 01bc7e6e36ed03..571140da4c20f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6242,7 +6242,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 10 + "port-version": 11 }, "opendnp3": { "baseline": "3.1.1", @@ -6357,8 +6357,8 @@ "port-version": 6 }, "openvino": { - "baseline": "2023.1.0", - "port-version": 4 + "baseline": "2023.2.0", + "port-version": 0 }, "openvpn3": { "baseline": "3.7.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index be06cfa44c42a1..996f5437145308 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d3433d44aaf404378dff91625448de76738a95f", + "version": "4.8.0", + "port-version": 11 + }, { "git-tree": "83f4fcf20bc429d1a01edb9fdf423ef78d18c9b6", "version": "4.8.0", diff --git a/versions/o-/openvino.json b/versions/o-/openvino.json index 8f05d268811b47..599a4028dcb3ae 100644 --- a/versions/o-/openvino.json +++ b/versions/o-/openvino.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "008bb3450506fc167c8928022a1f8782cddff866", + "version": "2023.2.0", + "port-version": 0 + }, { "git-tree": "e33c2a6c920269c1564d88ac95d0933771763ca3", "version": "2023.1.0", From 848c8178ce27e271cfba4f3b6195d958ca470769 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Nov 2023 10:34:00 +0100 Subject: [PATCH 0503/1039] [skia] Fix incomplete update, build modules, fix android (#34951) * [skia] Restore simple msvc toolchain fix * libgifcodec is gone * Update abseil-cpp * Use vcpkg abseil-cpp * Update wuffs * Update dawn * Update spirv deps * Remove tint * Update vulkan-tools * versions * Drop obsolete patch * Use github directly * Revert "Use vcpkg abseil-cpp" This reverts commit 9b4157c98075cb4c5dc0d8f57bb794e7ae6b6f4f. * Fix dawn * Build, install, export modules * Unroll default-features * Fix comments * Fix skresources * Fix manifest * WIP * WIP * Pass-through lib dirs * Filter link libs * WIP * WIP * Add feature 'modules' * Fix SkDebugf visibility * WIP * WIP * Rewrite gn install and export * No pdb for release * Omit explicit ouput check * Update modules config * Disable skparagraph DLL, no dllexport * Disable icu on shared windows * Cleanup * Cleanup * Enable android CI * Android * Don't export standard libraries * Disable FontConfigInterface on windows --- ports/skia/core-opengl32.patch | 15 -- ports/skia/dawn-dedup-native-proc-gen.patch | 26 ++ ports/skia/disable-msvc-env-setup.patch | 12 + ports/skia/example/CMakeLists.txt | 7 +- ports/skia/portfile.cmake | 120 ++++----- ports/skia/skdebug-stdio.patch | 12 + ports/skia/skia-functions.cmake | 227 +++++++++++++++++- ports/skia/support-x86-MSVC-build.patch | 13 - ports/skia/third-party.gn.in | 4 +- ports/skia/unofficial-skia-config.cmake | 77 ++---- .../unofficial-skia-targets-details.cmake | 18 ++ ports/skia/unofficial-skia-targets.cmake | 8 + ports/skia/usage | 2 + ports/skia/vcpkg.json | 74 +++--- scripts/ci.baseline.txt | 3 - scripts/test_ports/vcpkg-ci-skia/vcpkg.json | 10 +- versions/baseline.json | 2 +- versions/s-/skia.json | 5 + 18 files changed, 420 insertions(+), 215 deletions(-) delete mode 100644 ports/skia/core-opengl32.patch create mode 100644 ports/skia/dawn-dedup-native-proc-gen.patch create mode 100644 ports/skia/disable-msvc-env-setup.patch create mode 100644 ports/skia/skdebug-stdio.patch delete mode 100644 ports/skia/support-x86-MSVC-build.patch create mode 100644 ports/skia/unofficial-skia-targets-details.cmake create mode 100644 ports/skia/unofficial-skia-targets.cmake diff --git a/ports/skia/core-opengl32.patch b/ports/skia/core-opengl32.patch deleted file mode 100644 index 7395837fe48061..00000000000000 --- a/ports/skia/core-opengl32.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/BUILD.gn b/BUILD.gn -index 577dd00..07f9882 100644 ---- a/BUILD.gn -+++ b/BUILD.gn -@@ -1478,6 +1478,10 @@ skia_component("skia") { - defines = [] - libs = [] - -+ if (is_win && target_cpu != "arm64" && !skia_enable_winuwp) { -+ libs += [ "OpenGL32.lib" ] # for src/utils/win/SkWGL_win.cpp -+ } -+ - if (skia_enable_sksl) { - deps += [ ":minify_sksl" ] - sources += skia_sksl_sources diff --git a/ports/skia/dawn-dedup-native-proc-gen.patch b/ports/skia/dawn-dedup-native-proc-gen.patch new file mode 100644 index 00000000000000..f07b170733889d --- /dev/null +++ b/ports/skia/dawn-dedup-native-proc-gen.patch @@ -0,0 +1,26 @@ +diff --git a/src/dawn/native/BUILD.gn b/src/dawn/native/BUILD.gn +index 24853ced..064b839b 100644 +--- a/src/dawn/native/BUILD.gn ++++ b/src/dawn/native/BUILD.gn +@@ -882,6 +882,10 @@ dawn_json_generator("webgpu_dawn_native_proc_gen") { + target = "webgpu_dawn_native_proc" + outputs = [ "src/dawn/native/webgpu_dawn_native_proc.cpp" ] + } ++source_set("webgpu_dawn_native_proc_gen_sources") { ++ sources = get_target_outputs(":webgpu_dawn_native_proc_gen") ++ deps = [ ":webgpu_dawn_native_proc_gen" ] ++} + + dawn_component("webgpu_dawn") { + # For a single library - build `webgpu_dawn_shared` with GN args: +@@ -901,9 +905,8 @@ dawn_component("webgpu_dawn") { + DEFINE_PREFIX = "WGPU" + output_name = "webgpu_dawn" + +- sources = get_target_outputs(":webgpu_dawn_native_proc_gen") + deps = [ + ":static", +- ":webgpu_dawn_native_proc_gen", ++ ":webgpu_dawn_native_proc_gen_sources", + ] + } diff --git a/ports/skia/disable-msvc-env-setup.patch b/ports/skia/disable-msvc-env-setup.patch new file mode 100644 index 00000000000000..af4290baa7fa62 --- /dev/null +++ b/ports/skia/disable-msvc-env-setup.patch @@ -0,0 +1,12 @@ +diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn +index ba85c3d..901ba99 100644 +--- a/gn/toolchain/BUILD.gn ++++ b/gn/toolchain/BUILD.gn +@@ -94,6 +94,7 @@ toolchain("msvc") { + # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory. + env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && " + } ++ env_setup = "" # overwrite + + cl_m32_flag = "" + diff --git a/ports/skia/example/CMakeLists.txt b/ports/skia/example/CMakeLists.txt index 114ef3f1b17950..109ac5fdedfaf8 100644 --- a/ports/skia/example/CMakeLists.txt +++ b/ports/skia/example/CMakeLists.txt @@ -4,7 +4,10 @@ project(skia-example) set(CMAKE_CXX_STANDARD 17) -add_executable(main convert-to-nia.cpp) +add_executable(legacy convert-to-nia.cpp) +find_package(skia CONFIG REQUIRED) +target_link_libraries(legacy PRIVATE skia) +add_executable(main convert-to-nia.cpp) find_package(unofficial-skia CONFIG REQUIRED) -target_link_libraries(main PRIVATE unofficial::skia::skia) +target_link_libraries(main PRIVATE unofficial::skia::skia unofficial::skia::modules::skshaper) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 571a3d4b0d5414..d9d593ddcf07c8 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -6,28 +6,30 @@ vcpkg_from_github( REF "canvaskit/${VERSION}" SHA512 4672cfef8c92f37418e27df30a4e3fd6f7ca6273521e9d6b7755d9285800ad1ea6eff66639a17f591e6921ec8b78aa828500399a83295f9984ab58ebaff0ec24 PATCHES + disable-msvc-env-setup.patch uwp.patch - core-opengl32.patch disable-dev-test.patch - support-x86-MSVC-build.patch + skdebug-stdio.patch ) # these following aren't available in vcpkg # to update, visit the DEPS file in Skia's root directory declare_external_from_git(abseil-cpp - URL "https://skia.googlesource.com/external/github.com/abseil/abseil-cpp.git" - REF "c5a424a2a21005660b182516eb7a079cd8021699" + URL "https://github.com/abseil/abseil-cpp.git" + REF "cb436cf0142b4cbe47aae94223443df7f82e2920" LICENSE_FILE LICENSE ) declare_external_from_git(d3d12allocator - URL "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" + URL "https://github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git" REF "169895d529dfce00390a20e69c2f516066fe7a3b" LICENSE_FILE LICENSE.txt ) declare_external_from_git(dawn URL "https://dawn.googlesource.com/dawn.git" - REF "30fa0d8d2ced43e44baa522dd4bd4684b14a3099" + REF "6e25bf7674bbcb1d1e613dc0700c958830950037" LICENSE_FILE LICENSE + PATCHES + dawn-dedup-native-proc-gen.patch ) declare_external_from_git(dng_sdk URL "https://android.googlesource.com/platform/external/dng_sdk.git" @@ -39,11 +41,6 @@ declare_external_from_git(jinja2 REF "ee69aa00ee8536f61db6a451f3858745cf587de6" LICENSE_FILE LICENSE.rst ) -declare_external_from_git(libgifcodec - URL "https://skia.googlesource.com/libgifcodec" - REF "fd59fa92a0c86788dcdd84d091e1ce81eda06a77" - LICENSE_FILE LICENSE.md -) declare_external_from_git(markupsafe URL "https://chromium.googlesource.com/chromium/src/third_party/markupsafe" REF "0944e71f4b2cb9a871bcbe353f95e889b64a611a" @@ -55,38 +52,33 @@ declare_external_from_git(piex LICENSE_FILE LICENSE ) declare_external_from_git(sfntly - URL "https://github.com/googlefonts/sfntly.git" + URL "https://github.com/googlei18n/sfntly.git" REF "b55ff303ea2f9e26702b514cf6a3196a2e3e2974" LICENSE_FILE README.md ) declare_external_from_git(spirv-cross - URL "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - REF "61c603f3baa5270e04bcfb6acf83c654e3c57679" + URL "https://github.com/KhronosGroup/SPIRV-Cross" + REF "030d0be28c35bafebd20660c112852b1d8c8c6ca" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-headers - URL "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" - REF "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" + URL "https://github.com/KhronosGroup/SPIRV-Headers.git" + REF "8e2ad27488ed2f87c068c01a8f5e8979f7086405" LICENSE_FILE LICENSE ) declare_external_from_git(spirv-tools - URL "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" - REF "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad" - LICENSE_FILE LICENSE -) -declare_external_from_git(tint - URL "https://dawn.googlesource.com/tint" - REF "200492e32b94f042d9942154fb4fa7f93bb8289a" + URL "https://github.com/KhronosGroup/SPIRV-Tools.git" + REF "93c13345e176f3f8bdb4b07e59c5e3365b3dbf44" LICENSE_FILE LICENSE ) declare_external_from_git(vulkan-tools - URL "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - REF "d55c7aaf041af331bee8c22fb448a6ff4c797f73" + URL "https://github.com/KhronosGroup/Vulkan-Tools" + REF "2c83dd6cb2ef710bab843b69776997d6f2c12ba4" LICENSE_FILE LICENSE.txt ) declare_external_from_git(wuffs - URL "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - REF "e3f919ccfe3ef542cfc983a82146070258fb57f8" + URL "https://github.com/google/wuffs-mirror-release-c.git" + REF "a0041ac0310b3156b963e2f2bea09245f25ec073" LICENSE_FILE LICENSE ) @@ -94,7 +86,7 @@ declare_external_from_pkgconfig(expat) declare_external_from_pkgconfig(fontconfig PATH "third_party") declare_external_from_pkgconfig(freetype2) declare_external_from_pkgconfig(harfbuzz MODULES harfbuzz harfbuzz-subset) -declare_external_from_pkgconfig(icu MODULES icu-uc DEFINES "U_USING_ICU_NAMESPACE=0") +declare_external_from_pkgconfig(icu MODULES icu-uc) declare_external_from_pkgconfig(libjpeg PATH "third_party/libjpeg-turbo" MODULES libturbojpeg libjpeg) declare_external_from_pkgconfig(libpng) declare_external_from_pkgconfig(libwebp MODULES libwebpdecoder libwebpdemux libwebpmux libwebp) @@ -107,10 +99,19 @@ if(NOT VCPKG_TARGET_ARCHITECTURE IN_LIST known_cpus) message(WARNING "Unknown target cpu '${VCPKG_TARGET_ARCHITECTURE}'.") endif() -set(OPTIONS "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"") +string(JOIN " " OPTIONS + "target_cpu=\"${VCPKG_TARGET_ARCHITECTURE}\"" + skia_enable_android_utils=false + skia_enable_spirv_validation=false + skia_enable_tools=false + skia_enable_gpu_debug_layers=false + skia_use_jpeg_gainmaps=false + skia_use_libheif=false + skia_use_lua=false +) set(OPTIONS_DBG "is_debug=true") set(OPTIONS_REL "is_official_build=true") -vcpkg_list(SET SKIA_TARGETS ":skia") +vcpkg_list(SET SKIA_TARGETS :skia :modules) if(VCPKG_TARGET_IS_ANDROID) string(APPEND OPTIONS " target_os=\"android\"") @@ -118,11 +119,14 @@ elseif(VCPKG_TARGET_IS_IOS) string(APPEND OPTIONS " target_os=\"ios\"") elseif(VCPKG_TARGET_IS_EMSCRIPTEN) string(APPEND OPTIONS " target_os=\"wasm\"") -elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +elseif(VCPKG_TARGET_IS_WINDOWS) string(APPEND OPTIONS " target_os=\"win\"") if(VCPKG_TARGET_IS_UWP) string(APPEND OPTIONS " skia_enable_winuwp=true skia_enable_fontmgr_win=false skia_use_xps=false") endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + string(APPEND OPTIONS " skia_enable_skparagraph=false") + endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -134,7 +138,6 @@ endif() set(required_externals dng_sdk expat - libgifcodec libjpeg libpng libwebp @@ -147,6 +150,9 @@ set(required_externals if("fontconfig" IN_LIST FEATURES) list(APPEND required_externals fontconfig) string(APPEND OPTIONS " skia_use_fontconfig=true") + if(VCPKG_TARGET_IS_WINDOWS) + string(APPEND OPTIONS " skia_enable_fontmgr_FontConfigInterface=false") + endif() else() string(APPEND OPTIONS " skia_use_fontconfig=false") endif() @@ -225,7 +231,6 @@ They can be installed on Debian based systems via spirv-cross spirv-headers spirv-tools - tint jinja2 markupsafe vulkan_headers @@ -235,17 +240,15 @@ They can be installed on Debian based systems via ## REMOVE ^ dawn ) - string(APPEND OPTIONS " skia_use_dawn=true") - string(REPLACE "dynamic" "shared" DAWN_LINKAGE "${VCPKG_LIBRARY_LINKAGE}") - vcpkg_list(APPEND SKIA_TARGETS - "third_party/externals/dawn/src/dawn:proc_${DAWN_LINKAGE}" - "third_party/externals/dawn/src/dawn/native:${DAWN_LINKAGE}" - "third_party/externals/dawn/src/dawn/platform:${DAWN_LINKAGE}" - ) + # cf. external dawn/src/dawn/native/BUILD.gn + string(APPEND OPTIONS " skia_use_dawn=true dawn_use_angle=false dawn_use_swiftshader=false") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(APPEND OPTIONS " dawn_complete_static_libs=true") + endif() endif() get_externals(${required_externals}) -if(EXISTS "${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py") +if(EXISTS "${SOURCE_PATH}/third_party/externals/dawn") vcpkg_find_acquire_program(GIT) vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/dawn/generator/dawn_version_generator.py" "get_git()," @@ -259,9 +262,11 @@ vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "python3 " "\\\"${PY vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) +if(VCPKG_TARGET_IS_WINDOWS) string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}") string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"") +elseif(VCPKG_TARGET_IS_ANDROID) + string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}") else() string(APPEND OPTIONS " \ cc=\"${VCPKG_DETECTED_CMAKE_C_COMPILER}\" \ @@ -285,31 +290,12 @@ endif() vcpkg_gn_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS "${OPTIONS} skia_use_lua=false skia_enable_tools=false skia_enable_spirv_validation=false" + OPTIONS "${OPTIONS}" OPTIONS_DEBUG "${OPTIONS_DBG}" OPTIONS_RELEASE "${OPTIONS_REL}" ) -# desc json output is dual-use: logging and further processing -vcpkg_find_acquire_program(GN) -vcpkg_execute_required_process( - COMMAND "${GN}" desc --format=json --all --testonly=false "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "*" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME "desc-${TARGET_TRIPLET}-rel" - OUTPUT_VARIABLE desc_release -) -file(READ "${CURRENT_BUILDTREES_DIR}/desc-${TARGET_TRIPLET}-rel-out.log" desc_release) -if(NOT VCPKG_BUILD_TYPE) - vcpkg_execute_required_process( - COMMAND "${GN}" desc --format=json --all --testonly=false "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "*" - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME "desc-${TARGET_TRIPLET}-dbg" - OUTPUT_VARIABLE desc_debug - ) - file(READ "${CURRENT_BUILDTREES_DIR}/desc-${TARGET_TRIPLET}-dbg-out.log" desc_debug) -endif() - -vcpkg_gn_install( +skia_gn_install( SOURCE_PATH "${SOURCE_PATH}" TARGETS ${SKIA_TARGETS} ) @@ -329,14 +315,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/skia/include/core/SkTypes. # vcpkg legacy layout omits "include/" component. Just duplicate. file(COPY "${CURRENT_PACKAGES_DIR}/include/skia/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/skia") -get_definitions(SKIA_DEFINITIONS_REL "${desc_release}" "//:skia") -get_link_libs(SKIA_DEP_REL "${desc_release}" "//:skia") -if(NOT VCPKG_BUILD_TYPE) - get_definitions(SKIA_DEFINITIONS_DBG "${desc_debug}" "//:skia") - get_link_libs(SKIA_DEP_DBG "${desc_debug}" "//:skia") -endif() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/unofficial-skia") -configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-skia-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-skia/unofficial-skia-config.cmake" @ONLY) # vcpkg legacy file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/skia") diff --git a/ports/skia/skdebug-stdio.patch b/ports/skia/skdebug-stdio.patch new file mode 100644 index 00000000000000..136d75928118ec --- /dev/null +++ b/ports/skia/skdebug-stdio.patch @@ -0,0 +1,12 @@ +diff --git a/src/ports/SkDebug_stdio.cpp b/src/ports/SkDebug_stdio.cpp +index 78c7072b..3d5c134d 100644 +--- a/src/ports/SkDebug_stdio.cpp ++++ b/src/ports/SkDebug_stdio.cpp +@@ -7,6 +7,7 @@ + + #include "include/private/base/SkFeatures.h" + #include "include/private/base/SkLoadUserConfig.h" ++#include "include/private/base/SkDebug.h" + + #if !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_ANDROID) + diff --git a/ports/skia/skia-functions.cmake b/ports/skia/skia-functions.cmake index 609313e68f9dc3..24c4d2f5be354a 100644 --- a/ports/skia/skia-functions.cmake +++ b/ports/skia/skia-functions.cmake @@ -7,6 +7,8 @@ function(declare_external_from_git name) endif() set(actual "${arg_URL}@${arg_REF}") file(STRINGS "${SOURCE_PATH}/DEPS" upstream REGEX "\"third_party/externals/${name}\"") + string(REPLACE "https://chromium.googlesource.com/external/github.com" "https://github.com" upstream "${upstream}") + string(REPLACE "https://skia.googlesource.com/external/github.com" "https://github.com" upstream "${upstream}") string(FIND "${upstream}" "${arg_URL}@${arg_REF}" pos) if(pos STREQUAL "-1") string(REGEX REPLACE "^[^:]*: *" "" upstream "${upstream}") @@ -192,6 +194,68 @@ function(list_from_json out_var json) # set("${out_var}" "${list}" PARENT_SCOPE) endfunction() +# Expand gn targets for installable components. +function(expand_gn_targets targets_var desc_var source_path) + set(expand_gn_targets_components "") + set(expand_gn_targets_visited "") + foreach(gn_target IN LISTS "${targets_var}") + expand_gn_targets_recurse("${gn_target}" "${desc_var}" "${source_path}") + endforeach() + set("${targets_var}" "${expand_gn_targets_components}" PARENT_SCOPE) +endfunction() + +# Private helper for expand_gn_targets. +function(expand_gn_targets_recurse gn_target desc_var source_path) + # shortcuts + if(gn_target IN_LIST expand_gn_targets_components) + return() + elseif(gn_target IN_LIST expand_gn_targets_visited) + return() + endif() + list(APPEND expand_gn_targets_visited "${gn_target}") + + # current target + set(recurse 1) + string(JSON current_json GET "${${desc_var}}" "${gn_target}") + string(JSON target_type GET "${current_json}" "type") + if(target_type STREQUAL "static_library" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + string(REGEX REPLACE "^//([^:]*):(.*)\$" "${source_path}/\\1/BUILD.gn" build_gn_file "${gn_target}") + if(EXISTS "${build_gn_file}") + # skia's third-party "dawn_component" creates separate _shared/_static libs. + string(REGEX REPLACE "^(.*)(_static|_shared)\$" "(\\1\\2|\\1)" name_pattern "${CMAKE_MATCH_2}") + file(STRINGS "${build_gn_file}" maybe_component REGEX "component[(]\"${name_pattern}\"[)]") + if(NOT maybe_component STREQUAL "") + list(APPEND expand_gn_targets_components "${gn_target}") + endif() + else() + message(WARNING "No ${build_gn_file}") + endif() + elseif(target_type MATCHES "^(executable|loadable_module|shared_library)\$") + list(APPEND expand_gn_targets_components "${gn_target}") + elseif(NOT target_type MATCHES "^(group|source_set)\$") + set(recurse 0) + endif() + + if(recurse) + list_from_json(deps "${current_json}" "deps") + foreach(dep IN LISTS deps) + expand_gn_targets_recurse("${dep}" "${desc_var}" "${source_path}") + endforeach() + endif() + + set(expand_gn_targets_components "${expand_gn_targets_components}" PARENT_SCOPE) + set(expand_gn_targets_visited "${expand_gn_targets_visited}" PARENT_SCOPE) +endfunction() + +# Provide a cmake target name (w/o namespace) in out_var +function(get_cmake_target out_var gn_target) + if(gn_target MATCHES "/([^:/]+):") + string(REPLACE "/${CMAKE_MATCH_1}:${CMAKE_MATCH_1}" "/${CMAKE_MATCH_1}" gn_target "${gn_target}") + endif() + string(REGEX REPLACE "[:/]+" "::" target "unofficial/${PORT}${gn_target}") + set("${out_var}" "${target}" PARENT_SCOPE) +endfunction() + # Put the target's SK_<...> definitions in out_var function(get_definitions out_var desc_json target) list_from_json(output "${desc_json}" "${target}" "defines") @@ -201,6 +265,8 @@ endfunction() # Put the target's link libraries in out_var function(get_link_libs out_var desc_json target) + # We don't pass this variable explicitly now. + separate_arguments(known_standard_libraries NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") # From ldflags, we only want lib names or filepaths (cf. declare_external_from_pkgconfig) list_from_json(ldflags "${desc_json}" "${target}" "ldflags") string(REPLACE "-isysroot;" "-isysroot " ldflags "${ldflags}") @@ -218,8 +284,16 @@ function(get_link_libs out_var desc_json target) endif() vcpkg_list(SET output) foreach(lib IN LISTS frameworks ldflags libs) - string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${vcpkg_root}]] lib "${lib}") - string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${vcpkg_root}]] lib "${lib}") + if(VCPKG_TARGET_IS_WINDOWS) + string(TOLOWER "${lib}" lib_key) + else() + set(lib_key "{lib}") + endif() + if(lib_key IN_LIST known_standard_libraries) + continue() + endif() + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${z_vcpkg_${PORT}_root}" lib "${lib}") + string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${z_vcpkg_${PORT}_root}" lib "${lib}") if(NOT lib MATCHES "^-L") vcpkg_list(REMOVE_ITEM output "${lib}") endif() @@ -227,3 +301,152 @@ function(get_link_libs out_var desc_json target) endforeach() set("${out_var}" "${output}" PARENT_SCOPE) endfunction() + +# A revised variant of vcpkg_gn_install +function(skia_gn_install_build_type) + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "BUILD_TYPE;SOURCE_PATH;INSTALL_DIR;LABEL" "TARGETS") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Internal error: skia_gn_install_build_type was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + set(build_dir "${CURRENT_BUILDTREES_DIR}/${arg_LABEL}") + + # `gn desc json` output is dual-use: logging (early) and further processing + # Cf. https://github.com/universeroc/gn/blob/master/docs/reference.md#desc + vcpkg_find_acquire_program(GN) + vcpkg_execute_required_process( + COMMAND "${GN}" desc --format=json --all --testonly=false "${build_dir}" "*" + WORKING_DIRECTORY "${arg_SOURCE_PATH}" + LOGNAME "desc-${arg_LABEL}" + ) + + # build + set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + vcpkg_build_ninja(TARGETS ${arg_TARGETS}) + + # install and export + set(logfile "${CURRENT_BUILDTREES_DIR}/install-${arg_LABEL}.log") + file(WRITE "${logfile}" "") + message(STATUS "Installing (${arg_LABEL})...") + + file(MAKE_DIRECTORY "${arg_INSTALL_DIR}/share/unofficial-${PORT}") + + list(TRANSFORM arg_TARGETS PREPEND "//") + file(READ "${CURRENT_BUILDTREES_DIR}/desc-${arg_LABEL}-out.log" desc) + expand_gn_targets(arg_TARGETS desc "${arg_SOURCE_PATH}") + + string(TOUPPER "${arg_BUILD_TYPE}" cmake_build_type) + set(cmake_config_genex [[\$>]]) + if(cmake_build_type STREQUAL "DEBUG") + set(cmake_config_genex [[\$]]) + endif() + + foreach(gn_target IN LISTS arg_TARGETS) + get_cmake_target(cmake_target "${gn_target}") + set(add_target "add_library(${cmake_target} INTERFACE IMPORTED)") + set(has_location "0") + set(imported_location "") + set(not_executable "1") + string(JSON target_type GET "${desc}" "${gn_target}" "type") + + set(link_language "C") + string(JSON sources ERROR_VARIABLE unused GET "${desc}" "${gn_target}" "sources") + if(sources MATCHES "[.]cxx|[.]cpp") + set(link_language "CXX") + endif() + + list_from_json(outputs "${desc}" "${gn_target}" "outputs") + foreach(output IN LISTS outputs) + if(CMAKE_HOST_WIN32) + # absolute path (e.g. /C:/path/to/target.lib) + string(REGEX REPLACE "^/([^/]:)" "\\1" output "${output}") + endif() + # relative path (e.g. //out/Release/target.lib) + string(REGEX REPLACE "^//" "${arg_SOURCE_PATH}/" output "${output}") + + cmake_path(GET output FILENAME filename) + set(add_target "add_library(${cmake_target} UNKNOWN IMPORTED)") + set(destination "${arg_INSTALL_DIR}/lib") + set(has_location "1") + if(target_type STREQUAL "executable") + set(add_target "add_executable(${cmake_target} IMPORTED)") + set(destination "${arg_INSTALL_DIR}/tools/${PORT}") + set(imported_location "${destination}/${filename}") + set(not_executable "0") + elseif(filename MATCHES "\\.(dll|pdb)\$") + if(CMAKE_MATCH_1 STREQUAL "pdb" AND NOT EXISTS "${output}") + continue() + endif() + set(destination "${arg_INSTALL_DIR}/bin") + # Do not set (overwrite) imported_location + else() + set(imported_location "${destination}/${filename}") + endif() + # output artifact installation + file(APPEND "${logfile}" "Installing: ${destination}/${filename}\n") + file(COPY "${output}" DESTINATION "${destination}") + endforeach() + + # CMake target properties + string(REPLACE "::" "-" basename "${cmake_target}") + get_definitions(interface_compile_definitions "${desc}" "${gn_target}") + get_link_libs(interface_link_libs "${desc}" "${gn_target}") + set(interface_link_targets "") + list_from_json(deps "${desc}" "${gn_target}" "deps") + foreach(dep IN LISTS deps) + if(dep IN_LIST arg_TARGETS) + get_cmake_target(cmake_dep "${dep}") + list(APPEND interface_link_targets "${cmake_dep}") + endif() + endforeach() + file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets.cmake\n") + configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-targets.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets.cmake" @ONLY) + file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets-${arg_BUILD_TYPE}.cmake\n") + configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-targets-details.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/${basename}-targets-${arg_BUILD_TYPE}.cmake" @ONLY) + endforeach() + + # Main CMake config file + file(APPEND "${logfile}" "Installing: ${arg_INSTALL_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake\n") + configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake" "${arg_INSTALL_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) +endfunction() + +# A revised variant of vcpkg_gn_install +function(skia_gn_install) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "SOURCE_PATH" "TARGETS") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_gn_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified.") + endif() + + set(auto_clean_debug_share TRUE) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") + set(auto_clean_debug_share FALSE) + endif() + skia_gn_install_build_type( + BUILD_TYPE debug + LABEL "${TARGET_TRIPLET}-dbg" + SOURCE_PATH "${arg_SOURCE_PATH}" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug" + TARGETS ${arg_TARGETS} + ) + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + skia_gn_install_build_type( + BUILD_TYPE release + LABEL "${TARGET_TRIPLET}-rel" + SOURCE_PATH "${arg_SOURCE_PATH}" + INSTALL_DIR "${CURRENT_PACKAGES_DIR}" + TARGETS ${arg_TARGETS} + ) + endif() + + vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}") + if(auto_clean_debug_share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + endif() +endfunction() diff --git a/ports/skia/support-x86-MSVC-build.patch b/ports/skia/support-x86-MSVC-build.patch deleted file mode 100644 index a0683c659fe2d3..00000000000000 --- a/ports/skia/support-x86-MSVC-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gn/toolchain/BUILD.gn b/gn/toolchain/BUILD.gn -index dcf79cc..599629a 100644 ---- a/gn/toolchain/BUILD.gn -+++ b/gn/toolchain/BUILD.gn -@@ -89,7 +89,7 @@ toolchain("msvc") { - if (target_cpu == "x86") { - # Toolchain asset includes a script that configures for x86 building. - # We don't support x86 builds with local MSVC installations. -- env_setup = "$shell $win_sdk/bin/SetEnv.cmd /x86 && " -+ env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x86\" && " - } else if (target_cpu == "arm64") { - # ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory. - env_setup = "$shell set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && " diff --git a/ports/skia/third-party.gn.in b/ports/skia/third-party.gn.in index 7fd53dc52b2b3e..b637002605f242 100644 --- a/ports/skia/third-party.gn.in +++ b/ports/skia/third-party.gn.in @@ -5,17 +5,17 @@ config("vcpkg_@gn_group@") { if(is_debug) { defines = [ @gn_defines_DEBUG@ ] include_dirs = [ @gn_include_dirs_DEBUG@ ] - lib_dirs = [ @gn_lib_dirs_DEBUG@ ] } else { defines = [ @gn_defines_RELEASE@ ] include_dirs = [ @gn_include_dirs_RELEASE@ ] - lib_dirs = [ @gn_lib_dirs_RELEASE@ ] } } config("vcpkg_@gn_group@_link_libraries") { if(is_debug) { + lib_dirs = [ @gn_lib_dirs_DEBUG@ ] ldflags = [ @gn_ldflags_DEBUG@ ] } else { + lib_dirs = [ @gn_lib_dirs_RELEASE@ ] ldflags = [ @gn_ldflags_RELEASE@ ] } } diff --git a/ports/skia/unofficial-skia-config.cmake b/ports/skia/unofficial-skia-config.cmake index 5183762b803485..88c5d3e9a73219 100644 --- a/ports/skia/unofficial-skia-config.cmake +++ b/ports/skia/unofficial-skia-config.cmake @@ -1,11 +1,16 @@ -if(NOT TARGET unofficial::skia::skia) - function(z_vcpkg_skia_get_link_libraries out_var path libraries) +if(NOT COMMAND z_vcpkg_@PORT@_get_link_libraries) + function(z_vcpkg_@PORT@_get_link_libraries out_var type libraries) set(libs "") + if(type STREQUAL "DEBUG") + set(path "${z_vcpkg_@PORT@_root}/debug/lib" "${z_vcpkg_@PORT@_root}/lib") + else() + set(path "${z_vcpkg_@PORT@_root}/lib" "${z_vcpkg_@PORT@_root}/debug/lib") + endif() foreach(lib IN LISTS libraries) if(lib MATCHES [[^/|^(dl|m|pthread)$|^-framework ]]) list(APPEND libs "${lib}") else() - string(MAKE_C_IDENTIFIER "${out_var}_${lib}" lib_var) + string(MAKE_C_IDENTIFIER "${out_var}_${lib}_${type}" lib_var) find_library("${lib_var}" NAMES "${lib}" NAMES_PER_DIR PATH "${path}") mark_as_advanced("${lib_var}") if(${lib_var}) @@ -17,62 +22,16 @@ if(NOT TARGET unofficial::skia::skia) endforeach() set("${out_var}" "${libs}" PARENT_SCOPE) endfunction() +endif() - # Compute the installation prefix relative to this file. - get_filename_component(z_vcpkg_skia_root "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(z_vcpkg_skia_root "${z_vcpkg_skia_root}" PATH) - get_filename_component(z_vcpkg_skia_root "${z_vcpkg_skia_root}" PATH) - if(z_vcpkg_skia_root STREQUAL "/") - set(z_vcpkg_skia_root "") - endif() - - add_library(unofficial::skia::skia UNKNOWN IMPORTED) - set_target_properties(unofficial::skia::skia PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_skia_root}/include/skia" - ) - - find_library(z_vcpkg_skia_lib_release NAMES skia skia.dll PATHS "${z_vcpkg_skia_root}/lib" NO_DEFAULT_PATH) - find_library(z_vcpkg_skia_lib_debug NAMES skia skia.dll PATHS "${z_vcpkg_skia_root}/debug/lib" NO_DEFAULT_PATH) - mark_as_advanced(z_vcpkg_skia_lib_release z_vcpkg_skia_lib_debug) - - set(z_vcpkg_skia_config_debug "\$") - if(NOT z_vcpkg_skia_lib_debug) - set(z_vcpkg_skia_config_debug "0") - endif() +get_filename_component(z_vcpkg_@PORT@_root "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(z_vcpkg_@PORT@_root "${z_vcpkg_@PORT@_root}" PATH) - z_vcpkg_skia_get_link_libraries( - z_vcpkg_skia_link_libs_release - "${z_vcpkg_skia_root}/lib;${z_vcpkg_skia_root}/debug/lib" - "@SKIA_DEP_REL@" - ) - set_target_properties(unofficial::skia::skia PROPERTIES - IMPORTED_CONFIGURATIONS RELEASE - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C" - IMPORTED_LOCATION_RELEASE "${z_vcpkg_skia_lib_release}" - INTERFACE_COMPILE_DEFINITIONS "\$<\$:@SKIA_DEFINITIONS_REL@>" - INTERFACE_LINK_LIBRARIES "\$:${z_vcpkg_skia_link_libs_release}>>" - ) +file(GLOB z_vcpkg_@PORT@_config_files "${CMAKE_CURRENT_LIST_DIR}/unofficial-@PORT@-*-targets.cmake") +foreach(z_vcpkg_@PORT@_config_file IN LISTS z_vcpkg_@PORT@_config_files) + include("${z_vcpkg_@PORT@_config_file}") +endforeach() - if(z_vcpkg_skia_lib_debug) - z_vcpkg_skia_get_link_libraries( - z_vcpkg_skia_link_libs_debug - "${z_vcpkg_skia_root}/debug/lib;${z_vcpkg_skia_root}/lib" - "@SKIA_DEP_DBG@" - ) - set_property(TARGET unofficial::skia::skia APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG - ) - set_target_properties(unofficial::skia::skia PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C" - IMPORTED_LOCATION_DEBUG "${z_vcpkg_skia_lib_debug}" - ) - set_property(TARGET unofficial::skia::skia APPEND PROPERTY - INTERFACE_COMPILE_DEFINITIONS "\$<\$:@SKIA_DEFINITIONS_DBG@>" - ) - set_property(TARGET unofficial::skia::skia APPEND PROPERTY - INTERFACE_LINK_LIBRARIES "\$:${z_vcpkg_skia_link_libs_debug}>>" - ) - endif() - unset(z_vcpkg_skia_config_debug) - unset(z_vcpkg_skia_root) -endif() +unset(z_vcpkg_@PORT@_config_file) +unset(z_vcpkg_@PORT@_config_files) +unset(z_vcpkg_@PORT@_root) diff --git a/ports/skia/unofficial-skia-targets-details.cmake b/ports/skia/unofficial-skia-targets-details.cmake new file mode 100644 index 00000000000000..8246b36081f794 --- /dev/null +++ b/ports/skia/unofficial-skia-targets-details.cmake @@ -0,0 +1,18 @@ +# Exported from "@gn_target@" +if("@not_executable@") + set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$>") +endif() +if("@has_location@") + set_property(TARGET @cmake_target@ APPEND PROPERTY IMPORTED_CONFIGURATIONS "@cmake_build_type@") + set_target_properties(@cmake_target@ PROPERTIES IMPORTED_LOCATION_@cmake_build_type@ "@imported_location@") + if("@not_executable@") + set_target_properties(@cmake_target@ PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "\$<@cmake_config_genex@:@interface_compile_definitions@>" + INTERFACE_INCLUDE_DIRECTORIES "@CURRENT_PACKAGES_DIR@/include/@PORT@" + IMPORTED_LINK_INTERFACE_LANGUAGES_@cmake_build_type@ "@link_language@" + ) + z_vcpkg_@PORT@_get_link_libraries(z_vcpkg_@PORT@_link_libs "@cmake_build_type@" "@interface_link_libs@") + set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_LINK_LIBRARIES "\$>") + unset(z_vcpkg_@PORT@_link_libs) + endif() +endif() diff --git a/ports/skia/unofficial-skia-targets.cmake b/ports/skia/unofficial-skia-targets.cmake new file mode 100644 index 00000000000000..7c0c35f190f8db --- /dev/null +++ b/ports/skia/unofficial-skia-targets.cmake @@ -0,0 +1,8 @@ +# Exported from "@gn_target@" +if(NOT TARGET @cmake_target@) + @add_target@ + if("@not_executable@") + include("${CMAKE_CURRENT_LIST_DIR}/@basename@-targets-debug.cmake" OPTIONAL) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/@basename@-targets-release.cmake") +endif() diff --git a/ports/skia/usage b/ports/skia/usage index 36b64c19318220..7b1bdb3f45bd42 100644 --- a/ports/skia/usage +++ b/ports/skia/usage @@ -2,3 +2,5 @@ skia provides CMake targets: find_package(unofficial-skia CONFIG REQUIRED) target_link_libraries(main PRIVATE unofficial::skia::skia) + + # Similar for optional components, e.g. unofficial::skia::modules::skparagraph diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 9cc7507e4eeaf6..4053b6100317f5 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "skia", "version": "0.38.2", + "port-version": 1, "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.", @@ -8,7 +9,7 @@ ], "homepage": "https://skia.org", "license": null, - "supports": "!(windows & arm & !arm64)", + "supports": "!(windows & arm32) & !mingw", "dependencies": [ "expat", "libjpeg-turbo", @@ -19,6 +20,10 @@ "default-features": false, "platform": "windows & !arm64 & !uwp" }, + { + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "vcpkg-cmake-get-vars", "host": true @@ -38,7 +43,30 @@ "zlib" ], "default-features": [ - "default-features" + { + "name": "direct3d", + "platform": "uwp" + }, + { + "name": "fontconfig", + "platform": "linux" + }, + { + "name": "freetype", + "platform": "!(windows | osx | ios)" + }, + { + "name": "gl", + "platform": "!uwp" + }, + { + "name": "harfbuzz", + "platform": "!uwp" + }, + { + "name": "icu", + "platform": "!uwp & !(windows & !static)" + } ], "features": { "dawn": { @@ -47,45 +75,6 @@ "vulkan-headers" ] }, - "default-features": { - "description": "Default feature configuration", - "dependencies": [ - { - "name": "skia", - "default-features": false, - "features": [ - "direct3d" - ], - "platform": "uwp" - }, - { - "name": "skia", - "default-features": false, - "features": [ - "fontconfig" - ], - "platform": "linux" - }, - { - "name": "skia", - "default-features": false, - "features": [ - "gl", - "harfbuzz", - "icu" - ], - "platform": "!uwp" - }, - { - "name": "skia", - "default-features": false, - "features": [ - "freetype" - ], - "platform": "!(windows | osx | ios)" - } - ] - }, "direct3d": { "description": "Direct3D support for skia", "supports": "windows" @@ -130,7 +119,8 @@ ] }, "icu": { - "description": "Use icu", + "description": "Use icu.", + "supports": "!(windows & !static)", "dependencies": [ "icu" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1df2de4d6c5913..44d9e56ca4a04f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1083,9 +1083,6 @@ simd:x64-android=fail sjpeg:arm-neon-android=fail sjpeg:arm64-android=fail sjpeg:x64-android=fail -skia:arm-neon-android=fail -skia:arm64-android=fail -skia:x64-android=fail sleef:arm-neon-android=fail sleef:arm64-android=fail sleef:x64-android=fail diff --git a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json index 9a573f4cf1b18f..586b3a3a5315cb 100644 --- a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json @@ -1,16 +1,16 @@ { "name": "vcpkg-ci-skia", - "version-date": "2022-11-24", + "version-date": "2023-11-12", "description": "Builds an app in order to validate the skia port.", "license": "BSD-3-Clause", "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, { "name": "skia", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 571140da4c20f8..70e8ce6443f7d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7914,7 +7914,7 @@ }, "skia": { "baseline": "0.38.2", - "port-version": 0 + "port-version": 1 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 3303b6b7a9e684..d8f3ddbfbc0842 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7363d84372c8a2a6e3c06a7fcc6c1ef1d1b7b97a", + "version": "0.38.2", + "port-version": 1 + }, { "git-tree": "5a7376b3d299acc253980a36193079fbb42eea1b", "version": "0.38.2", From 4cac260c4b7331538d31886f57739fea0bffa27e Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:36:07 +0800 Subject: [PATCH 0504/1039] [glfw3] Fix the name of the dynamic library under win in the pc file (#33991) * Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * update version * Fix the name of the dynamic library under win in the pc file * update version * Fix the name of the dynamic library under win in the pc file * update version --- ports/glfw3/fix_win32_dllname.pacth | 29 +++++++++++++++++++++++++++++ ports/glfw3/portfile.cmake | 2 ++ ports/glfw3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glfw3.json | 5 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 ports/glfw3/fix_win32_dllname.pacth diff --git a/ports/glfw3/fix_win32_dllname.pacth b/ports/glfw3/fix_win32_dllname.pacth new file mode 100644 index 00000000000000..99484aa61bf974 --- /dev/null +++ b/ports/glfw3/fix_win32_dllname.pacth @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7506916..1ec8e9e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -333,6 +333,12 @@ write_basic_package_version_file(src/glfw3ConfigVersion.cmake + COMPATIBILITY SameMajorVersion) + + configure_file(src/glfw_config.h.in src/glfw_config.h @ONLY) ++set(GLFW_LIB_NAME_SUFFIX "") ++if (BUILD_SHARED_LIBS) ++ if (WIN32) ++ set(GLFW_LIB_NAME_SUFFIX "dll") ++ endif() ++endif() + + configure_file(src/glfw3.pc.in src/glfw3.pc @ONLY) + +diff --git a/src/glfw3.pc.in b/src/glfw3.pc.in +index f74298d..17779ac 100644 +--- a/src/glfw3.pc.in ++++ b/src/glfw3.pc.in +@@ -8,6 +8,6 @@ Description: A multi-platform library for OpenGL, window and input + Version: @GLFW_VERSION@ + URL: https://www.glfw.org/ + Requires.private: @GLFW_PKG_DEPS@ +-Libs: -L${libdir} -l@GLFW_LIB_NAME@ ++Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@ + Libs.private: @GLFW_PKG_LIBS@ + Cflags: -I${includedir} diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index cb9472a7c4dc93..4eba573c854ed8 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8 SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87 HEAD_REF master + PATCHES + fix_win32_dllname.pacth #https://github.com/glfw/glfw/pull/2386 ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index b6405ac3273416..90cd3a0dadedd9 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glfw3", "version-semver": "3.3.8", - "port-version": 2, + "port-version": 3, "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 70e8ce6443f7d3..ae8f2e94d63848 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2986,7 +2986,7 @@ }, "glfw3": { "baseline": "3.3.8", - "port-version": 2 + "port-version": 3 }, "gli": { "baseline": "2021-07-06", diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index ddbd52f795e149..52cf8a86158423 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c21a08a861a502b0e10c4a82de391a60bba6a4e6", + "version-semver": "3.3.8", + "port-version": 3 + }, { "git-tree": "308cd3ebdf6752e9d5eeb2933f33972c784aa8bd", "version-semver": "3.3.8", From 547e01527ceda893d4540487af4b4a18e3d9f048 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:02:33 +0800 Subject: [PATCH 0505/1039] [sqlite-orm] test feature unsupport uwp (#35390) * test unsupport uwp * update version --- ports/sqlite-orm/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/s-/sqlite-orm.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json index 6b269e81019f48..68a805c359555d 100644 --- a/ports/sqlite-orm/vcpkg.json +++ b/ports/sqlite-orm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite-orm", "version": "1.8.2", + "port-version": 1, "description": "SQLite ORM light header only library for modern C++", "homepage": "https://github.com/fnc12/sqlite_orm", "license": "AGPL-3.0-or-later OR MIT", @@ -21,6 +22,7 @@ }, "test": { "description": "Build sqlite_orm unit tests", + "supports": "!uwp", "dependencies": [ "catch2" ] diff --git a/versions/baseline.json b/versions/baseline.json index ae8f2e94d63848..b50c422a4de31f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8122,7 +8122,7 @@ }, "sqlite-orm": { "baseline": "1.8.2", - "port-version": 0 + "port-version": 1 }, "sqlite3": { "baseline": "3.43.2", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index 0e09c68aa07d1b..1c77b648f9c089 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13e0d0b90109dcaf60af5d316ece18d4cf6ef50e", + "version": "1.8.2", + "port-version": 1 + }, { "git-tree": "d46221e51b059d05e7f65620b5e377fdc3673d74", "version": "1.8.2", From 18368dba5b9cab3e4cf7643f2a640058bb450bed Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 30 Nov 2023 04:15:44 +0100 Subject: [PATCH 0506/1039] [Qt] update to 6.6.1 (#35365) * update qt to 6.6.1 * adjust patch * v db add qtgraphs to qt metaport * v db * remove copypasta * v db --- ports/qt/vcpkg.json | 3 +- ports/qt3d/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 | 89 +++++++++--------- ports/qtbase/cmake/qt_port_details.cmake | 14 ++- 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 | 3 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtgraphs/portfile.cmake | 8 ++ ports/qtgraphs/vcpkg.json | 26 ++++++ ports/qtgrpc/vcpkg.json | 2 +- ports/qthttpserver/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 2 +- ports/qtlanguageserver/vcpkg.json | 2 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/static_find_modules.patch | 11 --- ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/fix-build.patch | 22 ----- ports/qtopcua/vcpkg.json | 2 +- ports/qtpositioning/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquick3dphysics/vcpkg.json | 2 +- ports/qtquickeffectmaker/vcpkg.json | 2 +- 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/qtspeech/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 | 98 ++++++++++---------- versions/q-/qt.json | 5 + versions/q-/qt3d.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-/qtgraphs.json | 9 ++ versions/q-/qtgrpc.json | 5 + versions/q-/qthttpserver.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/q-/qtlanguageserver.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-/qtquick3dphysics.json | 5 + versions/q-/qtquickeffectmaker.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-/qtspeech.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 + 98 files changed, 423 insertions(+), 172 deletions(-) create mode 100644 ports/qtgraphs/portfile.cmake create mode 100644 ports/qtgraphs/vcpkg.json create mode 100644 versions/q-/qtgraphs.json diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index eff8c4d1918456..0191ed18498743 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, @@ -52,6 +52,7 @@ "platform": "linux" }, "qtdoc", + "qtgraphs", "qtgrpc", { "name": "qtimageformats", diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index d21dbde26ab214..9e9520ba633fef 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 339936014497fb..7a084edd150e18 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.6.0", + "version": "6.6.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 56c39465851787..0095c9deabfa5b 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.6.0", + "version": "6.6.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 597e0c5bd252ef..cb81af69beaeb4 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.6.0", + "version": "6.6.1", "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 51a26c6f44f2e5..ff40dae4c2297a 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,47 +1,48 @@ -set(qtbase_HASH "4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17") -set(qttools_HASH "42a5df24b57afc5d60d33d6e6dc4021b9c1dbaba2fb7cab251ab636df8457619ee55177d6fe3dd93db335f271a3b40a86a9f7a3c76e34373ed7bce449a9b0652") -set(qtdeclarative_HASH "6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a") -set(qtsvg_HASH "3c62b0b1425815fbbeb1d46cc3599edbf5c3b07f1f28840801d34620c0fe81740ad4b70743b72e8a52bdabcb14d77378f1c3fabae4eae2d29e017c8f40923205") -set(qt5compat_HASH "d6eb6ab52281e8b78de2a28aeaa1c0f9107634b5ada9700a4bad4f6fa66e2983dad6566b99d030d0980dd9817395fa033ebee7b79960fa527882b9239e908ff7") -set(qtshadertools_HASH "2b34f596c04eb7d24c83bd09c5a1a10923c0a0e7e94af5443b58c5b41285067da46ff06686877431fa7d385e07e019a1617f15a0bb6a423849d7288bafb41c2e") -set(qtquicktimeline_HASH "a2f8c1d7075fdaf57d7d4fc5f087449ef1a78ea6b6ab4ae7801decdb2436b7f95aefadaf365ab7c2ad0ceaf1f066c3c0ea189f3e3a18d41b89e391e6e5f33940") -set(qtquick3d_HASH "309800ad6afc1959d83d7dba97af41954b813486740f99747df6d997a3420c3a9fcc97e52ae67a390b34885ca9bc683cdecea55dd2ab4b530e7594654fa13454") -set(qttranslations_HASH "99dfd8a2e13f7862a21f9bccde4aa719bca1136addcc3e144fed0632a7d2341b27a44432c36d96ea221e6b5a9b6135241c1f2deeec5be3cbd40e5257ce3f8b77") -set(qtwayland_HASH "e9cf63ccc71d4dc61b04a0f8a1a466e9ede09aa689c53c1ccc9db5233e324894bfd198c9204d8d93509c770a7a6612c8eb9981e0b3ee7428f8bf2dcbdc255109") -set(qtdoc_HASH "15593b8bc37c7e8f5082e0c201e6a99a7646feed52b44dffb46d41d555e7cb060185229c3e271631ec3730947df25af0294561304a8352022e5f5688167ee78d") -set(qtcoap_HASH "27f3f48d3e8e32672194ce2377dc02974d01d5714071104359bb8003999a9b9184170da0ee618449493724036305a9ed47cfdf12fd4a63dfd48671114b05d11b") -set(qtopcua_HASH "d019c8dfc077a725704923234a9ef86d9ce68fdfb1187d18ff3bd9c6a5cc53ac502a67bbf27b70fc20807e99e9eb7d5da094a19bd8cedc1a2e51cc679a7e478f") -set(qtimageformats_HASH "e68d945abfd6f099abeb29d97beff90dd4856c9ad05491e440536edfbf299d1aba32eefc519a87d7e61f9ffcb4cd142ecb4e9d3c2aa10f93b5033de99e8ad0d1") -set(qtmqtt_HASH "22727b04340adffdb0f260cce46b57181c721aab29a1676c42ee64ef4df330556804286357143f858853e10e94230158d7d245d374925c4bab1ab385a4698252") -set(qtnetworkauth_HASH "5954da0478459f217979f6feba067ab4c42333995a203c3245289fcd9b966d18d0824099ff673d9e8a954562ff26595076be727f13194b3318060b7dbcab6ce9") -set(qt3d_HASH "7339fc08173793949f28b117c610e42bd25094d186b93db0a244c429e5232d9f5918247c654ee6c6f66802943eeadd1a545261a98b83db71e20b7867f27d94a7") -set(qtactiveqt_HASH "8f5271ee72499a2965f040ba4f2f7604f23d3c37b828612d7482b6b799b12875da5b916899e80b572a0d7217ce4349389e1e72701438fb9855bc7dbbf1ef6dbd") -set(qtdatavis3d_HASH "fc65c9a0685973bc39d2d54a40d537d9be99c442922c8f60db2c02d7c5ed2e33e4aeaa4c4c76267c6660aa66b6bdd3544d1c371925de74657512a5961b558965") -set(qtdeviceutilities_HASH "26659891a2bb4773ccd9cff8cf8a4e69d3b3649842a1dadb5efb62bb5e7411fb0c9d6d41321d1c850668942999ec55fdc5b54b8fde82fd0571a30d90653bacbb") -set(qtlottie_HASH "d565095945ea18d8524c993f428bc279e755ee5860e4888e7bbd553187aaed0b979fe864f518a439fcdbc663a9176168eebf338d76656876c945e8a21e3ba5f2") -set(qtscxml_HASH "ccb4c04048d4c18625b890b6a84a4ccf12108df88c0af0dff2dfa64b504116802fd6061226f991a212016210ab468f520d44bf4299d3ae79e7fe873e4d10c120") -set(qtvirtualkeyboard_HASH "5bf8c8b892c5398bf78662be3f44fbeb2f7dc96bf4ee88739f778c6427e5c8fd9f3e80356b9bd0ebea8f8adb733de44de51e8aaa6009b7cc52f0d0b5bfd3658b") -set(qtcharts_HASH "87659269eebeb36558337f1e7a954d93f9a0d4b7783611fa47a562c1f7e60b4f228e58650f69aacc72c656f322d3a5763a662206228667aeb32b16242b912bd2") -set(qtconnectivity_HASH "f660edbfaa9aefebdb602bb44b2e62b8a5d8dceba4b8c3d73d0f9daf6c29ff5f8953c134dc5af79dfd90b888f97d99e44f91a8e0aee3a51b278747eee2d1c381") -set(qtpositioning_HASH "6e71563444b1d3102ba6ad4ad04541b7ea3f7ee8737ebab76f7c8f7df5ac8e57afa0612bf634b97da5b7a424f7b2dcf28d57f5e67b91266a5138cbd41de8a0f3") -set(qtlocation_HASH "e4e492229d961bc34630aaff030b46385708312de174c9c47f85a6010f1fcb74e198333920fd5c02153a8bbae770c83d8cd1777177d9c9d7a1d555b6619be8f2") -set(qtmultimedia_HASH "ccfdd1aaed76dfb06692e212405d9b2804aa3da924c903febf5ee3fde057f4543f76284a543c808f600d61b5eadfbfe2437932f5ff4a7d19941c9ab3eae2d8a0") -set(qtremoteobjects_HASH "ef1307247e8355bdc8fd38255d8d75d821bbcdd4098e11e04ff1d63dc11656c7a52a99d4398fd437efc6df782130a2d10820c697385bc8901bb2e182340e91d3") -set(qtsensors_HASH "d7aa9a9c06c3c2c090a7ea570a9f01914ff62775ae9b6c4e4f6296e0f891d5b45fd0bedd04cebf02e314f73e8ccb8997bffe05ef04c19421f66638a4781a4b7d") -set(qtserialbus_HASH "90ec1ebba16247781e294d482257314f681f668d0abea84862d4f64bc09bafdaea5081098a5df716f22c1d0098862aa3ea3d4eba167470e0c35c4181dbe8366b") -set(qtserialport_HASH "8fc91ed80a7a58b2126f746a1148f64d34812574180d9b8609629e93903ce6d026f279aac87e0acd90f995d57ba12290fe57294ca15482c035337566ffe51fc6") -set(qtwebchannel_HASH "bffa1aeaefc1b3b5e8d0f958a689b9debd37134ed705f029c2edbd0c483181a474648c251e4921fc8a3d32ce6c1632e82ddba51c55cfb49843cf022870f053f7") -set(qtwebengine_HASH "30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366") -set(qtwebsockets_HASH "c679be915ed3831778d527d29a8a7277cdfe3912dbfd3d813750006c41c9433786122306db658bb5c1c22e22da9cdc339794b53c4f6c36d4603e98ddff60f0ef") -set(qtwebview_HASH "f76a64a36388e8fc7376d045dde6a54cfefb13c2b72378d9f7d35cc7c91c8a02ed8973918b335e67fc326967ae64a07fe685c521f5e0b30494d5e0a931b27b74") -set(qtinterfaceframework_REF 27cb74bdf3e24400687881fbf873c404bff49f37) -set(qtapplicationmanager_HASH "5c0f8f9b73bc3531727af9cb0175c1cc6487f81cfdc8574b53e5ce88375d767cd8b4d912a39545eab0219465ff633d913fb769fc44fc9715702f90e168117d81") -set(qtlanguageserver_HASH "58bc24427f7f33772bebfd5a67c091315b4c913a3c8d6c48a151046543e2756c4c2b0fa03e64bc6b1c760b28849b19676e86b24c4242353fd0aff5b8fa6015d5") -set(qthttpserver_HASH "06e501042d4fb78f4ade4093fc05940373156cc2fedc11f0a3b2191cc975fd92e660921c0c88ebc124cf243457f0dfedf7a1f32d30cd24e7fc74397191edd79d") -set(qtquick3dphysics_HASH "aba0669499ccc4989d50d3bd00b591317a8f09d234767f6ae10c360989a002a7426dc867c19843701e7a7f14b526c18be50274d5a30638e74a80e4257c6490f8") -set(qtspeech_HASH "29fc5e2401ac0d184ca5931c86eba152d33433ef60e91e3c30fdce79438e13f89b9f7ea01452c528fabd24425a9396c6d6f18b8d7d085a002073f0d27ec2a56a") -set(qtgrpc_HASH "e839d7a79349c33460850384933317af61c77abe90682566d8d457470619ca0571190befa91f71c8ba358f5320c11ac0090dffd29b99145134702fa571bb2432") -set(qtquickeffectmaker_HASH "7f89c05cc421a90c0006f3411a9965f27ada45de149a0ce0ca0f9d3b6d0a05ab5409e3cc66aa7cf8563b4d0796c77eb17976c56c03d65bc0724f0451eb0b810b") +set(qtbase_HASH "93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1") +set(qttools_HASH "7f7bfaf7f01a5374f711c20113e9461b83a6f908b48c7b3f662f8821a70ef0c792f040f2e8e62a570fec06df2329fe5eb953c680424262b3678ab283045e6909") +set(qtdeclarative_HASH "1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd") +set(qtsvg_HASH "46ca0e90a864678bbf46ac9618aacd1c2265eb336a798f6f09ab39cbfa7b16267b8d842f36b01c58d482a319bcd2172e7cbf09c08cd767a9e89d9b6d89b4a417") +set(qt5compat_HASH "2d5e2e40621590adb489dac4ae9a28fe8c2436de05dfe5aea47e449ae88ef82dd831e786d8290d04315c827f8adf217374ea5c6919ae12932496c5cd6ac28c01") +set(qtshadertools_HASH "1cc6e1e003754dd665b5633c0e38bab749b7fa002d68d5fff9caef850895ea30145fcb2a10621c5a666297bba9b95fcfaeb047b849b02f1992de3299cd675c03") +set(qtquicktimeline_HASH "c35c19d67ea0fcb3e052a35207a7e6a42a4c7b6784e2a33c7e9928735a56085f1cc3b4aeead428ccc9149bb74b7c70db1a94f6ab79101e6dd77dcffef937ba86") +set(qtquick3d_HASH "1a663920b3d2010de1b38ed559a2391d31a5c42dfdb0c414723acdf778c1fce2f6f74295bb260201d0a9ac64ff30570599e8d8b97229f6c5f33229a19a1fe763") +set(qttranslations_HASH "727d3cf53dc80754771318b2d0f32ad09e5d5f02127d5003ee3f9685bf5742d19efe3e3c1ee03d4def908b23173f0417e4115376474d3a8d7f05062960565850") +set(qtwayland_HASH "7f6533754daad7a2804ddddcd5139608c2b8f1ef92ae8a238c1ed4fc41c8a3ee532da0b2e57266d07d4d39d1ec6c83eca487c73788a108af30035b0dae262c76") +set(qtdoc_HASH "151727a9d578cddf0f922d7429c46fd1983419832dcb0163f82b0c7333e8f3ba5e9f810cc4070de03f1ac959aa0a3253999fdd1f7e1d451cf2169e5394cfafc1") +set(qtcoap_HASH "0c094b7743cb675ea92cc2e16dacc44b29bb060b5fa083208c123089b82092672b7877775e335e8dd148d700b8a13475f2ca5e061888a06f5c1844a02aa1b09c") +set(qtopcua_HASH "59cb047bd647d0418ffd10e576d8ba42c363a9a9eb62122a8b49161df6c8b8c19d30f535687e39b3a4b0ee885374a187bf60873bdfe387ccf320eba52435718a") +set(qtimageformats_HASH "da72e093b86638da5e5a5bd78a4ca88b72675d6294ad2af4b516affe88212ccc797ea859784b1f548c75c82fe926d3cd8f96a88901b475d60dc0dc30cfedb5a0") +set(qtmqtt_HASH "ba23048e80faae1c8cc34cb1c4731b19cd4f5c394fa190443cedfe06b6754d1f59cf7110a230deb4d6c065db14d14b035c3f86058caf62e8d0bac12cdc9cfa02") +set(qtnetworkauth_HASH "8d52344802ed6e9e6b60f1367ee9f9c2d495908a3992fa03f67d551c090cc837d02a560ba8e4244b739610b8ded0cb1bdc84ffa3f4183a6aa89df3b42310409f") +set(qt3d_HASH "c924ded219fb6a6f49eff83b41f9d290119f99e9910521098c6d979282ebfe1dab32afdd7a249fdedecad26a8683776087ef15b5657976e2ae85de7319c67c19") +set(qtactiveqt_HASH "653d8e634cead141b2f53f0c2339a36ffe254b046e514d5ad4f1453acf6bce73a2bb0d38b95f78a30a5cf0f59511fcb99a2464033551c4cbe775e0d25e10a7d0") +set(qtdatavis3d_HASH "a4d1b3b705e87b883b5cab94798c459d6151b4c560038f26ec2633998e2a18d176d7718ea876bba63b21bb61732d8e3a2097793b9f2ba57c382b40f2ca3f270c") +set(qtdeviceutilities_HASH "8ed34c952e31edc8e90928df3a992ae85edc5401108ad0d24fe2141336d873e776c406b90155a5da6a5fa06abd09cd4d226e5befdc32fa3b04904c5dd2d5a2c0") +set(qtlottie_HASH "ee7f2253610dec22f55ce6f1eb2479e5c26137c55ca705716961f53fa6296cae6fa6a982911131eb42f451bf59db6f17c4e0fb8725a81d12b259e253da39a779") +set(qtscxml_HASH "3c4b117138e9437a0e7b3f212e3a77aaf42c9fcbfdb30db0693e3fbf1562c68a88558951ff627dc9e91ff10625f3b269d115479e83cada46b9f9094f3d51e5a7") +set(qtvirtualkeyboard_HASH "9b12e3dc6bab0ae1dd86c4b2ff1b8dbff3477b2a2a17a123f34874a59aa02f3ae6ccc550046d1f3976e010ba74b4534667366498b1aa3604ac1d380db326740f") +set(qtcharts_HASH "1af5cb891454af3b0218e3475576609d438cbbbf9b52b2e614d1016cec8aff5b453d33964574b898ed70dff9ba78b17c1c5a0a186f508116ee721efc4e410778") +set(qtconnectivity_HASH "b1a1962d881c1965c56cef5226b3eac39613332c96778daf322fa0ccba9aa33677e1943f3bb3f7efbdd8aec81623ca6b59c2340c805346935ef77e7606210dab") +set(qtpositioning_HASH "8114d9cec0e453ff51fdbe8b1a814c968e614e1f9aaf031bf00c0c48e732de728d925852789360411c594f63ae322404fc9403d0bc3a35500522d8dc403d79e2") +set(qtlocation_HASH "aa820e84efe3576bf483cd7d64a3b930f731c88324d34cc1486312c1cb0107a726dea91dc226562f017695300f0d656228d947d97374747c3ac6ae597cda6bb5") +set(qtmultimedia_HASH "11fb3e421a80fee82d30a817f20277505868de0c1a870c55dd488114a0302f6a1bf41694ed64d904e4d29b1a3ad1ba01ce8399ae11f03ae2f6994359698e9c94") +set(qtremoteobjects_HASH "92d2ae9fa1f8ddff0e68bcaf54c9298ff54c7146fdf9e57ab60668057067797ecd1d72a08c5db827942985423075116d55213689114230c1bfa632e63756478b") +set(qtsensors_HASH "962f8947bbf21bd08c4b1a7da367fca1d0ec934a32a9820280730efa3f7e8b377a9f547bc91d4373d321ba74a147b7913bdf153599183b21f2ef10730132bb06") +set(qtserialbus_HASH "11245960ab411a490bbc70388f35b4f9109df43d87882da3af4994a5c0e415f052ec86f3e16931ebd4adf3d980f7fa9e3dcfc2791e6f7aebdd0eba6f32622ea2") +set(qtserialport_HASH "5841f6227725ed61a6e88f5359c0c75ff9192a66e916cc93a8028b03c2689dd10ea8f339a67cd0a26b55b44495880b3032ea1d5d99b716342912195a9b10516a") +set(qtwebchannel_HASH "027b22f8edfc3285199272bf367254749ed99de5a1f3724967e765c76cb3ba2e9946746414e9fac8e52ea12a52717b1da0186ddf0ac5d6e3588796c0b9592772") +set(qtwebengine_HASH "d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0") +set(qtwebsockets_HASH "0b067c263887002f415326c013a7c83634403ac486f9696a81ac601c7be421bd8a1fc97a86f10abb369fac9e4661d54571aaf559565125a1fa8005a718950559") +set(qtwebview_HASH "cb3093b233b3c77690be4c0c7cb7c7facd2d62c5a20f5f490a7881d97216ba13320e208dc74b7c02899250caa3d643b70c7ae5996ae15d2b2167fe4619046d3b") +set(qtinterfaceframework_REF a2085374e38a135eaacfe7533888f0a361d4c721) +set(qtapplicationmanager_HASH "a6c291d63e911f5344bd5a8fa6149e361402167c1c7c3a1672e5731ac664e01131b6f8f7b31ce6cbada7a0ec91d1aa6c9af7f9ef5125870a569c7e6bd4cf80dd") +set(qtlanguageserver_HASH "35b5c9419ca426643564a5df4bed16f586bb6841ecdf28dbd626fb1ab70f1cbd0f1da9a4e2f03a3829e68139b059d731b193bde5fe493cbc955303cb7f33086b") +set(qthttpserver_HASH "f851c8f5ea9cd4067474dee30ca797a2acb70ecaab2d993afe6abba3622fe3139acc6245b78f7d12b7e5dca5fc90aabd5144a3429c58a5f13cf23c6fbb023c24") +set(qtquick3dphysics_HASH "84d898ae8fa73b4ef941c16c29ca26044e680d2ab447026423ca30bf0c495cffef2753463bbf7b52228c4631ef239625982b7d3ccbc116d78d3af27378b8bf55") +set(qtspeech_HASH "79a2f9192585efbea0567648e4dcbf8f36f31f28463b031378a5027c036870c67b7b15c1223fbf838fae7f8e5b036fb29ca0a631cb7d19b0a40c55588b34d5a5") +set(qtgrpc_HASH "9fb537dab8ad79cac2b076989952decdeebe40c1a0fceebe3dd70ee1f1e60c679d0314637998bb36f1d0f35c894896358e77d87c1c9f832283b4a8943352317a") +set(qtquickeffectmaker_HASH "4f61a66cd01691d5318331b3a96cdc0d6ea902ed293ab93d45fb72ce0cec5cf5df0e4877cba09114c5ff6169cfa13e0fe41eb15dc48070ad4ed81c22739fe482") +set(qtgraphs_HASH "9f768ed53ae696ba15321b8de5658cea9a989dbdea276712ba5bc057048a13fae2b1913994dc77da1456896beb52c4644054777db1319f9c4a4dfa012bc2ba44") # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 151dc74961e4be..8dd317d049880b 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.6.0) +set(QT_VERSION 6.6.1) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) @@ -90,6 +90,18 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0) qtquickeffectmaker ) endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.6.0) + list(APPEND QT_PORTS + ## New in 6.6.0 + qtgraphs + #qtvncserver # only commercial + #qtinsighttracker + ) +endif() +#qtinsighttracker +#qtvncserver +#qtgraphs + # 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) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index cee0cfb67f1711..a1d43d2a333412 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.6.0", - "port-version": 1, + "version": "6.6.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 1d012678c47eb8..60b23d828e5cf0 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.6.0", + "version": "6.6.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index cfc92f473990aa..16632785cc3dcd 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.6.0", + "version": "6.6.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 69d7c4385021e8..e67dffa2c8fe74 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 47391000fdc673..2ebba253bb7ae2 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.6.0", + "version": "6.6.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 35e1cbc4b3ea7d..14b170f50d7c5b 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtdeclarative", - "version": "6.6.0", - "port-version": 1, + "version": "6.6.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 9abee0d7ba74a6..fb678f1d68c048 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.6.0", + "version": "6.6.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 281d5d49a49b5e..07f3c4e3fd09d0 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgraphs/portfile.cmake b/ports/qtgraphs/portfile.cmake new file mode 100644 index 00000000000000..014d19bd67d1b5 --- /dev/null +++ b/ports/qtgraphs/portfile.cmake @@ -0,0 +1,8 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtgraphs/vcpkg.json b/ports/qtgraphs/vcpkg.json new file mode 100644 index 00000000000000..24557853d69314 --- /dev/null +++ b/ports/qtgraphs/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "qtgraphs", + "version": "6.6.1", + "description": "Qt Location", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "testlib", + "widgets" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtquick3d", + "default-features": false + } + ] +} diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index 3be3f3b2b6225c..9b7c898a881518 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt framework based gRPC clients and services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index bce13f6079fade..d98f678e920edc 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 11eb9fa646b3c1..a3eb0ca620b353 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.6.0", + "version": "6.6.1", "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 f54bca2da36e10..358ed4d3eb571f 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index ff965c8f26e2f9..e29490e373b8f5 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.6.0", + "version": "6.6.1", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index edf137ea97c518..357ebfa2e61a5b 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index cba7bfa18fb7d5..bb1846a0ec54fa 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.6.0", + "version": "6.6.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 1fce03d4f2997e..93f0adb160d54e 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.6.0", + "version": "6.6.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/static_find_modules.patch b/ports/qtmultimedia/static_find_modules.patch index 2efe1915855059..cff8fa95474eed 100644 --- a/ports/qtmultimedia/static_find_modules.patch +++ b/ports/qtmultimedia/static_find_modules.patch @@ -11,17 +11,6 @@ index 47d8769..46a5c9b 100644 set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS}) list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS}) -@@ -240,8 +240,8 @@ endfunction() - set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES - INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIRS} -- INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARIES}" -- INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}" -+ IMPORTED_LOCATION "${${_component}_LIBRARY}" -+ #INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIRS}" - ) - if(__ffmpeg_is_static) - __ffmpeg_internal_set_dependencies(${_lowerComponent}) @@ -250,6 +250,9 @@ endfunction() if (UNIX AND NOT APPLE) target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 342bb4d634ba01..b44d81ae872062 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index c22616e600bf44..355a7e835bda32 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/fix-build.patch b/ports/qtopcua/fix-build.patch index 0c3fcd84eaba74..33f4e84e7f5f81 100644 --- a/ports/qtopcua/fix-build.patch +++ b/ports/qtopcua/fix-build.patch @@ -25,25 +25,3 @@ index b4fcea410..91958e554 100644 include(FeatureSummary) set_package_properties(Open62541 PROPERTIES -diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt -index d5e3c65df..0d2fa3952 100644 ---- a/src/opcua/CMakeLists.txt -+++ b/src/opcua/CMakeLists.txt -@@ -84,7 +84,7 @@ qt_internal_add_module(OpcUa - ## Scopes: - ##################################################################### - --qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT -+qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_openssl AND NOT APPLE AND NOT WINRT - SOURCES - client/qopcuagdsclient.cpp client/qopcuagdsclient_p.h - x509/openssl_symbols.cpp -@@ -102,7 +102,7 @@ qt_internal_extend_target(OpcUa CONDITION QT_FEATURE_gds AND QT_FEATURE_ssl AND - x509/qopcuax509utils.cpp x509/qopcuax509utils_p.h - ) - --if (QT_FEATURE_gds AND QT_FEATURE_ssl) -+if (QT_FEATURE_gds AND QT_FEATURE_openssl) - qt_internal_extend_target(OpcUa - LIBRARIES WrapOpenSSL::WrapOpenSSL) - endif() diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 17994f4a637018..6f4366a050db10 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.6.0", + "version": "6.6.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 44783a6d5fe3c2..46628170226685 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 052409d9f44cc2..2d37322ea251e7 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.6.0", + "version": "6.6.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 0dd9d0d9c20fc1..8a7a4e3b799153 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.6.0", + "version": "6.6.1", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index 4d6e38c7220030..cce441e9cefc86 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 4e304c5b09b6fe..09e9ad4b47b706 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.6.0", + "version": "6.6.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 0998ed8efd0d27..497b0b3ce2ceb5 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.6.0", + "version": "6.6.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 8f035980fe47dc..afbc4c278d25e8 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.6.0", + "version": "6.6.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 2abf26eb582719..889ac9765f6fe1 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d2e22e0950abaa..fd3633b86b8ebd 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.6.0", + "version": "6.6.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 d1123b8b089fb4..6ec17e3228f193 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.6.0", + "version": "6.6.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 a8cf9431553944..5b3d840cc35c9c 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.6.0", + "version": "6.6.1", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index eff0b7a82c1c6c..33f4e84cb4681a 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 049557c356936f..d78ce89752debf 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 30a719ef56b8a8..b7b032a03fe00e 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index ed2efc4144d5cd..43a325e5fa3fab 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index dad330298e131d..29d39ad096e2be 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.6.0", + "version": "6.6.1", "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index dd57c6277413c9..0b9c61bea4e466 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.6.0", + "version": "6.6.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 2679c9f4712eb8..c9e5cd1665798b 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 1eef09e754acbc..367bdc4aa53afc 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.6.0", + "version": "6.6.1", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 7161157463c092..f9112418d5d033 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 3beaab346afb50..4b8c019eaffad1 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.6.0", + "version": "6.6.1", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index b50c422a4de31f..c5c4f5352791f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6893,7 +6893,7 @@ "port-version": 2 }, "qt": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qt-advanced-docking-system": { @@ -6901,7 +6901,7 @@ "port-version": 0 }, "qt3d": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qt5": { @@ -7077,63 +7077,67 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtbase": { - "baseline": "6.6.0", - "port-version": 1 + "baseline": "6.6.1", + "port-version": 0 }, "qtcharts": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.6.0", - "port-version": 1 + "baseline": "6.6.1", + "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.6.0", + "baseline": "6.6.1", + "port-version": 0 + }, + "qtgraphs": { + "baseline": "6.6.1", "port-version": 0 }, "qtgrpc": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qthttpserver": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtkeychain": { @@ -7145,43 +7149,43 @@ "port-version": 0 }, "qtlanguageserver": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtlocation": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtlottie": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtpositioning": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtquick3d": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtquickcontrols2": { @@ -7189,75 +7193,75 @@ "port-version": 0 }, "qtquickeffectmaker": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtsensors": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtserialbus": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtserialport": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtspeech": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qttools": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qttranslations": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtwebengine": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "qtwebview": { - "baseline": "6.6.0", + "baseline": "6.6.1", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 755d370f8a6383..9fa4f9fe30582f 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd6a0c4b4f56e81db4ba5fedc5e07b8b2b896780", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "766ab007c0d703f29b892b6496af3ae458aab9c0", "version": "6.6.0", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index bb90bf55b3191b..39089e1ca0ab51 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f14756a5feca4f0d8dcf6161ef129c1144b25af6", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "d3c2532ea0b16b01aeb17c7e1bcdb0e4c1d3ff0a", "version": "6.6.0", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 517509dd5c6f46..02836c8234d473 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c729a2bff1118d75ed9a363b40ac1aac61fe54", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "e1188f496b30f0e4a2ed309dca03300c2f02c983", "version": "6.6.0", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 0e4216389ab51c..50d3decd6f8c9c 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d7834925f1e86b2a662b94aeefb9a7faa835a6", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "b4e05b3e0a3ce481228324c480ac8106295a6cec", "version": "6.6.0", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 6e7588b6bfda0a..f09b61f3a1ac45 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d94e40cc436fab8410d8d104453a39c77ea39c3", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "1baea015b866f295c1724220bf214796a8013d8a", "version": "6.6.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index c8ffa9c0e9d68d..ca17c51d838ed4 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e2fc7540c9a576e44a03dcdb011864e6ecdff8a", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "11861d085aeee91737a5dede66bb78845d99b0e7", "version": "6.6.0", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index fce5f5d2f578cf..ba0a6090435c65 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95a1151d8a815110f6641a373411d5b2783fe89b", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "da08464343df644146582857a4f560da79b76f06", "version": "6.6.0", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index ac3ab0512fbb85..7ce0a499012391 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a696a475ba2d214cb228b5b83ae06a875a342b9", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "7d18fea1869e4a37cde80de8e31294da8aa38fe1", "version": "6.6.0", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 414091c2ff1ec7..469a036dd65054 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83b610993d47952dc7cf1a117899d35d1232eaf0", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "b130a6686447df20bc5ae96bd6153cbac5aa1977", "version": "6.6.0", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index e498084a2715c4..7c4d23c73487d1 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22f5db80fc03af7c934a4f48d79e9df63514383f", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "256b706e812d3da7b4eb279e79b04095dcadde98", "version": "6.6.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 2e9959b26715e2..8ec466f8dc7fef 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f3e05d9f7a05f314c0c38c07b7ceb91b257f8cf", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "7fcbb7948afc44ea3d2d5ebff7cf9fd9c576010c", "version": "6.6.0", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 74b5c7bfbd5247..d55180ce22ebed 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d4936a7676dacfd1954ccab4ab56cf66fc29d12", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "49d4c0efba0c96742ba85c1699c5c0a39ac0937d", "version": "6.6.0", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 5a2fb26b6ac081..148cce57cfb708 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c1caa1eb1ce53c8e7096dc477c0878a885157b6", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "ed7bf70cb4a5e21fb76e7f7cc89d234fffd3201e", "version": "6.6.0", diff --git a/versions/q-/qtgraphs.json b/versions/q-/qtgraphs.json new file mode 100644 index 00000000000000..77a4b750f196bf --- /dev/null +++ b/versions/q-/qtgraphs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ae9bcc804f472bd60275ad1f73a8cf12574390ea", + "version": "6.6.1", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index 356f2527b9d4fc..e9f15ec4abd1e7 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4abad64b5fbebe9eff491e26fe91212b0c55e094", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "65fd752fc052bc1cbf13d66417e9c6c1aedc238a", "version": "6.6.0", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index f1c1c88641ef58..7398cdf068e5de 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f14429d07fb8ad95b822c2a330f11cb3423e67d", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "06ae6f390b9ea2025c189ecdadbeddde662b4f6e", "version": "6.6.0", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index eed40797f9de5d..7d98d1e72773ec 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fc433dbdd7a4f8151de5219b08d18f9a3296f8a", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "bf58f188746291ad38bafa413affa145fe792ee7", "version": "6.6.0", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index cb584d94c8d23a..21da0609b66887 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bcb4f2fd5111908f77a8b70692b935ec23c2d27", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "aef598c3223519da2bbb08353d365661f8959856", "version": "6.6.0", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 782f00d932c3ce..804fe0ee349404 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f636ad4c9bb289cd9ea0eaa1e876a7189670736", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "c8ae2fe1a207df127db279e437784cf63a1a2b7d", "version": "6.6.0", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 3663afa9b7d610..f58e03d3bb3144 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7cf327c103531729a525c4260e10f49ee99cbb6", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "f58c7ebb91f69f42a31504da406ece6d5d120593", "version": "6.6.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 2c4b6834c6e9a5..8193dbd079af81 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d71d7d1f4430a6830526ff437908abac994479aa", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "0c6ada64395147597928ad9d5af7e4fd5e7b4f0e", "version": "6.6.0", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index af7c3fbf3d3eb4..4dc3b8c5aa3919 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2551a8b3a525cabea535ca067c247df902082fb", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "7cb4cc198bfe6cec44ec059a9f2f516032edee04", "version": "6.6.0", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index e1bab305fb0325..22421481353791 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04543c19ec8a0f02404b1d58fc84396c3ff50357", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "d9c5671dd094e509c890955ee1f267b160bffa2c", "version": "6.6.0", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 763397e7f52069..0fe51427250b30 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89ef84d21ebae8cf3d9270e70ec6cc31ce053df7", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "ca177a05c921704e599d85961e52d6ee25d6b862", "version": "6.6.0", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index fda8f9a5686d56..914f732020e5c2 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd569723a9e84b190ba938c4f040d0cc83af21d", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "8ce50eb99dc427d5b17a01f839f70a3cc2d0cfea", "version": "6.6.0", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 38ab4bbf7f2a01..9ae78c59572ffb 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c0c21c983c3f010540a7b11c3896af2388a0531", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "80617e2f8e7186192365523150d3169d9b5a9061", "version": "6.6.0", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index e87476e146047d..c6d16e50c0baed 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fa6e34d1ad27b721739dd6c25b6bc7af7280ba4", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "c54c8417690bd1ebe375cd71a48388c6bf1d5782", "version": "6.6.0", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 053ecbcdb8fd99..6e4770babf62ef 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "975bb448a0623c02d5fd2334d5febe0dfa7603e3", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "bcb4cf2b1a80ff497ce7fafc885882aac775a6de", "version": "6.6.0", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index 08c88eaadf7c94..916fa90666fd19 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1862d1d3e018b1e69bf86a2f404e7f94a4ab5213", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "4325f77bda6cdda94f1dea48423dbbff111c97ae", "version": "6.6.0", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index ed9a62b8be2631..b98789bbf5752f 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4efff9158d154e6277cbab103862ac4ba8d0ffb2", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "8c089d10397f5bb8155b9e96fbbc1f7c1392b53f", "version": "6.6.0", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index f07e3590a477f1..abee2b81f8307f 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c76d00e0a4811d4854281c90e35c122470fc179d", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "ad083b7bdf871b65fa3f68cda2823f51e8cfe797", "version": "6.6.0", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 388d74903ddda9..09094298fc9754 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02277a0edef829aa3f48719ea0fc080230eeb7d3", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "25674eaa881bd361a4a333903f72a16656ee8ce6", "version": "6.6.0", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 01db8be962a915..7d202ad0f9d346 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b3f793528f4f59df67bcd9598c4d5878402ac6b", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "12ee32f418c15549486f21fd1fda55c629b01124", "version": "6.6.0", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index f84d6464210a0e..cda4c1f6d43004 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eaae9870e669397b0ae6da75224f99fb23b6005", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "d32539a07f99298f75e4006ff7c966a7d9e9f3ef", "version": "6.6.0", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 06d56a864a39ad..a7717a452a9fff 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0fe6127a189519fdb6c51b00d1fd14759459f96", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "a3224730e30748c1b7c57f6210cd375cd2a45f81", "version": "6.6.0", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 4a94b24675ec9a..3856b9516a61ec 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf2116fb4c0cdd945db89589094443e4304e043f", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "f84dd4728eb9792df16ff1b956ffdb806b04c016", "version": "6.6.0", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 63697e6794316c..78aa66c18b314c 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3be7b2606212665cabee66d33b125a452ab18b26", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "328df565e4640e536a8f6dde383feed0105fffc8", "version": "6.6.0", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 4dccb99adee4a7..f7fc4c1518a3ca 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654797512930b598c214eea4834db531b1bba48c", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "d1fcfd06b00e6e9f71dbe6e83bb796e89d774228", "version": "6.6.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index ce90b09b8cd3f6..e69cebdf19b532 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "727534f61f2786b70ed0ba51c56fc9dcf2191fb4", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "fabca872bf0e61547c64af674e33d557915d70c7", "version": "6.6.0", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index e97e31acdb2ee0..2da31ed8fa1965 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e6d58f96b90b6fca92cabacdd98fbb9d79585b", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "74986f47f213bebd33f07dbcc8a01c68719ac223", "version": "6.6.0", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 6223794c1de537..38c484a4530e3c 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9d3720c2252c8c75dc80cc6e48b3bfe7e6d4546", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "1c8dffb036b8e24cbfab8dc4fa4c49cdd02b4221", "version": "6.6.0", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index a946f348cf87c3..895a8606cf499e 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7d47223e41c55acc88b5a851730e253e244a79b", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "0bfb4cdda4d01946240acd3f5c2a16a4971f4f4d", "version": "6.6.0", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 78894184fadbc1..cea94ca5fb09f1 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ee9cba56e75f0dab9bc3118345e48ae39beef3c", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "d0c717f680978ecdd279354833ccc0ee99558f77", "version": "6.6.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 7087f455bff9e1..18e26711a52af6 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60b5738d6361d11f4dea17e82df45014ffddd6be", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "4df86b328fb276cf0cc5e9803390da032bb79f8a", "version": "6.6.0", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 2ec4d27575c907..656a51b5ede896 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "381d32890ac07fd2b095bcd55d9954e962c6b3b6", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "94038f6ef3143b15b2143e2521897b71d33c9750", "version": "6.6.0", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index b11e225931025f..0618f133eb03f8 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d46010ea6deab96d673fa42dfa126641472a808", + "version": "6.6.1", + "port-version": 0 + }, { "git-tree": "7bcd4ac467a6c0707c315f722457bd691adfcf83", "version": "6.6.0", From a5062aeddd8f733028803911523789f4eefcc4ed Mon Sep 17 00:00:00 2001 From: Ian Reinhart Geiser Date: Wed, 29 Nov 2023 22:16:47 -0500 Subject: [PATCH 0507/1039] [cnats] Update to 3.7.0 (#35384) * bump nats.c version to 3.7.0 * run x-add-version * Use version string instead of hash Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * fix versions --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/cnats/portfile.cmake | 6 +++--- ports/cnats/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cnats.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index 15d8f8ff561e95..fc32c08d1db96d 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c - REF 66cec7fce9a64f911015f0c516a086c1a74cd22a #v3.6.1 - SHA512 c0d3ad62c9453dca1799e69c3fe9df63c57c29c3c596ba4a9c5053b4886014741b8ce1563adb28d3e64b6b221748884ef71d6b288fae2855ae1ed1fdd2d028fb - HEAD_REF master + REF "v${VERSION}" + SHA512 0670a2b7fb70a49e2b1f5cbccf2406a3ecaf04b48b4147dc2ead9cb106f1673efa79b5e40d3bb557986ade35da2158b58b324603f98a58258a497dc57cb5d700 + HEAD_REF main PATCHES fix-sodium-dep.patch ) diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 71d5358b228508..8ed988008b78af 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cnats", - "version": "3.6.1", + "version": "3.7.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 c5c4f5352791f4..637166eb116113 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1677,7 +1677,7 @@ "port-version": 3 }, "cnats": { - "baseline": "3.6.1", + "baseline": "3.7.0", "port-version": 0 }, "cnl": { diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index 4e9ad29948b370..b3263220ec0c1a 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "438cfff2ee224f9d414bda9bcf796c13534443ba", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "809d101d1791bc6cd3f51c8c9fa8e86dc923113b", "version": "3.6.1", From bb588985e37484d543fc849d0d79434e0d45bb3c Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 29 Nov 2023 19:19:06 -0800 Subject: [PATCH 0508/1039] [llvm] Add patch to fix missing LinkageSpec of getCursorKindForDecl (#35351) * fix llvm * update version --------- Co-authored-by: Monica --- ports/llvm/0008-add-missing-case.patch | 71 ++++++++++++++++++++++++++ ports/llvm/portfile.cmake | 1 + ports/llvm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llvm.json | 5 ++ 5 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 ports/llvm/0008-add-missing-case.patch diff --git a/ports/llvm/0008-add-missing-case.patch b/ports/llvm/0008-add-missing-case.patch new file mode 100644 index 00000000000000..2ed29c34e2596e --- /dev/null +++ b/ports/llvm/0008-add-missing-case.patch @@ -0,0 +1,71 @@ +diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp +index b5d29b2e9..b4fc088a1 100644 +--- a/clang/lib/Sema/SemaCodeComplete.cpp ++++ b/clang/lib/Sema/SemaCodeComplete.cpp +@@ -4088,6 +4088,9 @@ CXCursorKind clang::getCursorKindForDecl(const Decl *D) { + case Decl::Concept: + return CXCursor_ConceptDecl; + ++ case Decl::LinkageSpec: ++ return CXCursor_LinkageSpec; ++ + default: + if (const auto *TD = dyn_cast(D)) { + switch (TD->getTagKind()) { +diff --git a/clang/test/Index/recursive-cxx-member-calls.cpp b/clang/test/Index/recursive-cxx-member-calls.cpp +index 09f3f4141..be908c506 100644 +--- a/clang/test/Index/recursive-cxx-member-calls.cpp ++++ b/clang/test/Index/recursive-cxx-member-calls.cpp +@@ -216,9 +216,9 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { + // CHECK-tokens: Punctuation: "}" [4:63 - 4:64] ClassTemplate=pair:4:44 (Definition) + // CHECK-tokens: Punctuation: ";" [4:64 - 4:65] Namespace=std:3:11 (Definition) + // CHECK-tokens: Punctuation: "}" [5:1 - 5:2] Namespace=std:3:11 (Definition) +-// CHECK-tokens: Keyword: "extern" [6:1 - 6:7] +-// CHECK-tokens: Literal: ""C"" [6:8 - 6:11] UnexposedDecl=:6:8 (Definition) +-// CHECK-tokens: Punctuation: "{" [6:12 - 6:13] UnexposedDecl=:6:8 (Definition) ++// CHECK-tokens: Keyword: "extern" [6:1 - 6:7] LinkageSpec=:6:8 (Definition) ++// CHECK-tokens: Literal: ""C"" [6:8 - 6:11] LinkageSpec=:6:8 (Definition) ++// CHECK-tokens: Punctuation: "{" [6:12 - 6:13] LinkageSpec=:6:8 (Definition) + // CHECK-tokens: Keyword: "int" [7:3 - 7:6] FunctionDecl=memcmp:7:7 + // CHECK-tokens: Identifier: "memcmp" [7:7 - 7:13] FunctionDecl=memcmp:7:7 + // CHECK-tokens: Punctuation: "(" [7:13 - 7:14] FunctionDecl=memcmp:7:7 +@@ -232,7 +232,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { + // CHECK-tokens: Punctuation: "," [7:40 - 7:41] FunctionDecl=memcmp:7:7 + // CHECK-tokens: Identifier: "size_t" [7:42 - 7:48] TypeRef=size_t:2:25 + // CHECK-tokens: Punctuation: ")" [7:48 - 7:49] FunctionDecl=memcmp:7:7 +-// CHECK-tokens: Punctuation: ";" [7:49 - 7:50] UnexposedDecl=:6:8 (Definition) ++// CHECK-tokens: Punctuation: ";" [7:49 - 7:50] LinkageSpec=:6:8 (Definition) + // CHECK-tokens: Identifier: "size_t" [8:3 - 8:9] TypeRef=size_t:2:25 + // CHECK-tokens: Identifier: "strlen" [8:10 - 8:16] FunctionDecl=strlen:8:10 + // CHECK-tokens: Punctuation: "(" [8:16 - 8:17] FunctionDecl=strlen:8:10 +@@ -1532,7 +1532,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo * Name) { + // CHECK: 4:20: TemplateTypeParameter=_T1:4:20 (Definition) Extent=[4:14 - 4:23] + // CHECK: 4:31: TemplateTypeParameter=_T2:4:31 (Definition) Extent=[4:25 - 4:34] + // CHECK: 4:55: FieldDecl=second:4:55 (Definition) Extent=[4:51 - 4:61] +-// CHECK: 6:8: UnexposedDecl=:6:8 (Definition) Extent=[6:1 - 9:2] ++// CHECK: 6:8: LinkageSpec=:6:8 (Definition) Extent=[6:1 - 9:2] + // CHECK: 7:7: FunctionDecl=memcmp:7:7 Extent=[7:3 - 7:49] + // CHECK: 7:26: ParmDecl=:7:26 (Definition) Extent=[7:14 - 7:26] + // CHECK: 7:40: ParmDecl=:7:40 (Definition) Extent=[7:28 - 7:40] +diff --git a/clang/tools/c-index-test/c-index-test.c b/clang/tools/c-index-test/c-index-test.c +index 9d66a22f3..2c0c9cb8e 100644 +--- a/clang/tools/c-index-test/c-index-test.c ++++ b/clang/tools/c-index-test/c-index-test.c +@@ -1838,6 +1838,8 @@ static enum CXChildVisitResult PrintMangledName(CXCursor cursor, CXCursor p, + CXString MangledName; + if (clang_isUnexposed(clang_getCursorKind(cursor))) + return CXChildVisit_Recurse; ++ if (clang_getCursorKind(cursor) == CXCursor_LinkageSpec) ++ return CXChildVisit_Recurse; + PrintCursor(cursor, NULL); + MangledName = clang_Cursor_getMangling(cursor); + printf(" [mangled=%s]\n", clang_getCString(MangledName)); +@@ -1853,6 +1855,8 @@ static enum CXChildVisitResult PrintManglings(CXCursor cursor, CXCursor p, + return CXChildVisit_Recurse; + if (!clang_isDeclaration(clang_getCursorKind(cursor))) + return CXChildVisit_Recurse; ++ if (clang_getCursorKind(cursor) == CXCursor_LinkageSpec) ++ return CXChildVisit_Recurse; + if (clang_getCursorKind(cursor) == CXCursor_ParmDecl) + return CXChildVisit_Continue; + PrintCursor(cursor, NULL); diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index bf9397b6630693..0cdc1203122976 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( 0005-remove-numpy.patch 0006-create-destination-mlir-directory.patch 0007-fix-compiler-rt-warnings.patch # fixed in upstream + 0008-add-missing-case.patch # From upstream https://github.com/llvm/llvm-project/pull/72401 ) vcpkg_check_features( diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 31a2cd2a1e2544..694c4ef76c2711 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llvm", "version": "17.0.2", - "port-version": 1, + "port-version": 2, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 637166eb116113..235b94d170da30 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5230,7 +5230,7 @@ }, "llvm": { "baseline": "17.0.2", - "port-version": 1 + "port-version": 2 }, "lmdb": { "baseline": "0.9.31", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 1830c3f8048728..32ae36a933346e 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af2e23c1205568f576321133141a51439ef1059f", + "version": "17.0.2", + "port-version": 2 + }, { "git-tree": "3d195e85c468428553d0aed0eeb76e3714231e3a", "version": "17.0.2", From e85cafa30def190eca0dc1413bf8c04e434af567 Mon Sep 17 00:00:00 2001 From: Sam Yun Date: Thu, 30 Nov 2023 13:58:50 -0800 Subject: [PATCH 0509/1039] Add ctstraffic port (microsoft/ctsTraffic) (#35238) * Initial port * Add to baseline * Usage * update hash * Update to fixed version * Update json * Disallow uwp * rename to ctstraffic * Only build release Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Remove copy_pdbs Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Add line at end Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update hash * Update ports/ctstraffic/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update hash --------- Co-authored-by: Sam Yun Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/ctstraffic/portfile.cmake | 29 ++++++++++++++++++++++++ ports/ctstraffic/prepare_for_build.cmake | 19 ++++++++++++++++ ports/ctstraffic/usage | 3 +++ ports/ctstraffic/vcpkg.json | 15 ++++++++++++ versions/baseline.json | 4 ++++ versions/c-/ctstraffic.json | 9 ++++++++ 6 files changed, 79 insertions(+) create mode 100644 ports/ctstraffic/portfile.cmake create mode 100644 ports/ctstraffic/prepare_for_build.cmake create mode 100644 ports/ctstraffic/usage create mode 100644 ports/ctstraffic/vcpkg.json create mode 100644 versions/c-/ctstraffic.json diff --git a/ports/ctstraffic/portfile.cmake b/ports/ctstraffic/portfile.cmake new file mode 100644 index 00000000000000..ee63d075e5e31f --- /dev/null +++ b/ports/ctstraffic/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/ctsTraffic + REF 88a415197951912fc70e440b31cad8d4ff4ea68a + SHA512 152ee25d1ba70c68c5bae61ee08d1d2905efd28a10c48672de852c8ee9d0964a9202814cdcc40bca712ef69f952630509810827226861dad16516f5e0827d879 + HEAD_REF master +) + +set(VCPKG_BUILD_TYPE release) # Windows port only includes tools. + +include("${CURRENT_PORT_DIR}/prepare_for_build.cmake") +prepare_for_build("${SOURCE_PATH}") + +vcpkg_list(SET MSBUILD_OPTIONS + "/p:UseVcpkg=yes" +) + +vcpkg_msbuild_install( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH ctsTraffic/ctsTraffic.vcxproj + OPTIONS + ${MSBUILD_OPTIONS} +) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/ctstraffic/prepare_for_build.cmake b/ports/ctstraffic/prepare_for_build.cmake new file mode 100644 index 00000000000000..90333e939123e5 --- /dev/null +++ b/ports/ctstraffic/prepare_for_build.cmake @@ -0,0 +1,19 @@ +function(prepare_for_build CTSTRAFFIC_SOURCE_DIR) + + message("-- Modifying hardcoded 'NuGet' directives in .vcxproj files") + file(GLOB_RECURSE PROJ_FILES "${CTSTRAFFIC_SOURCE_DIR}/*.vcxproj") + + foreach(PROJ_FILE ${PROJ_FILES}) + file(READ ${PROJ_FILE} PROJ_FILE_CONTENT) + STRING(REGEX + REPLACE + "" + "" + PROJ_FILE_CONTENT + "${PROJ_FILE_CONTENT}" + ) + + file(WRITE ${PROJ_FILE} "${PROJ_FILE_CONTENT}") + endforeach() + +endfunction() diff --git a/ports/ctstraffic/usage b/ports/ctstraffic/usage new file mode 100644 index 00000000000000..3c3b7430515192 --- /dev/null +++ b/ports/ctstraffic/usage @@ -0,0 +1,3 @@ +See https://github.com/microsoft/ctsTraffic for usage instructions or + + .\ctsTraffic.exe -help \ No newline at end of file diff --git a/ports/ctstraffic/vcpkg.json b/ports/ctstraffic/vcpkg.json new file mode 100644 index 00000000000000..ef5b3a08aee3a0 --- /dev/null +++ b/ports/ctstraffic/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ctstraffic", + "version": "2.0.3.2", + "description": "ctsTraffic is a highly scalable client/server networking tool giving detailed performance and reliability analytics.", + "homepage": "https://github.com/microsoft/ctsTraffic/", + "license": "Apache-2.0", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-msbuild", + "host": true + }, + "wil" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 235b94d170da30..cfed05b01b0aac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2008,6 +2008,10 @@ "baseline": "3.8", "port-version": 0 }, + "ctstraffic": { + "baseline": "2.0.3.2", + "port-version": 0 + }, "cub": { "baseline": "2.1.0", "port-version": 0 diff --git a/versions/c-/ctstraffic.json b/versions/c-/ctstraffic.json new file mode 100644 index 00000000000000..70d462cf1cc475 --- /dev/null +++ b/versions/c-/ctstraffic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e97cd84703f8c6e44d38be51561113c564590876", + "version": "2.0.3.2", + "port-version": 0 + } + ] +} From 24ae27eb23c105fdb631120aa1a46958cb0337af Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 1 Dec 2023 17:57:19 +0800 Subject: [PATCH 0510/1039] [libexif] Change to the official build system (#32114) * [vtk] Fix the dependency curl of proj * version * [libexif] Change to the official build system * add port-version * version * revert * libexif * version * default feature nls * version * update * format * version * revert * vdb * version --- ports/libexif/CMakeLists.txt | 158 ------------------ ports/libexif/add-missing-_stdint-h.patch | 7 - ports/libexif/config.h.cmake | 96 ----------- ports/libexif/fix-ssize.patch | 16 ++ ports/libexif/libexif.def | 136 --------------- ports/libexif/portfile.cmake | 31 ++-- ports/libexif/unofficial-libexif-config.cmake | 28 ++++ ports/libexif/vcpkg.json | 21 ++- versions/baseline.json | 2 +- versions/l-/libexif.json | 5 + 10 files changed, 91 insertions(+), 409 deletions(-) delete mode 100644 ports/libexif/CMakeLists.txt delete mode 100644 ports/libexif/add-missing-_stdint-h.patch delete mode 100644 ports/libexif/config.h.cmake create mode 100644 ports/libexif/fix-ssize.patch delete mode 100644 ports/libexif/libexif.def create mode 100644 ports/libexif/unofficial-libexif-config.cmake diff --git a/ports/libexif/CMakeLists.txt b/ports/libexif/CMakeLists.txt deleted file mode 100644 index be7e4ed752419f..00000000000000 --- a/ports/libexif/CMakeLists.txt +++ /dev/null @@ -1,158 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(libexif LANGUAGES C) - -set(PACKAGE "libexif") - -option(ENABLE_NLS "Enable NLS" OFF) - -set(HEADERS - libexif/_stdint.h - libexif/exif.h - libexif/exif-byte-order.h - libexif/exif-content.h - libexif/exif-data.h - libexif/exif-data-type.h - libexif/exif-entry.h - libexif/exif-format.h - libexif/exif-gps-ifd.h - libexif/exif-ifd.h - libexif/exif-loader.h - libexif/exif-log.h - libexif/exif-mem.h - libexif/exif-mnote-data.h - libexif/exif-mnote-data-priv.h - libexif/exif-system.h - libexif/exif-tag.h - libexif/exif-utils.h -) - -set(SOURCES - libexif/exif-byte-order.c - libexif/exif-content.c - libexif/exif-data.c - libexif/exif-entry.c - libexif/exif-format.c - libexif/exif-gps-ifd.c - libexif/exif-ifd.c - libexif/exif-loader.c - libexif/exif-log.c - libexif/exif-mem.c - libexif/exif-mnote-data.c - libexif/exif-tag.c - libexif/exif-utils.c -) - -set(HEADERS_APPLE - libexif/apple/exif-mnote-data-apple.h - libexif/apple/mnote-apple-entry.h - libexif/apple/mnote-apple-tag.h -) - -set(SOURCES_APPLE - libexif/apple/exif-mnote-data-apple.c - libexif/apple/mnote-apple-entry.c - libexif/apple/mnote-apple-tag.c -) - -set(HEADERS_CANON - libexif/canon/exif-mnote-data-canon.h - libexif/canon/mnote-canon-entry.h - libexif/canon/mnote-canon-tag.h -) - -set(SOURCES_CANON - libexif/canon/exif-mnote-data-canon.c - libexif/canon/mnote-canon-entry.c - libexif/canon/mnote-canon-tag.c -) - -set(HEADERS_FUJI - libexif/fuji/exif-mnote-data-fuji.h - libexif/fuji/mnote-fuji-entry.h - libexif/fuji/mnote-fuji-tag.h -) - -set(SOURCES_FUJI - libexif/fuji/exif-mnote-data-fuji.c - libexif/fuji/mnote-fuji-entry.c - libexif/fuji/mnote-fuji-tag.c -) - -set(HEADERS_OLYMPUS - libexif/olympus/exif-mnote-data-olympus.h - libexif/olympus/mnote-olympus-entry.h - libexif/olympus/mnote-olympus-tag.h -) - -set(SOURCES_OLYMPUS - libexif/olympus/exif-mnote-data-olympus.c - libexif/olympus/mnote-olympus-entry.c - libexif/olympus/mnote-olympus-tag.c -) - -set(HEADERS_PENTAX - libexif/pentax/exif-mnote-data-pentax.h - libexif/pentax/mnote-pentax-entry.h - libexif/pentax/mnote-pentax-tag.h -) - -set(SOURCES_PENTAX - libexif/pentax/exif-mnote-data-pentax.c - libexif/pentax/mnote-pentax-entry.c - libexif/pentax/mnote-pentax-tag.c -) - -if(MSVC) - set(SOURCES_MSVC "libexif.def") -endif() - -add_library(libexif - ${SOURCES} - ${SOURCES_APPLE} - ${SOURCES_CANON} - ${SOURCES_FUJI} - ${SOURCES_OLYMPUS} - ${SOURCES_PENTAX} - ${SOURCES_MSVC} -) - -target_include_directories(libexif PRIVATE .) -target_include_directories(libexif PRIVATE ${CMAKE_BINARY_DIR}) -target_compile_definitions(libexif PRIVATE -D_CRT_SECURE_NO_WARNINGS) -target_compile_definitions(libexif PRIVATE -DGETTEXT_PACKAGE="${PACKAGE}") - -include(CheckFunctionExists) -include(CheckIncludeFile) - -check_function_exists(dcgettext HAVE_DCGETTEXT) -check_function_exists(gettext HAVE_DCGETTEXT) -check_function_exists(iconv HAVE_DCGETTEXT) -check_function_exists(localtime_r HAVE_DCGETTEXT) - -check_include_file(dlfcn.h HAVE_DLFCN_H) -check_include_file(inttypes.h HAVE_INTTYPES_H) -check_include_file(memory.h HAVE_MEMORY_H) -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stdlib.h HAVE_STDLIB_H) -check_include_file(strings.h HAVE_STRINGS_H) -check_include_file(string.h HAVE_STRING_H) -check_include_file(sys/stat.h HAVE_SYS_STAT_H) -check_include_file(sys/stat.h HAVE_SYS_STAT_H) -check_include_file(sys/types.h HAVE_SYS_TYPES_H) -check_include_file(unistd.h HAVE_UNISTD_H) - -configure_file(config.h.cmake config.h) - -install( - TARGETS libexif - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(FILES ${HEADERS} DESTINATION include/libexif) -install(FILES ${HEADERS_APPLE} DESTINATION include/libexif/apple) -install(FILES ${HEADERS_CANON} DESTINATION include/libexif/canon) -install(FILES ${HEADERS_FUJI} DESTINATION include/libexif/fuji) -install(FILES ${HEADERS_OLYMPUS} DESTINATION include/libexif/olympus) -install(FILES ${HEADERS_PENTAX} DESTINATION include/libexif/pentax) diff --git a/ports/libexif/add-missing-_stdint-h.patch b/ports/libexif/add-missing-_stdint-h.patch deleted file mode 100644 index 1c4c95d1c29a32..00000000000000 --- a/ports/libexif/add-missing-_stdint-h.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/libexif/_stdint.h b/libexif/_stdint.h -new file mode 100644 -index 0000000..9a6118b ---- /dev/null -+++ b/libexif/_stdint.h -@@ -0,0 +1 @@ -+#include diff --git a/ports/libexif/config.h.cmake b/ports/libexif/config.h.cmake deleted file mode 100644 index 4dfbdb1b004d6c..00000000000000 --- a/ports/libexif/config.h.cmake +++ /dev/null @@ -1,96 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#cmakedefine ENABLE_NLS - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#cmakedefine HAVE_DCGETTEXT - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DLFCN_H - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#cmakedefine HAVE_GETTEXT - -/* Define if you have the iconv() function. */ -#cmakedefine HAVE_ICONV - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_INTTYPES_H - -/* Define to 1 if you have the `localtime_r' function. */ -#cmakedefine HAVE_LOCALTIME_R - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_UNISTD_H - -/* Define as const if the declaration of iconv() needs const. */ -#cmakedefine ICONV_CONST - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#cmakedefine LT_OBJDIR - -/* Name of package */ -#cmakedefine PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#cmakedefine PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#cmakedefine PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#cmakedefine PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#cmakedefine PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#cmakedefine PACKAGE_URL - -/* Define to the version of this package. */ -#cmakedefine PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS - -/* Version number of package */ -#cmakedefine VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#cmakedefine const - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#cmakedefine inline -#endif - -#ifdef _MSC_VER -#include -typedef SSIZE_T ssize_t; -#endif \ No newline at end of file diff --git a/ports/libexif/fix-ssize.patch b/ports/libexif/fix-ssize.patch new file mode 100644 index 00000000000000..afcd87cf723aa0 --- /dev/null +++ b/ports/libexif/fix-ssize.patch @@ -0,0 +1,16 @@ +diff --git a/libexif/exif-loader.c b/libexif/exif-loader.c +index ad4ae96..8a24ef6 100644 +--- a/libexif/exif-loader.c ++++ b/libexif/exif-loader.c +@@ -19,6 +19,11 @@ + */ + + #include ++#ifdef _WIN32 ++#include ++#define ssize_t ptrdiff_t ++#endif ++ + + #include + #include diff --git a/ports/libexif/libexif.def b/ports/libexif/libexif.def deleted file mode 100644 index 7013674a8f2823..00000000000000 --- a/ports/libexif/libexif.def +++ /dev/null @@ -1,136 +0,0 @@ -EXPORTS - exif_array_set_byte_order - exif_byte_order_get_name - exif_content_add_entry - exif_content_dump - exif_content_fix - exif_content_foreach_entry - exif_content_free - exif_content_get_entry - exif_content_get_ifd - exif_content_log - exif_content_new - exif_content_new_mem - exif_content_ref - exif_content_remove_entry - exif_content_unref - exif_data_dump - exif_data_fix - exif_data_foreach_content - exif_data_free - exif_data_get_byte_order - exif_data_get_data_type - exif_data_get_log - exif_data_get_mnote_data - exif_data_load_data - exif_data_log - exif_data_new - exif_data_new_from_data - exif_data_new_from_file - exif_data_new_mem - exif_data_option_get_description - exif_data_option_get_name - exif_data_ref - exif_data_save_data - exif_data_set_byte_order - exif_data_set_data_type - exif_data_set_option - exif_data_unref - exif_data_unset_option - exif_entry_dump - exif_entry_fix - exif_entry_free - exif_entry_get_value - exif_entry_initialize - exif_entry_new - exif_entry_new_mem - exif_entry_ref - exif_entry_unref - exif_format_get_name - exif_format_get_size - exif_get_gps_tag_info - exif_get_long - exif_get_rational - exif_get_short - exif_get_slong - exif_get_srational - exif_get_sshort - exif_ifd_get_name - exif_loader_get_buf - exif_loader_get_data - exif_loader_log - exif_loader_new - exif_loader_new_mem - exif_loader_ref - exif_loader_reset - exif_loader_unref - exif_loader_write - exif_loader_write_file - exif_log - exif_log_code_get_message - exif_log_code_get_title - exif_log_free - exif_log_new - exif_log_new_mem - exif_log_ref - exif_log_set_func - exif_log_unref - exif_logv - exif_mem_alloc - exif_mem_free - exif_mem_new - exif_mem_new_default - exif_mem_realloc - exif_mem_ref - exif_mem_unref - exif_mnote_data_apple_new - exif_mnote_data_canon_new - exif_mnote_data_construct - exif_mnote_data_count - exif_mnote_data_get_description - exif_mnote_data_get_id - exif_mnote_data_get_name - exif_mnote_data_get_title - exif_mnote_data_get_value - exif_mnote_data_load - exif_mnote_data_log - exif_mnote_data_olympus_new - exif_mnote_data_pentax_new - exif_mnote_data_ref - exif_mnote_data_save - exif_mnote_data_set_byte_order - exif_mnote_data_set_offset - exif_mnote_data_unref - exif_set_long - exif_set_rational - exif_set_short - exif_set_slong - exif_set_srational - exif_set_sshort - exif_tag_from_name - exif_tag_get_description - exif_tag_get_description_in_ifd - exif_tag_get_name - exif_tag_get_name_in_ifd - exif_tag_get_support_level_in_ifd - exif_tag_get_title - exif_tag_get_title_in_ifd - exif_tag_table_count - exif_tag_table_get_name - exif_tag_table_get_tag - mnote_apple_entry_get_value - mnote_apple_tag_get_description - mnote_apple_tag_get_name - mnote_apple_tag_get_title - mnote_canon_entry_get_value - mnote_canon_tag_get_description - mnote_canon_tag_get_name - mnote_canon_tag_get_title - mnote_olympus_entry_get_value - mnote_olympus_tag_get_description - mnote_olympus_tag_get_name - mnote_olympus_tag_get_title - mnote_pentax_entry_get_value - mnote_pentax_tag_get_description - mnote_pentax_tag_get_name - mnote_pentax_tag_get_title \ No newline at end of file diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index 83fc06ec89bcbe..30a0355acb40b3 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -1,24 +1,35 @@ + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexif/libexif - REF v0.6.24 + REF "v${VERSION}" SHA512 eac1b5220ca0e02370837a0d78a6d38e91c5afa0956d4196b26a8d2a8a2c5dea18d58c0e473285f278653c3863923241651b7dff4d007cc46385eb29ea188330 HEAD_REF master PATCHES - add-missing-_stdint-h.patch + fix-ssize.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/libexif.def" DESTINATION "${SOURCE_PATH}") +vcpkg_list(SET options) +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_cmake_configure( +vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${options} + --enable-internal-docs=no + --enable-ship-binaries=no ) -vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_install_make() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libexif-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/libexif/unofficial-libexif-config.cmake b/ports/libexif/unofficial-libexif-config.cmake new file mode 100644 index 00000000000000..80ae7915e11cbe --- /dev/null +++ b/ports/libexif/unofficial-libexif-config.cmake @@ -0,0 +1,28 @@ + +if(NOT TARGET unofficial::libexif::libexif) + add_library(unofficial::libexif::libexif UNKNOWN IMPORTED) + get_filename_component(z_vcpkg_LIBEXIF_root "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_LIBEXIF_root "${z_vcpkg_libexif_root}" PATH) + get_filename_component(z_vcpkg_LIBEXIF_root "${z_vcpkg_libexif_root}" PATH) + set_target_properties(unofficial::libexif::libexif PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_libexif_root}/include" + ) + find_library(Z_VCPKG_LIBEXIF_LIBRARY_RELEASE NAMES libexif PATHS "${z_vcpkg_LIBEXIF_root }/lib" NO_DEFAULT_PATH REQUIRED) + find_library(Z_VCPKG_LIBEXIF_LIBRARY_DEBUG NAMES libexif PATHS "${z_vcpkg_LIBEXIF_root }/debug/lib" NO_DEFAULT_PATH) + + if(EXISTS "${Z_VCPKG_LIBEXIF_LIBRARY_RELEASE}") + set_property(TARGET unofficial::libexif::libexif APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::libexif::libexif PROPERTIES + IMPORTED_LOCATION_RELEASE "${Z_VCPKG_LIBEXIF_LIBRARY_RELEASE}" + ) + endif() + + if(EXISTS "${Z_VCPKG_LIBEXIF_LIBRARY_DEBUG}") + set_property(TARGET unofficial::libexif::libexif APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::libexif::libexif PROPERTIES + IMPORTED_LOCATION_DEBUG "${Z_VCPKG_LIBEXIF_LIBRARY_DEBUG}" + ) + endif() + + unset(z_vcpkg_LIBEXIF_root) +endif() diff --git a/ports/libexif/vcpkg.json b/ports/libexif/vcpkg.json index 77c7c25aeddd85..80aa5fba2ef0fc 100644 --- a/ports/libexif/vcpkg.json +++ b/ports/libexif/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libexif", "version": "0.6.24", + "port-version": 1, "description": "a library for parsing, editing, and saving EXIF data", "homepage": "https://libexif.github.io/", "license": "LGPL-2.1-or-later", @@ -10,5 +11,23 @@ "name": "vcpkg-cmake", "host": true } - ] + ], + "default-features": [ + "nls" + ], + "features": { + "nls": { + "description": "Enable native language support.", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gettext-libintl" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index cfed05b01b0aac..3eca02d8256402 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4262,7 +4262,7 @@ }, "libexif": { "baseline": "0.6.24", - "port-version": 0 + "port-version": 1 }, "libfabric": { "baseline": "1.13.2", diff --git a/versions/l-/libexif.json b/versions/l-/libexif.json index 40d2a2cbeb3d21..9b612d7bfb3565 100644 --- a/versions/l-/libexif.json +++ b/versions/l-/libexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40f7058e18a937bab35b7213595fc4eef5de7dec", + "version": "0.6.24", + "port-version": 1 + }, { "git-tree": "7194d724b7e14c0d3661153bc81f614a86276c6a", "version": "0.6.24", From e9aaa090107e37e793fe58fb79dbb1c5a44baf6b Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:00:13 -0800 Subject: [PATCH 0511/1039] [podofo] Update to 0.10.2 (#35436) * [podofo] Update to 0.10.2 * update version --- ports/podofo/fix-interface-include.patch | 20 ++++++++++++++++++++ ports/podofo/portfile.cmake | 7 +++++-- ports/podofo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/podofo.json | 5 +++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ports/podofo/fix-interface-include.patch diff --git a/ports/podofo/fix-interface-include.patch b/ports/podofo/fix-interface-include.patch new file mode 100644 index 00000000000000..a4a2ae6c7c424b --- /dev/null +++ b/ports/podofo/fix-interface-include.patch @@ -0,0 +1,20 @@ +diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt +index 697e475..6c12036 100644 +--- a/src/podofo/CMakeLists.txt ++++ b/src/podofo/CMakeLists.txt +@@ -72,6 +72,7 @@ if(PODOFO_BUILD_STATIC) + add_library(podofo_static STATIC ${PODOFO_SOURCES}) + add_library(podofo::podofo ALIAS podofo_static) + target_link_libraries(podofo_static podofo_private ${PODOFO_LIB_DEPENDS}) ++ target_include_directories(podofo_static PUBLIC "$") + set_target_properties(podofo_static PROPERTIES + VERSION "${PODOFO_VERSION}" + SOVERSION "${PODOFO_SOVERSION}" +@@ -96,6 +97,7 @@ if(PODOFO_BUILD_SHARED) + add_library(podofo_shared SHARED ${PODOFO_SOURCES}) + add_library(podofo::podofo ALIAS podofo_shared) + target_link_libraries(podofo_shared PRIVATE podofo_private ${PODOFO_LIB_DEPENDS}) ++ target_include_directories(podofo_shared PUBLIC "$") + # TODO: set /wd4251 flag if we're doing a debug build with + # Visual Studio, since it produces invalid warnings about STL + # use. diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index 0946b18fdd8ae9..eaba88764aa3ef 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -1,9 +1,10 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo REF "${VERSION}" - SHA512 cbbd183cd940345f9b077b7da140414c27badc70fdf754e2f3c6f0e51c25072de46d7fe312b014c0eab359bd03e9dca0283260db00f079c5014e268d5c5ef5c9 + SHA512 b5b7d4236a1f15b4eeee9d24210015b983910e88efa4727dd551f58b4d39cf7566314513b99099f54835b90a209cbf8231e04d19b63019223113abe6520fc932 + PATCHES + fix-interface-include.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -26,6 +27,8 @@ vcpkg_cmake_configure( -DPODOFO_BUILD_LIB_ONLY=1 -DPODOFO_BUILD_STATIC=${PODOFO_BUILD_STATIC} -DCMAKE_DISABLE_FIND_PACKAGE_Libidn=ON + MAYBE_UNUSED_VARIABLES + PKG_CONFIG_FOUND # Fix the warning of static build. ) vcpkg_cmake_install() diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 23a158cc9f27cd..098212375a14e8 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "podofo", - "version": "0.10.1", + "version": "0.10.2", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://github.com/podofo/podofo", "license": "LGPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3eca02d8256402..c1370fd2fe9ff0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6673,7 +6673,7 @@ "port-version": 0 }, "podofo": { - "baseline": "0.10.1", + "baseline": "0.10.2", "port-version": 0 }, "poissonrecon": { diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index b99596bc96ae3f..120a22e7fb96a4 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0323e740780ecead10bd47ca5bfb89ca6140c3b7", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "75683a46d35cfff92866f9c559833c7d1962cc55", "version": "0.10.1", From b1222cf8132be52bf80481b77ed937b3c299f7da Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:00:53 +0800 Subject: [PATCH 0512/1039] [triton] Version updated and compilation errors fixed (#34864) * update * update version * update version * update version --- ports/triton/fix_bin_path.patch | 13 +++++++++++++ ports/triton/portfile.cmake | 6 ++++-- ports/triton/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/triton.json | 5 +++++ 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/triton/fix_bin_path.patch diff --git a/ports/triton/fix_bin_path.patch b/ports/triton/fix_bin_path.patch new file mode 100644 index 00000000000000..13b02bd097eaa8 --- /dev/null +++ b/ports/triton/fix_bin_path.patch @@ -0,0 +1,13 @@ +diff --git a/src/libtriton/CMakeLists.txt b/src/libtriton/CMakeLists.txt +index 3c3ef6b..1adb110 100644 +--- a/src/libtriton/CMakeLists.txt ++++ b/src/libtriton/CMakeLists.txt +@@ -318,7 +318,7 @@ install( + EXPORT tritonTargets + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/triton" + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) diff --git a/ports/triton/portfile.cmake b/ports/triton/portfile.cmake index 5bd17c4b7f9415..cec442193aa895 100644 --- a/ports/triton/portfile.cmake +++ b/ports/triton/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JonathanSalwan/Triton - REF 2b655f20528065cf70e0fa95e2d01b34a8ef6a17 - SHA512 819c0c6eb9e5609240fe4be47c1f4584d2979e3b54f34c2978989ad9b3b10f73dc65ac87fca88fbfc26767f7a4df5b3a2ae70bcbda43ec89eef4c456a37bd884 + REF a61651ce331ac53ec09e1d8fef5eab744e98c9de + SHA512 b53befe232e986409789533ac39b371b5701d9b9b72ee47c6486408c57f72800d2192b0f65bd0cc751147fbea2f8c0ef5b6375c913bd1d57393236a619f319c9 HEAD_REF master + PATCHES + fix_bin_path.patch ) string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB) diff --git a/ports/triton/vcpkg.json b/ports/triton/vcpkg.json index 86836fab77aac0..a4d7a73a6cdd03 100644 --- a/ports/triton/vcpkg.json +++ b/ports/triton/vcpkg.json @@ -1,7 +1,6 @@ { "name": "triton", - "version": "0.9", - "port-version": 5, + "version-date": "2023-08-16", "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", diff --git a/versions/baseline.json b/versions/baseline.json index c1370fd2fe9ff0..d82a540cd4b532 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8593,8 +8593,8 @@ "port-version": 3 }, "triton": { - "baseline": "0.9", - "port-version": 5 + "baseline": "2023-08-16", + "port-version": 0 }, "trompeloeil": { "baseline": "45", diff --git a/versions/t-/triton.json b/versions/t-/triton.json index d38021f09cdf0c..f06187d8d9cfac 100644 --- a/versions/t-/triton.json +++ b/versions/t-/triton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d0facf413b0d9a2a4678af72776046a1c24f970", + "version-date": "2023-08-16", + "port-version": 0 + }, { "git-tree": "c3decfebbe5a1a8e132c0234074a82224a5335ce", "version": "0.9", From d606daa8f6a80646869a797a75d3a0f083c07290 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Dec 2023 11:02:01 +0100 Subject: [PATCH 0513/1039] [geos] Update to 3.11.2 (#35433) --- ports/geos/disable-warning-4996.patch | 13 ------------- ports/geos/gcc-13-fix-backport.patch | 12 ------------ ports/geos/portfile.cmake | 7 ++----- ports/geos/vcpkg.json | 2 +- ports/geos/{fix-dll-builds.patch => win32.patch} | 15 ++++++++------- versions/baseline.json | 2 +- versions/g-/geos.json | 5 +++++ 7 files changed, 17 insertions(+), 39 deletions(-) delete mode 100644 ports/geos/disable-warning-4996.patch delete mode 100644 ports/geos/gcc-13-fix-backport.patch rename ports/geos/{fix-dll-builds.patch => win32.patch} (87%) diff --git a/ports/geos/disable-warning-4996.patch b/ports/geos/disable-warning-4996.patch deleted file mode 100644 index d10e8df8ab6e17..00000000000000 --- a/ports/geos/disable-warning-4996.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e758b5dc8..074986f38 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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>" -- "$<$:/fp:precise>" -+ $<$:/fp:precise /wd4996> - ) - - # Use -ffloat-store for 32-bit builds (needed to make some tests pass) diff --git a/ports/geos/gcc-13-fix-backport.patch b/ports/geos/gcc-13-fix-backport.patch deleted file mode 100644 index 9344a426488998..00000000000000 --- a/ports/geos/gcc-13-fix-backport.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h -index 61c0010d4..eba5bba8f 100644 ---- a/include/geos/shape/fractal/HilbertEncoder.h -+++ b/include/geos/shape/fractal/HilbertEncoder.h -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - // Forward declarations - namespace geos { diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index c5b03880ddbd6d..20ec99b5b33fc0 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -1,17 +1,14 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} vcpkg_download_distfile(ARCHIVE URLS "https://download.osgeo.org/geos/geos-${VERSION}.tar.bz2" FILENAME "geos-${VERSION}.tar.bz2" - SHA512 b5df5b773bef595335e1be6c6d3325f932f1577e2a4b8bdfa8cf26f09c7d41ed5e0695ca15826d1f95bc4a45b777839c2be8a96a8af5415c8bcf58cc804eb1ec + SHA512 bbca43c1eb9c4001d2e3c29d054b597bfb2c1d4860784246dd20fec21882b54bc2a8a8f0f09b8816aec7a85b621d3d1645adca15318838d2b4f4b5c4c4a58a94 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" SOURCE_BASE "v${VERSION}" PATCHES - disable-warning-4996.patch + win32.patch fix-exported-config.patch - fix-dll-builds.patch - gcc-13-fix-backport.patch ) vcpkg_cmake_configure( diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 7de5c672afa144..54078ba2ae2bc8 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geos", - "version": "3.11.2", + "version": "3.11.3", "description": "Geometry Engine Open Source", "homepage": "https://libgeos.org/", "license": "LGPL-2.1-only", diff --git a/ports/geos/fix-dll-builds.patch b/ports/geos/win32.patch similarity index 87% rename from ports/geos/fix-dll-builds.patch rename to ports/geos/win32.patch index 9e1aa9f9551e28..f06c9a97207164 100644 --- a/ports/geos/fix-dll-builds.patch +++ b/ports/geos/win32.patch @@ -1,17 +1,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 074986f..bb5ab3a 100644 +index e758b5d..beda887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) +@@ -187,7 +187,8 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) target_compile_options(geos_cxx_flags INTERFACE "$<$,$>:-ffp-contract=off>" "$<$:-ffp-contract=off>" -- $<$:/fp:precise /wd4996> -+ "$<$:/fp:precise /wd4996>" +- "$<$:/fp:precise>" ++ "$<$:/fp:precise>" ++ "$<$:/wd4996>" ) # Use -ffloat-store for 32-bit builds (needed to make some tests pass) -@@ -227,10 +227,10 @@ target_compile_definitions(geos_cxx_flags +@@ -227,10 +228,10 @@ target_compile_definitions(geos_cxx_flags target_compile_definitions(geos_developer_cxx_flags INTERFACE @@ -26,7 +27,7 @@ index 074986f..bb5ab3a 100644 target_compile_options(geos_developer_cxx_flags INTERFACE -@@ -269,7 +269,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries" +@@ -269,7 +270,7 @@ option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries" if(BUILD_SHARED_LIBS) target_compile_definitions(geos @@ -35,7 +36,7 @@ index 074986f..bb5ab3a 100644 set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH}) set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH}) -@@ -287,7 +287,7 @@ target_link_libraries(geos_c PRIVATE geos) +@@ -287,7 +288,7 @@ target_link_libraries(geos_c PRIVATE geos) if(BUILD_SHARED_LIBS) target_compile_definitions(geos_c diff --git a/versions/baseline.json b/versions/baseline.json index d82a540cd4b532..264fee955f058e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2909,7 +2909,7 @@ "port-version": 1 }, "geos": { - "baseline": "3.11.2", + "baseline": "3.11.3", "port-version": 0 }, "geotrans": { diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 541800bb851174..8b14e257d97bf0 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74ed7ac2ba209cbd984174705b2e3fc7fcf99e9a", + "version": "3.11.3", + "port-version": 0 + }, { "git-tree": "6e3173bfbaacdb8fee9ac698f0b6dc668136ed9b", "version": "3.11.2", From e732da23b69bfbceef51da1bd95f1f9a8a9fb494 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:02:41 +0800 Subject: [PATCH 0514/1039] [tinyorm] Suppress warning STL4043 (#35432) --- ports/tinyorm/portfile.cmake | 7 +++++-- ports/tinyorm/suppress-warning-STL4043.patch | 18 ++++++++++++++++++ ports/tinyorm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tinyorm.json | 5 +++++ 5 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 ports/tinyorm/suppress-warning-STL4043.patch diff --git a/ports/tinyorm/portfile.cmake b/ports/tinyorm/portfile.cmake index 0f4d22ca5b5e55..74d14ea3b6d2e8 100644 --- a/ports/tinyorm/portfile.cmake +++ b/ports/tinyorm/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO silverqx/TinyORM - REF v0.36.5 + REF "v${VERSION}" SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183 HEAD_REF main + PATCHES + suppress-warning-STL4043.patch ) vcpkg_check_features( @@ -27,7 +29,6 @@ vcpkg_cmake_configure( -DTINY_PORT:STRING=${PORT} -DTINY_VCPKG:BOOL=ON -DVERBOSE_CONFIGURE:BOOL=ON - -DWARNINGS_AS_ERRORS=FALSE ${FEATURE_OPTIONS} ) @@ -38,3 +39,5 @@ vcpkg_cmake_config_fixup() if(TINYORM_TOM_EXAMPLE) vcpkg_copy_tools(TOOL_NAMES tom AUTO_CLEAN) endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tinyorm/suppress-warning-STL4043.patch b/ports/tinyorm/suppress-warning-STL4043.patch new file mode 100644 index 00000000000000..8c048d0a42d9f5 --- /dev/null +++ b/ports/tinyorm/suppress-warning-STL4043.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b6f2cd..7a2e32f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,13 @@ project(${TinyOrm_ns} + set(CMAKE_CXX_STANDARD 20) + set(CMAKE_CXX_STANDARD_REQUIRED YES) + set(CMAKE_CXX_EXTENSIONS OFF) ++ ++if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.38.32914.95") ++ add_compile_options(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) ++ endif() ++endif() ++ + # Set the AUTOMOC property explicitly only when needed (eg. unit tests need AUTOMOC) + set(CMAKE_AUTOMOC OFF) + diff --git a/ports/tinyorm/vcpkg.json b/ports/tinyorm/vcpkg.json index 5f26da6cdf49ec..6ec027afc09d7c 100644 --- a/ports/tinyorm/vcpkg.json +++ b/ports/tinyorm/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "tinyorm", "version-semver": "0.36.5", - "port-version": 1, + "port-version": 2, "maintainers": "Silver Zachara ", "description": "Modern C++ ORM library for Qt framework", "homepage": "https://github.com/silverqx/TinyORM", diff --git a/versions/baseline.json b/versions/baseline.json index 264fee955f058e..594d1b2cb91a4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8478,7 +8478,7 @@ }, "tinyorm": { "baseline": "0.36.5", - "port-version": 1 + "port-version": 2 }, "tinyply": { "baseline": "2.3.4", diff --git a/versions/t-/tinyorm.json b/versions/t-/tinyorm.json index 73c327c483646d..bc3e3b68e170eb 100644 --- a/versions/t-/tinyorm.json +++ b/versions/t-/tinyorm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d", + "version-semver": "0.36.5", + "port-version": 2 + }, { "git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba", "version-semver": "0.36.5", From 2fd72b34883da5e7c4be394261cd1a2a415cf930 Mon Sep 17 00:00:00 2001 From: Christian Mazakas <5543573+cmazakas@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:03:33 -0800 Subject: [PATCH 0515/1039] update liburing port to version 2.5 (#35430) --- ports/liburing/fix-configure.patch | 15 +++++++-------- ports/liburing/portfile.cmake | 2 +- ports/liburing/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/liburing.json | 5 +++++ 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/liburing/fix-configure.patch b/ports/liburing/fix-configure.patch index 6eac3f0eaba55f..ae718c0972d7d0 100644 --- a/ports/liburing/fix-configure.patch +++ b/ports/liburing/fix-configure.patch @@ -1,8 +1,8 @@ diff --git a/configure b/configure -index 28f3eb0..b3ac6bc 100755 +index 88b8ee7..bf9312f 100755 --- a/configure +++ b/configure -@@ -36,7 +36,7 @@ for opt do +@@ -20,7 +20,7 @@ for opt do ;; --mandir=*) mandir="$optarg" ;; @@ -11,23 +11,22 @@ index 28f3eb0..b3ac6bc 100755 ;; --cc=*) cc="$optarg" ;; -@@ -44,10 +44,12 @@ for opt do +@@ -28,10 +28,12 @@ for opt do ;; - --nolibc) nolibc_deprecated + --use-libc) use_libc=yes ;; + --enable-shared) ENABLE_SHARED=1 + ;; + --enable-static) ENABLE_SHARED=0 -+ ;; ++ ;; *) -- echo "ERROR: unknown option $opt" + echo "ERROR: unknown option $opt" - echo "Try '$0 --help' for more information" - exit 1 -+ echo "WARNING: unknown option $opt" ;; esac done -@@ -146,6 +148,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/portfile.cmake b/ports/liburing/portfile.cmake index 68e0161339e6fb..03edb90792fb4b 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing REF "liburing-${VERSION}" - SHA512 8033f813262472b695d15ce20cc6cbe76a5577f16bfa7e8bc2f21c7925ec831b0f2eaf135af721e80cccce9ebe7f4431148dba2e66fa5f0278be457d9aca6535 + SHA512 53742c23211de7194322874eb8186b942ccc1611c231d49f60fd1d8bc2bb93d231ed521af77802db68c30557d71fa5799ae40cbacfc24ba1db3d650c7ba8cc62 HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index d6a1ba2a54c692..6f5161198980cb 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "liburing", - "version": "2.4", + "version": "2.5", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": "MIT OR LGPL-2.1 OR GPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 594d1b2cb91a4f..eb1a8282519900 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4957,7 +4957,7 @@ "port-version": 0 }, "liburing": { - "baseline": "2.4", + "baseline": "2.5", "port-version": 0 }, "libusb": { diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 2797aff8c4b7ad..1d3ea6122094c4 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b66acf8da313f79a9cdcc12ee6daf8f621e7bcce", + "version": "2.5", + "port-version": 0 + }, { "git-tree": "317cfa2c23f9e0e285b1c36140cdb54739ebf328", "version": "2.4", From b9c9941e78bb8e481ec103192b1686835611b23b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Dec 2023 11:05:34 +0100 Subject: [PATCH 0516/1039] [gdal] Update to 3.8.1 (#35428) --- ports/gdal/portfile.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 22ac3ee410de93..45872faccc683a 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 ae0238b2741c673927f80b3d0765fbb0eb2ddb8699441564e67dd7bb6a429b45e4eac57f9c4e93ecea7a4525f28c05e6f3097828c40d5af6a66dda83d2245242 + SHA512 1a5ddc6a53f54e1c2f36cfd9af0ec05abc48c14207afaa89f449f3c7395f724ff92a8a5936608703dcc8b862e1762b1c3840445f440ebf9437816362aceef931 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index be6c2725b01ef2..350d8327864522 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.8.0", + "version-semver": "3.8.1", "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 eb1a8282519900..f75a5f21ed1db9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2877,7 +2877,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.8.0", + "baseline": "3.8.1", "port-version": 0 }, "gdcm": { diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 7e22496c5afbd0..1cf843c4b94a2d 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33a60f073f77b16b9364659fea34df2cff9ea3ae", + "version-semver": "3.8.1", + "port-version": 0 + }, { "git-tree": "4eb6f65b6e278d02d05adff2de5e9fc0b068dd39", "version-semver": "3.8.0", From af6b93abd4ac598f61a42e4b9c288ea67af865eb Mon Sep 17 00:00:00 2001 From: Julian Zimmermann Date: Fri, 1 Dec 2023 11:06:17 +0100 Subject: [PATCH 0517/1039] [open62541] don't force static CRT anymore (#35419) * [open62541] don't force static crt * run x-add-version --------- Co-authored-by: Julian Zimmermann --- ports/open62541/portfile.cmake | 1 + ports/open62541/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/open62541.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index b2736584efad53..0054a496b63378 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} ${OPEN62541_ENCRYPTION_OPTIONS} -DOPEN62541_VERSION=${VERSION} + -DUA_MSVC_FORCE_STATIC_CRT=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 11911dac780765..1971d3455c2171 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,6 +1,7 @@ { "name": "open62541", "version": "1.3.8", + "port-version": 1, "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f75a5f21ed1db9..4c68b63e1ef86a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6194,7 +6194,7 @@ }, "open62541": { "baseline": "1.3.8", - "port-version": 0 + "port-version": 1 }, "openal-soft": { "baseline": "1.23.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 4d45b6aea4b4ad..08975e611eea94 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66034a6a77c3169eba0a175a4b67fe2ad3eab48b", + "version": "1.3.8", + "port-version": 1 + }, { "git-tree": "a50cf77d055c6249b2568880f61fb72b8f916d62", "version": "1.3.8", From 7bb78b3f1590dca38c4f7407763d6b55c8eb5acd Mon Sep 17 00:00:00 2001 From: FantasqueX Date: Fri, 1 Dec 2023 18:08:05 +0800 Subject: [PATCH 0518/1039] [libspng]: New port (#35412) * [libspng]: New port * fix usage * update version --- ports/libspng/fix-spngconfig-cmake.patch | 11 ++++++++ ports/libspng/portfile.cmake | 33 ++++++++++++++++++++++++ ports/libspng/usage | 4 +++ ports/libspng/vcpkg.json | 18 +++++++++++++ versions/baseline.json | 4 +++ versions/l-/libspng.json | 9 +++++++ 6 files changed, 79 insertions(+) create mode 100644 ports/libspng/fix-spngconfig-cmake.patch create mode 100644 ports/libspng/portfile.cmake create mode 100644 ports/libspng/usage create mode 100644 ports/libspng/vcpkg.json create mode 100644 versions/l-/libspng.json diff --git a/ports/libspng/fix-spngconfig-cmake.patch b/ports/libspng/fix-spngconfig-cmake.patch new file mode 100644 index 00000000000000..b4e8680999ff76 --- /dev/null +++ b/ports/libspng/fix-spngconfig-cmake.patch @@ -0,0 +1,11 @@ +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index d0123db..5756179 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -1,5 +1,6 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) + find_dependency(ZLIB REQUIRED) + + include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake") diff --git a/ports/libspng/portfile.cmake b/ports/libspng/portfile.cmake new file mode 100644 index 00000000000000..2105ae10820186 --- /dev/null +++ b/ports/libspng/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO randy408/libspng + REF "v${VERSION}" + SHA512 cd729653599ed97f80d19f3048c1b3bc2ac16f922b3465804b1913bc45d9fc8b28b56bc2121fda36e9d3dcdd12612cced5383313b722a5342b613f8781879f1a + HEAD_REF master + PATCHES + fix-spngconfig-cmake.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SPNG_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPNG_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPNG_STATIC=${SPNG_BUILD_STATIC} + -DSPNG_SHARED=${SPNG_BUILD_SHARED} + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/spng PACKAGE_NAME spng) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +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/libspng/usage b/ports/libspng/usage new file mode 100644 index 00000000000000..bc69e6a0448686 --- /dev/null +++ b/ports/libspng/usage @@ -0,0 +1,4 @@ +libspng provides CMake targets: + + find_package(SPNG CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,spng::spng,spng::spng_static>) \ No newline at end of file diff --git a/ports/libspng/vcpkg.json b/ports/libspng/vcpkg.json new file mode 100644 index 00000000000000..ce125080115d04 --- /dev/null +++ b/ports/libspng/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libspng", + "version": "0.7.4", + "description": "Simple, modern libpng alternative", + "homepage": "https://github.com/randy408/libspng", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4c68b63e1ef86a..5b2bdf31a09408 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4836,6 +4836,10 @@ "baseline": "0.2.3", "port-version": 2 }, + "libspng": { + "baseline": "0.7.4", + "port-version": 0 + }, "libsquish": { "baseline": "1.15", "port-version": 13 diff --git a/versions/l-/libspng.json b/versions/l-/libspng.json new file mode 100644 index 00000000000000..5c77ab884fea96 --- /dev/null +++ b/versions/l-/libspng.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ed674df56d8b39d76443c7db3ae893c08394bf9c", + "version": "0.7.4", + "port-version": 0 + } + ] +} From 8a837a50241c7095cd7794a2df688b2b54f96366 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:09:03 +0800 Subject: [PATCH 0519/1039] update to 0.24.7 (#35410) --- ports/xtensor/portfile.cmake | 2 +- ports/xtensor/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/x-/xtensor.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/xtensor/portfile.cmake b/ports/xtensor/portfile.cmake index f4e6ef950e8d7d..37b8a34e14c2a8 100644 --- a/ports/xtensor/portfile.cmake +++ b/ports/xtensor/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor REF "${VERSION}" - SHA512 6284fb5de5d61c87a8599baad86b6c8c95d06d3753698a3a49efe9a87c291965e4a2439c84abf0722ce97ca7e48c5fdb0b64141f1bc8de7a7d06b7de9ec06cb6 + SHA512 1b2683225a400e2ed06679eedc13c001be80163afb8b42918091670995c04f26ef03ffa9ef72ec7fe6c9d4c1aa88df9ad17698abe5ccd8b19a057ebc10956594 HEAD_REF master PATCHES fix-find-tbb-and-install-destination.patch diff --git a/ports/xtensor/vcpkg.json b/ports/xtensor/vcpkg.json index ff8d9ec4adf404..0d239fa1c7fab3 100644 --- a/ports/xtensor/vcpkg.json +++ b/ports/xtensor/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xtensor", - "version": "0.24.6", - "port-version": 1, + "version": "0.24.7", "description": "C++ tensors with broadcasting and lazy computing", "homepage": "https://github.com/xtensor-stack/xtensor", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 5b2bdf31a09408..6adfa7e3ed8ae3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9249,8 +9249,8 @@ "port-version": 0 }, "xtensor": { - "baseline": "0.24.6", - "port-version": 1 + "baseline": "0.24.7", + "port-version": 0 }, "xtensor-blas": { "baseline": "0.20.0", diff --git a/versions/x-/xtensor.json b/versions/x-/xtensor.json index 90157a3fc058b5..680e70712e9c54 100644 --- a/versions/x-/xtensor.json +++ b/versions/x-/xtensor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f097c22efd106eadd130143bbe0ea4ce0355959", + "version": "0.24.7", + "port-version": 0 + }, { "git-tree": "3243d2557778b77adbd7b2dbc83ade2456e8fe5c", "version": "0.24.6", From ee34d77c7bbfe14cf1a1e679430058fa77683257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Fri, 1 Dec 2023 10:09:43 +0000 Subject: [PATCH 0520/1039] [Glaze] Update to version 1.8.1 (#35393) * Glaze update 1.8.1 * Update database --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 6f74cb75fc44b1..c3ce1788fbcb09 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 288775a9c9eaeffe7fe8294c7ac1cb89df1898b6cbcad3c174d530f6d35943f41dc65d675efaac8c2bea4dd54d882719ec039e257193e2a272939fcf3c336252 + SHA512 8ae5ff0b6d13a1b2895ababa8264b20f50705c3a29d0ff875ca830b5588b7ac2df8f9b41e56a4af68acfeb93702df6220be7a84e7e38e46f5983f901d9084b3c ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 469360976d15b8..39e48cd025c43a 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.8.0", + "version": "1.8.1", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6adfa7e3ed8ae3..5ab675fb919ac7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2977,7 +2977,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.8.0", + "baseline": "1.8.1", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index d2c96f661467e2..acdb2ea9289dd6 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bc431f655de61084866947ee92fcf59cba56e0e", + "version": "1.8.1", + "port-version": 0 + }, { "git-tree": "69ee3541bd226042e5dab58f37f9b89ade5be622", "version": "1.8.0", From 5b60a7a1059573784f998ca470c4ce9fa0cfdf3d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:11:44 -0800 Subject: [PATCH 0521/1039] [qtbase] Fix Binaries value in qt.conf.in (#35392) * [qtbase] Fix Binaries value in qt.conf.in * update version * update version --------- Co-authored-by: vzhli17 --- ports/qtbase/qt.conf.in | 4 ++-- ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/qtbase/qt.conf.in b/ports/qtbase/qt.conf.in index 8e76b8f6d343c7..be5cf99400feb4 100644 --- a/ports/qtbase/qt.conf.in +++ b/ports/qtbase/qt.conf.in @@ -5,7 +5,7 @@ Libraries=@REL_PATH@lib Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml Documentation=doc/@QT6_DIRECTORY_PREFIX@ -Binaries=@REL_PATH@bin +Binaries=tools/Qt6/bin LibraryExecutables=tools/Qt6/bin ArchData=share/Qt6 Data=share/Qt6 @@ -18,7 +18,7 @@ Libraries=@REL_PATH@lib Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins Qml2Imports=@REL_PATH@@QT6_DIRECTORY_PREFIX@qml Documentation=doc/@QT6_DIRECTORY_PREFIX@ -Binaries=@REL_PATH@bin +Binaries=tools/Qt6/bin LibraryExecutables=tools/Qt6/bin ArchData=share/Qt6 Data=share/Qt6 diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index a1d43d2a333412..c04355031fd5f4 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.6.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 5ab675fb919ac7..0a667df7d5b6e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7098,7 +7098,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index ca17c51d838ed4..b53ba6c70d8ca1 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a05b4f8f0ecf48816dfe2dd648bf0b1202d771e", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "4e2fc7540c9a576e44a03dcdb011864e6ecdff8a", "version": "6.6.1", From 01ea5f6f168b47a72811bc0007d50ed491836ebb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Dec 2023 11:13:18 +0100 Subject: [PATCH 0522/1039] [freeglut,gl2ps,glui,mdl-sdk] Platform support corrections (#35391) * [freeglut] Fix android * [glui] android unsupported, needs GL/gl.h * [gl2ps] android unsupported, needs GL/gl.h * [libraw] Skip arm-neon-android CI, needs ftello * [mdl-sdk] Update 'supports' * Update ci.baseline.txt * [gl2ps] freeglut not needed * [mdl-sdk] Fix static-md --- ports/freeglut/portfile.cmake | 26 +++++++++++++------- ports/freeglut/vcpkg.json | 2 ++ ports/gl2ps/portfile.cmake | 19 +++++++++----- ports/gl2ps/vcpkg.json | 5 ++-- ports/glui/vcpkg.json | 4 ++- ports/mdl-sdk/001-freeimage-from-vcpkg.patch | 4 ++- ports/mdl-sdk/vcpkg.json | 4 +-- scripts/ci.baseline.txt | 6 ++--- versions/baseline.json | 8 +++--- versions/f-/freeglut.json | 5 ++++ versions/g-/gl2ps.json | 5 ++++ versions/g-/glui.json | 5 ++++ versions/m-/mdl-sdk.json | 5 ++++ 13 files changed, 70 insertions(+), 28 deletions(-) diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 2cccbbb31d31cd..3afc8e28b7b9cd 100755 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeGLUTProject/freeglut @@ -13,8 +11,10 @@ vcpkg_from_github( windows-output-name.patch ) -if(NOT VCPKG_TARGET_IS_WINDOWS) - message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") +if(VCPKG_TARGET_IS_OSX) + message("Freeglut currently requires Xquartz for macOS.") +elseif(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) + message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev") endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FREEGLUT_STATIC) @@ -33,12 +33,20 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeGLUT) vcpkg_fixup_pkgconfig() -file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc") -if(NOT VCPKG_BUILD_TYPE) - if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd") + +file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") +foreach(file IN LISTS pc_files) + vcpkg_replace_string("${file}" ";-D" " -D") +endforeach() + +if(NOT VCPKG_TARGET_IS_ANDROID) + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freeglut.pc") + if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" " -lfreeglut" " -lfreeglutd") + endif() + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc") endif() - file(COPY_FILE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glut.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freeglut.pc") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index e9d9424473b4ae..e3ece926080234 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -1,9 +1,11 @@ { "name": "freeglut", "version": "3.4.0", + "port-version": 1, "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.", "homepage": "https://sourceforge.net/projects/freeglut/", "license": null, + "supports": "!ios", "dependencies": [ "opengl", { diff --git a/ports/gl2ps/portfile.cmake b/ports/gl2ps/portfile.cmake index 2095809c3ccfa8..d48897f2890b41 100644 --- a/ports/gl2ps/portfile.cmake +++ b/ports/gl2ps/portfile.cmake @@ -1,20 +1,27 @@ vcpkg_from_gitlab( - GITLAB_URL http://gitlab.onelab.info + GITLAB_URL https://gitlab.onelab.info OUT_SOURCE_PATH SOURCE_PATH REPO gl2ps/gl2ps REF gl2ps_1_4_2 SHA512 cb4abd79f6790e229a0b05a6d12e4bd4d24885c89c4cb8644e49b0459361565c5c5379b53d85f59eeaba16144d3288dbd06c90f55a739f0928a788224ccb8085 HEAD_REF master - PATCHES separate-static-dynamic-build.patch + PATCHES + separate-static-dynamic-build.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) vcpkg_cmake_install() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.GL2PS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright.LGPL) +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/README.txt" + "${SOURCE_PATH}/COPYING.LGPL" + "${SOURCE_PATH}/COPYING.GL2PS" +) diff --git a/ports/gl2ps/vcpkg.json b/ports/gl2ps/vcpkg.json index 32105b0ecf505e..c4b26d3bdead90 100644 --- a/ports/gl2ps/vcpkg.json +++ b/ports/gl2ps/vcpkg.json @@ -1,12 +1,13 @@ { "name": "gl2ps", "version": "1.4.2", - "port-version": 3, + "port-version": 4, "description": "OpenGL to PostScript Printing Library", "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps", + "supports": "!android", "dependencies": [ - "freeglut", "libpng", + "opengl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/glui/vcpkg.json b/ports/glui/vcpkg.json index 40fe8892f0013a..e9ce83d89eaafd 100644 --- a/ports/glui/vcpkg.json +++ b/ports/glui/vcpkg.json @@ -1,11 +1,13 @@ { "name": "glui", "version-date": "2019-11-30", - "port-version": 3, + "port-version": 4, "description": "GLUI is a GLUT-based C++ user interface library", "homepage": "https://github.com/libglui/glui", + "supports": "!android", "dependencies": [ "freeglut", + "opengl", { "name": "vcpkg-cmake", "host": true diff --git a/ports/mdl-sdk/001-freeimage-from-vcpkg.patch b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch index 9dcc6edcc51e12..78712f73e77d52 100644 --- a/ports/mdl-sdk/001-freeimage-from-vcpkg.patch +++ b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch @@ -30,7 +30,7 @@ index b11573a..703458e 100644 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) +@@ -90,6 +93,37 @@ function(FIND_FREEIMAGE_EXT) endif() endif() @@ -55,6 +55,8 @@ index b11573a..703458e 100644 + if(NOT _FREEIMAGE_LIB) + get_target_property(_FREEIMAGE_LIB freeimage::FreeImage IMPORTED_IMPLIB_DEBUG) + endif() ++ elseif(WINDOWS) ++ set(_FREEIMAGE_LIB "${_FREEIMAGE_SHARED}") + endif() + + find_file(_FREEIMAGE_HEADER_FILE "FreeImage.h" diff --git a/ports/mdl-sdk/vcpkg.json b/ports/mdl-sdk/vcpkg.json index 2f473ed2964a18..c049a4773540d9 100644 --- a/ports/mdl-sdk/vcpkg.json +++ b/ports/mdl-sdk/vcpkg.json @@ -1,11 +1,11 @@ { "name": "mdl-sdk", "version": "2021.1.2", - "port-version": 3, + "port-version": 4, "description": "NVIDIA Material Definition Language SDK", "homepage": "https://github.com/NVIDIA/MDL-SDK", "license": "BSD-3-Clause", - "supports": "!arm & !x86 & !(windows & static)", + "supports": "!arm & !x86 & !staticcrt", "dependencies": [ "boost-algorithm", "boost-any", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 44d9e56ca4a04f..09632028abc9a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -338,9 +338,7 @@ fmi4cpp:arm64-uwp=fail fmi4cpp:x64-uwp=fail folly:arm64-android=fail folly:x64-android=fail -freeglut:arm-neon-android=fail -freeglut:arm64-android=fail -freeglut:x64-android=fail +# Needs XQuartz freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm-neon-android=fail @@ -610,6 +608,8 @@ libqcow:x64-windows=skip libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip +# needs ftello +libraw:arm-neon-android=fail # Conflicts with openssl libressl:arm-neon-android=skip libressl:arm64-android=skip diff --git a/versions/baseline.json b/versions/baseline.json index 0a667df7d5b6e0..366c429c369544 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2758,7 +2758,7 @@ }, "freeglut": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "freeimage": { "baseline": "3.18.0", @@ -2966,7 +2966,7 @@ }, "gl2ps": { "baseline": "1.4.2", - "port-version": 3 + "port-version": 4 }, "gl3w": { "baseline": "2018-05-31", @@ -3030,7 +3030,7 @@ }, "glui": { "baseline": "2019-11-30", - "port-version": 3 + "port-version": 4 }, "gmime": { "baseline": "3.2.6", @@ -5490,7 +5490,7 @@ }, "mdl-sdk": { "baseline": "2021.1.2", - "port-version": 3 + "port-version": 4 }, "mdns": { "baseline": "1.4.3", diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json index 1d92627f0e2f14..81073ba5ce8f3e 100644 --- a/versions/f-/freeglut.json +++ b/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f948f7bed9cac147c0687d4b170b99bc6b59f157", + "version": "3.4.0", + "port-version": 1 + }, { "git-tree": "51a55df4538f3ecdeeb6d9846afd156ec3255630", "version": "3.4.0", diff --git a/versions/g-/gl2ps.json b/versions/g-/gl2ps.json index 57909dbef9b3d2..c4ba380363e6a1 100644 --- a/versions/g-/gl2ps.json +++ b/versions/g-/gl2ps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f0cdea5ea747e24f3a5fba076e645e1292a832f", + "version": "1.4.2", + "port-version": 4 + }, { "git-tree": "3607998f92ba0e61fbcae891aa6a8aa996e3bf0a", "version": "1.4.2", diff --git a/versions/g-/glui.json b/versions/g-/glui.json index f1ed1ccb03fbfa..1a32a34bd895ea 100644 --- a/versions/g-/glui.json +++ b/versions/g-/glui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c2b09ac7fb9d890c835c7580c3e0addb996752d", + "version-date": "2019-11-30", + "port-version": 4 + }, { "git-tree": "5fb1a005d3f676d62e974dbb3b96dba5c3c7369a", "version-date": "2019-11-30", diff --git a/versions/m-/mdl-sdk.json b/versions/m-/mdl-sdk.json index 0cadd714931b1c..ff004d1d592b7b 100644 --- a/versions/m-/mdl-sdk.json +++ b/versions/m-/mdl-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c4084ba04dcadc57086603e341b7d74e6926f00", + "version": "2021.1.2", + "port-version": 4 + }, { "git-tree": "a8fcd0cdebe6b073993485aba6fa0dd24445f9f5", "version": "2021.1.2", From efe9c8a3e396014eee14c94709aa9c50067beab9 Mon Sep 17 00:00:00 2001 From: Kent Date: Fri, 1 Dec 2023 11:13:48 +0100 Subject: [PATCH 0523/1039] [nlohmann-json] version 3.11.3 (#35385) * nlohmann-json version 3.11.3 * ./vcpkg x-add-version --all * Update ports/nlohmann-json/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update nlohmann-json.json --------- Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/nlohmann-json/portfile.cmake | 4 ++-- ports/nlohmann-json/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 947cba357282f7..c20c5307877ee4 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.11.2 - SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 + REF "v${VERSION}" + SHA512 7df19b621de34f08d5d5c0a25e8225975980841ef2e48536abcf22526ed7fb99f88ad954a2cb823115db59ccc88d1dbe74fe6c281b5644b976b33fb78db9d717 HEAD_REF master ) diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index cc65b9d204d696..232df9415b439f 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nlohmann-json", - "version-semver": "3.11.2", + "version-semver": "3.11.3", "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 366c429c369544..37b4df6eab10e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5965,7 +5965,7 @@ "port-version": 3 }, "nlohmann-json": { - "baseline": "3.11.2", + "baseline": "3.11.3", "port-version": 0 }, "nlopt": { diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 382f3b167b58cf..ac520132fa1cec 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a728b86fa36d4885a4c57c79432660950644d6d4", + "version-semver": "3.11.3", + "port-version": 0 + }, { "git-tree": "caa64b8c731ac2457575ea3c5f1827bc82ecac84", "version-semver": "3.11.2", From 7771a37ebd5cb103c56b7febd7aa4d35234db949 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Fri, 1 Dec 2023 02:15:12 -0800 Subject: [PATCH 0524/1039] [openxr-loader] update to 1.0.31 (#34901) --- ports/openxr-loader/002-fix-hpp-gen.patch | 16 ---------- ports/openxr-loader/portfile.cmake | 29 +++++++++---------- .../python3_8_compatibility.patch | 13 +++++++++ ports/openxr-loader/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/o-/openxr-loader.json | 5 ++++ 6 files changed, 34 insertions(+), 36 deletions(-) delete mode 100644 ports/openxr-loader/002-fix-hpp-gen.patch create mode 100644 ports/openxr-loader/python3_8_compatibility.patch diff --git a/ports/openxr-loader/002-fix-hpp-gen.patch b/ports/openxr-loader/002-fix-hpp-gen.patch deleted file mode 100644 index 9f58f76268495e..00000000000000 --- a/ports/openxr-loader/002-fix-hpp-gen.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py -index 6b95fe4..3a19058 100755 ---- a/scripts/hpp_genxr.py -+++ b/scripts/hpp_genxr.py -@@ -80,6 +80,11 @@ def genTarget(args): - "XR_MSFT_controller_model", - # Projection of static string fails - "XR_MSFT_spatial_graph_bridge", -+ "XR_MSFT_spatial_anchor_persistence", -+ "XR_MSFT_holographic_window_attachment", -+ # Projection of UuidMSFT fails -+ "XR_MSFT_scene_understanding", -+ "XR_MSFT_scene_understanding_serialization", - )) - - # Turn lists of names/patterns into matching regular expressions diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index 04a518602f4190..4d1127e56e6e6b 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenXR-SDK - REF release-1.0.22 - SHA512 fe3c393c2d11981b42355acd8dbc337727120bcd0ff595abac1975c4ce5f68bb74a9a1b4c959e64e9a847ae5d504100d31979ffd7d9702c55b2dbd889de17d3e + REF "release-${VERSION}" + SHA512 6efc7596e707f95366dbcdbac9bd7d0c20735a2175b4edf56a9e8a112cf0ab8b664069fe942313164a37119032ddbf5671bc88ab5f276005dd36e4a4dabba1c7 HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -12,8 +12,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SDK_SOURCE_PATH REPO KhronosGroup/OpenXR-SDK-Source - REF release-1.0.22 - SHA512 92802d57a45ca1d697d3cea1b3f5619af4ba36156cb28c2c39b2295a74ebc45907caf371c916c54ec3be44a2f3ae447ffc1cd62f54b7b24f7a081408328c7651 + REF "release-${VERSION}" + SHA512 04bdb0f16078209b5edd175a3396f70e1ceb8cfa382c65b8fda388e565480e3844daf68e0d987e72ed8c21d3148af0b41a2170911ec1660565887e0e5ae6d2bf HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -23,11 +23,11 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH HPP_SOURCE_PATH REPO KhronosGroup/OpenXR-hpp - REF release-1.0.21 - SHA512 cda111f20392a64d5f4de6bd71f1fe7fe39d688bb2376c6b1841763459e32fd6d03b9552804b5ee464ba84cd4c05cfdaa1a6e8a8e5da3eae6b94c7797c65cb36 + REF 63db9919822f8af6f7bf7416ba6a015d4617202e + SHA512 9e768f485d1631f8e74f35f028a64e2d64e33d362c53ae1c54427a10786e3befdd24089927319aa1a4b4c3e010247bd6cb3394bcee460c467c637ab6bc7bec90 HEAD_REF master PATCHES - 002-fix-hpp-gen.patch + python3_8_compatibility.patch ) # Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and @@ -57,16 +57,13 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# Generate the OpenXR C++ bindings +# Generate the OpenXR C++ bindings set(ENV{OPENXR_REPO} "${SDK_SOURCE_PATH}") -file(STRINGS "${HPP_SOURCE_PATH}/headers.txt" HEADER_LIST REGEX "^openxr.*") -foreach(HEADER ${HEADER_LIST}) - vcpkg_execute_required_process( - COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" ${HEADER} - WORKING_DIRECTORY "${HPP_SOURCE_PATH}" - LOGNAME openxrhpp - ) -endforeach() +vcpkg_execute_required_process( + COMMAND ${PYTHON3} "${HPP_SOURCE_PATH}/scripts/hpp_genxr.py" -quiet -registry "${SDK_SOURCE_PATH}/specification/registry/xr.xml" -o "${CURRENT_PACKAGES_DIR}/include/openxr" + WORKING_DIRECTORY "${HPP_SOURCE_PATH}" + LOGNAME "openxr-hpp" +) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(PACKAGE_NAME OpenXR CONFIG_PATH cmake) diff --git a/ports/openxr-loader/python3_8_compatibility.patch b/ports/openxr-loader/python3_8_compatibility.patch new file mode 100644 index 00000000000000..657bb2b7ab8e61 --- /dev/null +++ b/ports/openxr-loader/python3_8_compatibility.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py +index ce419b0..23e1d3d 100644 +--- a/scripts/hpp_genxr.py ++++ b/scripts/hpp_genxr.py +@@ -36,7 +36,7 @@ from xrconventions import OpenXRConventions + from data import EXCLUDED_EXTENSIONS + + +-def makeREstring(strings: Iterable[str], default: typing.Optional[str] = None) -> str: ++def makeREstring(strings, default: typing.Optional[str] = None) -> str: + """Turn a list of strings into a regexp string matching exactly those strings.""" + if strings or default is None: + return f"^({'|'.join(re.escape(s) for s in strings)})$" diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json index c2e6b9a404490c..a45e3c9199ffda 100644 --- a/ports/openxr-loader/vcpkg.json +++ b/ports/openxr-loader/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openxr-loader", - "version": "1.0.22", - "port-version": 3, + "version": "1.0.31", "description": "A royalty-free, open standard that provides high-performance access to Augmented Reality (AR) and Virtual Reality (VR)—collectively known as XR—platforms and devices", "homepage": "https://github.com/KhronosGroup/OpenXR-SDK", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 37b4df6eab10e6..7439b97b86ae45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6377,8 +6377,8 @@ "port-version": 0 }, "openxr-loader": { - "baseline": "1.0.22", - "port-version": 3 + "baseline": "1.0.31", + "port-version": 0 }, "optimus-cpp": { "baseline": "0.3.0", diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 6385ac6a9d6b63..81c538268fef57 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8275bf000597b3d7cd12109347f21552bcd39cc", + "version": "1.0.31", + "port-version": 0 + }, { "git-tree": "e26b91f539cbbba23cc6ccd2eb9106322ba1c81c", "version": "1.0.22", From ea9f45d1bc03efbf43a3bbd0788d6a433b8fe445 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:16:35 +0800 Subject: [PATCH 0525/1039] [SDL2] update to 2.28.5 (#35352) * [SDL2] update to 2.28.5 * Unroll the base feature into direct members of default-features * Apply suggestion --- ports/sdl2/portfile.cmake | 2 +- ports/sdl2/vcpkg.json | 31 +++++++++++++------------------ versions/baseline.json | 4 ++-- versions/s-/sdl2.json | 5 +++++ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index e9c6837b054d37..4e3ad0bfa39d26 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL REF "release-${VERSION}" - SHA512 3199e535033c8728bd12b97931d5c5d7a7dcc9b0f502109ff722982601b6fbb00995d71cbaab7d3b780c738deece235ef76ab1963ce946084c482c2d31a4abe8 + SHA512 d3cf7d356b79184dd211c9fbbfcb2a83d1acb68ee549ab82be109cd899039f18f0dbf3aedbf0800793c3a68580688014863b5d9bf79bcd366ff0e88252955e3c HEAD_REF main PATCHES deps.patch diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 4f67f6ea0bced0..b5e96c4bacbb62 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version": "2.28.4", - "port-version": 1, + "version": "2.28.5", "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", @@ -20,7 +19,18 @@ } ], "default-features": [ - "base" + { + "name": "ibus", + "platform": "linux" + }, + { + "name": "wayland", + "platform": "linux" + }, + { + "name": "x11", + "platform": "linux" + } ], "features": { "alsa": { @@ -32,21 +42,6 @@ } ] }, - "base": { - "description": "Base functionality for SDL", - "dependencies": [ - { - "name": "sdl2", - "default-features": false, - "features": [ - "ibus", - "wayland", - "x11" - ], - "platform": "linux" - } - ] - }, "ibus": { "description": "Build with ibus IME support", "supports": "linux" diff --git a/versions/baseline.json b/versions/baseline.json index 7439b97b86ae45..9465d8b0c02c49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7729,8 +7729,8 @@ "port-version": 6 }, "sdl2": { - "baseline": "2.28.4", - "port-version": 1 + "baseline": "2.28.5", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 88e296f3c06f62..5c450683eb4146 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06cf4722fa0f5f8467136faebe34cef0e85e1a4c", + "version": "2.28.5", + "port-version": 0 + }, { "git-tree": "3d625914314454b36d303ce86753840f6193f2bd", "version": "2.28.4", From 72f36d7d0c0fa56069af51efe3f928a520a5cd65 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:19:27 -0800 Subject: [PATCH 0526/1039] [sentencepiece] Fix port (#35283) * [sentencepiece] Fix port * update version * add supports * update version * remove features * update version --------- Co-authored-by: vzhli17 --- ports/sentencepiece/portfile.cmake | 10 ++++------ ports/sentencepiece/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sentencepiece.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index 0ce7cd8eb63459..e8e97eb39b350d 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -14,20 +14,18 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPM_ENABLE_SHARED=OFF + -DSPM_USE_BUILTIN_PROTOBUF=ON + -DSPM_USE_EXTERNAL_ABSL=OFF ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -if(NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_BUILD_TYPE) - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib") -endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_copy_tools(TOOL_NAMES spm_decode spm_encode spm_export_vocab spm_normalize spm_train AUTO_CLEAN) + vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index 8bb9f7f9a290d5..d6d3b80ac5d995 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sentencepiece", "version": "0.1.99", + "port-version": 1, "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", "license": "Apache-2.0", - "supports": "!((windows | uwp) & !static)", + "supports": "static", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 9465d8b0c02c49..66fc20b6a344dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7782,7 +7782,7 @@ }, "sentencepiece": { "baseline": "0.1.99", - "port-version": 0 + "port-version": 1 }, "sentry-native": { "baseline": "0.6.7", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 6a0fc3ea75fab6..2841da808bb1b8 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c21445dada5c5ad8efb9bcf2729648155a7c391", + "version": "0.1.99", + "port-version": 1 + }, { "git-tree": "e4113b95c56e98d9c59787730bdc69978d23e290", "version": "0.1.99", From ca9ac0ba65965937fb66783c4f726c2c755ad9d9 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:20:53 -0800 Subject: [PATCH 0527/1039] [libxml2] Fix ICU support option (#35281) * Fix ICU support option * update version * [libxml2] Fix ICU support option * format vcpkg.json * update version * Add qtwebengine depend on libxml2[icu] * update version * update version * update feature * update version --------- Co-authored-by: vzhli17 --- ports/libxml2/portfile.cmake | 2 +- ports/libxml2/vcpkg.json | 7 +++++++ ports/qtwebengine/vcpkg.json | 5 +++++ versions/baseline.json | 4 ++-- versions/l-/libxml2.json | 5 +++++ versions/q-/qtwebengine.json | 5 +++++ 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index 207d0f68ddfac8..c2e47946518ab2 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "lzma" LIBXML2_WITH_LZMA "zlib" LIBXML2_WITH_ZLIB "tools" LIBXML2_WITH_PROGRAMS + "icu" LIBXML2_WITH_ICU ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -30,7 +31,6 @@ vcpkg_cmake_configure( -DLIBXML2_WITH_CATALOG=ON -DLIBXML2_WITH_DEBUG=ON -DLIBXML2_WITH_ISO8859X=ON - -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR -DLIBXML2_WITH_MEM_DEBUG=OFF -DLIBXML2_WITH_MODULES=ON -DLIBXML2_WITH_OUTPUT=ON diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 0dd912fcfdd6ac..2ed3e6f8d68a27 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxml2", "version": "2.11.6", + "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://gitlab.gnome.org/GNOME/libxml2/-/wikis/home", "license": "MIT", @@ -34,6 +35,12 @@ "libiconv" ] }, + "icu": { + "description": "Add ICU support", + "dependencies": [ + "icu" + ] + }, "legacy": { "description": "Add deprecated APIs for compatibility" }, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 367bdc4aa53afc..942f49da7fc41e 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,6 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.6.1", + "port-version": 1, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, @@ -57,6 +58,10 @@ }, { "name": "libxml2", + "default-features": false, + "features": [ + "icu" + ], "platform": "!windows" }, { diff --git a/versions/baseline.json b/versions/baseline.json index 66fc20b6a344dd..fa5ead0a43a866 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5098,7 +5098,7 @@ }, "libxml2": { "baseline": "2.11.6", - "port-version": 0 + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", @@ -7262,7 +7262,7 @@ }, "qtwebengine": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtwebsockets": { "baseline": "6.6.1", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 4da178ff3b6031..56dd4815c808cb 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2fd11805c5e6714215c5dd9630400c4ad32e833", + "version": "2.11.6", + "port-version": 1 + }, { "git-tree": "a347ee0ddfd928d4f61ec12b3b95c1c7740d46df", "version": "2.11.6", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 18e26711a52af6..e466151563f28d 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f84af713f1090d7294c2707dc722373c06857114", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "60b5738d6361d11f4dea17e82df45014ffddd6be", "version": "6.6.1", From 16ee2ecb31788c336ace8bb14c21801efb6836e4 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Fri, 1 Dec 2023 12:21:55 +0200 Subject: [PATCH 0528/1039] [libmagic] Add CMake config. (#35274) * [libmagic] Add CMake config. * Fix license information and add usage. * Address PR feedback. Co-authored-by: Kai Pastor * Set some missing properties. * Fix location to import library. * Update version database. --- ports/libmagic/portfile.cmake | 12 +++- .../unofficial-libmagic-config.cmake.in | 69 +++++++++++++++++++ ports/libmagic/usage | 6 ++ ports/libmagic/vcpkg.json | 2 + versions/baseline.json | 2 +- versions/l-/libmagic.json | 5 ++ 6 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 ports/libmagic/unofficial-libmagic-config.cmake.in create mode 100644 ports/libmagic/usage diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index 0d23dff826677a..c1afade496b1a3 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -66,5 +66,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +include(CMakePackageConfigHelpers) +configure_package_config_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" + INSTALL_DESTINATION "share/unofficial-${PORT}" +) + +# Handle copyright and usage +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libmagic/unofficial-libmagic-config.cmake.in b/ports/libmagic/unofficial-libmagic-config.cmake.in new file mode 100644 index 00000000000000..8f22d30f9a58d2 --- /dev/null +++ b/ports/libmagic/unofficial-libmagic-config.cmake.in @@ -0,0 +1,69 @@ +@PACKAGE_INIT@ + +if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + include(CMakeFindDependencyMacro) + find_dependency(unofficial-tre) +endif() + +# 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() + +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + add_library(unofficial::libmagic::libmagic STATIC IMPORTED) +else() + add_library(unofficial::libmagic::libmagic SHARED IMPORTED) +endif() + +set_target_properties(unofficial::libmagic::libmagic PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +) + +if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set_target_properties(unofficial::libmagic::libmagic PROPERTIES + INTERFACE_LINK_LIBRARIES "\$" + ) +endif() + +macro(add_library_config config prefix) + set_property(TARGET unofficial::libmagic::libmagic APPEND PROPERTY IMPORTED_CONFIGURATIONS ${config}) + if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set_target_properties(unofficial::libmagic::libmagic PROPERTIES + IMPORTED_LOCATION_${config} "${_IMPORT_PREFIX}/${prefix}lib/@VCPKG_TARGET_STATIC_LIBRARY_PREFIX@magic@VCPKG_TARGET_STATIC_LIBRARY_SUFFIX@" + IMPORTED_LINK_INTERFACE_LANGUAGES_${config} "C" + ) + else() + if(WIN32) + set(library_dir "${_IMPORT_PREFIX}/${prefix}bin/") + set(soversion_suffix "-1") + set_target_properties(unofficial::libmagic::libmagic PROPERTIES + IMPORTED_IMPLIB_${config} "${_IMPORT_PREFIX}/${prefix}/lib/@VCPKG_TARGET_IMPORT_LIBRARY_PREFIX@magic@VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX@" + ) + else() + set(library_dir "${_IMPORT_PREFIX}/${prefix}lib/") + endif() + set_target_properties(unofficial::libmagic::libmagic PROPERTIES + IMPORTED_LOCATION_${config} "${library_dir}@VCPKG_TARGET_SHARED_LIBRARY_PREFIX@magic${soversion_suffix}@VCPKG_TARGET_SHARED_LIBRARY_SUFFIX@" + ) + unset(soversion_suffix) + unset(library_dir) + endif() +endmacro() + +if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "debug") + add_library_config(DEBUG "debug/") +endif() + +if("@VCPKG_BUILD_TYPE@" STREQUAL "" OR "@VCPKG_BUILD_TYPE@" STREQUAL "release") + add_library_config(RELEASE "") +endif() + +set_and_check(unofficial-libmagic_DICTIONARY "${_IMPORT_PREFIX}/share/libmagic/misc/magic.mgc") + +unset(_IMPORT_PREFIX) + +check_required_components(unofficial-libmagic) diff --git a/ports/libmagic/usage b/ports/libmagic/usage new file mode 100644 index 00000000000000..3f7bb80fb7ccff --- /dev/null +++ b/ports/libmagic/usage @@ -0,0 +1,6 @@ +libmagic provides CMake targets: + + find_package(unofficial-libmagic REQUIRED) + target_link_libraries(main PRIVATE unofficial::libmagic::libmagic) + +The magic.mgc file can be accessed from the unofficial-libmagic_DICTIONARY variable. diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index 8763f636b2d2b5..a556d5d34dafdf 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libmagic", "version": "5.45", + "port-version": 1, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", + "license": "BSD-2-Clause", "dependencies": [ { "name": "dirent", diff --git a/versions/baseline.json b/versions/baseline.json index fa5ead0a43a866..bcc458ac6fdb52 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4498,7 +4498,7 @@ }, "libmagic": { "baseline": "5.45", - "port-version": 0 + "port-version": 1 }, "libmariadb": { "baseline": "3.3.1", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index 6cdbcdc821d092..a1d52c3b1924f2 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65715ba20e3afecd46e0fb81326503257174585f", + "version": "5.45", + "port-version": 1 + }, { "git-tree": "30ebcd2ff5522b8c72ba5a5cadd840df34350382", "version": "5.45", From 568471bbed4de11d584f217477ddedc852ae3c8f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:13:49 -0800 Subject: [PATCH 0529/1039] [vcpkg baseline][open62541] passing remove from fail (#35478) Co-authored-by: vzhli17 --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 09632028abc9a5..52d3c00b9ceed8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -819,7 +819,6 @@ omplapp:arm-neon-android=fail omplapp:arm64-android=fail omplapp:x64-android=fail onednn:x64-android=fail -open62541:x64-windows-static-md=fail openblas:arm-neon-android=fail openblas:arm64-android=fail openblas:x64-android=fail From 4f72ab7c671f5671def228e8474b5492585210eb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:25:45 -0800 Subject: [PATCH 0530/1039] [simdjson]Update to version 3.6.2 (#34837) --- ports/simdjson/portfile.cmake | 2 +- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index f576d08cd9970d..581b1d7f15ace8 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO simdjson/simdjson REF "v${VERSION}" HEAD_REF master - SHA512 eeac785c7868362f51f3fb87cb4e0cfc77b2c4e3767afbe1d22df87f16a3cb4af1dc27a1df5ba3c139cb0a3053bc30afcdcb31515ce4e757c309ed2c0f3f507e + SHA512 370a2e37dd08f6df2720f94beddc14ce3a04e8216fe1fbd5c2119166a2bd070daad80d193da1ee683bb4a320f446f3bb38cc100928d534df0a28a48ad8fb6137 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 209968b0c7884d..4693cb8ca384d5 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "3.2.1", + "version": "3.6.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 bcc458ac6fdb52..f18e05a374e30c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7893,7 +7893,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "3.2.1", + "baseline": "3.6.2", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 188a1b26a60921..0cebaef7750fef 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85480e0db4ff161c74400267ba3567d038fb15c7", + "version": "3.6.2", + "port-version": 0 + }, { "git-tree": "838a79135dfbc8b2870346447b3387543f94e067", "version": "3.2.1", From 3035d072b0efb0ac1d68d4860ce86f0e714d8fc1 Mon Sep 17 00:00:00 2001 From: Fei Chong <13114351+ZgblKylin@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:38:12 +0800 Subject: [PATCH 0531/1039] [fastrtps] Fix mac address overflow (#34867) --- ports/fastrtps/portfile.cmake | 11 +++++++++++ ports/fastrtps/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fastrtps.json | 5 +++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index cbceacd732f82c..5a600f9eb6e855 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -1,3 +1,13 @@ +# https://github.com/eProsima/Fast-DDS/pull/3983 +# Could remove after 2.6.6/2.10.2/2.11.2, other minor versions not applied +# Could remove after 2.13 released, or any newer mijor versions +vcpkg_download_distfile( + PR_3983_PATCH + URLS https://github.com/eProsima/Fast-DDS/commit/2601e95429f5676c47c25200e995fb93157e7815.patch?full_index=1 + SHA512 440ee6a918d7085b6520613fad1482a9b833ee259e64c8919bdeb43277f3685362e6314380bafc6c51dad46fd16a9b415343e9db28f157d13f76b9af0cb21e8d + FILENAME fastrtps-2601e95429f5676c47c25200e995fb93157e7815.patch +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-DDS @@ -9,6 +19,7 @@ vcpkg_from_github( disable-symlink.patch fix-xtime.patch fix_thread.patch #https://github.com/eProsima/Fast-DDS/pull/3904 + "${PR_3983_PATCH}" ) vcpkg_cmake_configure( diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index 130260655fd4d7..32c8bf71443714 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fastrtps", "version": "2.7.0", - "port-version": 4, + "port-version": 5, "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f18e05a374e30c..b20a3feddd8176 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2574,7 +2574,7 @@ }, "fastrtps": { "baseline": "2.7.0", - "port-version": 4 + "port-version": 5 }, "fawdlstty-libfv": { "baseline": "0.0.8", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index 3ddde31d11ae29..df7195502a29e7 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e60f3fa00c69cc283d5ba48b642abdd8464c49f8", + "version": "2.7.0", + "port-version": 5 + }, { "git-tree": "2b2c27c3a92da80b837e5f14641cd6ea2b5fc6f6", "version": "2.7.0", From aa628ceb5f15f0c30d4d481f14fa5b2be2b4a658 Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Tue, 5 Dec 2023 00:46:19 +0000 Subject: [PATCH 0532/1039] Fix CMake detection of cross-compilers on arm/arm64 build arch (#35084) Signed-off-by: Vasyl Gello --- scripts/toolchains/linux.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/toolchains/linux.cmake b/scripts/toolchains/linux.cmake index f19940b453cca7..f22c7107682fb9 100644 --- a/scripts/toolchains/linux.cmake +++ b/scripts/toolchains/linux.cmake @@ -13,7 +13,7 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") string(APPEND VCPKG_LINKER_FLAGS " -m32") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l CACHE STRING "") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_CXX_COMPILER "arm-linux-gnueabihf-g++") endif() @@ -25,12 +25,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") endif() if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) set(CMAKE_ASM-ATT_COMPILER "arm-linux-gnueabihf-as") - endif() - message(STATUS "Cross compiling arm on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") + endif() + message(STATUS "Cross compiling arm on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64 CACHE STRING "") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(NOT DEFINED CMAKE_CXX_COMPILER) set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++") endif() @@ -42,8 +42,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") endif() if(NOT DEFINED CMAKE_ASM-ATT_COMPILER) set(CMAKE_ASM-ATT_COMPILER "aarch64-linux-gnu-as") - endif() - message(STATUS "Cross compiling arm64 on host x86_64, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") + endif() + message(STATUS "Cross compiling arm64 on host ${CMAKE_HOST_SYSTEM_PROCESSOR}, use cross compiler: ${CMAKE_CXX_COMPILER}/${CMAKE_C_COMPILER}") endif() endif() From c0edfbe543d7b30cf748909a26e7818018df7095 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:08:11 -0800 Subject: [PATCH 0533/1039] [opencv3/opencv4] Fix supports QNX (#35409) --- ports/opencv3/0020-fix-supportqnx.patch | 21 +++++++++++++++++++++ ports/opencv3/portfile.cmake | 1 + ports/opencv3/vcpkg.json | 2 +- ports/opencv4/0022-fix-supportqnx.patch | 21 +++++++++++++++++++++ ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 9 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 ports/opencv3/0020-fix-supportqnx.patch create mode 100644 ports/opencv4/0022-fix-supportqnx.patch diff --git a/ports/opencv3/0020-fix-supportqnx.patch b/ports/opencv3/0020-fix-supportqnx.patch new file mode 100644 index 00000000000000..be592ba4e2bd7f --- /dev/null +++ b/ports/opencv3/0020-fix-supportqnx.patch @@ -0,0 +1,21 @@ +diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp +index 9bade08..28f006e 100644 +--- a/modules/core/src/system.cpp ++++ b/modules/core/src/system.cpp +@@ -129,11 +129,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); } + #include // std::abort + #endif + +-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ ++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __QNX__ + # include + # include + #if defined __QNX__ + # include ++# include ++using Elf64_auxv_t = auxv64_t; ++# include ++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP; + #else + # include + #endif diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 8712c07ce44a4d..797aa6ca369656 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( 0012-fix-zlib.patch 0019-missing-include.patch fix-tbb-error.patch + 0020-fix-supportqnx.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 4a1291f68dcb90..f61e73abbd46e9 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.18", - "port-version": 11, + "port-version": 12, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0022-fix-supportqnx.patch b/ports/opencv4/0022-fix-supportqnx.patch new file mode 100644 index 00000000000000..91d145f0031c4f --- /dev/null +++ b/ports/opencv4/0022-fix-supportqnx.patch @@ -0,0 +1,21 @@ +diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp +index 7811ab7..8f00891 100644 +--- a/modules/core/src/system.cpp ++++ b/modules/core/src/system.cpp +@@ -120,11 +120,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); } + #include // std::abort + #endif + +-#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ ++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ || defined __QNX__ + # include + # include + #if defined __QNX__ + # include ++# include ++using Elf64_auxv_t = auxv64_t; ++# include ++constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP; + #else + # include + #endif diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 6ae5473fd99f62..49772e15e2f8df 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_from_github( 0020-fix-compat-cuda12.2.patch 0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963 "${ARM64_WINDOWS_FIX}" + 0022-fix-supportqnx.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 067849b02b2c6d..1cbf5942a37b69 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 11, + "port-version": 12, "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 b20a3feddd8176..f0a209fcfee079 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6246,11 +6246,11 @@ }, "opencv3": { "baseline": "3.4.18", - "port-version": 11 + "port-version": 12 }, "opencv4": { "baseline": "4.8.0", - "port-version": 11 + "port-version": 12 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 1d0f322be447be..474a6545e4fe2d 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5ee69ffa1b6c98a28fc805afffaeb799b4d22a8", + "version": "3.4.18", + "port-version": 12 + }, { "git-tree": "8eca838beb277535a53756ceb5da17aa8b5050a8", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 996f5437145308..29218357596042 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d46b66df37511cf7b49ceffe96f5ff62acf6ea", + "version": "4.8.0", + "port-version": 12 + }, { "git-tree": "9d3433d44aaf404378dff91625448de76738a95f", "version": "4.8.0", From 607aac22037e535d1da88bbaffe41eb24cb4aeb7 Mon Sep 17 00:00:00 2001 From: sewon jeon Date: Tue, 5 Dec 2023 10:13:07 +0900 Subject: [PATCH 0534/1039] [cuda-api-wrappers] new port (#35376) --- ports/cuda-api-wrappers/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/cuda-api-wrappers/usage | 4 +++ ports/cuda-api-wrappers/vcpkg.json | 17 ++++++++++++ versions/baseline.json | 4 +++ versions/c-/cuda-api-wrappers.json | 9 ++++++ 5 files changed, 72 insertions(+) create mode 100644 ports/cuda-api-wrappers/portfile.cmake create mode 100644 ports/cuda-api-wrappers/usage create mode 100644 ports/cuda-api-wrappers/vcpkg.json create mode 100644 versions/c-/cuda-api-wrappers.json diff --git a/ports/cuda-api-wrappers/portfile.cmake b/ports/cuda-api-wrappers/portfile.cmake new file mode 100644 index 00000000000000..9467e3875b5ec9 --- /dev/null +++ b/ports/cuda-api-wrappers/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eyalroz/cuda-api-wrappers + REF "v${VERSION}" + SHA512 4bc095513ed1a40f7239810abf7f6edcfde5471a89de8cf27a76038f6a54f6234542693bb606cc5e389403f3d12cb186b5a9cfb31c2bf3e437c112d215fb872d + HEAD_REF master +) + +# head only library +set(VCPKG_BUILD_TYPE release) + +# cuda toolkit check +vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) +message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") + +# nvcc compiler path +set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT}/bin/nvcc${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +set(CUDA_ARCHITECTURES "native") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCAW_BUILD_EXAMPLES=OFF + "-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}" + "-DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +vcpkg_fixup_pkgconfig() diff --git a/ports/cuda-api-wrappers/usage b/ports/cuda-api-wrappers/usage new file mode 100644 index 00000000000000..aeb5856dfa794f --- /dev/null +++ b/ports/cuda-api-wrappers/usage @@ -0,0 +1,4 @@ +cuda-api-wrappers provides CMake targets: + + find_package(cuda-api-wrappers CONFIG REQUIRED) + target_link_libraries(main PRIVATE cuda-api-wrappers::rtc cuda-api-wrappers::nvtx cuda-api-wrappers::runtime-and-driver) diff --git a/ports/cuda-api-wrappers/vcpkg.json b/ports/cuda-api-wrappers/vcpkg.json new file mode 100644 index 00000000000000..78ad5bf9c93e36 --- /dev/null +++ b/ports/cuda-api-wrappers/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cuda-api-wrappers", + "version": "0.6.6", + "description": "header-only library of integrated wrappers around the core parts of NVIDIA's CUDA execution ecosystem", + "license": "BSD-3-Clause", + "dependencies": [ + "cuda", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f0a209fcfee079..c1d9a2148e0aa2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2024,6 +2024,10 @@ "baseline": "10.1", "port-version": 13 }, + "cuda-api-wrappers" : { + "baseline": "0.6.6", + "port-version": 0 + }, "cudnn": { "baseline": "7.6.5", "port-version": 10 diff --git a/versions/c-/cuda-api-wrappers.json b/versions/c-/cuda-api-wrappers.json new file mode 100644 index 00000000000000..adccf36c244b6a --- /dev/null +++ b/versions/c-/cuda-api-wrappers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f31ca06768d00b72f8387dce98f3a8d2d867cfcb", + "version": "0.6.6", + "port-version": 0 + } + ] +} From 3d007e3e9d929b2155e80d566b9ac591d8583b5d Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:19:21 +0800 Subject: [PATCH 0535/1039] [xsimd] update to 12.0.0 (#35440) --- ports/xsimd/portfile.cmake | 2 +- ports/xsimd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xsimd.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index 8b695b2b86be92..a81346597753da 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd REF "${VERSION}" - SHA512 3a6141dfa4d95a977f4222880dfd06197613d153a78a84653022423279eec037ea9def08ae225aba7231c0b2c434ab7c907c965f8367fb0db9b96113980b51f3 + SHA512 6b8ec8d3ab7ca850dbcf9f97707b72dc443a17693eb040c187802c161c85a65029ccb1690219a33c4018afcd303a2f93eb69facbf8178e286cd9fc36ec63f0c1 HEAD_REF master ) diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index af7e5d334f5b4c..b19a1e16be4fdf 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xsimd", - "version": "11.1.0", + "version": "12.0.0", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c1d9a2148e0aa2..8cca4d7c699248 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9249,7 +9249,7 @@ "port-version": 2 }, "xsimd": { - "baseline": "11.1.0", + "baseline": "12.0.0", "port-version": 0 }, "xtensor": { diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 28cf4d8d5ee14b..249fe757fc4ef0 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e979cb9a0721fa813065c5783d604bac193f6c6", + "version": "12.0.0", + "port-version": 0 + }, { "git-tree": "55021644d976597e734aa0e9b678f369625b14c1", "version": "11.1.0", From d8d5186f0ec9b9a6b30cfdb3d694f8de35c1d292 Mon Sep 17 00:00:00 2001 From: gastineau Date: Tue, 5 Dec 2023 02:19:41 +0100 Subject: [PATCH 0536/1039] [calceph] update to version 3.5.4 (#35443) --- ports/calceph/portfile.cmake | 3 ++- ports/calceph/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/calceph.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake index b962568e4d75bc..f41ea2c27e52e7 100755 --- a/ports/calceph/portfile.cmake +++ b/ports/calceph/portfile.cmake @@ -1,4 +1,4 @@ -set(CALCEPH_HASH 4e0b702494c9fc05f6a192671bccdc0f8002b5706cba4bd7ff50d9e8754203b4a78e3759ccc3003809123584c9bca1434411e111357852dbc58e4d1903c1879e) +set(CALCEPH_HASH 387a96a1007c8182ae5867415ccbfb1f65f10e11980efa69ffa06ba29dddb18e2bd208a52b3a3f7d8f23ccd2878bb6ccddd86a0e021a10ee32ee7a93e0e15c95) vcpkg_download_distfile(ARCHIVE URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${VERSION}.tar.gz" @@ -13,6 +13,7 @@ vcpkg_extract_source_archive( if (VCPKG_TARGET_IS_WINDOWS) + file(COPY "${SOURCE_PATH}/pythonapi/src/calcephpy.pyx.in" DESTINATION "${SOURCE_PATH}/pythonapi/src/calcephpy.pyx.vc") vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json index 493977480d4ffb..bb7f31afb07f48 100755 --- a/ports/calceph/vcpkg.json +++ b/ports/calceph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "calceph", - "version": "3.5.2", + "version": "3.5.4", "description": "C library to access the binary planetary ephemeris files.", "homepage": "https://www.imcce.fr/inpop/calceph/", "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index 8cca4d7c699248..793cdff1fb90cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1421,7 +1421,7 @@ "port-version": 1 }, "calceph": { - "baseline": "3.5.2", + "baseline": "3.5.4", "port-version": 0 }, "camport3": { diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json index 71428da52932df..ba8b83d2d18fff 100644 --- a/versions/c-/calceph.json +++ b/versions/c-/calceph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3602c8d1030d2f0260d5de2104b5111fd4f7f253", + "version": "3.5.4", + "port-version": 0 + }, { "git-tree": "e1167b91f758af9aa0077bdee620995c65898554", "version": "3.5.2", From d5eafb41cda7c33bad6ecc6bd854e2514ec7faa6 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Tue, 5 Dec 2023 03:20:01 +0200 Subject: [PATCH 0537/1039] [aws-sdk-cpp and co] Update to the latest version. (#35445) --- ports/aws-c-auth/portfile.cmake | 2 +- ports/aws-c-auth/vcpkg.json | 2 +- ports/aws-c-common/portfile.cmake | 2 +- ports/aws-c-common/vcpkg.json | 2 +- ports/aws-c-io/portfile.cmake | 2 +- ports/aws-c-io/vcpkg.json | 2 +- ports/aws-c-mqtt/portfile.cmake | 2 +- ports/aws-c-mqtt/vcpkg.json | 2 +- ports/aws-c-s3/portfile.cmake | 2 +- ports/aws-c-s3/vcpkg.json | 2 +- ports/aws-crt-cpp/portfile.cmake | 2 +- ports/aws-crt-cpp/vcpkg.json | 2 +- ports/aws-sdk-cpp/portfile.cmake | 2 +- ports/aws-sdk-cpp/vcpkg.in.json | 3 +- ports/aws-sdk-cpp/vcpkg.json | 3 +- ports/s2n/portfile.cmake | 3 +- ports/s2n/remove-trycompile.patch | 59 ------------------------------- ports/s2n/vcpkg.json | 2 +- versions/a-/aws-c-auth.json | 5 +++ versions/a-/aws-c-common.json | 5 +++ versions/a-/aws-c-io.json | 5 +++ versions/a-/aws-c-mqtt.json | 5 +++ versions/a-/aws-c-s3.json | 5 +++ versions/a-/aws-crt-cpp.json | 5 +++ versions/a-/aws-sdk-cpp.json | 5 +++ versions/baseline.json | 18 +++++----- versions/s-/s2n.json | 5 +++ 27 files changed, 66 insertions(+), 88 deletions(-) delete mode 100644 ports/s2n/remove-trycompile.patch diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake index 381fd83daf635d..2793a550f5b61e 100644 --- a/ports/aws-c-auth/portfile.cmake +++ b/ports/aws-c-auth/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-auth REF "v${VERSION}" - SHA512 2f3b4c8bc91b84f570eda29904fc6078557fd393a879cd710f8ad06abc37fd0fffb535a19c2813a333a2c384da8756f85bb6589bdc3aa1a2a4a9754795aca705 + SHA512 e247b145132818bb1adf03689fdc98984e6ac50e6d81d0d7caf60d53ba3d3a95bbb4e76f48ac4582365f9038d0d8b29e57947190ec5c34f68e816dd7efcc117d HEAD_REF master ) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json index 2394a7d120f3ef..091f5047896048 100644 --- a/ports/aws-c-auth/vcpkg.json +++ b/ports/aws-c-auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-auth", - "version": "0.7.6", + "version": "0.7.8", "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", "homepage": "https://github.com/awslabs/aws-c-auth", "license": "Apache-2.0", diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 0143b7cdae66c4..e96d1a82844e87 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common REF "v${VERSION}" - SHA512 4e9df8edeefa7765fb68c25b36a72dd389ef3cf99ec0d37661f527a85f36d59f87fe6f0d2c7c52132abe45062ac7eb74513552d98b72c5aadb074624b1eb741f + SHA512 f04bdc01d52b5ad191d320d352a13dd4cb9675127596c2c2229657211bc5fa3cddf05a3b395a0dc0ac5ce2f09cecf54c04b9cfacb08299e24a16a47684560f11 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 381ae8b13143b3..9d7a14ce9cfd97 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-common", - "version": "0.9.9", + "version": "0.9.10", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "license": "Apache-2.0", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index 36320230b86408..bf331bfbaa20ce 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 286090cb04fa75e98e8bf33a665f9a1dce8601d543af330b0a610f10ddddc211408db56bdcc125a2b399181530bd56fb102cddcba32fb885d1ab6bd6ab666be2 + SHA512 cb76ddf7d43c440443c6e5fb33a022f540d8ca95572f36b263836fe6bebfd0790370c84fec37b45475645167ab71bb14de320b9988803ac01f6bbb0d7436949a HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index 66a7a0d66ab85f..e6fc427362c283 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.13.35", + "version": "0.13.36", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake index 78355c14502065..e7775f07eeac68 100644 --- a/ports/aws-c-mqtt/portfile.cmake +++ b/ports/aws-c-mqtt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-mqtt REF "v${VERSION}" - SHA512 e7c85fbbf91848720848751748d75eeb2b788552871d3055a93724aa9d814ef088821d77a8dc8fa265b8f8c730990d221e5babc4bdbff0b73f03e24bb54d3c60 + SHA512 9664596de78a8778349cf32d5dd207ed8e5a28e1d13505f942c8486c3fbf516ec49121af312d85182ebdc66b464d430fcd2d28606b1c2652a8dfb9c173334681 HEAD_REF master ) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json index b22e3ce28932c2..1bec811c346370 100644 --- a/ports/aws-c-mqtt/vcpkg.json +++ b/ports/aws-c-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-mqtt", - "version": "0.9.9", + "version": "0.9.10", "description": "C99 implementation of the MQTT 3.1.1 specification.", "homepage": "https://github.com/awslabs/aws-c-mqtt", "license": "Apache-2.0", diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake index b5ce27ecc730e7..a1d50b64f5f8f0 100644 --- a/ports/aws-c-s3/portfile.cmake +++ b/ports/aws-c-s3/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-s3 REF "v${VERSION}" - SHA512 5a6738d77d87ece6125233c6f50a446843dd8d3b11749a61c80d0eb8e8528d51ab9ccfe65fb59a00bc249d5a4d47b7787b5dcae963d8f60f49eaf5d9c1b3f7db + SHA512 62dca71a857f7c55cb824cf1a81f3dbefa7cf7d50e5fadec5f2e67d4c2e33c2902a483145b4e9390aa5adf68ab65588c7c71e91717b74733db2a15e7a1cc5794 HEAD_REF master ) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json index 1d73db0e104e1d..362b597c81bc84 100644 --- a/ports/aws-c-s3/vcpkg.json +++ b/ports/aws-c-s3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-s3", - "version": "0.3.24", + "version": "0.4.3", "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", "homepage": "https://github.com/awslabs/aws-c-s3", "license": "Apache-2.0", diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index ee85a6563396ad..030981d73c05c7 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-crt-cpp REF "v${VERSION}" - SHA512 32359a7a94e9f044de1184e633a7e2466e697022fd713a507c143c465c6ecb9632354c067d3987e21d86b9c614c8d2af180645b6c79a5c6533cbeb6a1a762bcf + SHA512 4160aae9aaf98556d9fd26a13feb09f7fce2a20e073740d13ab9890fdab158de63918c8fd2f4a2d07e92798e2df47b6696b38e614c9631ebcdddf7ea1c44a126 PATCHES no-werror.patch ) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 65b1f07cde673d..a211574cd573f2 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-crt-cpp", - "version": "0.24.7", + "version": "0.24.8", "description": "C++ wrapper around the aws-c-* libraries. Provides Cross-Platform Transport Protocols and SSL/TLS implementations for C++.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 525068260a295f..1dc66c5f4b3ce4 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 03d21fd2b12116a43aa8163f69d5707d259c6330ddee80a5fef3b344d3797bab72e56ade7fd6669c2532798337a922e2439e0c57d1e76d2b2e8470909c4d996d + SHA512 4410eaff815ce7b6c0bc0d37bd4175754d5103d2e3cfd60755df57dad103ab7e7705b79fc6039d2c8b7d1ccec650912f5ff0aa73baa2d9cf6d6608a493d11088 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index a618a77d864b7f..e79a583786ba5d 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,7 +1,6 @@ { "name": "aws-sdk-cpp", - "version": "1.11.160", - "port-version": 1, + "version": "1.11.215", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 55cbd7b75a4912..745435741aa627 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.201", - "port-version": 1, + "version": "1.11.215", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index 98bb2c08a09e84..0909ebee5bc501 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls REF "v${VERSION}" - SHA512 cfdfcdaa9d57427211e896845358da85d7498fa0478b6916dd34f36c755100c0421c07ccd624ed2d4baf9fcfe0dde6629159769619ac22e9ef1535ba20bf8979 + SHA512 deead85f2ab22441e1110d442fc93273d96d8dd6a203940cca7ef166fc1c9e7ab75ffe2d550e013e1e1e3266b208904cff94cc2482d6fd00e0546293b0ba11d4 PATCHES fix-cmake-target-path.patch - remove-trycompile.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/s2n/remove-trycompile.patch b/ports/s2n/remove-trycompile.patch deleted file mode 100644 index d9385fd45778c7..00000000000000 --- a/ports/s2n/remove-trycompile.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt (revision 4aec93c6a74aacf60cec6229b35094f56cb0f87b) -+++ b/CMakeLists.txt (date 1675010024800) -@@ -393,55 +393,6 @@ - message(STATUS "Enabling libcrypto interning") - endif() - --# Determine if EVP_md5_sha1 is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md5_sha1.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} --) --if (LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD5_SHA1_HASH) --endif() -- --# Determine if RC4 is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_RC4 -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_rc4.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} --) -- --if (LIBCRYPTO_SUPPORTS_EVP_RC4) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_RC4) --endif() -- --# Determine if EVP_MD_CTX_set_pkey_ctx is available in libcrypto --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_md_ctx_set_pkey_ctx.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} -- CMAKE_FLAGS ${ADDITIONAL_FLAGS} --) -- --if (LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_EVP_MD_CTX_SET_PKEY_CTX) --endif() -- --# Determine if Kyber512 implementation from AWS-LC is available --try_compile( -- LIBCRYPTO_SUPPORTS_EVP_KYBER_512 -- ${CMAKE_BINARY_DIR} -- SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/features/evp_kyber_512.c" -- LINK_LIBRARIES ${LINK_LIB} ${OS_LIBS} -- COMPILE_DEFINITIONS "-Werror" --) -- --if(S2N_AWSLC_KYBER_UNSTABLE AND LIBCRYPTO_SUPPORTS_EVP_KYBER_512) -- target_compile_options(${PROJECT_NAME} PUBLIC -DS2N_LIBCRYPTO_SUPPORTS_KYBER512) --endif() -- - if (NOT DEFINED CMAKE_AR) - message(STATUS "CMAKE_AR undefined, setting to `ar` by default") - SET(CMAKE_AR ar) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index 1f26ea583b9ec8..76f883756f64b0 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "s2n", - "version": "1.3.34", + "version": "1.3.56", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json index 896cd855b1aa62..10e4aaaa27b3ce 100644 --- a/versions/a-/aws-c-auth.json +++ b/versions/a-/aws-c-auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e80f8a3a15231a8d513d03ff7761acf4a5c18269", + "version": "0.7.8", + "port-version": 0 + }, { "git-tree": "ab09a6f41712ba35a021c3d6392a804e47858668", "version": "0.7.6", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index ccc20b53b662cf..b5181534e66246 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e07be2013141ae49e6bf3340ccce57b0031cfb17", + "version": "0.9.10", + "port-version": 0 + }, { "git-tree": "30465cfdc4851970efc5767fd57ad6e0dedad46a", "version": "0.9.9", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index f735eb75847a39..f02800006881c9 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "586cb06ad50ef2627c4dd30ab97b88d79e559fd5", + "version": "0.13.36", + "port-version": 0 + }, { "git-tree": "caab59ca1fe5071d552eaf073a501151ac6099a5", "version": "0.13.35", diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json index 936cc9a53a05df..fad9f5f68342a4 100644 --- a/versions/a-/aws-c-mqtt.json +++ b/versions/a-/aws-c-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79c21d94b22888e395bd53041457397fcb013486", + "version": "0.9.10", + "port-version": 0 + }, { "git-tree": "9210c6a8260e7b5058fd4d9bb7d1a42cd6d78079", "version": "0.9.9", diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json index 4dbc1faa7cdd4b..952da0a5aec626 100644 --- a/versions/a-/aws-c-s3.json +++ b/versions/a-/aws-c-s3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e12d01447182cce36c5524fbd6a22f8135dd9ecb", + "version": "0.4.3", + "port-version": 0 + }, { "git-tree": "709e576231214f693d747d8187e44b30c77f4443", "version": "0.3.24", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index 1ad459bf30df2f..9e9690b8c9178d 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ec1e5fdb18e38dc54d06842860ec7f95df53c5a", + "version": "0.24.8", + "port-version": 0 + }, { "git-tree": "855f83fcf951b5fcaf0af75159ff979980670088", "version": "0.24.7", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 1be1f631ffde26..9bfb28eb8f9a44 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbebf005503aa74f6725df8f4d04eb21a894e127", + "version": "1.11.215", + "port-version": 0 + }, { "git-tree": "f669bd77e23c643da0c15162dc46d84b924938a0", "version": "1.11.201", diff --git a/versions/baseline.json b/versions/baseline.json index 793cdff1fb90cb..067085f3bacf85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -353,7 +353,7 @@ "port-version": 0 }, "aws-c-auth": { - "baseline": "0.7.6", + "baseline": "0.7.8", "port-version": 0 }, "aws-c-cal": { @@ -361,7 +361,7 @@ "port-version": 0 }, "aws-c-common": { - "baseline": "0.9.9", + "baseline": "0.9.10", "port-version": 0 }, "aws-c-compression": { @@ -377,15 +377,15 @@ "port-version": 0 }, "aws-c-io": { - "baseline": "0.13.35", + "baseline": "0.13.36", "port-version": 0 }, "aws-c-mqtt": { - "baseline": "0.9.9", + "baseline": "0.9.10", "port-version": 0 }, "aws-c-s3": { - "baseline": "0.3.24", + "baseline": "0.4.3", "port-version": 0 }, "aws-c-sdkutils": { @@ -397,7 +397,7 @@ "port-version": 0 }, "aws-crt-cpp": { - "baseline": "0.24.7", + "baseline": "0.24.8", "port-version": 0 }, "aws-lambda-cpp": { @@ -405,8 +405,8 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.201", - "port-version": 1 + "baseline": "1.11.215", + "port-version": 0 }, "azmq": { "baseline": "2023-03-23", @@ -7621,7 +7621,7 @@ "port-version": 0 }, "s2n": { - "baseline": "1.3.34", + "baseline": "1.3.56", "port-version": 0 }, "safeint": { diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index 7cb031d6d146ce..870385eaa493d2 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a5705f86914ceeaa101adb9b7aca73c785aa584", + "version": "1.3.56", + "port-version": 0 + }, { "git-tree": "2928707380a76632c3953b843ce34019fbf2c90c", "version": "1.3.34", From 544daf445a359a2f4dac92182afb0a003e65f678 Mon Sep 17 00:00:00 2001 From: Sergey Podobry Date: Tue, 5 Dec 2023 03:20:43 +0200 Subject: [PATCH 0538/1039] [libdatachannel] Update to 0.19.4 (#35450) --- ports/libdatachannel/fix-for-vcpkg.patch | 276 ++--------------------- ports/libdatachannel/portfile.cmake | 14 +- ports/libdatachannel/uwp-warnings.patch | 19 +- ports/libdatachannel/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/l-/libdatachannel.json | 5 + 6 files changed, 42 insertions(+), 280 deletions(-) diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch index 6511bb13596ef0..2b5f27f80dc297 100644 --- a/ports/libdatachannel/fix-for-vcpkg.patch +++ b/ports/libdatachannel/fix-for-vcpkg.patch @@ -1,266 +1,30 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 634f242..c8e2f1e 100644 +index a3837943..2c34d7fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,6 @@ endif() - - list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) --set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static - - if(WIN32) - add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -202,12 +201,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) - --set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) --add_subdirectory(deps/plog EXCLUDE_FROM_ALL) -+find_library(USRSCTP_LIBRARY usrsctp REQUIRED) -+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") - - if(SCTP_DEBUG) - add_definitions(-DSCTP_DEBUG) - endif() -+ -+if(0) - option(sctp_build_shared_lib OFF) - option(sctp_build_programs OFF) - option(sctp_inet OFF) -@@ -221,7 +222,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) - endif() - add_library(Usrsctp::Usrsctp ALIAS usrsctp) -+endif() - -+if(BUILD_SHARED_LIBS) - add_library(datachannel SHARED - ${LIBDATACHANNEL_SOURCES} - ${LIBDATACHANNEL_HEADERS} -@@ -234,7 +237,8 @@ set_target_properties(datachannel PROPERTIES - CXX_VISIBILITY_PRESET default) - target_compile_definitions(datachannel PRIVATE RTC_EXPORTS) - --add_library(datachannel-static STATIC EXCLUDE_FROM_ALL -+elseif(BUILD_STATIC_LIBS) -+add_library(datachannel-static STATIC - ${LIBDATACHANNEL_SOURCES} - ${LIBDATACHANNEL_HEADERS} - ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -244,42 +248,63 @@ set_target_properties(datachannel-static PROPERTIES - CXX_STANDARD 17) - target_compile_definitions(datachannel-static PRIVATE RTC_EXPORTS) - target_compile_definitions(datachannel-static PUBLIC RTC_STATIC) -+endif() - -+if(BUILD_SHARED_LIBS) - target_include_directories(datachannel PUBLIC - $ - $) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel PRIVATE Threads::Threads) --target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) - -+elseif(BUILD_STATIC_LIBS) - target_include_directories(datachannel-static PUBLIC - $ - $) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) -+target_include_directories(datachannel-static PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel-static PRIVATE Threads::Threads) --target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) -+target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) -+endif() - - if(WIN32) -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PUBLIC ws2_32) # winsock2 -+ endif() - endif() - - if (NO_WEBSOCKET) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=0) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=0) -+ endif() - else() -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PUBLIC RTC_ENABLE_WEBSOCKET=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_WEBSOCKET=1) -+ endif() +@@ -446,11 +446,25 @@ if(WARNINGS_AS_ERRORS) + endif() endif() - if(NO_MEDIA) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=0) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=0) -+ endif() - else() -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PUBLIC RTC_ENABLE_MEDIA=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PUBLIC RTC_ENABLE_MEDIA=1) -+ endif() - if(USE_SYSTEM_SRTP) - find_package(libSRTP REQUIRED) - if(NOT TARGET libSRTP::srtp2) -@@ -289,10 +314,16 @@ else() - IMPORTED_LINK_INTERFACE_LANGUAGES C - IMPORTED_LOCATION ${SRTP_LIBRARIES}) - endif() -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_SRTP=1) -+ endif() -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE libSRTP::srtp2) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE libSRTP::srtp2) -+ endif() - else() - add_subdirectory(deps/libsrtp EXCLUDE_FROM_ALL) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_SRTP=0) -@@ -312,15 +343,24 @@ if (USE_GNUTLS) - IMPORTED_LINK_INTERFACE_LANGUAGES C - IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") - endif() -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE USE_GNUTLS=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=1) -+ endif() -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE GnuTLS::GnuTLS) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE GnuTLS::GnuTLS) -+ endif() - if (NOT NO_WEBSOCKET) - # Needed for SHA1, it should be present as GnuTLS cryptography backend - find_package(Nettle REQUIRED) -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE Nettle::Nettle) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE Nettle::Nettle) -+ endif() - endif() - else() - if(APPLE) -@@ -340,27 +380,48 @@ else() - endif() - endif() - find_package(OpenSSL REQUIRED) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE USE_GNUTLS=0) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE USE_GNUTLS=0) -+ endif() -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE OpenSSL::SSL) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE OpenSSL::SSL) -+ endif() - endif() - - if (USE_NICE) - find_package(LibNice REQUIRED) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE USE_NICE=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE USE_NICE=1) -+ endif() -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE LibNice::LibNice) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE LibNice::LibNice) -+ endif() - else() -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE USE_NICE=0) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE USE_NICE=0) -+ endif() - if(USE_SYSTEM_JUICE) - find_package(LibJuice REQUIRED) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=1) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=1) -+ endif() -+ if(BUILD_SHARED_LIBS) - target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) -+ elseif(BUILD_STATIC_LIBS) - target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) -+ endif() - else() - add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) - target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) -@@ -371,36 +432,58 @@ else() - endif() - - if(CAPI_STDCALL) -+ if(BUILD_SHARED_LIBS) - target_compile_definitions(datachannel PUBLIC CAPI_STDCALL) -+ elseif(BUILD_STATIC_LIBS) - target_compile_definitions(datachannel-static PUBLIC CAPI_STDCALL) -+ endif() - endif() - -+if(BUILD_SHARED_LIBS) - set_target_properties(datachannel PROPERTIES EXPORT_NAME LibDataChannel) - add_library(LibDataChannel::LibDataChannel ALIAS datachannel) -- -+elseif(BUILD_STATIC_LIBS) - set_target_properties(datachannel-static PROPERTIES EXPORT_NAME LibDataChannelStatic) - add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static) -+endif() - - if(NOT MSVC) -+ if(BUILD_SHARED_LIBS) - target_compile_options(datachannel PRIVATE -Wall -Wextra) -+ elseif(BUILD_STATIC_LIBS) - target_compile_options(datachannel-static PRIVATE -Wall -Wextra) -+ endif() - endif() - - if(WARNINGS_AS_ERRORS) - if(MSVC) -+ if(BUILD_SHARED_LIBS) - target_compile_options(datachannel PRIVATE /WX) -+ elseif(BUILD_STATIC_LIBS) - target_compile_options(datachannel-static PRIVATE /WX) -+ endif() - else() -+ if(BUILD_SHARED_LIBS) - target_compile_options(datachannel PRIVATE -Werror) -+ elseif(BUILD_STATIC_LIBS) - target_compile_options(datachannel-static PRIVATE -Werror) -+ endif() - endif() - endif() - -+if(BUILD_SHARED_LIBS) - install(TARGETS datachannel EXPORT LibDataChannelTargets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ) -+elseif(BUILD_STATIC_LIBS) ++if(DATACHANNEL_STATIC_LINKAGE) ++set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 1) ++set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 0) ++ +install(TARGETS datachannel-static EXPORT LibDataChannelTargets -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) ++else() ++set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 0) ++set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 1) ++ + install(TARGETS datachannel EXPORT LibDataChannelTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +endif() install(FILES ${LIBDATACHANNEL_HEADERS} - DESTINATION include/rtc + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rtc diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 13c9603031052c..c46f2a5cdd21b8 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -8,14 +8,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel REF "v${VERSION}" - SHA512 bcf58026612e2ae670911945f9f74660b513cbd38c9bae13e7b8acd41e545b5760ab4713c67b956e0bb8c0449491a5ab8e3f8d05e2468ff6540fc99e2540a105 + SHA512 2c8da820ebf6751d696645092ea5e562f7cb303d4f5cec9a8ca8e69b65321e79cc8a645095a4ecea710f5afd54499e71f4cdf261a0a2e32e28aef96a50ace28c HEAD_REF master - PATCHES - ${PATCHES} + PATCHES ${PATCHES} ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DATACHANNEL_STATIC_LINKAGE) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -29,12 +27,10 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DUSE_SYSTEM_SRTP=ON - -DUSE_SYSTEM_JUICE=ON + -DPREFER_SYSTEM_LIB=ON -DNO_EXAMPLES=ON -DNO_TESTS=ON - -DBUILD_STATIC_LIBS=${BUILD_STATIC} - -DBUILD_SHARED_LIBS=${BUILD_SHARED} + -DDATACHANNEL_STATIC_LINKAGE=${DATACHANNEL_STATIC_LINKAGE} ) vcpkg_cmake_install() diff --git a/ports/libdatachannel/uwp-warnings.patch b/ports/libdatachannel/uwp-warnings.patch index 6885dee0f626ea..75bddb5d698c64 100644 --- a/ports/libdatachannel/uwp-warnings.patch +++ b/ports/libdatachannel/uwp-warnings.patch @@ -1,17 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c8e2f1e..1dfcd62 100644 +index 2c34d7fb..1bedd212 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -471,6 +471,12 @@ if(WARNINGS_AS_ERRORS) - endif() +@@ -446,6 +446,9 @@ if(WARNINGS_AS_ERRORS) + endif() endif() -+if(BUILD_SHARED_LIBS) -+ target_compile_options(datachannel PRIVATE /wd4996) -+elseif(BUILD_STATIC_LIBS) -+ target_compile_options(datachannel-static PRIVATE /wd4996) -+endif() ++target_compile_options(datachannel PRIVATE /wd4996) ++target_compile_options(datachannel-static PRIVATE /wd4996) + - if(BUILD_SHARED_LIBS) - install(TARGETS datachannel EXPORT LibDataChannelTargets - RUNTIME DESTINATION bin + if(DATACHANNEL_STATIC_LINKAGE) + set_target_properties(datachannel PROPERTIES EXCLUDE_FROM_ALL 1) + set_target_properties(datachannel-static PROPERTIES EXCLUDE_FROM_ALL 0) diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 12f67a87d1ea3a..0abf18fd08c315 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,13 +1,13 @@ { "name": "libdatachannel", - "version-semver": "0.18.6", - "port-version": 2, + "version-semver": "0.19.4", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", "supports": "!xbox", "dependencies": [ "libjuice", + "nlohmann-json", "openssl", "plog", "usrsctp", diff --git a/versions/baseline.json b/versions/baseline.json index 067085f3bacf85..e8c2cb7d722334 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4181,8 +4181,8 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.18.6", - "port-version": 2 + "baseline": "0.19.4", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 4284fedbe7f4cf..7ba284b21d6ab0 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e45715d7c64f9b22c87aff96594979f11e872a7", + "version-semver": "0.19.4", + "port-version": 0 + }, { "git-tree": "3552621ddd4919b86e0b0333bf6530cc1402ec6f", "version-semver": "0.18.6", From a5bc2a1b2568482f0aac1f59291c6096c7cbda79 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:24:32 +0800 Subject: [PATCH 0539/1039] [dcmtk] Fix link xml2 error (#35414) --- ports/dcmtk/fix_link_xml2.patch | 13 +++++++++++++ ports/dcmtk/portfile.cmake | 1 + ports/dcmtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dcmtk.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/dcmtk/fix_link_xml2.patch diff --git a/ports/dcmtk/fix_link_xml2.patch b/ports/dcmtk/fix_link_xml2.patch new file mode 100644 index 00000000000000..feaa4038ff2a4d --- /dev/null +++ b/ports/dcmtk/fix_link_xml2.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake +index 2c974e8..90707bd 100644 +--- a/CMake/3rdparty.cmake ++++ b/CMake/3rdparty.cmake +@@ -94,7 +94,7 @@ if(DCMTK_USE_FIND_PACKAGE) + else() + message(STATUS "Info: DCMTK XML support will be enabled") + set(WITH_LIBXML 1) +- include_directories(${LIBXML2_INCLUDE_DIR}) ++ include_directories(${LIBXML2_INCLUDE_DIRS}) + set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC}) + endif() + endif() diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 724876e2741030..859581c400b5f3 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( dcmtk.patch windows-patch.patch fix-pc-format.patch + fix_link_xml2.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 7adfe71059e2c2..470cd87dd42334 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dcmtk", "version": "3.6.7", - "port-version": 5, + "port-version": 6, "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/versions/baseline.json b/versions/baseline.json index e8c2cb7d722334..1509ee9e4caa79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2146,7 +2146,7 @@ }, "dcmtk": { "baseline": "3.6.7", - "port-version": 5 + "port-version": 6 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 0e5e9f7f96381d..c2c22d9cb9760a 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bea28d42632b9740c795d645252307fe02c273cc", + "version": "3.6.7", + "port-version": 6 + }, { "git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458", "version": "3.6.7", From c2d8d423bb26454851e8aa48c58e5140cf4d8b42 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:24:45 +0800 Subject: [PATCH 0540/1039] [vcpkg baseline][drogon/libusb]passing remove from fail (#35434) --- scripts/ci.baseline.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 52d3c00b9ceed8..a16e55a356fc7e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -282,9 +282,6 @@ discord-rpc:x64-uwp=fail discordcoreapi:x64-linux=fail discordcoreapi:x64-osx=fail discount:x64-android=fail -drogon:arm-neon-android=fail -drogon:arm64-android=fail -drogon:x64-android=fail eathread:x64-android=fail elfio:arm-neon-android=fail @@ -526,6 +523,9 @@ libcpplocate:x64-android=fail libcrafter:arm-neon-android=fail libcrafter:arm64-android=fail libcrafter:x64-android=fail +libdc1394:arm-neon-android=fail +libdc1394:x64-android=fail +libdc1394:arm64-android=fail libgo:x64-android=fail libgpg-error:arm-neon-android=fail libgpg-error:arm64-android=fail @@ -632,9 +632,6 @@ libtcod:x64-android=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm64-uwp=fail libtorch:x64-osx=fail -libusb:arm-neon-android=fail -libusb:arm64-android=fail -libusb:x64-android=fail libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail #Skip detection to avoid upstream remove older releases @@ -1169,8 +1166,11 @@ torch-th:arm64-uwp=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -treehopper:x64-windows-static=fail +treehopper:arm-neon-android=fail +treehopper:arm64-android=fail +treehopper:x64-android=fail treehopper:x64-linux=fail +treehopper:x64-windows-static=fail turbobase64:arm-neon-android=fail tvision:arm-neon-android=fail tvision:arm64-android=fail From 85f5e134cea4b2702ea8332ca43b4f1aa192e4c4 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:26:50 +0800 Subject: [PATCH 0541/1039] [vcpkg baseline][treehopper] Only build dynamic libraries (#35435) --- ports/treehopper/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/t-/treehopper.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json index 3287953f8d823d..42d19e0f68220b 100644 --- a/ports/treehopper/vcpkg.json +++ b/ports/treehopper/vcpkg.json @@ -1,9 +1,10 @@ { "name": "treehopper", "version": "1.11.3", - "port-version": 7, + "port-version": 8, "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", "homepage": "https://treehopper.io", + "supports": "!staticcrt", "dependencies": [ "libusb", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a16e55a356fc7e..91100f223f2611 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1166,11 +1166,7 @@ torch-th:arm64-uwp=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -treehopper:arm-neon-android=fail -treehopper:arm64-android=fail -treehopper:x64-android=fail treehopper:x64-linux=fail -treehopper:x64-windows-static=fail turbobase64:arm-neon-android=fail tvision:arm-neon-android=fail tvision:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 1509ee9e4caa79..aba04815c5c5c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8594,7 +8594,7 @@ }, "treehopper": { "baseline": "1.11.3", - "port-version": 7 + "port-version": 8 }, "triangle": { "baseline": "1.6", diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index e8271133ea627b..8569bae3611fb5 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94c478388c393d8b174b2fd9c4ad0f77805583dc", + "version": "1.11.3", + "port-version": 8 + }, { "git-tree": "bfc0dea8339d81f05a040cd2ca7831c18c43f765", "version": "1.11.3", From f74109a40b228a368212a34a94c4455905186f3e Mon Sep 17 00:00:00 2001 From: Bradley White <14679271+devbww@users.noreply.github.com> Date: Mon, 4 Dec 2023 20:28:36 -0500 Subject: [PATCH 0542/1039] [google-cloud-cpp] update to the latest release (2.19.0) (#35451) --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 38 ++++++++++++++++++++++++++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 ++++ 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index dace1512b5aa04..b0aa0ee2496005 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 18c3fc4fabd1fabfbfb33760636e9403f5b5965cde9e2feab38ac76063ba82fd4aa59a895ded7288ff7552e5806714b5428765b673b5eff95080cd1718bd6792 + SHA512 a392da19ac353409ecbf30e390803b2e34670552fd54466a08ee554a77c893d447289b30d5841c7f79b2a23244a269d8ecac8f7fbd8a34dda45ce2d8b1d46817 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 d60fae7fd5ab41..304a85e22acee3 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.18.0", + "version": "2.19.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -574,6 +574,18 @@ } ] }, + "edgenetwork": { + "description": "Distributed Cloud Edge Network API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "eventarc": { "description": "Eventarc API C++ Client Library", "dependencies": [ @@ -1228,6 +1240,18 @@ } ] }, + "sql": { + "description": "The Google Cloud SQL Admin C++ client library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "rest-common" + ] + } + ] + }, "storage": { "description": "The Google Cloud Storage C++ client library", "dependencies": [ @@ -1301,6 +1325,18 @@ } ] }, + "telcoautomation": { + "description": "Cloud Telco Automation API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "texttospeech": { "description": "Cloud Text-to-Speech API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index aba04815c5c5c7..badb2546c1e258 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3057,7 +3057,7 @@ "port-version": 5 }, "google-cloud-cpp": { - "baseline": "2.18.0", + "baseline": "2.19.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 b1eb437c4ddd1f..9de8f823c46bfd 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cda5a5192b0d1310376b1370890e1d38755c076a", + "version": "2.19.0", + "port-version": 0 + }, { "git-tree": "21cf84757dd988f8b1ea4aa318002a4cc047b697", "version": "2.18.0", From d31c6ce0817fb3aa3d2b770c233d436572a96b37 Mon Sep 17 00:00:00 2001 From: i-curve Date: Tue, 5 Dec 2023 09:29:25 +0800 Subject: [PATCH 0543/1039] [copypp] update to 0.1.1 (#35454) --- ports/copypp/portfile.cmake | 2 +- ports/copypp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/copypp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/copypp/portfile.cmake b/ports/copypp/portfile.cmake index ba1157c08a4eaf..2c04373c6d5792 100644 --- a/ports/copypp/portfile.cmake +++ b/ports/copypp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO i-curve/copypp REF "v${VERSION}" - SHA512 a13a3ee105b3802f585c086846dbce7d5e9c23d11bf55fcc0c63e1a4b21fc6798f1a324cfb3da66b715dfc22a4f1f7ba51a2f4e10db331f7d4fd6b20a9be6d41 + SHA512 f2d45b4a3d2a3e8b1f04a777a9efd31e127771146c2a45d57a49417906ecc40543e9f7ef9908ec8f24c328cf29b0ad10625195a802cde568e830bb62f2067ca2 HEAD_REF main ) diff --git a/ports/copypp/vcpkg.json b/ports/copypp/vcpkg.json index db04c31a8ac2e8..73ae05e82045dd 100644 --- a/ports/copypp/vcpkg.json +++ b/ports/copypp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "copypp", - "version": "0.1.0", + "version": "0.1.1", "description": "support field copy in different c++ struct.", "homepage": "https://github.com/i-curve/copypp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index badb2546c1e258..8522b662b68bf7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1789,7 +1789,7 @@ "port-version": 3 }, "copypp": { - "baseline": "0.1.0", + "baseline": "0.1.1", "port-version": 0 }, "coroutine": { diff --git a/versions/c-/copypp.json b/versions/c-/copypp.json index 87186d964cc05b..38383532096308 100644 --- a/versions/c-/copypp.json +++ b/versions/c-/copypp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7be5573b44b0520d8f4cb7619bf8755184bb4019", + "version": "0.1.1", + "port-version": 0 + }, { "git-tree": "30342b837d13819393c9f898e82f5c2cf25bed32", "version": "0.1.0", From 3ad8a69502ac13d35ca16db2adb0e808198518d4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Dec 2023 02:30:06 +0100 Subject: [PATCH 0544/1039] [proj] Update to 9.3.1 (#35456) --- ports/proj/fix-uwp.patch | 17 ----------------- ports/proj/portfile.cmake | 3 +-- ports/proj/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/proj.json | 5 +++++ 5 files changed, 9 insertions(+), 23 deletions(-) delete mode 100644 ports/proj/fix-uwp.patch diff --git a/ports/proj/fix-uwp.patch b/ports/proj/fix-uwp.patch deleted file mode 100644 index a55cde15e93599..00000000000000 --- a/ports/proj/fix-uwp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt -index cdd85bd3..5c63cab7 100644 ---- a/src/apps/CMakeLists.txt -+++ b/src/apps/CMakeLists.txt -@@ -37,10 +37,12 @@ if(NOT MSVC) - - else() - -+ if(NOT WINDOWS_STORE) - # Linking to setargv.obj enables wildcard globbing for the - # command line utilities, when compiling with MSVC - # https://docs.microsoft.com/cpp/c-language/expanding-wildcard-arguments - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} setargv.obj") -+ endif() - - endif() - diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index d94c051e009304..fdf74fe05a573b 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -2,13 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ REF "${VERSION}" - SHA512 ee8170780c70e09efa4bc3fcf6ee9a2c15554a05a8562617fc5e9698fb33c6c0af380dd0de836db91955eb35623ded1fec67c6afe5fd3b692fcf4f4b3e4f0658 + SHA512 45775e2b2a6b5bc490743c562155521a2ef48c5a8834cc96f88784aea785df10688f8962ae22fcac64d3b2f85378539ef1d3a082243cdc0ca3695ed8b9efa18b HEAD_REF master PATCHES fix-win-output-name.patch fix-proj4-targets-cmake.patch remove_toolset_restriction.patch - fix-uwp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index d9d52ec9e92a34..f5d93d4fd2a5ad 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,7 +1,6 @@ { "name": "proj", - "version": "9.3.0", - "port-version": 1, + "version": "9.3.1", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8522b662b68bf7..fbcc06e16a8fe7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6765,8 +6765,8 @@ "port-version": 2 }, "proj": { - "baseline": "9.3.0", - "port-version": 1 + "baseline": "9.3.1", + "port-version": 0 }, "proj4": { "baseline": "8.9.9", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index af8483d5831971..6a64b45eea3964 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa1294c10c33d46c0294b3c1952d1c7aa57439a5", + "version": "9.3.1", + "port-version": 0 + }, { "git-tree": "6e31164b906c96903b8352e6a9211ae019672ac4", "version": "9.3.0", From 8b838b5616275a52f6afe1af1af4742e3c5d3b26 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Dec 2023 02:30:52 +0100 Subject: [PATCH 0545/1039] [libdeflate] Fix usage (#35460) --- ports/libdeflate/portfile.cmake | 11 +++++++++++ ports/libdeflate/usage | 2 +- ports/libdeflate/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libdeflate.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/libdeflate/portfile.cmake b/ports/libdeflate/portfile.cmake index db7e8ca8ca33c0..ae83dae067509e 100644 --- a/ports/libdeflate/portfile.cmake +++ b/ports/libdeflate/portfile.cmake @@ -32,6 +32,17 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdeflate") vcpkg_fixup_pkgconfig() +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdeflate.h" "defined(LIBDEFLATE_DLL)" "1") + elseif(NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") + endif() + endif() +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libdeflate/usage b/ports/libdeflate/usage index 0c41e9570abd23..c7a57452f4ce27 100644 --- a/ports/libdeflate/usage +++ b/ports/libdeflate/usage @@ -1,4 +1,4 @@ -The package zstd provides CMake targets: +libdeflate provides CMake targets: find_package(libdeflate CONFIG REQUIRED) target_link_libraries(main PRIVATE $,libdeflate::libdeflate_shared,libdeflate::libdeflate_static>) diff --git a/ports/libdeflate/vcpkg.json b/ports/libdeflate/vcpkg.json index 60f273db36aacb..b329492660d1f5 100644 --- a/ports/libdeflate/vcpkg.json +++ b/ports/libdeflate/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdeflate", "version": "1.19", + "port-version": 1, "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.", "homepage": "https://github.com/ebiggers/libdeflate", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fbcc06e16a8fe7..affb7e3a492138 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4198,7 +4198,7 @@ }, "libdeflate": { "baseline": "1.19", - "port-version": 0 + "port-version": 1 }, "libdisasm": { "baseline": "0.23", diff --git a/versions/l-/libdeflate.json b/versions/l-/libdeflate.json index 6459b0a55fe851..8f30f6ce2264d5 100644 --- a/versions/l-/libdeflate.json +++ b/versions/l-/libdeflate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f16e38faecc95d0dc0c1a4a2ac32a4983f4775", + "version": "1.19", + "port-version": 1 + }, { "git-tree": "60231c270c3eca938a64b43dfb0b66846787a464", "version": "1.19", From 83055c068d17029ace18b28fb4b496ded5b9a469 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Mon, 4 Dec 2023 20:31:13 -0500 Subject: [PATCH 0546/1039] [cpptrace] Add 0.3.1 (#35473) --- ports/cpptrace/nullable_export.patch | 13 ------------- ports/cpptrace/portfile.cmake | 4 +--- ports/cpptrace/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpptrace.json | 5 +++++ 5 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 ports/cpptrace/nullable_export.patch diff --git a/ports/cpptrace/nullable_export.patch b/ports/cpptrace/nullable_export.patch deleted file mode 100644 index d75b21cd35c7f0..00000000000000 --- a/ports/cpptrace/nullable_export.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/cpptrace/cpptrace.hpp b/include/cpptrace/cpptrace.hpp -index b35bed1..27b626b 100644 ---- a/include/cpptrace/cpptrace.hpp -+++ b/include/cpptrace/cpptrace.hpp -@@ -90,7 +90,7 @@ namespace cpptrace { - // This is used over std::optional because the library is C++11 and also std::optional is a bit heavy-duty for this - // use. - template::value, int>::type = 0> -- struct CPPTRACE_EXPORT nullable { -+ struct nullable { - T raw_value; - nullable& operator=(T value) { - raw_value = value; diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index c82ac7eedae89c..0d9c9c8250721e 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/cpptrace REF "v${VERSION}" - SHA512 10b3106eb10b16ec7459ebd7f5e10c08238c553ed8718aa0f9e5e83a921d970f742eef214148ddd33d0d20e7cb14489ae24bc5b70f0523dc0a3abb139a8357a8 + SHA512 732f8f70d9c8f01d10802bbb1da150d75b93c15fa0299bb84ba5be87d0da52ebe3b637e382a044c8d1e4ea283fae84c008113fc1f17ec4224692d5d911ab45d7 HEAD_REF main - PATCHES - nullable_export.patch ) vcpkg_cmake_configure( diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index dad621d9897de5..ec388ebbf78990 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpptrace", - "version": "0.3.0", + "version": "0.3.1", "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", "homepage": "https://github.com/jeremy-rifkin/cpptrace", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index affb7e3a492138..da350190f31a34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1901,7 +1901,7 @@ "port-version": 4 }, "cpptrace": { - "baseline": "0.3.0", + "baseline": "0.3.1", "port-version": 0 }, "cppunit": { diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index a30ab3d753bbc5..b82a0d6dd677e7 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9dc1989a430b531df437790e61d09b411342ec3", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "620e293efe2a80f6abdf9499855b09718cd8a051", "version": "0.3.0", From b6e73bd3dc8a8d061ee601336b8f43d2570a7080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni?= Date: Tue, 5 Dec 2023 01:31:32 +0000 Subject: [PATCH 0547/1039] [Glaze] Update to version 1.8.4 (#35474) --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index c3ce1788fbcb09..5da937b2bb0c8d 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 8ae5ff0b6d13a1b2895ababa8264b20f50705c3a29d0ff875ca830b5588b7ac2df8f9b41e56a4af68acfeb93702df6220be7a84e7e38e46f5983f901d9084b3c + SHA512 47f069b44102cd8fa67b8ec8424a31e549c213ded4510e50065fd8fad4141c036f30bec000e7a934cca3d2f32bbfe573fd7707b870ddd915cc1fa55f5699db86 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 39e48cd025c43a..7f38e80f97cd14 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.8.1", + "version": "1.8.4", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index da350190f31a34..a8175007410c86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.8.1", + "baseline": "1.8.4", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index acdb2ea9289dd6..378df0db20824a 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "feacc21a5c09665421fdbf6bbfe8c5bf8553f4d9", + "version": "1.8.4", + "port-version": 0 + }, { "git-tree": "8bc431f655de61084866947ee92fcf59cba56e0e", "version": "1.8.1", From ee3d0e9941b152e5dc1544213ed039f23152dc06 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:31:53 +0100 Subject: [PATCH 0548/1039] [hnswlib] update to 0.8.0 (#35475) --- ports/hnswlib/cmake.patch | 44 ------------------------------------ ports/hnswlib/portfile.cmake | 4 +--- ports/hnswlib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/hnswlib.json | 5 ++++ 5 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 ports/hnswlib/cmake.patch diff --git a/ports/hnswlib/cmake.patch b/ports/hnswlib/cmake.patch deleted file mode 100644 index 7e5be49eec08e2..00000000000000 --- a/ports/hnswlib/cmake.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7cebe60..b2aecc8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,11 +1,36 @@ --cmake_minimum_required (VERSION 2.6) --project(hnsw_lib -+cmake_minimum_required(VERSION 3.0...3.26) -+ -+project(hnswlib - LANGUAGES CXX) - -+include(GNUInstallDirs) -+ - add_library(hnswlib INTERFACE) --target_include_directories(hnswlib INTERFACE .) -+add_library(hnswlib::hnswlib ALIAS hnswlib) -+ -+target_include_directories(hnswlib INTERFACE -+ $ -+ $) -+ -+# Install -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hnswlib -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - -+install(TARGETS hnswlib -+ EXPORT hnswlibTargets) -+ -+install(EXPORT hnswlibTargets -+ FILE hnswlibConfig.cmake -+ NAMESPACE hnswlib:: -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/hnswlib) -+ -+# Examples and tests - if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) -+ option(HNSWLIB_EXAMPLES "Build examples and tests." ON) -+else() -+ option(HNSWLIB_EXAMPLES "Build examples and tests." OFF) -+endif() -+if(HNSWLIB_EXAMPLES) - set(CMAKE_CXX_STANDARD 11) - - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/ports/hnswlib/portfile.cmake b/ports/hnswlib/portfile.cmake index 4d1379ef4fe1ca..d02ecd207ce5bf 100644 --- a/ports/hnswlib/portfile.cmake +++ b/ports/hnswlib/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nmslib/hnswlib REF "v${VERSION}" - SHA512 fd74c23040598973d7e0b5a6af73eb884ee2d30703187d1702fdd48eaf8f7f96d8fbb125d3763f90111d9fb7c5ab3434ebdb818da8717d35c5571e99083c812b + SHA512 2bac86547374ef762083f33b5209c7c02c89b3270442dda2bc80fbc7b6a33766cb81248841deddc2ca1f7c49e3e19889955f45c91d0b601d1c883a5e1c930794 HEAD_REF master - PATCHES - cmake.patch # Backport CMake targets from nmslib/hnswlib #446 to 0.7.0 release. ) set(VCPKG_BUILD_TYPE "release") # header-only port diff --git a/ports/hnswlib/vcpkg.json b/ports/hnswlib/vcpkg.json index 72b6c82932af74..9eb1503f64112c 100644 --- a/ports/hnswlib/vcpkg.json +++ b/ports/hnswlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hnswlib", - "version": "0.7.0", - "port-version": 1, + "version": "0.8.0", "description": "Header-only library for fast approximate nearest neighbors", "homepage": "https://github.com/nmslib/hnswlib", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a8175007410c86..9cd00195396801 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3341,8 +3341,8 @@ "port-version": 0 }, "hnswlib": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.8.0", + "port-version": 0 }, "hps": { "baseline": "2022-01-18", diff --git a/versions/h-/hnswlib.json b/versions/h-/hnswlib.json index 7bc1c41cc35de5..45b276ae1c1282 100644 --- a/versions/h-/hnswlib.json +++ b/versions/h-/hnswlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e476d41813814f2180e5a898c81ca394339c4cf3", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "497030f03d37d63ff86c9e99d24d9e8f048ea067", "version": "0.7.0", From 293d43427b6460ffd0616fa656da66a0e771ffbd Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:35:22 -0800 Subject: [PATCH 0549/1039] [curlpp] Remove find_dependency from wrapper file (#35482) --- ports/curlpp/portfile.cmake | 9 +++++++-- ports/curlpp/vcpkg-cmake-wrapper.cmake | 5 ----- ports/curlpp/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/c-/curlpp.json | 5 +++++ 5 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 ports/curlpp/vcpkg-cmake-wrapper.cmake diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index 8a2652fc4b5f63..8106a99e4b5506 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -33,8 +33,13 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static)) endif() endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/unofficial-curlpp/unofficial-curlpp-config.cmake" +"# Generated by CMake" +[[# Generated by CMake +include(CMakeFindDependencyMacro) +find_dependency(CURL)]]) + vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") -file(INSTALL "${SOURCE_PATH}/doc/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/LICENSE") diff --git a/ports/curlpp/vcpkg-cmake-wrapper.cmake b/ports/curlpp/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index a7f88cd72cc9d2..00000000000000 --- a/ports/curlpp/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(FIND_CURLPP_ARGS ${ARGS}) -include(CMakeFindDependencyMacro) -find_dependency(CURL) - -_find_package(${FIND_CURLPP_ARGS}) diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json index 8d134bb3eef1c2..90c0f5d2ee1ec1 100644 --- a/ports/curlpp/vcpkg.json +++ b/ports/curlpp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "curlpp", "version-date": "2018-06-15", - "port-version": 8, + "port-version": 9, "description": "C++ wrapper around libcURL", + "homepage": "https://github.com/jpbarrette/curlpp", + "license": "MIT", "dependencies": [ { "name": "curl", diff --git a/versions/baseline.json b/versions/baseline.json index 9cd00195396801..faa19fe1688c32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2042,7 +2042,7 @@ }, "curlpp": { "baseline": "2018-06-15", - "port-version": 8 + "port-version": 9 }, "cute-headers": { "baseline": "2019-09-20", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index 978c213aaedac7..8ecfa361bc5a32 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f1ce1e78bf1fca65c8f47bde61824589bd11e5c", + "version-date": "2018-06-15", + "port-version": 9 + }, { "git-tree": "bce2ac6d85261a2aca4b9ea5e974e5a7ee45be3a", "version-date": "2018-06-15", From 631ba72c109d67c57b9f46fc4c5e5317e7f4fc9e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Dec 2023 04:44:53 +0100 Subject: [PATCH 0550/1039] [kealib] Cleanup, fix CMake config (#35461) --- ports/kealib/hdf5_include.patch | 65 -------------------------- ports/kealib/kealib-target.diff | 43 +++++++++++++++++ ports/kealib/no-kea-config-script.diff | 14 ++++++ ports/kealib/portfile.cmake | 14 +++--- ports/kealib/usage | 4 ++ ports/kealib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kealib.json | 5 ++ 8 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 ports/kealib/hdf5_include.patch create mode 100644 ports/kealib/kealib-target.diff create mode 100644 ports/kealib/no-kea-config-script.diff create mode 100644 ports/kealib/usage diff --git a/ports/kealib/hdf5_include.patch b/ports/kealib/hdf5_include.patch deleted file mode 100644 index 9c8d0547a2bdcd..00000000000000 --- a/ports/kealib/hdf5_include.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h -index 3991ffb..ddc314f 100644 ---- a/include/libkea/KEAAttributeTable.h -+++ b/include/libkea/KEAAttributeTable.h -@@ -37,7 +37,7 @@ - #include - #include - --#include "H5Cpp.h" -+#include - - #include "libkea/KEACommon.h" - #include "libkea/KEAException.h" -diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h -index 902f485..245e068 100644 ---- a/include/libkea/KEAAttributeTableFile.h -+++ b/include/libkea/KEAAttributeTableFile.h -@@ -35,7 +35,7 @@ - #include - #include - --#include "H5Cpp.h" -+#include - - #include "libkea/KEACommon.h" - #include "libkea/KEAException.h" -diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h -index 7df369a..28018cc 100644 ---- a/include/libkea/KEAAttributeTableInMem.h -+++ b/include/libkea/KEAAttributeTableInMem.h -@@ -35,7 +35,7 @@ - #include - #include - --#include "H5Cpp.h" -+#include - - #include "libkea/KEACommon.h" - #include "libkea/KEAException.h" -diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h -index cb8a577..a6fbfca 100644 ---- a/include/libkea/KEACommon.h -+++ b/include/libkea/KEACommon.h -@@ -38,7 +38,7 @@ - #include - #include - --#include "H5Cpp.h" -+#include - - #include - -diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h -index 87a2d07..c59a7f0 100644 ---- a/include/libkea/KEAImageIO.h -+++ b/include/libkea/KEAImageIO.h -@@ -35,7 +35,7 @@ - #include - #include - --#include "H5Cpp.h" -+#include - - #include "libkea/KEACommon.h" - #include "libkea/KEAException.h" diff --git a/ports/kealib/kealib-target.diff b/ports/kealib/kealib-target.diff new file mode 100644 index 00000000000000..d89095f208dc8f --- /dev/null +++ b/ports/kealib/kealib-target.diff @@ -0,0 +1,43 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index a9b19fe..3ab09c1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -54,21 +54,8 @@ set_target_properties(${LIBKEA_LIB_NAME} + ) + + add_library(Kealib INTERFACE) +-target_include_directories(Kealib INTERFACE +- $ +- $ +- $ +-) +-# TODO: a better way?? +-if(MSVC) +- target_link_libraries(Kealib INTERFACE +- $ +- $) +-else() +- target_link_libraries(Kealib INTERFACE +- $ +- $) +-endif(MSVC) ++target_include_directories(Kealib INTERFACE $) ++target_link_libraries(Kealib INTERFACE ${LIBKEA_LIB_NAME}) + ############################################################################### + + ############################################################################### +diff --git a/src/Config.cmake.in b/src/Config.cmake.in +index 7de44f9..8a7bb8c 100644 +--- a/src/Config.cmake.in ++++ b/src/Config.cmake.in +@@ -1,5 +1,10 @@ + @PACKAGE_INIT@ + ++# FindHDF5.cmake may expose exported targets in HDF5_LIBRARIES. ++include(CMakeFindDependencyMacro) ++set(HDF5_USE_STATIC_LIBRARIES "@HDF5_USE_STATIC_LIBRARIES@") ++find_dependency(HDF5) ++ + include("${CMAKE_CURRENT_LIST_DIR}/libkeaTargets.cmake") + + check_required_components(libkea) diff --git a/ports/kealib/no-kea-config-script.diff b/ports/kealib/no-kea-config-script.diff new file mode 100644 index 00000000000000..2b79093ed85f3d --- /dev/null +++ b/ports/kealib/no-kea-config-script.diff @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 90f64d6..17f2929 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,9 +222,7 @@ add_test(NAME test1 COMMAND src/test1) + ############################################################################### + # Installation + if(MSVC) +- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_BINARY_DIR}/kea-config.bat" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + else() +- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_BINARY_DIR}/kea-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + endif(MSVC) + install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_HEADER_DIR}/libkea/kea-config.h" DESTINATION include/libkea) + ############################################################################### diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake index c6cebcae9036ba..5f2a2a5df05d2e 100644 --- a/ports/kealib/portfile.cmake +++ b/ports/kealib/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF "kealib-${VERSION}" SHA512 82399f1332ff2aeb6342732e9e5c897c813109fd18e77cfc8d866f06adf4faa7f080f1f3c0a3b777fb3a679912dacf4851b7ad09a338d6087dd1d26eb2d1689f HEAD_REF master - PATCHES hdf5_include.patch + PATCHES + kealib-target.diff + no-kea-config-script.diff ) vcpkg_cmake_configure( @@ -16,13 +18,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") -endif() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/kealib/usage b/ports/kealib/usage new file mode 100644 index 00000000000000..9b42e9f066a620 --- /dev/null +++ b/ports/kealib/usage @@ -0,0 +1,4 @@ +kealib provides CMake targets: + + find_package(libkea CONFIG REQUIRED) + target_link_libraries(main PRIVATE libkea::Kealib) diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json index 49dd980eb2fad6..6ca70a322f69c9 100644 --- a/ports/kealib/vcpkg.json +++ b/ports/kealib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kealib", "version": "1.5.2", + "port-version": 1, "description": "KEALib provides an implementation of the GDAL data model using HDF5.", "homepage": "https://github.com/ubarsc/kealib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index faa19fe1688c32..f50f7593beb0c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3746,7 +3746,7 @@ }, "kealib": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "keccak-tiny": { "baseline": "2014-09-08", diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json index 40a96ca4481695..1772d8b07a5c60 100644 --- a/versions/k-/kealib.json +++ b/versions/k-/kealib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834", + "version": "1.5.2", + "port-version": 1 + }, { "git-tree": "e23b8bf23a4254e1028ca0c93f722a2691012852", "version": "1.5.2", From 72010900b7cee36cea77aebb97695095c9358eaf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Dec 2023 04:47:16 +0100 Subject: [PATCH 0551/1039] [libusb] Set host triplet for wasm32 (#35292) --- ports/libusb/portfile.cmake | 3 +++ ports/libusb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 0438794ed2643d..4c69b06c6dead8 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -43,6 +43,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() vcpkg_list(SET MAKE_OPTIONS) vcpkg_list(SET LIBUSB_LINK_LIBRARIES) + if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND MAKE_OPTIONS BUILD_TRIPLET --host=wasm32) + endif() if("udev" IN_LIST FEATURES) vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev") vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 810f16e4dc34bf..0dd6263bb26fea 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", - "port-version": 4, + "port-version": 5, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index f50f7593beb0c5..1566449e30c375 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4970,7 +4970,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 4 + "port-version": 5 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index f1dd0c3ab566b1..15dcbcc464ecd0 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d325ede3cd1de2acd9a2d8f2708ec1e758cf0a", + "version": "1.0.26.11791", + "port-version": 5 + }, { "git-tree": "1e6400f24988b86ad461447df4eef8efc56a919f", "version": "1.0.26.11791", From b051c80d93fb023ce959622271e1183bff291fd5 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 6 Dec 2023 03:41:09 +0800 Subject: [PATCH 0552/1039] [allegro5] update to 5.2.9.0 (#35495) --- ports/allegro5/export-targets.patch | 60 ----------------------------- ports/allegro5/portfile.cmake | 9 ++--- ports/allegro5/vcpkg.json | 3 +- versions/a-/allegro5.json | 5 +++ versions/baseline.json | 4 +- 5 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 ports/allegro5/export-targets.patch diff --git a/ports/allegro5/export-targets.patch b/ports/allegro5/export-targets.patch deleted file mode 100644 index 21ad6d3b5c3d26..00000000000000 --- a/ports/allegro5/export-targets.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c5720b..72880c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1156,6 +1156,24 @@ if(INSTALL_PKG_CONFIG_FILES) - endforeach(versuffix) - endif(INSTALL_PKG_CONFIG_FILES) - -+file(WRITE "${CMAKE_INSTALL_PREFIX}/share/unofficial-allegro5/unofficial-allegro5-config.cmake" -+[[ -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegroTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_audioTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_videoTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_primitivesTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_fontTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_ttfTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_memfileTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_physfsTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_imageTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_mainTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_dialogTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_colorTargets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-allegro_acodecTargets.cmake") -+ -+]]) -+ - #-----------------------------------------------------------------------------# - # - # Documentation -diff --git a/cmake/Common.cmake b/cmake/Common.cmake -index b95479f..4093a47 100644 ---- a/cmake/Common.cmake -+++ b/cmake/Common.cmake -@@ -166,6 +166,7 @@ function(add_our_library target framework_name sources extra_flags link_with) - # Library dependencies are transitive by default. Any target which links - # with this target will therefore pull in these dependencies automatically. - target_link_libraries(${target} ${link_with}) -+ target_include_directories(${target} PUBLIC "$") - - # Set list of dependencies that the user would need to explicitly link with - # if static linking. -@@ -220,6 +221,7 @@ endfunction(set_our_framework_properties) - - function(install_our_library target filename) - install(TARGETS ${target} -+ EXPORT unofficial-${target}Targets - LIBRARY DESTINATION "lib${LIB_SUFFIX}" - ARCHIVE DESTINATION "lib${LIB_SUFFIX}" - FRAMEWORK DESTINATION "${FRAMEWORK_INSTALL_PREFIX}" -@@ -227,6 +229,10 @@ function(install_our_library target filename) - # Doesn't work, see below. - # PUBLIC_HEADER DESTINATION "include" - ) -+ install(EXPORT unofficial-${target}Targets -+ NAMESPACE unofficial-allegro5:: -+ DESTINATION share/unofficial-allegro5 -+ ) - if(0) - install(FILES ${CMAKE_BINARY_DIR}/lib/\${CMAKE_INSTALL_CONFIG_NAME}/${filename}.pdb - DESTINATION lib diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake index b9521f48df44c0..8166ea16345ed8 100644 --- a/ports/allegro5/portfile.cmake +++ b/ports/allegro5/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO liballeg/allegro5 - REF 5.2.6.0 - SHA512 d590c1a00d1b314c6946e0f6ad3e3a8b6e6309bada2ec38857186f817147ac99dae8a1c4412abe701af88da5dca3dd8f989a1da66630192643d3c08c0146b603 + REF ${VERSION} + SHA512 2e7833b725718fdf11f1cd5999dc9fafca4b34adda15d3d8cb551c0eb00368d2e1c08b15f8beb766e2f208ffdc3b5e33175e969c7333ad6dc92f269522ac3d32 HEAD_REF master PATCHES do-not-copy-pdbs-to-lib.patch - export-targets.patch msvc-arm64-atomic.patch ) @@ -64,9 +63,9 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-allegro5 CONFIG_PATH share/unofficial-allegro5) +vcpkg_cmake_config_fixup(PACKAGE_NAME allegro CONFIG_PATH lib/cmake/allegro) 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/allegro5/vcpkg.json b/ports/allegro5/vcpkg.json index e265058d1ca5cd..40b37627c5f496 100644 --- a/ports/allegro5/vcpkg.json +++ b/ports/allegro5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "allegro5", - "version": "5.2.6.0", - "port-version": 4, + "version": "5.2.9.0", "description": "Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.", "homepage": "https://github.com/liballeg/allegro5", "license": "BSD-3-Clause AND Zlib", diff --git a/versions/a-/allegro5.json b/versions/a-/allegro5.json index eeb137a4b36704..58027fd2d9f750 100644 --- a/versions/a-/allegro5.json +++ b/versions/a-/allegro5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93860d1ef432006526823ace61750eb6b0e86ec2", + "version": "5.2.9.0", + "port-version": 0 + }, { "git-tree": "a50ae858c1ef5e8d94fa850e2857b7a449cc5f55", "version": "5.2.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1566449e30c375..2d25c6606c5950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -81,8 +81,8 @@ "port-version": 3 }, "allegro5": { - "baseline": "5.2.6.0", - "port-version": 4 + "baseline": "5.2.9.0", + "port-version": 0 }, "alpaca": { "baseline": "0.2.1", From 08c4e71048eb54733d9b180a28b9b1d7ce637454 Mon Sep 17 00:00:00 2001 From: talregev Date: Tue, 5 Dec 2023 22:23:44 +0200 Subject: [PATCH 0553/1039] upgrade ogre-next 2.3.3 and fix osx (#34945) --- ports/gz-cmake3/dependencies.patch | 26 ++++++++++++---------- ports/gz-cmake3/vcpkg.json | 2 +- ports/gz-rendering7/fix-dependencies.patch | 2 +- ports/gz-rendering7/vcpkg.json | 1 + ports/ogre-next/fix-pc-file.patch | 21 ----------------- ports/ogre-next/osx.patch | 13 +++++++++++ ports/ogre-next/portfile.cmake | 24 ++++++++++++++++++-- ports/ogre-next/toolchain_fixes.patch | 10 --------- ports/ogre-next/vcpkg.json | 7 ++++-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 6 ++--- versions/g-/gz-cmake3.json | 5 +++++ versions/g-/gz-rendering7.json | 5 +++++ versions/o-/ogre-next.json | 5 +++++ 14 files changed, 76 insertions(+), 52 deletions(-) delete mode 100644 ports/ogre-next/fix-pc-file.patch create mode 100644 ports/ogre-next/osx.patch diff --git a/ports/gz-cmake3/dependencies.patch b/ports/gz-cmake3/dependencies.patch index f00a50741a03b9..48d7c0e0a90f7b 100644 --- a/ports/gz-cmake3/dependencies.patch +++ b/ports/gz-cmake3/dependencies.patch @@ -117,7 +117,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake find_package(PkgConfig QUIET) -if (PkgConfig_FOUND) -+if (NOT WIN32) ++if (UNIX AND NOT APPLE) set(PKG_CONFIG_PATH_ORIGINAL $ENV{PKG_CONFIG_PATH}) - foreach (GZ_OGRE2_PROJECT_NAME "OGRE2" "OGRE-Next") + foreach (GZ_OGRE2_PROJECT_NAME "OGRE-Next") @@ -146,7 +146,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake if (NOT "${OGRE2-${component}}" STREQUAL "OGRE2-${component}-NOTFOUND") message(STATUS " + component ${component}: found") # create a new target for each component -@@ -403,15 +406,24 @@ +@@ -403,15 +406,23 @@ set(OGRE2_SEARCH_VER "OGRE-${GzOGRE2_FIND_VERSION_MAJOR}.${GzOGRE2_FIND_VERSION_MINOR}") set(OGRE2_PATHS "") set(OGRE2_INC_PATHS "") @@ -162,20 +162,19 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake + list(APPEND OGRE2_INC_PATHS "${_rootPath}/include/OGRE-Next") endforeach() -+ if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(OGRE_MAIN_LIB "OgreNextMain_d") -+ else() -+ set(OGRE_MAIN_LIB "OgreNextMain") -+ endif() -+ find_library(OGRE2_LIBRARY - NAMES "OgreMain" -+ NAMES "${OGRE_MAIN_LIB}" ++ NAMES ++ "OgreNextMain" ++ "OgreNextMainStatic" ++ "OgreNextMain_d" ++ "OgreNextMainStatic_d" ++ NAMES_PER_DIR HINTS ${OGRE2_PATHS} NO_DEFAULT_PATH) find_path(OGRE2_INCLUDE -@@ -449,10 +461,10 @@ +@@ -449,10 +460,13 @@ ${PATH_HINTS} ${COMPONENT} ${OGRE2_SEARCH_VER}/${COMPONENT}) find_library(${PREFIX}_LIBRARY @@ -184,11 +183,14 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake - "Ogre${COMPONENT}_d" + "OgreNext${COMPONENT}" + "OgreNext${COMPONENT}_d" ++ "OgreNext${COMPONENT}Static" ++ "OgreNext${COMPONENT}Static_d" ++ NAMES_PER_DIR HINTS ${OGRE2_LIBRARY_DIRS} NO_DEFAULT_PATH) -@@ -509,8 +521,9 @@ +@@ -509,8 +522,9 @@ ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include) ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include) @@ -198,7 +200,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake foreach(component ${GzOGRE2_FIND_COMPONENTS}) set(PREFIX OGRE2_${component}) if(${PREFIX}_FOUND) -@@ -520,9 +533,9 @@ +@@ -520,9 +534,9 @@ string(FIND ${component} "Hlms" HLMS_POS) if(${HLMS_POS} GREATER -1) foreach (dir ${OGRE2_INCLUDE_DIRS}) diff --git a/ports/gz-cmake3/vcpkg.json b/ports/gz-cmake3/vcpkg.json index 8e43122d8b43e0..7877778e3ef477 100644 --- a/ports/gz-cmake3/vcpkg.json +++ b/ports/gz-cmake3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gz-cmake3", "version": "3.4.1", - "port-version": 4, + "port-version": 5, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-rendering7/fix-dependencies.patch b/ports/gz-rendering7/fix-dependencies.patch index 79136c638aa2f9..e55f35e6742147 100644 --- a/ports/gz-rendering7/fix-dependencies.patch +++ b/ports/gz-rendering7/fix-dependencies.patch @@ -7,7 +7,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt gz_find_package(OpenGL REQUIRED_BY ogre ogre2 - PKGCONFIG gl) -+ PKGCONFIG opengl) ++ ) else() gz_find_package(OpenGL REQUIRED COMPONENTS OpenGL diff --git a/ports/gz-rendering7/vcpkg.json b/ports/gz-rendering7/vcpkg.json index 1e345181b6c0c6..e96824ce57d93c 100644 --- a/ports/gz-rendering7/vcpkg.json +++ b/ports/gz-rendering7/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gz-rendering7", "version": "7.4.1", + "port-version": 1, "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.", "homepage": "https://gazebosim.org/libs/rendering", "license": "Apache-2.0", diff --git a/ports/ogre-next/fix-pc-file.patch b/ports/ogre-next/fix-pc-file.patch deleted file mode 100644 index 42a18f3882fce3..00000000000000 --- a/ports/ogre-next/fix-pc-file.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMake/Templates/OGREStatic.pc.in b/CMake/Templates/OGREStatic.pc.in ---- a/CMake/Templates/OGREStatic.pc.in -+++ b/CMake/Templates/OGREStatic.pc.in -@@ -1,13 +1,13 @@ - prefix=@OGRE_PREFIX_PATH@ - exec_prefix=${prefix} - libdir=${prefix}/@OGRE_LIB_DIRECTORY@ - includedir=${prefix}/include --plugindir=${libdir}/OGRE -+plugindir=${libdir}/@OGRE_NEXT_PREFIX@ - --Name: OGRE (static lib) -+Name: @OGRE_NEXT_PREFIX@ (static lib) - Description: Object-Oriented Graphics Rendering Engine - Version: @OGRE_VERSION@ - URL: http://www.ogre3d.org - Requires: freetype2, zziplib, x11, xt, xaw7, gl --Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ --Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@ -+Libs: -L${libdir} -L${plugindir} -l@OGRE_NEXT@Main@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ -+Cflags: -I${includedir} -I${includedir}/@OGRE_NEXT_PREFIX@ @OGRE_CFLAGS@ diff --git a/ports/ogre-next/osx.patch b/ports/ogre-next/osx.patch new file mode 100644 index 00000000000000..f0a87eded1860d --- /dev/null +++ b/ports/ogre-next/osx.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,3 +29,3 @@ + endif() +- ++set(CMAKE_CXX_STANDARD 17) + # Use relative paths +@@ -387,3 +387,3 @@ + else() +- set(CMAKE_OSX_SYSROOT macosx) ++ # set(CMAKE_OSX_SYSROOT macosx) + endif() diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index f394ca1e1d5ed7..92658b8cb3ae25 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -6,14 +6,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next REF v${VERSION} - SHA512 fbc1969244db07d013118fbce12b319e83cdae93a822cb2d90bbd12108ac3ce48d1f5437b4375b3daf5640b9ec6f1764daeef742161a101f77c3e25ccaf4b154 + SHA512 52ed2d2a3375c0d35f0dc695b986514484ad1d47966c5c18351d3b09913123b2487b9729738c6b8b1219c1a992a8c8509a2303e097a6eb26497e152a14d48830 HEAD_REF master PATCHES toolchain_fixes.patch avoid-name-clashes.patch fix-error-c2039.patch fix-dependencies.patch - fix-pc-file.patch + osx.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -32,6 +32,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF -DOGRE_COPY_DEPENDENCIES=OFF -DOGRE_BUILD_SAMPLES2=OFF -DOGRE_BUILD_TESTS=OFF @@ -119,4 +120,23 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_TARGET_IS_OSX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") + file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*") + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*") + file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") + file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*") + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*") + file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/") + endif() +endif() + vcpkg_fixup_pkgconfig() diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index fdd1c4a784a5ef..1a527eec86b4de 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -163,13 +163,3 @@ diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD -diff --git a/RenderSystems/Direct3D11/CMakeLists.txt b/RenderSystems/Direct3D11/CMakeLists.txt ---- a/RenderSystems/Direct3D11/CMakeLists.txt -+++ b/RenderSystems/Direct3D11/CMakeLists.txt -@@ -60,5 +60,5 @@ - target_link_libraries(RenderSystem_Direct3D11 ${AMDAGS_LIBRARIES}) - endif() - - ogre_config_plugin(RenderSystem_Direct3D11) --install(FILES ${HEADER_FILES} DESTINATION include/OGRE/RenderSystems/Direct3D11) -+install(FILES ${HEADER_FILES} DESTINATION include/${OGRE_NEXT_PREFIX}/RenderSystems/Direct3D11) diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index c82432ec448896..459747c166f91c 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ogre-next", - "version": "2.3.2", + "version": "2.3.3", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", @@ -9,7 +9,10 @@ "boost-thread", "freeimage", "freetype", - "openvr", + { + "name": "openvr", + "platform": "!osx" + }, "pkgconf", "poco", "rapidjson", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 91100f223f2611..8093971ce482eb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -431,6 +431,7 @@ gul14:x64-android=fail gz-tools2:arm-neon-android=fail gz-tools2:x64-android=fail gz-tools2:arm64-android=fail +gz-gui7:x64-osx=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2d25c6606c5950..4b47b37a728b58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3198,7 +3198,7 @@ }, "gz-cmake3": { "baseline": "3.4.1", - "port-version": 4 + "port-version": 5 }, "gz-common5": { "baseline": "5.4.1", @@ -3230,7 +3230,7 @@ }, "gz-rendering7": { "baseline": "7.4.1", - "port-version": 0 + "port-version": 1 }, "gz-sensors7": { "baseline": "7.3.0", @@ -6153,7 +6153,7 @@ "port-version": 2 }, "ogre-next": { - "baseline": "2.3.2", + "baseline": "2.3.3", "port-version": 0 }, "ois": { diff --git a/versions/g-/gz-cmake3.json b/versions/g-/gz-cmake3.json index e787660ed87fe1..bb94cf5d5dff18 100644 --- a/versions/g-/gz-cmake3.json +++ b/versions/g-/gz-cmake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76e06938007614b4fe523e37e368d7e39a40a9bc", + "version": "3.4.1", + "port-version": 5 + }, { "git-tree": "0238546ece05d52d030eb6dd62373ae4b65d1503", "version": "3.4.1", diff --git a/versions/g-/gz-rendering7.json b/versions/g-/gz-rendering7.json index 0d8daead9a2744..8a9c1bcd2c3813 100644 --- a/versions/g-/gz-rendering7.json +++ b/versions/g-/gz-rendering7.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29ca14723fbc8c73390ab5abe48b4e58cb0674b2", + "version": "7.4.1", + "port-version": 1 + }, { "git-tree": "5fa361453bcae9a0e8acee956057e9436f8d1377", "version": "7.4.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 52bcb60e289dad..805e301d795976 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecf4c650a53fe5d7427f5fcb1e28302d42aad2c7", + "version": "2.3.3", + "port-version": 0 + }, { "git-tree": "e79346cd0f83209b8d6b14b8d486971918013ce9", "version": "2.3.2", From fe7cea8f7e4737ec8509a23caa4818bcff9efe8f Mon Sep 17 00:00:00 2001 From: Sergey Podobry Date: Wed, 6 Dec 2023 03:52:23 +0200 Subject: [PATCH 0554/1039] [plog] Update to 1.1.10 (#35508) --- ports/plog/portfile.cmake | 4 ++-- ports/plog/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/p-/plog.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/plog/portfile.cmake b/ports/plog/portfile.cmake index 705467fc54e10a..a250a8f4c98896 100644 --- a/ports/plog/portfile.cmake +++ b/ports/plog/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SergiusTheBest/plog - REF 1.1.9 - SHA512 d979fdf0011ef9bb94a2271da5d17058dbab5bc47438a13769d084fdebe5e169e7c05a043d69acceb752896df7cdae4433f32bfbcc81e055dffd9c701be88003 + REF ${VERSION} + SHA512 b1d55baadbd16bafa5165b05352f367455b51f2eec2102f1ebad2e6a049954d1b87ffdd96811b0acea2313877db1db837f780971fd027d0db683fe42aeb29573 HEAD_REF master ) diff --git a/ports/plog/vcpkg.json b/ports/plog/vcpkg.json index 5a46c22aa84ca3..3cb32d0b807337 100644 --- a/ports/plog/vcpkg.json +++ b/ports/plog/vcpkg.json @@ -1,6 +1,6 @@ { "name": "plog", - "version": "1.1.9", + "version": "1.1.10", "description": "Portable, simple and extensible C++ logging library.", "homepage": "https://github.com/SergiusTheBest/plog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4b47b37a728b58..fc3fdccead84d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2024,7 +2024,7 @@ "baseline": "10.1", "port-version": 13 }, - "cuda-api-wrappers" : { + "cuda-api-wrappers": { "baseline": "0.6.6", "port-version": 0 }, @@ -6649,7 +6649,7 @@ "port-version": 7 }, "plog": { - "baseline": "1.1.9", + "baseline": "1.1.10", "port-version": 0 }, "plplot": { diff --git a/versions/p-/plog.json b/versions/p-/plog.json index 8850a9fd581377..fede13af8413d6 100644 --- a/versions/p-/plog.json +++ b/versions/p-/plog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "773c53426d316bfe1e35ae7cf9a5afe5c41b8a70", + "version": "1.1.10", + "port-version": 0 + }, { "git-tree": "8123d0f93ad451c1bbf9cb25b57ea290f4124030", "version": "1.1.9", From b051745c68faa6f65c493371d564c4eb8af34dad Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Tue, 5 Dec 2023 17:52:53 -0800 Subject: [PATCH 0555/1039] [cpprestsdk] Update to 2.10.19 (#35497) --- ports/cpprestsdk/portfile.cmake | 4 ++-- ports/cpprestsdk/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cpprestsdk.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index b26acfce43e00b..371d92a5cf4b65 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF 122d09549201da5383321d870bed45ecb9e168c5 - SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7 + REF 411a109150b270f23c8c97fa4ec9a0a4a98cdecf + SHA512 4f604763f05d53e50dec5deaba283fa4f82d5e7a94c7c8142bf422f4c0bc24bcef00666ddbdd820f64c14e552997d6657b6aca79a29e69db43799961b44b2a1a HEAD_REF master PATCHES fix-find-openssl.patch diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index a270085312a031..e8a0e467a145a3 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpprestsdk", - "version": "2.10.18", - "port-version": 4, + "version": "2.10.19", "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." diff --git a/versions/baseline.json b/versions/baseline.json index fc3fdccead84d9..9b6ba5df7648a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,8 +1889,8 @@ "port-version": 0 }, "cpprestsdk": { - "baseline": "2.10.18", - "port-version": 4 + "baseline": "2.10.19", + "port-version": 0 }, "cppslippi": { "baseline": "1.3.3.14", diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index e06a1087274fa1..43cb0fcacde12d 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "110c2c2a08e520877aa3fa9231ab69e0a76f388d", + "version": "2.10.19", + "port-version": 0 + }, { "git-tree": "e906f25fb64a3b11da4b1e551d63fe569fd300e3", "version": "2.10.18", From 24d884e1b8a7be8aedc745871251efce62edd36a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 6 Dec 2023 12:17:01 -0800 Subject: [PATCH 0556/1039] Update Android base image to 2023-12-05. (#35526) Also tells Docker to invalidate caches so that our apt-get update attempt actually does something. --- scripts/azure-pipelines/android/Dockerfile | 120 ++++---- .../android/azure-pipelines.yml | 272 +++++++++--------- .../android/create-docker-image.ps1 | 76 ++--- .../android/provision-image.sh | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 2 +- 5 files changed, 242 insertions(+), 230 deletions(-) diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 36cb3fd551e8e9..0e51a8bf632ee9 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,55 +1,65 @@ -FROM ubuntu:20.04 -ENV DEBIAN_FRONTEND noninteractive - -RUN \ - apt-get update && \ - apt-get -y upgrade && \ - apt-get -y --no-install-recommends install git g++ wget curl zip vim \ - pkg-config tar cmake unzip ca-certificates - -# Download Android NDK -RUN \ - wget https://dl.google.com/android/repository/android-ndk-r25c-linux.zip && \ - unzip android-ndk-r25c-linux.zip && \ - rm -rf android-ndk-r25c-linux.zip - -ENV ANDROID_NDK_HOME /android-ndk-r25c - -# Download Powershell -RUN \ - wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb && \ - dpkg -i packages-microsoft-prod.deb && \ - rm -f packages-microsoft-prod.deb && \ - apt-get -y install software-properties-common && \ - apt-get update && \ - add-apt-repository universe && \ - apt-get -y install powershell - -RUN \ - apt-get -y --no-install-recommends install autoconf nasm bison python2 \ - flex build-essential libtool libtool-bin gettext automake autoconf-archive - -# python related -RUN \ - apt-get -y --no-install-recommends install python3-setuptools python3-pip python3-venv - -# freeglut -RUN \ - apt-get -y --no-install-recommends install libxi-dev libgl1-mesa-dev \ - libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev - -# glfw3 -RUN \ - apt-get -y --no-install-recommends install libxinerama-dev libxcursor-dev - -# required by qt5-base -RUN \ - apt-get -y --no-install-recommends install libxext-dev libxfixes-dev libxrender-dev \ - libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev \ - libxkbcommon-dev libxcb-keysyms1-dev \ - libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ - libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ - libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev \ - libxcb-cursor-dev libxkbcommon-x11-dev - -WORKDIR /vcpkg \ No newline at end of file +# syntax=docker/dockerfile:1.4 +FROM ubuntu:20.04 + +ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb +ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip + +# Add apt packages + +## vcpkg prerequisites +ENV APT_PACKAGES="git curl zip unzip tar" + +## Common build prereqs +ENV APT_PACKAGES="$APT_PACKAGES g++ vim pkg-config cmake ca-certificates" + +ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin gettext automake autoconf-archive" + +## Python related +ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv" + +## freeglut +ENV APT_PACKAGES="$APT_PACKAGES libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev" + +# glfw3 +ENV APT_PACKAGES="$APT_PACKAGES libxinerama-dev libxcursor-dev" + +# qt5-base +ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ + libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev \ + libxkbcommon-dev libxcb-keysyms1-dev \ + libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ + libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ + libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev \ + libxcb-cursor-dev libxkbcommon-x11-dev" + +## PowerShell +ENV APT_PACKAGES="$APT_PACKAGES powershell" + +RUN < /dev/null apt-get update -apt-get -y --no-install-recommends install docker-ce docker-ce-cli \ No newline at end of file +apt-get -y --no-install-recommends install docker-ce docker-ce-cli diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index dd6094c4b90016..97d382694d3199 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -6,7 +6,7 @@ variables: linux-pool: 'PrLin-1ES-Pool' windows-pool: 'PrWin-2023-10-11' osx-pool: 'PrOsx-2023-09-11' - linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-10-11' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05' parameters: - name: vcpkgToolSha From 9ce52f8c564b5199a0df0591a20fc54abe68e88a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 6 Dec 2023 21:44:18 +0000 Subject: [PATCH 0557/1039] [qcoro] Update to 0.10.0 (#35532) --- ...0001-qt6-deprecated-qwebsocket-error.patch | 19 ------------------- ports/qcoro/portfile.cmake | 3 +-- ports/qcoro/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qcoro.json | 5 +++++ 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch diff --git a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch b/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch deleted file mode 100644 index 9f84b4319a93e1..00000000000000 --- a/ports/qcoro/0001-qt6-deprecated-qwebsocket-error.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/qcoro/websockets/qcorowebsocket.cpp b/qcoro/websockets/qcorowebsocket.cpp -index be9c1f7..c686d14 100644 ---- a/qcoro/websockets/qcorowebsocket.cpp -+++ b/qcoro/websockets/qcorowebsocket.cpp -@@ -32,7 +32,13 @@ public: - emitReady(true); - } - })) -- , mError(connect(socket, qOverload(&QWebSocket::error), this, [this](auto error) { -+ , mError(connect(socket, qOverload( -+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) -+ &QWebSocket::errorOccurred -+#else -+ &QWebSocket::error -+#endif -+ ), this, [this](auto error) { - qWarning() << "QWebSocket failed to connect to a websocket server: " << error; - emitReady(false); - })) diff --git a/ports/qcoro/portfile.cmake b/ports/qcoro/portfile.cmake index 141554d50e3046..4ab92f3419b993 100644 --- a/ports/qcoro/portfile.cmake +++ b/ports/qcoro/portfile.cmake @@ -2,9 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danvratil/qcoro REF "v${VERSION}" - SHA512 f708e1a82861c39434d6934172246c3280864e933b333b56c0471f1a629f9da65554d1508af4291ac2257ad8df2040655394ae5525d728710de5bd83cef8fbee + SHA512 de2e55256d3c9d35fec3ef6dc78128801b70a5e5b8ff0f3a6f235dac17f349ea44207a7c9f35375215dbeea04cb67c3412d505d0a8a95f2b926775f804a02649 HEAD_REF main - PATCHES 0001-qt6-deprecated-qwebsocket-error.patch ) vcpkg_check_features( diff --git a/ports/qcoro/vcpkg.json b/ports/qcoro/vcpkg.json index 3000d2faa70269..ca8cc009f2ae26 100644 --- a/ports/qcoro/vcpkg.json +++ b/ports/qcoro/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qcoro", - "version": "0.9.0", + "version": "0.10.0", "description": "Coroutine support for Qt", "homepage": "https://www.github.com/danvratil/qcoro", "documentation": "https://qcoro.dvratil.cz", diff --git a/versions/baseline.json b/versions/baseline.json index 9b6ba5df7648a9..7ee0869142d47d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6869,7 +6869,7 @@ "port-version": 0 }, "qcoro": { - "baseline": "0.9.0", + "baseline": "0.10.0", "port-version": 0 }, "qcustomplot": { diff --git a/versions/q-/qcoro.json b/versions/q-/qcoro.json index 4a347717df90d6..245b1245bb6746 100644 --- a/versions/q-/qcoro.json +++ b/versions/q-/qcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98bf3c0f6c546401e5976e2d474765d838050fd3", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "0b82c30bd542212b17946094149433dda747515f", "version": "0.9.0", From 86a6c21d41f0fd84e8f6fe7587083731b3a2a760 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 7 Dec 2023 05:56:22 +0800 Subject: [PATCH 0558/1039] [cnats] Repair installation path (#35493) --- ports/cnats/fix_install_path.patch | 28 ++++++++++++++++++++++++++++ ports/cnats/portfile.cmake | 3 ++- ports/cnats/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cnats.json | 5 +++++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ports/cnats/fix_install_path.patch diff --git a/ports/cnats/fix_install_path.patch b/ports/cnats/fix_install_path.patch new file mode 100644 index 00000000000000..15c8ab24b272cd --- /dev/null +++ b/ports/cnats/fix_install_path.patch @@ -0,0 +1,28 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b3f376c..8e6d06a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -60,7 +60,10 @@ if(NATS_BUILD_LIB_SHARED) + target_include_directories(nats PUBLIC + $ + $) +- install(TARGETS nats EXPORT cnats-targets DESTINATION ${NATS_LIBDIR}) ++ install(TARGETS nats EXPORT cnats-targets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(EXPORT cnats-targets + NAMESPACE cnats:: + FILE cnats-targets.cmake +@@ -72,7 +75,10 @@ if(NATS_BUILD_LIB_STATIC) + target_include_directories(nats_static PUBLIC + $ + $) +- install(TARGETS nats_static EXPORT cnats-targets ARCHIVE DESTINATION ${NATS_LIBDIR}) ++ install(TARGETS nats_static EXPORT cnats-targets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(EXPORT cnats-targets + NAMESPACE cnats:: + FILE cnats-targets.cmake diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index fc32c08d1db96d..66cabd10d71e04 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF main PATCHES fix-sodium-dep.patch + fix_install_path.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -74,5 +75,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 8ed988008b78af..1cbf12825a355d 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cnats", "version": "3.7.0", + "port-version": 1, "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 7ee0869142d47d..c3655af01fc750 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1678,7 +1678,7 @@ }, "cnats": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "cnl": { "baseline": "1.1.7", diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index b3263220ec0c1a..f04424341b9fb2 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cce27b1efc5af15e4222a5fdc5502959f24e9d03", + "version": "3.7.0", + "port-version": 1 + }, { "git-tree": "438cfff2ee224f9d414bda9bcf796c13534443ba", "version": "3.7.0", From ea958c708ed3b996c9490e04faf2c7c91e958859 Mon Sep 17 00:00:00 2001 From: i-curve Date: Thu, 7 Dec 2023 06:01:53 +0800 Subject: [PATCH 0559/1039] [copypp] update to 0.2.0 (#35536) --- ports/copypp/portfile.cmake | 2 +- ports/copypp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/copypp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/copypp/portfile.cmake b/ports/copypp/portfile.cmake index 2c04373c6d5792..5af36233d7bdbf 100644 --- a/ports/copypp/portfile.cmake +++ b/ports/copypp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO i-curve/copypp REF "v${VERSION}" - SHA512 f2d45b4a3d2a3e8b1f04a777a9efd31e127771146c2a45d57a49417906ecc40543e9f7ef9908ec8f24c328cf29b0ad10625195a802cde568e830bb62f2067ca2 + SHA512 cd96a310544dcd936126162de603c8a79c60e1ab9764e337704c3425096592b8e91e92ba9813f28f4838cd9b5f58e2e50cb7bce9a15d9b35c5c863693c32ae5d HEAD_REF main ) diff --git a/ports/copypp/vcpkg.json b/ports/copypp/vcpkg.json index 73ae05e82045dd..4c93a2c079ca42 100644 --- a/ports/copypp/vcpkg.json +++ b/ports/copypp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "copypp", - "version": "0.1.1", + "version": "0.2.0", "description": "support field copy in different c++ struct.", "homepage": "https://github.com/i-curve/copypp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c3655af01fc750..4f5b775f8acf93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1789,7 +1789,7 @@ "port-version": 3 }, "copypp": { - "baseline": "0.1.1", + "baseline": "0.2.0", "port-version": 0 }, "coroutine": { diff --git a/versions/c-/copypp.json b/versions/c-/copypp.json index 38383532096308..3e6af81f7577f7 100644 --- a/versions/c-/copypp.json +++ b/versions/c-/copypp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19d47125ad84c71c928f7ea266a6d7543b65ef23", + "version": "0.2.0", + "port-version": 0 + }, { "git-tree": "7be5573b44b0520d8f4cb7619bf8755184bb4019", "version": "0.1.1", From e6c6bb1debfc1fd32d9048a5d1499c4713721db8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Dec 2023 23:02:56 +0100 Subject: [PATCH 0560/1039] [x265] Update to 3.5 (#35531) --- ports/x265/fix-pkgconfig-version.patch | 13 ------------- ports/x265/portfile.cmake | 14 +++++++------- ports/x265/vcpkg.json | 3 +-- ports/x265/version.patch | 16 ++++++++++++++++ versions/baseline.json | 4 ++-- versions/x-/x265.json | 5 +++++ 6 files changed, 31 insertions(+), 24 deletions(-) delete mode 100644 ports/x265/fix-pkgconfig-version.patch create mode 100644 ports/x265/version.patch diff --git a/ports/x265/fix-pkgconfig-version.patch b/ports/x265/fix-pkgconfig-version.patch deleted file mode 100644 index f5c3d436643dfb..00000000000000 --- a/ports/x265/fix-pkgconfig-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 17c4553c8edf88..e4b5bc3534574d 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -1,12 +1,12 @@ -vcpkg_from_github( +vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH - REPO videolan/x265 - REF 07295ba7ab551bb9c1580fdaee3200f1b45711b7 #v3.4 - SHA512 21a4ef8733a9011eec8b336106c835fbe04689e3a1b820acb11205e35d2baba8c786d9d8cf5f395e78277f921857e4eb8622cf2ef3597bce952d374f7fe9ec29 + REPO multicoreware/x265_git + REF "${VERSION}" + SHA512 e95e454b438114cf90e32818847afa65b54caf69442a4a39dc92f125a7ec6f99c83ec509549ced3395cd5a77305abef0ecdad38b4a359f82fb17fce6c4c7cc7a HEAD_REF master PATCHES disable-install-pdb.patch - fix-pkgconfig-version.patch + version.patch ) set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF") @@ -23,7 +23,7 @@ vcpkg_cmake_configure( ${ASSEMBLY_OPTIONS} -DENABLE_SHARED=${ENABLE_SHARED} -DENABLE_LIBNUMA=OFF - -DX265_LATEST_TAG=3.4 + "-DVERSION=${VERSION}" OPTIONS_DEBUG -DENABLE_CLI=OFF MAYBE_UNUSED_VARIABLES @@ -64,4 +64,4 @@ foreach(FILE IN LISTS pc_files) endforeach() # Handle copyright -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/x265/vcpkg.json b/ports/x265/vcpkg.json index f7cec32c975ede..651eec5e3d9687 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,7 +1,6 @@ { "name": "x265", - "version": "3.4", - "port-version": 10, + "version": "3.5", "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-or-later", diff --git a/ports/x265/version.patch b/ports/x265/version.patch new file mode 100644 index 00000000000000..b9cb75a51a52e3 --- /dev/null +++ b/ports/x265/version.patch @@ -0,0 +1,16 @@ +diff --git a/source/cmake/Version.cmake b/source/cmake/Version.cmake +index 3bbf42f..e77f639 100644 +--- a/source/cmake/Version.cmake ++++ b/source/cmake/Version.cmake +@@ -28,6 +28,11 @@ + set(X265_VERSION "unknown") + set(X265_LATEST_TAG "0.0") + set(X265_TAG_DISTANCE "0") ++if(VERSION) ++ set(X265_VERSION "${VERSION}-vcpkg") ++ set(X265_LATEST_TAG "${VERSION}") ++ return() ++endif() + + #Find version control software to be used for live and extracted repositories from compressed tarballs + if(CMAKE_VERSION VERSION_LESS "2.8.10") diff --git a/versions/baseline.json b/versions/baseline.json index 4f5b775f8acf93..342b0bac8775fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9137,8 +9137,8 @@ "port-version": 0 }, "x265": { - "baseline": "3.4", - "port-version": 10 + "baseline": "3.5", + "port-version": 0 }, "x86-simd-sort": { "baseline": "3.0", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index 23a00b658a804c..9032e9044cc8dd 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b234c25f697f72c031c5d243a78be3dbb98c93c2", + "version": "3.5", + "port-version": 0 + }, { "git-tree": "8aa499d4919383c463198cedf2bc8cea9b01adff", "version": "3.4", From 71376b2613f91fe963f0f68340441395f1b3c94d Mon Sep 17 00:00:00 2001 From: Yiwen <15225434259xue@gmail.com> Date: Thu, 7 Dec 2023 06:03:55 +0800 Subject: [PATCH 0561/1039] [stdexec] update to nvhpc-23.09.rc4 (#35537) --- ports/stdexec/fix-include-location.patch | 20 -------------------- ports/stdexec/portfile.cmake | 6 ++---- ports/stdexec/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/s-/stdexec.json | 5 +++++ 5 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 ports/stdexec/fix-include-location.patch diff --git a/ports/stdexec/fix-include-location.patch b/ports/stdexec/fix-include-location.patch deleted file mode 100644 index 5edca9397a4919..00000000000000 --- a/ports/stdexec/fix-include-location.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d59e51d5..166bab1a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ set_target_properties(stdexec PROPERTIES - SOVERSION "${STDEXEC_VERSION_MAJOR}") - - # Declare the public include directories -+include(GNUInstallDirs) - target_include_directories(stdexec INTERFACE - $ - $ -@@ -276,7 +277,6 @@ endif() - # Install targets ------------------------------------------------------------ - - include(CPack) --include(GNUInstallDirs) - - install(TARGETS stdexec - DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/stdexec/portfile.cmake b/ports/stdexec/portfile.cmake index ee4764fda9f233..c04f0e4b44ab7d 100644 --- a/ports/stdexec/portfile.cmake +++ b/ports/stdexec/portfile.cmake @@ -2,11 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIA/stdexec - REF 6247237ca9e061401f90a8d320bfe33a61d69a31 - SHA512 485a8c5a5cd7de9a8875aff769d2c07fb0c7d01d552a0d53c215115384baa23b50524fdb093e5b9c7b8652f463e591df31c7cc45594f7e287664fe1106f1cd3c + REF 6b9f3501dced0e39611f93ff795da83d24364f30 + SHA512 d9a88b5095234c114cc45cef352662677b9f832065f3eec9c0f371547a5627672c3cf85ca19de702b2cd78ba5c1653b5e8156abe2f52d1e27ba014929b9336f2 HEAD_REF main - PATCHES - fix-include-location.patch # From https://github.com/NVIDIA/stdexec/pull/803 ) vcpkg_from_github( diff --git a/ports/stdexec/vcpkg.json b/ports/stdexec/vcpkg.json index 0ae84d6f026b3d..b4bf651e298ee5 100644 --- a/ports/stdexec/vcpkg.json +++ b/ports/stdexec/vcpkg.json @@ -1,7 +1,7 @@ { "name": "stdexec", - "version-date": "2023-03-05", - "port-version": 2, + "version-date": "2023-09-06", + "port-version": 3, "description": "stdexec is an experimental reference implementation of the Senders model of asynchronous programming proposed by P2300 - std::execution for adoption into the C++ Standard.", "homepage": "https://github.com/NVIDIA/stdexec", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 342b0bac8775fe..8941e9fb400a8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8205,8 +8205,8 @@ "port-version": 1 }, "stdexec": { - "baseline": "2023-03-05", - "port-version": 2 + "baseline": "2023-09-06", + "port-version": 3 }, "stduuid": { "baseline": "1.2.3", diff --git a/versions/s-/stdexec.json b/versions/s-/stdexec.json index eda5d41d750883..4abd1e7956d75f 100644 --- a/versions/s-/stdexec.json +++ b/versions/s-/stdexec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e618d986f55789354b123286ca6ecf674358447a", + "version-date": "2023-09-06", + "port-version": 3 + }, { "git-tree": "945f9fceea838cc9f1c251a801a39244785cb08e", "version-date": "2023-03-05", From 92a8ae82bc57e0a782cfc4c81e75c81a38534105 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Dec 2023 23:04:33 +0100 Subject: [PATCH 0562/1039] [graphite2] Burn-in library linkage (#35528) --- ports/graphite2/portfile.cmake | 9 ++++++--- ports/graphite2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/graphite2.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake index 62a71bb171c703..790304362737af 100644 --- a/ports/graphite2/portfile.cmake +++ b/ports/graphite2/portfile.cmake @@ -16,12 +16,15 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/graphite2/Types.h" "defined GRAPHITE2_STATIC" "1") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libgraphite2.la" "${CURRENT_PACKAGES_DIR}/debug/lib/libgraphite2.la") -file(COPY "${SOURCE_PATH}/LICENSE" 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}/LICENSE") -vcpkg_fixup_pkgconfig() diff --git a/ports/graphite2/vcpkg.json b/ports/graphite2/vcpkg.json index 1dc5a3fc25380f..66f9d6e61d6a92 100644 --- a/ports/graphite2/vcpkg.json +++ b/ports/graphite2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphite2", "version": "1.3.14", - "port-version": 3, + "port-version": 4, "description": [ "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.", "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications." diff --git a/versions/baseline.json b/versions/baseline.json index 8941e9fb400a8d..14dc4031c0c917 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3106,7 +3106,7 @@ }, "graphite2": { "baseline": "1.3.14", - "port-version": 3 + "port-version": 4 }, "graphqlparser": { "baseline": "0.7.0", diff --git a/versions/g-/graphite2.json b/versions/g-/graphite2.json index 19e5978ba5e1ae..afaf3248b2a98f 100644 --- a/versions/g-/graphite2.json +++ b/versions/g-/graphite2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d9a7404bf9dece906b2f6d8d8a70d7139d5e998", + "version": "1.3.14", + "port-version": 4 + }, { "git-tree": "247c12c09e9766df6a90a8a45dad08320f4e0493", "version": "1.3.14", From 77634e799ad6fa096f72cb5839854fd741f46405 Mon Sep 17 00:00:00 2001 From: J_Q <40571485+GitJQ@users.noreply.github.com> Date: Thu, 7 Dec 2023 06:21:01 +0800 Subject: [PATCH 0563/1039] [paho-mqttpp3] Update to 1.3.2 (#35534) --- ports/paho-mqttpp3/fix-dependency.patch | 84 ------------------------- ports/paho-mqttpp3/portfile.cmake | 11 ++-- ports/paho-mqttpp3/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/p-/paho-mqttpp3.json | 5 ++ 5 files changed, 12 insertions(+), 95 deletions(-) delete mode 100644 ports/paho-mqttpp3/fix-dependency.patch diff --git a/ports/paho-mqttpp3/fix-dependency.patch b/ports/paho-mqttpp3/fix-dependency.patch deleted file mode 100644 index 1ace8a30d024dd..00000000000000 --- a/ports/paho-mqttpp3/fix-dependency.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index a9f8908..5c98f3f 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -17,6 +17,5 @@ install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} - - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" -- FindPahoMqttC.cmake - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" - DESTINATION lib/cmake/${package_name}) -diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in -index 164e123..9beac1c 100644 ---- a/cmake/PahoMqttCppConfig.cmake.in -+++ b/cmake/PahoMqttCppConfig.cmake.in -@@ -5,7 +5,7 @@ set(PAHO_WITH_SSL @PAHO_WITH_SSL@) - - include(CMakeFindDependencyMacro) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) --find_dependency(PahoMqttC REQUIRED) -+find_dependency(eclipse-paho-mqtt-c REQUIRED) - list(REMOVE_AT CMAKE_MODULE_PATH -1) - find_dependency(Threads REQUIRED) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3d43595..a25f74d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,7 +23,7 @@ - # Frank Pagliughi - made the shared library optional - #*******************************************************************************/ - --find_package(PahoMqttC REQUIRED) -+find_package(eclipse-paho-mqtt-c CONFIG REQUIRED) - - # --- The headers --- - -@@ -81,13 +81,21 @@ target_include_directories(paho-cpp-objs - ## --- Build the shared library, if requested --- - - if(PAHO_BUILD_SHARED) -+ ## set PAHO_C_LIB -+ if(PAHO_WITH_SSL) -+ find_package(OpenSSL REQUIRED) -+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs) -+ else() -+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c) -+ endif() -+ - ## create the shared library - add_library(paho-mqttpp3 SHARED $) - - ## add dependencies to the shared library - target_link_libraries(paho-mqttpp3 - PRIVATE ${LIBS_SYSTEM} -- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) -+ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) - - # It would be nice to exort the include paths from the obj lib, but we - # get an export error. Perhaps in a future version? -@@ -119,13 +127,22 @@ endif() - ## --- Build static version of the library, if requested --- - - if(PAHO_BUILD_STATIC) -+ -+ ## set PAHO_C_LIB -+ if(PAHO_WITH_SSL) -+ find_package(OpenSSL REQUIRED) -+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static) -+ else() -+ set(_PAHO_MQTT_C_LIB_NAME eclipse-paho-mqtt-c::paho-mqtt3a-static eclipse-paho-mqtt-c::paho-mqtt3c-static) -+ endif() -+ - ## create the static library - add_library(paho-mqttpp3-static STATIC $) - - ## add dependencies to the shared library - target_link_libraries(paho-mqttpp3-static - PRIVATE ${LIBS_SYSTEM} -- PUBLIC PahoMqttC::PahoMqttC Threads::Threads) -+ PUBLIC ${_PAHO_MQTT_C_LIB_NAME} Threads::Threads) - - target_include_directories(paho-mqttpp3-static PUBLIC - $ diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake index d2103a8c5f8fae..b2efd0b75bebbc 100644 --- a/ports/paho-mqttpp3/portfile.cmake +++ b/ports/paho-mqttpp3/portfile.cmake @@ -1,15 +1,12 @@ -# Download from Github vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.cpp - REF 33921c8b68b351828650c36816e7ecf936764379 #v1.2.0 - SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55 + REF 5e0d1bf37b4826d680ec066ec42afd133851a681 + SHA512 bcf36ab01e00959093b09d871bdd81d5c89b865357412b35da474092cf02d1501a2191d32b5ff7257afc50a5f12cfe4e5229b976c617da83ad3e5477add51731 HEAD_REF master - PATCHES - fix-dependency.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "ssl" PAHO_WITH_SSL ) @@ -28,7 +25,7 @@ endif() set(PAHO_C_INC "${CURRENT_INSTALLED_DIR}/include") -# NOTE: the Paho C++ cmake files on Github are problematic. +# NOTE: the Paho C++ cmake files on Github are problematic. # It uses two different options PAHO_BUILD_STATIC and PAHO_BUILD_SHARED instead of just using one variable. # Unless the open source community cleans up the cmake files, we are stuck with setting both of them. if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/paho-mqttpp3/vcpkg.json b/ports/paho-mqttpp3/vcpkg.json index 4ea7289ecc2b95..7a5db99b9cc72c 100644 --- a/ports/paho-mqttpp3/vcpkg.json +++ b/ports/paho-mqttpp3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "paho-mqttpp3", - "version": "1.2.0", - "port-version": 1, + "version": "1.3.2", "description": "Paho project provides open-source C++ wrapper for Paho C library", "homepage": "https://github.com/eclipse/paho.mqtt.cpp", "license": "EPL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 14dc4031c0c917..1817875910e693 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6453,8 +6453,8 @@ "port-version": 0 }, "paho-mqttpp3": { - "baseline": "1.2.0", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "palsigslot": { "baseline": "1.2.2", diff --git a/versions/p-/paho-mqttpp3.json b/versions/p-/paho-mqttpp3.json index 20df1bcb3643d1..26aeba1eb1a1c5 100644 --- a/versions/p-/paho-mqttpp3.json +++ b/versions/p-/paho-mqttpp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaf93e3c80805f50d436446e913e3f1bb6668054", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "4e5982f9707bb0222b6694cee8d4a0d23698e20f", "version": "1.2.0", From 5aa429bdf8ee1942daa08783e1ad5167ea164ae9 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 7 Dec 2023 06:42:52 +0800 Subject: [PATCH 0564/1039] [qt-advanced-docking-system] update to 4.2.1 (#35519) --- ports/qt-advanced-docking-system/portfile.cmake | 2 +- ports/qt-advanced-docking-system/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt-advanced-docking-system.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake index 182e8eb149a8f5..f6524e79428e32 100644 --- a/ports/qt-advanced-docking-system/portfile.cmake +++ b/ports/qt-advanced-docking-system/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO githubuser0xFFFF/Qt-Advanced-Docking-System REF "${VERSION}" - SHA512 2da93dfecdccf494ab051dd42c79ade681534530914ad4ddfc38ec77c32b3c1e56242bef7dd1bfe8b14bc63564c485d59da2518bf6d6b76c3be905accfe6297c + SHA512 d06939e7c8a5ffb8398257889e0f393ac1d06b20fc4326327226334cbf1a3cf7bc1878a1d9d4cc73dd8f178982b6508e2aa8435f715d5a610914835fc318b471 HEAD_REF master ) diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json index 0155ecfabbc400..e1a9f13b458c3b 100644 --- a/ports/qt-advanced-docking-system/vcpkg.json +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt-advanced-docking-system", - "version": "4.2.0", + "version": "4.2.1", "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 1817875910e693..24f0eebb24b8f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6909,7 +6909,7 @@ "port-version": 0 }, "qt-advanced-docking-system": { - "baseline": "4.2.0", + "baseline": "4.2.1", "port-version": 0 }, "qt3d": { diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index 78543a3f8dc566..c15fb6f1c07735 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "628b6d9fc6b20da81f18c74bb9673c083b5206b9", + "version": "4.2.1", + "port-version": 0 + }, { "git-tree": "ce9908d6903a343d5b5d22750c4c29fe097ff418", "version": "4.2.0", From 5a499da390b21f0bd91163c13252fafd93cfc2a8 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Thu, 7 Dec 2023 06:45:06 +0800 Subject: [PATCH 0565/1039] [fakeit] fix header files copy (#35527) --- ports/fakeit/portfile.cmake | 4 ++-- ports/fakeit/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fakeit.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index 596a641059038a..338d822c655f8e 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -6,6 +6,6 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY "${SOURCE_PATH}/single_header/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/single_header/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}" FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") -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/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index 066ce9a9509585..d608d246323d52 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fakeit", "version": "2.4.0", + "port-version": 1, "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 24f0eebb24b8f2..33fcd8e8d2de19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2526,7 +2526,7 @@ }, "fakeit": { "baseline": "2.4.0", - "port-version": 0 + "port-version": 1 }, "fameta-counter": { "baseline": "2021-02-13", diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index 86fac0f3932955..c3cc2b42a3bc69 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4975f837bbd496c621a2b6cd11fc6745357c61c5", + "version": "2.4.0", + "port-version": 1 + }, { "git-tree": "a226f1d679f9c3acf8c67d69d24086e236b67a29", "version": "2.4.0", From 1226ef677decbb5fd6bcd3feb3087dd49222b1f1 Mon Sep 17 00:00:00 2001 From: aleradamantis99 <31964732+aleradamantis99@users.noreply.github.com> Date: Wed, 6 Dec 2023 23:50:13 +0000 Subject: [PATCH 0566/1039] [arrow] Add 'compute' feature to arrow (#35492) --- ports/arrow/portfile.cmake | 1 + ports/arrow/vcpkg.json | 5 ++++- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 834741486eb7f1..6da29ed9041ce3 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES acero ARROW_ACERO + compute ARROW_COMPUTE csv ARROW_CSV cuda ARROW_CUDA dataset ARROW_DATASET diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 631f4089a5f7a2..e26fd4df3bbe52 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "14.0.1", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -41,6 +41,9 @@ "acero": { "description": "Acero support" }, + "compute": { + "description": "Build all computational kernel functions" + }, "csv": { "description": "CSV support" }, diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 517b0ba6168b79..574f16a24777a5 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f73c538acb0a7dbda211654b354286af98b399f0", + "version": "14.0.1", + "port-version": 2 + }, { "git-tree": "f3517d0d8bf39d98d806b0c84eac2f5f1acbbf32", "version": "14.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 33fcd8e8d2de19..9280ff20f20e32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -238,7 +238,7 @@ }, "arrow": { "baseline": "14.0.1", - "port-version": 1 + "port-version": 2 }, "arsenalgear": { "baseline": "2.1.0", From 45f6e57d3e10ad96b7db206cf7888f736ba5aa61 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Thu, 7 Dec 2023 01:50:59 +0200 Subject: [PATCH 0567/1039] [aws-sdk-cpp] Update features. (#35513) --- ports/aws-sdk-cpp/vcpkg.in.json | 1 + ports/aws-sdk-cpp/vcpkg.json | 67 +++++++++++++++++++++++++++++++-- versions/a-/aws-sdk-cpp.json | 5 +++ versions/baseline.json | 2 +- 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json index e79a583786ba5d..3eb486f732feff 100644 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ b/ports/aws-sdk-cpp/vcpkg.in.json @@ -1,6 +1,7 @@ { "name": "aws-sdk-cpp", "version": "1.11.215", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 745435741aa627..d41fe2bd21726d 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.11.215", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -142,6 +143,9 @@ "awstransfer": { "description": "C++ SDK for the AWS awstransfer service" }, + "b2bi": { + "description": "C++ SDK for the AWS b2bi service" + }, "backup": { "description": "C++ SDK for the AWS backup service" }, @@ -154,6 +158,21 @@ "batch": { "description": "C++ SDK for the AWS batch service" }, + "bcm-data-exports": { + "description": "C++ SDK for the AWS bcm-data-exports service" + }, + "bedrock": { + "description": "C++ SDK for the AWS bedrock service" + }, + "bedrock-agent": { + "description": "C++ SDK for the AWS bedrock-agent service" + }, + "bedrock-agent-runtime": { + "description": "C++ SDK for the AWS bedrock-agent-runtime service" + }, + "bedrock-runtime": { + "description": "C++ SDK for the AWS bedrock-runtime service" + }, "billingconductor": { "description": "C++ SDK for the AWS billingconductor service" }, @@ -187,6 +206,9 @@ "cleanrooms": { "description": "C++ SDK for the AWS cleanrooms service" }, + "cleanroomsml": { + "description": "C++ SDK for the AWS cleanroomsml service" + }, "cloud9": { "description": "C++ SDK for the AWS cloud9 service" }, @@ -202,6 +224,9 @@ "cloudfront": { "description": "C++ SDK for the AWS cloudfront service" }, + "cloudfront-keyvaluestore": { + "description": "C++ SDK for the AWS cloudfront-keyvaluestore service" + }, "cloudhsm": { "description": "C++ SDK for the AWS cloudhsm service" }, @@ -295,6 +320,9 @@ "controltower": { "description": "C++ SDK for the AWS controltower service" }, + "cost-optimization-hub": { + "description": "C++ SDK for the AWS cost-optimization-hub service" + }, "cur": { "description": "C++ SDK for the AWS cur service" }, @@ -313,6 +341,9 @@ "datasync": { "description": "C++ SDK for the AWS datasync service" }, + "datazone": { + "description": "C++ SDK for the AWS datazone service" + }, "dax": { "description": "C++ SDK for the AWS dax service" }, @@ -376,6 +407,9 @@ "eks": { "description": "C++ SDK for the AWS eks service" }, + "eks-auth": { + "description": "C++ SDK for the AWS eks-auth service" + }, "elastic-inference": { "description": "C++ SDK for the AWS elastic-inference service" }, @@ -448,6 +482,9 @@ "frauddetector": { "description": "C++ SDK for the AWS frauddetector service" }, + "freetier": { + "description": "C++ SDK for the AWS freetier service" + }, "fsx": { "description": "C++ SDK for the AWS fsx service" }, @@ -515,6 +552,9 @@ "inspector": { "description": "C++ SDK for the AWS inspector service" }, + "inspector-scan": { + "description": "C++ SDK for the AWS inspector-scan service" + }, "inspector2": { "description": "C++ SDK for the AWS inspector2 service" }, @@ -629,6 +669,9 @@ "lambda": { "description": "C++ SDK for the AWS lambda service" }, + "launch-wizard": { + "description": "C++ SDK for the AWS launch-wizard service" + }, "lex": { "description": "C++ SDK for the AWS lex service" }, @@ -674,9 +717,6 @@ "machinelearning": { "description": "C++ SDK for the AWS machinelearning service" }, - "macie": { - "description": "C++ SDK for the AWS macie service" - }, "macie2": { "description": "C++ SDK for the AWS macie2 service" }, @@ -686,9 +726,15 @@ "managedblockchain-query": { "description": "C++ SDK for the AWS managedblockchain-query service" }, + "marketplace-agreement": { + "description": "C++ SDK for the AWS marketplace-agreement service" + }, "marketplace-catalog": { "description": "C++ SDK for the AWS marketplace-catalog service" }, + "marketplace-deployment": { + "description": "C++ SDK for the AWS marketplace-deployment service" + }, "marketplace-entitlement": { "description": "C++ SDK for the AWS marketplace-entitlement service" }, @@ -851,6 +897,12 @@ "proton": { "description": "C++ SDK for the AWS proton service" }, + "qbusiness": { + "description": "C++ SDK for the AWS qbusiness service" + }, + "qconnect": { + "description": "C++ SDK for the AWS qconnect service" + }, "qldb": { "description": "C++ SDK for the AWS qldb service" }, @@ -896,6 +948,9 @@ "rekognition": { "description": "C++ SDK for the AWS rekognition service" }, + "repostspace": { + "description": "C++ SDK for the AWS repostspace service" + }, "resiliencehub": { "description": "C++ SDK for the AWS resiliencehub service" }, @@ -1134,6 +1189,9 @@ "translate": { "description": "C++ SDK for the AWS translate service" }, + "trustedadvisor": { + "description": "C++ SDK for the AWS trustedadvisor service" + }, "verifiedpermissions": { "description": "C++ SDK for the AWS verifiedpermissions service" }, @@ -1173,6 +1231,9 @@ "workspaces": { "description": "C++ SDK for the AWS workspaces service" }, + "workspaces-thin-client": { + "description": "C++ SDK for the AWS workspaces-thin-client service" + }, "workspaces-web": { "description": "C++ SDK for the AWS workspaces-web service" }, diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 9bfb28eb8f9a44..70e2486caebcc0 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eeab7418483a9b578bb186acde08a1130301e0a1", + "version": "1.11.215", + "port-version": 1 + }, { "git-tree": "bbebf005503aa74f6725df8f4d04eb21a894e127", "version": "1.11.215", diff --git a/versions/baseline.json b/versions/baseline.json index 9280ff20f20e32..e39091ca9b4272 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -406,7 +406,7 @@ }, "aws-sdk-cpp": { "baseline": "1.11.215", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "2023-03-23", From 916929b17185d94854a520c380663f986b980bb2 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Dec 2023 21:26:10 -0800 Subject: [PATCH 0568/1039] [vcpkg baseline][mongo-c-driver] fix mongo-c-driver when Python3 isn't on the PATH (#35521) --- ports/mongo-c-driver/portfile.cmake | 1 + ports/mongo-c-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 5f87c1aa7bb7cb..bb488176fa239b 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -47,6 +47,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} + "-DBUILD_VERSION=${VERSION}" -DUSE_SYSTEM_LIBBSON=ON -DENABLE_EXAMPLES=OFF -DENABLE_SHM_COUNTERS=OFF diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index e22eb9e88ee0e0..c9c721ae301bac 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-c-driver", "version": "1.25.1", + "port-version": 1, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e39091ca9b4272..b9cd72b057541d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5654,7 +5654,7 @@ }, "mongo-c-driver": { "baseline": "1.25.1", - "port-version": 0 + "port-version": 1 }, "mongo-cxx-driver": { "baseline": "3.9.0", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index e3f820205649b6..39d834f6d0f6aa 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "988570f6f3cad6a77c519990851d9d2208d5970d", + "version": "1.25.1", + "port-version": 1 + }, { "git-tree": "7bc0eb795e698bac0f4d77bed4b6ecbde0f57857", "version": "1.25.1", From 5ed66ab293f3e0c2fa62a4d0f15feb6af36936ac Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:26:26 +0800 Subject: [PATCH 0569/1039] [rtaudio] update to 6.0.1 (#35520) --- ports/rtaudio/fix-alsa.patch | 19 ------------------- ports/rtaudio/portfile.cmake | 5 ++--- ports/rtaudio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rtaudio.json | 5 +++++ 5 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 ports/rtaudio/fix-alsa.patch diff --git a/ports/rtaudio/fix-alsa.patch b/ports/rtaudio/fix-alsa.patch deleted file mode 100644 index 3953aadae2cb45..00000000000000 --- a/ports/rtaudio/fix-alsa.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59e8bb..1334f5a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,12 +123,12 @@ endif() - # ALSA - if (RTAUDIO_API_ALSA) - set(NEED_PTHREAD ON) -- find_package(ALSA) -+ find_package(ALSA REQUIRED) - if (NOT ALSA_FOUND) - message(FATAL_ERROR "ALSA API requested but no ALSA dev libraries found") - endif() - list(APPEND INCDIRS ${ALSA_INCLUDE_DIR}) -- list(APPEND LINKLIBS ${ALSA_LIBRARY}) -+ list(APPEND LINKLIBS ${ALSA_LIBRARY} dl) - list(APPEND PKGCONFIG_REQUIRES "alsa") - list(APPEND API_DEFS "-D__LINUX_ALSA__") - list(APPEND API_LIST "alsa") diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index fd28a3aa2cca8c..1ccb885709b031 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtaudio - REF 46b01b5b134f33d8ddc3dab76829d4b1350e0522 - SHA512 f26f64fe77aa18c9adf401a720fc3d929af8655827f2c149539a1b73736efb3757ac2eaf5a6535a3c801df13e5f49728a49b6ffe5c01c2f91ab23e145bad5355 + REF ${VERSION} + SHA512 085feb2673185460717ba45fc87254961e477823759e11281092c1ba13301303de1cd36aa9efeba0710cbf2c70f2e2f7f9e41173cf372ded528c41612b19acd5 HEAD_REF master - PATCHES fix-alsa.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" RTAUDIO_STATIC_MSVCRT) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index c77a9a52790f28..204980ad24e240 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rtaudio", - "version-date": "2021-11-16", - "port-version": 2, + "version": "6.0.1", "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index b9cd72b057541d..08a9ed1c3fec69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7573,8 +7573,8 @@ "port-version": 3 }, "rtaudio": { - "baseline": "2021-11-16", - "port-version": 2 + "baseline": "6.0.1", + "port-version": 0 }, "rtlsdr": { "baseline": "2020-04-16", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index 5be0172e806ad0..b0cc7141a3fd92 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b97a9859776e7d23b21a9660e9b31e69fdb84185", + "version": "6.0.1", + "port-version": 0 + }, { "git-tree": "989c7dceafbd4ea849445d86bdc1b4bbf7133960", "version-date": "2021-11-16", From 3135b990681223c46d2bce0793e04036d88f307c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Dec 2023 06:27:16 +0100 Subject: [PATCH 0570/1039] [pkgconf] Update to 2.1.0 (#34228) --- ports/pkgconf/portfile.cmake | 6 +++--- ports/pkgconf/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pkgconf.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake index 0f269dc13b702e..2922316e829e63 100644 --- a/ports/pkgconf/portfile.cmake +++ b/ports/pkgconf/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pkgconf/pkgconf - REF cef30268e1a3f79efd607c26abcf556aa314c9c4 - SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee + REF "pkgconf-${VERSION}" + SHA512 40abbfdbd64ac95d0e9578acc5f1cb2b692d4c1bfa9f07c4eb1042380bcebff5c063434da2f64bc986c8a7163cde4f7051ba61400461b103616253ab739d4e43 HEAD_REF master ) vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" NO_PKG_CONFIG - OPTIONS -Dtests=false + OPTIONS -Dtests=disabled ) set(systemsuffix "") diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 606759d9e8e6bc..d88dce9392a287 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pkgconf", - "version": "1.8.0", - "port-version": 5, + "version": "2.1.0", "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 08a9ed1c3fec69..64a0485b4973e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6609,8 +6609,8 @@ "port-version": 2 }, "pkgconf": { - "baseline": "1.8.0", - "port-version": 5 + "baseline": "2.1.0", + "port-version": 0 }, "plasma-wayland-protocols": { "baseline": "1.8.0", diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 62cac3dcc78ac6..eba0839560e9dc 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea46d2e90c7d74f952d99b6640a88cb9bef6438f", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "8848e56b32837456dfb872f6ca3cc9953558d453", "version": "1.8.0", From ffc1b51dfb37f34c2f916eba1a9710087a40609d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Dec 2023 21:22:04 +0100 Subject: [PATCH 0571/1039] [icu] Fix wasm, fix icudt for almost-native builds (#35529) --- ports/icu/portfile.cmake | 13 ++++++++++++- ports/icu/vcpkg-cross-data.patch | 13 +++++++++++++ ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 ports/icu/vcpkg-cross-data.patch diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index e40106e8c10022..36cddcc09ec5dd 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -19,11 +19,22 @@ vcpkg_extract_source_archive(SOURCE_PATH mingw-dll-install.patch disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. fix-win-build.patch + vcpkg-cross-data.patch ) vcpkg_find_acquire_program(PYTHON3) set(ENV{PYTHON} "${PYTHON3}") +vcpkg_list(SET CONFIGURE_OPTIONS) +vcpkg_list(SET CONFIGURE_OPTIONS_RELEASE) +vcpkg_list(SET CONFIGURE_OPTIONS_DEBUG) +vcpkg_list(SET BUILD_OPTIONS) + +if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras) + vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc") +endif() + if(VCPKG_TARGET_IS_WINDOWS) list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) endif() @@ -144,7 +155,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() -vcpkg_install_make() +vcpkg_install_make(OPTIONS ${BUILD_OPTIONS}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share" diff --git a/ports/icu/vcpkg-cross-data.patch b/ports/icu/vcpkg-cross-data.patch new file mode 100644 index 00000000000000..7ca87fb93b2e6d --- /dev/null +++ b/ports/icu/vcpkg-cross-data.patch @@ -0,0 +1,13 @@ +diff --git a/source/configure.ac b/source/configure.ac +index 1bd5871..c508f48 100644 +--- a/source/configure.ac ++++ b/source/configure.ac +@@ -1151,7 +1151,7 @@ AC_ARG_ENABLE(fuzzer, + fuzzer=false) + ICU_CONDITIONAL(FUZZER, test "$fuzzer" = true) + +-ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes") ++ICU_CONDITIONAL(DATA, test "$tools" = true || test "$cross_compiling" = "yes" || test -n "$cross_buildroot") + + AC_ARG_WITH(data-packaging, + [ --with-data-packaging specify how to package ICU data. Possible values: diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 5ad88701fb3caf..d80834ecb61e81 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "73.1", - "port-version": 1, + "port-version": 2, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", diff --git a/versions/baseline.json b/versions/baseline.json index 64a0485b4973e8..8eeae81019b0bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3386,7 +3386,7 @@ }, "icu": { "baseline": "73.1", - "port-version": 1 + "port-version": 2 }, "ideviceinstaller": { "baseline": "2023-07-21", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index d08559d00fe5c2..d76f3d6c058d36 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6ac20c2420a4f7118d5db326c8c599e50b2c5a4", + "version": "73.1", + "port-version": 2 + }, { "git-tree": "deb5694d7965a264d6eb579df49aff4fe6362c24", "version": "73.1", From 42301df395852935d105799de93abf5481f34f1a Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Thu, 7 Dec 2023 21:22:39 +0100 Subject: [PATCH 0572/1039] [ms-gsl] add license (#35086) --- ports/ms-gsl/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/m-/ms-gsl.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/ms-gsl/vcpkg.json b/ports/ms-gsl/vcpkg.json index ace0f12e7e90a8..8d70ddbcd39889 100644 --- a/ports/ms-gsl/vcpkg.json +++ b/ports/ms-gsl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "ms-gsl", "version": "4.0.0", + "port-version": 1, "description": "Microsoft implementation of the Guidelines Support Library", "homepage": "https://github.com/Microsoft/GSL", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 8eeae81019b0bb..47e9916bc3688d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5750,7 +5750,7 @@ }, "ms-gsl": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "ms-quic": { "baseline": "1.2.0", diff --git a/versions/m-/ms-gsl.json b/versions/m-/ms-gsl.json index 3693c27218c0f1..fe599f2528bf0e 100644 --- a/versions/m-/ms-gsl.json +++ b/versions/m-/ms-gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d8da50e7ffaa4a1460036950f527b0a5e64c02a", + "version": "4.0.0", + "port-version": 1 + }, { "git-tree": "9d8d320f8c5db1a6b0c7517d110b854bc4b551e5", "version": "4.0.0", From 72c441c62741ec5a5afe181d7a8d3e7af8fbc332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni?= Date: Fri, 8 Dec 2023 07:34:51 +0000 Subject: [PATCH 0573/1039] [Glaze] Update to 1.9.2 (#35551) --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 5da937b2bb0c8d..8ba4db39c85ff8 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 47f069b44102cd8fa67b8ec8424a31e549c213ded4510e50065fd8fad4141c036f30bec000e7a934cca3d2f32bbfe573fd7707b870ddd915cc1fa55f5699db86 + SHA512 8ca16d2f63a6a5ec866cd65f649b8f80ab0507a54b6128d26d8e355bc8a8b4202051f7d2146fbcf3d2e0b5f58f069fdf7e4fe116f7e6bb19671b95b4285fc699 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 7f38e80f97cd14..6c8e296783e369 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.8.4", + "version": "1.9.2", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 47e9916bc3688d..478bceb2498037 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.8.4", + "baseline": "1.9.2", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 378df0db20824a..fdc4400aea62ec 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfb0ed37ac62c7704664274ee0219d7823fec9d1", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "feacc21a5c09665421fdbf6bbfe8c5bf8553f4d9", "version": "1.8.4", From e3146582c4e60037c19903f1318bb72589ed81c1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Dec 2023 08:35:10 +0100 Subject: [PATCH 0574/1039] [luajit] Burn-in dll (#35544) --- ports/luajit/{luajit.pc.win.in => luajit.pc} | 4 ++-- ports/luajit/portfile.cmake | 11 ++++++----- ports/luajit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 +++++ 5 files changed, 15 insertions(+), 9 deletions(-) rename ports/luajit/{luajit.pc.win.in => luajit.pc} (89%) diff --git a/ports/luajit/luajit.pc.win.in b/ports/luajit/luajit.pc similarity index 89% rename from ports/luajit/luajit.pc.win.in rename to ports/luajit/luajit.pc index b90d065426b03a..877303cec9e1a6 100644 --- a/ports/luajit/luajit.pc.win.in +++ b/ports/luajit/luajit.pc @@ -5,7 +5,7 @@ relver=0 version=${majver}.${minver}.${relver}-beta3 abiver=51 -prefix=@PREFIX@ +prefix=handled-by-fixup multilib=lib exec_prefix=${prefix} libdir=${exec_prefix}/${multilib} @@ -21,4 +21,4 @@ URL: https://luajit.org Version: ${version} Requires: Libs: -L${libdir} -l${libname} -Cflags: -I${includedir} @LJIT_MSVC_PC_CFLAGS@ +Cflags: -I${includedir} diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 242636a3d25c19..98042ee1262298 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -23,11 +23,8 @@ if(VCPKG_DETECTED_MSVC) # minilua tool with the target toolchain. This will work for native builds and # for targeting x86 from x64 hosts. (UWP and ARM64 is unsupported.) vcpkg_list(SET options) - set(PKGCONFIG_CFLAGS "") if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND options "MSVCBUILD_OPTIONS=static") - else() - set(PKGCONFIG_CFLAGS "/DLUA_BUILD_AS_DLL=1") endif() vcpkg_install_nmake(SOURCE_PATH "${SOURCE_PATH}" @@ -36,9 +33,13 @@ if(VCPKG_DETECTED_MSVC) ${options} ) - configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/luajit/luaconf.h" "defined(LUA_BUILD_AS_DLL)" "1") + endif() + + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/luajit.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") if(NOT VCPKG_BUILD_TYPE) - configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" @ONLY) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/luajit.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() vcpkg_copy_pdbs() diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 41e1275a2d1250..9436f4bfc1c64f 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", "version-date": "2023-01-04", - "port-version": 4, + "port-version": 5, "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 478bceb2498037..3f55e7a4059b0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5326,7 +5326,7 @@ }, "luajit": { "baseline": "2023-01-04", - "port-version": 4 + "port-version": 5 }, "luasec": { "baseline": "1.3.1", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 88714d9b094a71..aec86ddbc8e92f 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca00ef84f25e0b841d36d6aa5403c525ea476b9c", + "version-date": "2023-01-04", + "port-version": 5 + }, { "git-tree": "53de073fe6d5962408626e251fce79e2d5bb49bf", "version-date": "2023-01-04", From 8ee46dc72f75fc3d8d8dc90386bf7e84f2eb7450 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 7 Dec 2023 23:35:37 -0800 Subject: [PATCH 0575/1039] [poppler] update to 23.11.0 (#35494) --- ports/poppler/portfile.cmake | 13 ++++++++++--- ports/poppler/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/poppler.json | 5 +++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 2686861545f812..4b5e8a75d9ad83 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH SOURCE_PATH REPO poppler/poppler REF "poppler-${POPPLER_VERSION}" - SHA512 18649364dc407080941b7c4010c0f26c1ce825d9ec49ff8e9ef298c62afb8d5bb77cea6a5cd1a74615190f433c265613dba42a6b7fdd80c2b5f00d372a31d21d + SHA512 23fe0f5445896e3a0731a0f3eae6aac84dc8f4b0718e947ae3ee3492295720408738f0c706eb2e5cbaa41e854dafc70e5c59c9c70e7d78ab33c318b2e8d7e4ff HEAD_REF master PATCHES export-unofficial-poppler.patch @@ -27,10 +27,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS qt ENABLE_QT6 qt CMAKE_REQUIRE_FIND_PACKAGE_Qt6 cms CMAKE_REQUIRE_FIND_PACKAGE_LCMS2 + cms ENABLE_LCMS ) if("fontconfig" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") string(APPEND POPPLER_PC_REQUIRES " fontconfig") +elseif(VCPKG_TARGET_IS_ANDROID) + list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=android") elseif(VCPKG_TARGET_IS_WINDOWS) list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=win32") else() @@ -46,6 +49,10 @@ if("zlib" IN_LIST FEATURES) string(APPEND POPPLER_PC_REQUIRES " zlib") endif() +if("cms" IN_LIST FEATURES) + string(APPEND POPPLER_PC_REQUIRES " lcms2") +endif() + vcpkg_find_acquire_program(PKGCONFIG) vcpkg_find_acquire_program(PYTHON3) @@ -63,10 +70,10 @@ vcpkg_cmake_configure( -DENABLE_UTILS=OFF -DENABLE_GOBJECT_INTROSPECTION=OFF -DENABLE_QT5=OFF - -DENABLE_CMS=none -DRUN_GPERF_IF_PRESENT=OFF -DENABLE_RELOCATABLE=OFF # https://gitlab.freedesktop.org/poppler/poppler/-/issues/1209 - -DWITH_NSS3=OFF + -DENABLE_NSS3=OFF + -DENABLE_GPGME=OFF -DCMAKE_DISABLE_FIND_PACKAGE_ECM=ON -DCMAKE_REQUIRE_FIND_PACKAGE_OpenJPEG=ON -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index bc3aeeba3d10de..98010d960fd18d 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,6 @@ { "name": "poppler", - "version": "23.1.0", - "port-version": 4, + "version": "23.11.0", "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3f55e7a4059b0e..fbcab2e3098897 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6709,8 +6709,8 @@ "port-version": 5 }, "poppler": { - "baseline": "23.1.0", - "port-version": 4 + "baseline": "23.11.0", + "port-version": 0 }, "popsift": { "baseline": "0.9", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 22cde8f4a2f1db..f553b2d9fe8360 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59fe9d32b68bf9d4bc186eea35c45ceaddac1848", + "version": "23.11.0", + "port-version": 0 + }, { "git-tree": "0c07d1b54b7ce6cd8a4ce8ba9da7cf9f3ae2af70", "version": "23.1.0", From 7fb97764bc81edaba8cf23bbca6b01b86d942fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Wegner?= Date: Fri, 8 Dec 2023 10:25:03 +0100 Subject: [PATCH 0576/1039] [scripts] Download arm64 python when host is arm64 on windows. (#34354) --- ports/gobject-introspection/vcpkg.json | 4 ++-- .../vcpkg_find_acquire_program(PYTHON3).cmake | 20 ++++++++++++++----- versions/baseline.json | 2 +- versions/g-/gobject-introspection.json | 5 +++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index 25dc66d235dc7d..b6f1a0a43755cc 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gobject-introspection", "version": "1.72.0", - "port-version": 5, + "port-version": 6, "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", "license": null, - "supports": "!static & (native | (windows & x86))", + "supports": "!static & native", "dependencies": [ { "name": "cairo", diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake index 64142892f3dff5..8a7c9f9d674ccd 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake @@ -1,16 +1,26 @@ if(CMAKE_HOST_WIN32) set(program_name python) set(program_version 3.11.5) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(tool_subdirectory "python-${program_version}-x86") - set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") - set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) else() + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(build_arch MATCHES "^(ARM|arm)64$") + set(tool_subdirectory "python-${program_version}-arm64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-arm64.zip") + set(download_filename "python-${program_version}-embed-arm64.zip") + set(download_sha512 23d67fa89176fb47f564df9713039e86d1957831866c20d474be03fe6616bd15292e9912e44d3c1830747c24eb2131aeda53f19b3d4e7d1c8bd2bbb461e56f6c) + elseif(build_arch MATCHES "(amd|AMD)64") set(tool_subdirectory "python-${program_version}-x64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") set(download_sha512 29a526da7624423b09ea1c8f94d83e5ad2d7ba7553c5651d8fcbe1b2483c62f27f9db105d1fdcfca3357b44d456fe1141274725bc97ad5166edfec14f251eb36) + else() + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") + set(download_filename "python-${program_version}-embed-win32.zip") + set(download_sha512 d5412c5bc2a0664f86e504a536c201789c8fd8b97c641bbb7b254c87c2f13504d25fa9d0b74e27a1c54c2d9fb592f9546d8c1e82c506dc9c76a21774c4c3ea75) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") diff --git a/versions/baseline.json b/versions/baseline.json index fbcab2e3098897..450ae64f6e045b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3054,7 +3054,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 5 + "port-version": 6 }, "google-cloud-cpp": { "baseline": "2.19.0", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 4081d456a3dcea..5c5ac27213a6d0 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa7163808411a8ff5641022957909a6d681cea69", + "version": "1.72.0", + "port-version": 6 + }, { "git-tree": "a697a0e2fa6d441dc5008a6d128a9a8f3e2440ab", "version": "1.72.0", From 0b5d4f25a6fb6cf8ecdaef9a07c87b9933780375 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:25:46 +0800 Subject: [PATCH 0577/1039] [onnxruntime-gpu] update to v1.16.3 (#35556) --- ports/onnxruntime-gpu/portfile.cmake | 4 ++-- ports/onnxruntime-gpu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/onnxruntime-gpu.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/onnxruntime-gpu/portfile.cmake b/ports/onnxruntime-gpu/portfile.cmake index 017e146bd63649..698bebb08faf73 100644 --- a/ports/onnxruntime-gpu/portfile.cmake +++ b/ports/onnxruntime-gpu/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/microsoft/onnxruntime/releases/download/v${VERSION}/onnxruntime-win-x64-gpu-${VERSION}.zip" FILENAME "onnxruntime-win-x64-gpu-${VERSION}.zip" - SHA512 6e95199e8cfdee7c056811c2c27f45f7b45bd00b48424d331d8685993102d1b59e14fc3c86e7307b780531ac3e5dcbe760c93018d1b1f106bb36fe32dc44974c + SHA512 7ab350a2ede0fc8c716cf083e16a9303acbcc855982e53900f8843773ec32fd20a7396f0bde82bb29f382012b1d05dea41708797f112d9096c8b5048fc5eb7d8 ) vcpkg_extract_source_archive( @@ -17,7 +17,7 @@ vcpkg_from_github( OUT_SOURCE_PATH REPO_PATH REPO microsoft/onnxruntime REF v${VERSION} - SHA512 c9ad2ab1102bb97bdd88aa8e06432fff2960fb21172891eee9631ff7cbbdf3366cd7cf5c0baa494eb883135eab47273ed3128851ff4d9adfa004a479e941b6b5 + SHA512 f2fec4ded88da6bf67ae7d0aa3082736cb3b8ba29e723b5a516d7632b68ce02aed461f24d3e82cbab20757729e0ab45d736bd986c9b7395f2879b16a091c12a1 ) file(COPY diff --git a/ports/onnxruntime-gpu/vcpkg.json b/ports/onnxruntime-gpu/vcpkg.json index 92fe66767d603d..9eeb2130a5db0c 100644 --- a/ports/onnxruntime-gpu/vcpkg.json +++ b/ports/onnxruntime-gpu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onnxruntime-gpu", - "version": "1.15.1", + "version": "1.16.3", "description": "onnxruntime (GPU)", "homepage": "https://github.com/microsoft/onnxruntime", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 450ae64f6e045b..b62224fc80cf4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6189,7 +6189,7 @@ "port-version": 0 }, "onnxruntime-gpu": { - "baseline": "1.15.1", + "baseline": "1.16.3", "port-version": 0 }, "oof": { diff --git a/versions/o-/onnxruntime-gpu.json b/versions/o-/onnxruntime-gpu.json index 092ed1c3b12a41..beee180b6ea926 100644 --- a/versions/o-/onnxruntime-gpu.json +++ b/versions/o-/onnxruntime-gpu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77632d67293cb70293c7fd22a3897e48c6efabe4", + "version": "1.16.3", + "port-version": 0 + }, { "git-tree": "3836c30f0e39aa6c9f9a9dbfa8f146e3ae5e97cf", "version": "1.15.1", From a20e828a55101da222d5062d39eb3a9c04e1ae83 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Dec 2023 10:26:20 +0100 Subject: [PATCH 0578/1039] [sol2] Update, fix, don't build anything (#35545) --- ports/sol2/fix-namespace.patch | 17 ----------------- ports/sol2/header-only.patch | 13 +++++++++++++ ports/sol2/portfile.cmake | 27 +++++++++------------------ ports/sol2/vcpkg.json | 6 +----- versions/baseline.json | 2 +- versions/s-/sol2.json | 5 +++++ 6 files changed, 29 insertions(+), 41 deletions(-) delete mode 100644 ports/sol2/fix-namespace.patch create mode 100644 ports/sol2/header-only.patch diff --git a/ports/sol2/fix-namespace.patch b/ports/sol2/fix-namespace.patch deleted file mode 100644 index 79b3548d059218..00000000000000 --- a/ports/sol2/fix-namespace.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in -index 0c48a99..62930db 100644 ---- a/cmake/sol2-config.cmake.in -+++ b/cmake/sol2-config.cmake.in -@@ -24,9 +24,9 @@ - - include("${CMAKE_CURRENT_LIST_DIR}/sol2-targets.cmake") - --if (TARGET sol2) -+if (TARGET sol2::sol2) - get_target_property(SOL2_INCLUDE_DIRS -- sol2 INTERFACE_INCLUDE_DIRECTORIES) -+ sol2::sol2 INTERFACE_INCLUDE_DIRECTORIES) - set_and_check(SOL2_INCLUDE_DIRS "${SOL2_INCLUDE_DIRS}") -- set(SOL2_LIBRARIES sol2) -+ set(SOL2_LIBRARIES sol2::sol2) - endif() diff --git a/ports/sol2/header-only.patch b/ports/sol2/header-only.patch new file mode 100644 index 00000000000000..06f6facadbd933 --- /dev/null +++ b/ports/sol2/header-only.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 120dd38..0b069dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ else() + endif() + + # # # Tests, Examples and other CI suites that come with sol2 +-if (sol2-is-top-level-project) ++if (0) + # # # General project output locations + if (CMAKE_SIZEOF_VOID_P EQUAL 4) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/x86/lib") diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake index c5c2cd8bcf50c3..b7ffa6538ad1ad 100644 --- a/ports/sol2/portfile.cmake +++ b/ports/sol2/portfile.cmake @@ -1,28 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ThePhD/sol2 - REF eba86625b707e3c8c99bbfc4624e51f42dc9e561 #v3.3.0 - SHA512 a1fbcb4efd9a8b8b97c351e90499644aea72a3db62c258e219a2912853936b76870b51e69d835c14cbf1a20733673ba474e259a0243fec419c411b995cd1511d + REF "v${VERSION}" + SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd HEAD_REF develop - PATCHES fix-namespace.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + PATCHES + header-only.patch ) +set(VCPKG_BUILD_TYPE release) # header-only +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sol2) +vcpkg_fixup_pkgconfig() -file( - REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug" - "${CURRENT_PACKAGES_DIR}/lib" - "${CURRENT_PACKAGES_DIR}/include" -) - -file(INSTALL "${SOURCE_PATH}/include/sol" DESTINATION "${CURRENT_PACKAGES_DIR}/include/") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/sol2/vcpkg.json b/ports/sol2/vcpkg.json index 699abac2321f01..9f4856dd1abd01 100644 --- a/ports/sol2/vcpkg.json +++ b/ports/sol2/vcpkg.json @@ -1,14 +1,10 @@ { "name": "sol2", - "version": "3.3.0", + "version": "3.3.1", "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great", "homepage": "https://github.com/ThePhD/sol2", "license": "MIT", "dependencies": [ - { - "name": "lua", - "platform": "windows" - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index b62224fc80cf4b..e429d6cc2cd509 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8013,7 +8013,7 @@ "port-version": 0 }, "sol2": { - "baseline": "3.3.0", + "baseline": "3.3.1", "port-version": 0 }, "solid3": { diff --git a/versions/s-/sol2.json b/versions/s-/sol2.json index b84e76483700f8..26dd3f938493c2 100644 --- a/versions/s-/sol2.json +++ b/versions/s-/sol2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "803f41c884606248b07d343e13716c1135da7957", + "version": "3.3.1", + "port-version": 0 + }, { "git-tree": "115cb8217bb876cfb71fadec889faa25954db8b1", "version": "3.3.0", From c4f29d253e9fd47afc7e9c32dfdc4d7f3d9c8835 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:26:51 +0100 Subject: [PATCH 0579/1039] [liblemon] no uwp (#35257) --- ports/liblemon/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/l-/liblemon.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index 7232279f5aca8c..bcc8b89def6e62 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,9 +1,10 @@ { "name": "liblemon", "version-date": "2019-06-13", - "port-version": 8, + "port-version": 9, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8093971ce482eb..9adcc1f1d3a971 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -550,8 +550,6 @@ libidn2:arm64-android=fail libidn2:x64-android=fail # 120 min build time for libjxl arm64-uwp-rel, reason unknown libjxl:arm64-uwp=skip -liblemon:arm64-uwp=fail -liblemon:x64-uwp=fail liblo:arm-neon-android=fail liblo:arm64-uwp=fail liblo:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index e429d6cc2cd509..672099f98af22d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4470,7 +4470,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 8 + "port-version": 9 }, "liblinear": { "baseline": "243", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index 33774711fcb8b2..55c66a4503c264 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bf1f61e61e2ed7917a9ec102b564a6c68229d7b", + "version-date": "2019-06-13", + "port-version": 9 + }, { "git-tree": "6bdd7ed9804fee3e743082bb048916a213777a79", "version-date": "2019-06-13", From 2a6371b01420d8820d158b4707e79931feba27aa Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:30:37 +0800 Subject: [PATCH 0580/1039] [sdl2,sdl2-*] allow disabling transitive dependencies (#35394) --- ports/sdl2-gfx/vcpkg.json | 7 +++++-- ports/sdl2-image/vcpkg.json | 6 +++++- ports/sdl2-mixer-ext/vcpkg.json | 6 +++++- ports/sdl2-mixer/vcpkg.json | 7 +++++-- ports/sdl2-net/vcpkg.json | 7 +++++-- ports/sdl2-ttf/vcpkg.json | 6 +++++- ports/sdl2/vcpkg.json | 2 ++ ports/sdl2pp/vcpkg.json | 7 +++++-- versions/baseline.json | 16 ++++++++-------- versions/s-/sdl2-gfx.json | 5 +++++ versions/s-/sdl2-image.json | 5 +++++ versions/s-/sdl2-mixer-ext.json | 5 +++++ versions/s-/sdl2-mixer.json | 5 +++++ versions/s-/sdl2-net.json | 5 +++++ versions/s-/sdl2-ttf.json | 5 +++++ versions/s-/sdl2.json | 5 +++++ versions/s-/sdl2pp.json | 5 +++++ 17 files changed, 85 insertions(+), 19 deletions(-) diff --git a/ports/sdl2-gfx/vcpkg.json b/ports/sdl2-gfx/vcpkg.json index a6b0345c715dd9..4e48c75f3281c7 100644 --- a/ports/sdl2-gfx/vcpkg.json +++ b/ports/sdl2-gfx/vcpkg.json @@ -1,10 +1,13 @@ { "name": "sdl2-gfx", "version": "1.0.4", - "port-version": 10, + "port-version": 11, "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 8198bbd180606b..bcec81ee077ccb 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,12 +1,16 @@ { "name": "sdl2-image", "version": "2.6.3", + "port-version": 1, "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://github.com/libsdl-org/SDL_image", "license": "Zlib", "dependencies": [ "libpng", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-mixer-ext/vcpkg.json b/ports/sdl2-mixer-ext/vcpkg.json index d45124ea3b0c52..bf61b0923e340b 100644 --- a/ports/sdl2-mixer-ext/vcpkg.json +++ b/ports/sdl2-mixer-ext/vcpkg.json @@ -1,11 +1,15 @@ { "name": "sdl2-mixer-ext", "version": "2.6.0", + "port-version": 1, "description": "An audio mixer library based on the SDL library, a fork of SDL_mixer", "homepage": "https://wohlsoft.github.io/SDL-Mixer-X", "license": "Zlib OR LGPL-2.1-or-later OR GPL-2.0-or-later OR GPL-3.0-or-later", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 63226e7c8728e0..ba390032ccc1fd 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,13 +1,16 @@ { "name": "sdl2-mixer", "version": "2.6.3", - "port-version": 1, + "port-version": 2, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", "dependencies": [ "libvorbis", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json index 941ca075e48e58..72a7076ec34c14 100644 --- a/ports/sdl2-net/vcpkg.json +++ b/ports/sdl2-net/vcpkg.json @@ -1,12 +1,15 @@ { "name": "sdl2-net", "version": "2.2.0", - "port-version": 2, + "port-version": 3, "description": "Networking library for SDL", "homepage": "https://github.com/libsdl-org/SDL_net", "license": "Zlib", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 526313c0126416..7594a5d818b5a2 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,12 +1,16 @@ { "name": "sdl2-ttf", "version": "2.20.2", + "port-version": 1, "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", "license": "Zlib", "dependencies": [ "freetype", - "sdl2", + { + "name": "sdl2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index b5e96c4bacbb62..7a38084094d9d8 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,12 +1,14 @@ { "name": "sdl2", "version": "2.28.5", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", "dependencies": [ { "name": "dbus", + "default-features": false, "platform": "linux" }, { diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index fd8683d9bf238a..cca338e8767780 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,12 +1,15 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 7, + "port-version": 8, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", "license": "Zlib", "dependencies": [ - "sdl2", + { + "name": "sdl2", + "default-features": false + }, "sdl2-image", "sdl2-mixer", "sdl2-ttf", diff --git a/versions/baseline.json b/versions/baseline.json index 672099f98af22d..ccace07ec49ab1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7734,35 +7734,35 @@ }, "sdl2": { "baseline": "2.28.5", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", - "port-version": 10 + "port-version": 11 }, "sdl2-image": { "baseline": "2.6.3", - "port-version": 0 + "port-version": 1 }, "sdl2-mixer": { "baseline": "2.6.3", - "port-version": 1 + "port-version": 2 }, "sdl2-mixer-ext": { "baseline": "2.6.0", - "port-version": 0 + "port-version": 1 }, "sdl2-net": { "baseline": "2.2.0", - "port-version": 2 + "port-version": 3 }, "sdl2-ttf": { "baseline": "2.20.2", - "port-version": 0 + "port-version": 1 }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 7 + "port-version": 8 }, "seacas": { "baseline": "2022-11-22", diff --git a/versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json index 0e29a98178a0bf..db923c68b7af3d 100644 --- a/versions/s-/sdl2-gfx.json +++ b/versions/s-/sdl2-gfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c97b80725181cf21b62229de6194b92d74f0fa", + "version": "1.0.4", + "port-version": 11 + }, { "git-tree": "6799c7e90f7c606835a0544db0852f31dbf99cbb", "version": "1.0.4", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 38f9a2a45faa93..5292e9b68a619b 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "641c3eeecdd7f109ac777e1a2792dd2b755f07fc", + "version": "2.6.3", + "port-version": 1 + }, { "git-tree": "cea786776b9bf5d0af613153194d58fa74aaf011", "version": "2.6.3", diff --git a/versions/s-/sdl2-mixer-ext.json b/versions/s-/sdl2-mixer-ext.json index 9c12d86166fffe..4d116f1f56cbc4 100644 --- a/versions/s-/sdl2-mixer-ext.json +++ b/versions/s-/sdl2-mixer-ext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84e15f8ee51675059344358a920f2c9f4d3caa36", + "version": "2.6.0", + "port-version": 1 + }, { "git-tree": "4585bc468e6fbd0b8315dfa4dddbc2501945fbf8", "version": "2.6.0", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 1f24d00edaab39..f311d989b033d3 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf530acd7b5169aaea8a4a7ec8c8d9a1987f7164", + "version": "2.6.3", + "port-version": 2 + }, { "git-tree": "4c169dd178363fec7d46194a45dc250b604b1f2e", "version": "2.6.3", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index 0452f1331ea656..1a4e1c3c1ee328 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f735d9ac81c56778c5a317db55d1c1f2cce78e87", + "version": "2.2.0", + "port-version": 3 + }, { "git-tree": "755d96f16afae7c5b7cae15eb97fe5da85951a72", "version": "2.2.0", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 3441119d6e845e..7d1a1116a418b7 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5727e1037aeb6698eda35ad791157d78d22b1a93", + "version": "2.20.2", + "port-version": 1 + }, { "git-tree": "8ea231424114356e940ea3ac40fdc7da27ea95ad", "version": "2.20.2", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 5c450683eb4146..da2c1c4796cc3c 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46ab8ddbed64fe98dab84eb0d95b8bb6e6d2d531", + "version": "2.28.5", + "port-version": 1 + }, { "git-tree": "06cf4722fa0f5f8467136faebe34cef0e85e1a4c", "version": "2.28.5", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index f5603adc58176d..9bdb0f8af2ba49 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e56d86771c6c97f8d9c7d8fa121dc2312ef509", + "version": "0.16.1", + "port-version": 8 + }, { "git-tree": "bad32a45cda4bfc70197d99e62b840794bd0b747", "version": "0.16.1", From 000d1bda1ffa95a73e0b40334fa4103d6f4d3d48 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Sat, 9 Dec 2023 02:10:03 +0100 Subject: [PATCH 0581/1039] [glslang] update to 13.1.1, opt feature [shaderc] update to 2023.7 (#35219) --- ports/glslang/cmake.patch | 56 +++++++++++++++++++ ports/glslang/portfile.cmake | 6 +- ports/glslang/vcpkg.json | 9 ++- ports/shaderc/build-version.inc | 2 +- ports/shaderc/cmake-config-export.patch | 7 ++- ports/shaderc/disable-update-version.patch | 8 +-- ports/shaderc/fix-build-type.patch | 14 ++--- ...x-tbuiltinresource-for-glslang-11-12.patch | 20 ------- ports/shaderc/portfile.cmake | 6 +- ports/shaderc/vcpkg.json | 3 +- versions/baseline.json | 8 +-- versions/g-/glslang.json | 5 ++ versions/s-/shaderc.json | 5 ++ 13 files changed, 101 insertions(+), 48 deletions(-) create mode 100644 ports/glslang/cmake.patch delete mode 100644 ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch diff --git a/ports/glslang/cmake.patch b/ports/glslang/cmake.patch new file mode 100644 index 00000000000000..db649e35260e6f --- /dev/null +++ b/ports/glslang/cmake.patch @@ -0,0 +1,56 @@ +diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt +index a80e74ed..8a1d8867 100644 +--- a/SPIRV/CMakeLists.txt ++++ b/SPIRV/CMakeLists.txt +@@ -99,14 +99,9 @@ if(WIN32 AND BUILD_SHARED_LIBS) + endif() + + if(ENABLE_OPT) +- target_include_directories(SPIRV +- PRIVATE ${spirv-tools_SOURCE_DIR}/include +- PRIVATE ${spirv-tools_SOURCE_DIR}/source +- ) +- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) ++ target_link_libraries(SPIRV PRIVATE MachineIndependent PUBLIC SPIRV-Tools-opt) + target_include_directories(SPIRV PUBLIC +- $ +- $) ++ $) + else() + target_link_libraries(SPIRV PRIVATE MachineIndependent) + endif() +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index ad88442c..5ca185ae 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -68,14 +68,7 @@ endif() + + target_link_libraries(glslang-standalone ${LIBRARIES}) + target_include_directories(glslang-standalone PUBLIC +- $ +- $) +- +-if(ENABLE_OPT) +- target_include_directories(glslang-standalone +- PRIVATE ${spirv-tools_SOURCE_DIR}/include +- ) +-endif() ++ $) + + if(ENABLE_SPVREMAPPER) + set(REMAPPER_SOURCES spirv-remap.cpp) +diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt +index 408a92db..b73e7f15 100644 +--- a/gtests/CMakeLists.txt ++++ b/gtests/CMakeLists.txt +@@ -97,8 +97,8 @@ if(BUILD_TESTING) + ${gtest_SOURCE_DIR}/include) + + if(ENABLE_OPT) +- target_include_directories(glslangtests +- PRIVATE ${spirv-tools_SOURCE_DIR}/include ++ target_link_libraries(glslangtests ++ PRIVATE SPIRV-Tools-opt + ) + endif() + diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index ef14a5acefc7a0..7ea0aaccdde19f 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -4,12 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang REF "${VERSION}" - SHA512 678df76a6f23b9da93f111fc7e6db57b7f6bf34661b077f9259a0a77d6c023b4d2e3c1cd60b3f9fc15fe69f25cdcb19877e88a50771d3d5275e32574eaefc056 + SHA512 e16b01925a657750733a2973dc803fc3910a3a169ae276af205de6cb1bf0536fd2dbb63c5fd4fc10f800ba95f71bce673417121ad640cb9c964f291596c80025 HEAD_REF master + PATCHES + cmake.patch # Remove on next version (Upstream PR #3406 and #3420). ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + opt ENABLE_OPT + opt ALLOW_EXTERNAL_SPIRV_TOOLS tools ENABLE_GLSLANG_BINARIES rtti ENABLE_RTTI ) diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 0720cd728a94dc..4e84d5a2716829 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glslang", - "version": "13.0.0", - "port-version": 2, + "version": "13.1.1", "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", @@ -16,6 +15,12 @@ } ], "features": { + "opt": { + "description": "Build with spirv-opt capability", + "dependencies": [ + "spirv-tools" + ] + }, "rtti": { "description": "Build with dynamic typeinfo" }, diff --git a/ports/shaderc/build-version.inc b/ports/shaderc/build-version.inc index d5b1449e2bbda4..7c320762726dbd 100644 --- a/ports/shaderc/build-version.inc +++ b/ports/shaderc/build-version.inc @@ -1 +1 @@ -"shaderc v2021.1-dev unknown hash, 2021-06-21\n" +"shaderc v2023.7 v2023.7\n" diff --git a/ports/shaderc/cmake-config-export.patch b/ports/shaderc/cmake-config-export.patch index 0bf837bb0b3a3f..ccc613f55c83af 100644 --- a/ports/shaderc/cmake-config-export.patch +++ b/ports/shaderc/cmake-config-export.patch @@ -1,5 +1,5 @@ diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index d3bc639..6432a9b 100644 +index e0eea6c..b54ace4 100644 --- a/libshaderc/CMakeLists.txt +++ b/libshaderc/CMakeLists.txt @@ -28,7 +28,9 @@ if (NOT BUILD_SHARED_LIBS) @@ -24,13 +24,14 @@ index d3bc639..6432a9b 100644 PRIVATE ${glslang_SOURCE_DIR} ${SPIRV-Headers_SOURCE_DIR}/include) target_compile_definitions(shaderc_shared -@@ -60,9 +64,14 @@ if(SHADERC_ENABLE_INSTALL) +@@ -60,10 +64,15 @@ if(SHADERC_ENABLE_INSTALL) ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) install(TARGETS ${shaderc_install_target} shaderc_util + EXPORT unofficial-shaderc-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(EXPORT unofficial-shaderc-targets + NAMESPACE unofficial::shaderc:: @@ -39,7 +40,7 @@ index d3bc639..6432a9b 100644 endif(SHADERC_ENABLE_INSTALL) find_package(Threads) -@@ -79,6 +88,15 @@ else() +@@ -80,6 +89,15 @@ else() target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) endif() diff --git a/ports/shaderc/disable-update-version.patch b/ports/shaderc/disable-update-version.patch index 7bf47bd508d5f6..f9e2f86a84acae 100644 --- a/ports/shaderc/disable-update-version.patch +++ b/ports/shaderc/disable-update-version.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4e779b..dc5f1a9 100644 +index 075641e..b2e92ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES}) +@@ -129,11 +129,6 @@ if(${SHADERC_ENABLE_EXAMPLES}) add_subdirectory(examples) endif() @@ -15,10 +15,10 @@ index a4e779b..dc5f1a9 100644 function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index acf6fb0..d0df7db 100644 +index c8fa6d5..341865a 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) diff --git a/ports/shaderc/fix-build-type.patch b/ports/shaderc/fix-build-type.patch index 3e3f500e046e73..46826d3aa109aa 100644 --- a/ports/shaderc/fix-build-type.patch +++ b/ports/shaderc/fix-build-type.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 52ebd1c..f73252f 100644 +index b2e92ef..cf0832b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -144,6 +144,8 @@ function(define_pkg_config_file NAME LIBS) +@@ -152,6 +152,8 @@ function(define_pkg_config_file NAME LIBS) endif() endfunction() @@ -13,7 +13,7 @@ index 52ebd1c..f73252f 100644 -define_pkg_config_file(shaderc_combined -lshaderc_combined) +endif() diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index 3ada419..d3bc639 100644 +index 2cced9e..e0eea6c 100644 --- a/libshaderc/CMakeLists.txt +++ b/libshaderc/CMakeLists.txt @@ -24,13 +24,16 @@ set(SHADERC_SOURCES @@ -50,8 +50,8 @@ index 3ada419..d3bc639 100644 + install(TARGETS ${shaderc_install_target} shaderc_util LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -@@ -68,8 +73,11 @@ set(SHADERC_LIBS + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} +@@ -69,8 +74,11 @@ set(SHADERC_LIBS SPIRV-Tools ) @@ -63,7 +63,7 @@ index 3ada419..d3bc639 100644 shaderc_add_tests( TEST_PREFIX shaderc -@@ -93,6 +101,7 @@ shaderc_add_tests( +@@ -94,6 +102,7 @@ shaderc_add_tests( shaderc_cpp shaderc_private) @@ -71,7 +71,7 @@ index 3ada419..d3bc639 100644 shaderc_combine_static_lib(shaderc_combined shaderc) if(SHADERC_ENABLE_INSTALL) -@@ -121,6 +130,7 @@ shaderc_add_tests( +@@ -122,6 +131,7 @@ shaderc_add_tests( TEST_NAMES shaderc shaderc_cpp) diff --git a/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch b/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch deleted file mode 100644 index 8740dee6b72e81..00000000000000 --- a/ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc -index d64e47f..6c662d3 100644 ---- a/libshaderc_util/src/resources.cc -+++ b/libshaderc_util/src/resources.cc -@@ -125,6 +125,15 @@ const TBuiltInResource kDefaultTBuiltInResource = { - /* .maxTaskWorkGroupSizeY_NV = */ 1, - /* .maxTaskWorkGroupSizeZ_NV = */ 1, - /* .maxMeshViewCountNV = */ 4, -+ /* .maxMeshOutputVerticesEXT = */ 256, -+ /* .maxMeshOutputPrimitivesEXT = */ 256, -+ /* .maxMeshWorkGroupSizeX_EXT = */ 128, -+ /* .maxMeshWorkGroupSizeY_EXT = */ 128, -+ /* .maxMeshWorkGroupSizeZ_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeX_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeY_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeZ_EXT = */ 128, -+ /* .maxMeshViewCountEXT = */ 4, - /* .maxDualSourceDrawBuffersEXT = */ 1, - // This is the glslang TLimits structure. - // It defines whether or not the following features are enabled. diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index b009c060e43d97..9da937cbd14969 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -4,15 +4,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/shaderc - REF adca18dcadd460eb517fe44f6cd2460fa0650ebe - SHA512 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf + REF "v${VERSION}" + SHA512 f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269 HEAD_REF master PATCHES disable-update-version.patch fix-build-type.patch cmake-config-export.patch - # NOTE: This should be removed when shaderc gets updated to use glslang 11.12.0 - fix-tbuiltinresource-for-glslang-11-12.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src") diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index 37b54a2558e4b2..2a306afbf0fb9c 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "shaderc", - "version": "2021.1", - "port-version": 4, + "version": "2023.7", "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 ccace07ec49ab1..e796a857b30356 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3029,8 +3029,8 @@ "port-version": 2 }, "glslang": { - "baseline": "13.0.0", - "port-version": 2 + "baseline": "13.1.1", + "port-version": 0 }, "glui": { "baseline": "2019-11-30", @@ -7833,8 +7833,8 @@ "port-version": 0 }, "shaderc": { - "baseline": "2021.1", - "port-version": 4 + "baseline": "2023.7", + "port-version": 0 }, "shaderwriter": { "baseline": "2.7.0", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 3e0dbfeccdd0a5..e9b97f3ecb584e 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8296ce09ec51c8495a5bec8d65445b681df27b74", + "version": "13.1.1", + "port-version": 0 + }, { "git-tree": "488d78f12e3a376002a80d0058e3973ac75d4fe7", "version": "13.0.0", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 4c592b030f376c..e0c31bde154d69 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d90cdfaa52413836f8f4557bae2eff84dbb2c322", + "version": "2023.7", + "port-version": 0 + }, { "git-tree": "3a6e1c8ff08a6437170e17cc7b9c6c0bc0113ba2", "version": "2021.1", From 146441473c8176a5509c6eac979860f37f834730 Mon Sep 17 00:00:00 2001 From: liamwhite Date: Tue, 12 Dec 2023 04:05:14 -0500 Subject: [PATCH 0582/1039] [breakpad] update to 2023.01.27 (#34273) * [breakpad] update to 2023.01.27 * Fix the CMakeFindDependencyMacro part. * Attach zlib to where the glob happens, and remove duplicate cpp files from dump_syms. * Zlib is an unconditional dependency on Linux --------- Co-authored-by: Billy Robert O'Neal III --- ports/breakpad/CMakeLists.txt | 22 ++-- ports/breakpad/fix-const-char.patch | 14 +++ ports/breakpad/portfile.cmake | 118 ++++++++++-------- .../breakpad/unofficial-breakpadConfig.cmake | 6 + ports/breakpad/vcpkg.json | 7 +- versions/b-/breakpad.json | 6 +- versions/baseline.json | 4 +- 7 files changed, 111 insertions(+), 66 deletions(-) create mode 100644 ports/breakpad/fix-const-char.patch create mode 100644 ports/breakpad/unofficial-breakpadConfig.cmake diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index f37d30f3ef6dfc..167257ba1a252e 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.8) project(breakpad CXX) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_definitions( @@ -93,6 +93,14 @@ else() endif() endif() +set(USED_ZLIB OFF) +if(LINUX AND NOT CMAKE_SYSTEM_NAME STREQUAL Android) + # src/common/linux/dump_symbols.cc wants zlib.h + find_package(ZLIB REQUIRED) + target_link_libraries(libbreakpad_client PRIVATE ZLIB::ZLIB) + set(USED_ZLIB ON) +endif() + target_include_directories(libbreakpad_client PUBLIC $ @@ -141,14 +149,6 @@ if(INSTALL_TOOLS) src/common/dwarf/dwarf2diehandler.cc src/common/dwarf/dwarf2reader.cc src/common/dwarf/elf_reader.cc - src/common/linux/crc32.cc - src/common/linux/dump_symbols.cc - src/common/linux/elf_symbols_to_module.cc - src/common/linux/elfutils.cc - src/common/linux/file_id.cc - src/common/linux/linux_libc_support.cc - src/common/linux/memory_mapped_file.cc - src/common/linux/safe_readlink.cc src/tools/linux/dump_syms/dump_syms.cc) target_link_libraries(dump_syms PRIVATE libbreakpad_client) install(TARGETS dump_syms DESTINATION bin) @@ -213,7 +213,9 @@ endif() install( EXPORT unofficial-breakpad-targets - FILE unofficial-breakpad-config.cmake + FILE unofficial-breakpadTargets.cmake NAMESPACE unofficial::breakpad:: DESTINATION share/unofficial-breakpad ) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadConfig.cmake" "${CMAKE_INSTALL_PREFIX}/share/unofficial-breakpad/unofficial-breakpadConfig.cmake" @ONLY) diff --git a/ports/breakpad/fix-const-char.patch b/ports/breakpad/fix-const-char.patch new file mode 100644 index 00000000000000..57a9a823a2f9db --- /dev/null +++ b/ports/breakpad/fix-const-char.patch @@ -0,0 +1,14 @@ +diff --git a/src/processor/disassembler_objdump.cc b/src/processor/disassembler_objdump.cc +index dfe10d58..26be029c 100644 +--- a/src/processor/disassembler_objdump.cc ++++ b/src/processor/disassembler_objdump.cc +@@ -85,7 +85,7 @@ ScopedTmpFile::~ScopedTmpFile() { + } + + bool ScopedTmpFile::Create() { +- fd_ = mkstemp(path_.data()); ++ fd_ = mkstemp(const_cast(path_.data())); + if (fd_ < 0) { + unlink(path_.c_str()); + fd_ = 0; + diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index b5d472da6b1b22..e7d99b9da05582 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -1,49 +1,69 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/breakpad - REF v2022.07.12 - SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f - HEAD_REF master - PATCHES - fix-unique_ptr.patch -) - -if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) - vcpkg_from_git( - OUT_SOURCE_PATH LSS_SOURCE_PATH - URL https://chromium.googlesource.com/linux-syscall-support - REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a - ) - - file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss") -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" DESTINATION "${SOURCE_PATH}") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "tools" INSTALL_TOOLS -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - OPTIONS_RELEASE - -DINSTALL_HEADERS=ON -) - -vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/client/linux/data" "${CURRENT_PACKAGES_DIR}/include/client/linux/sender") - -if("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES microdump_stackwalk minidump_dump minidump_stackwalk core2md pid2md dump_syms minidump-2-core minidump_upload sym_upload core_handler AUTO_CLEAN) -endif() - -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad) - -vcpkg_copy_pdbs() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/breakpad + REF v2023.01.27 + SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4 + HEAD_REF master + PATCHES + fix-const-char.patch + fix-unique_ptr.patch +) + +if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) + vcpkg_from_git( + OUT_SOURCE_PATH LSS_SOURCE_PATH + URL https://chromium.googlesource.com/linux-syscall-support + REF 7bde79cc274d06451bf65ae82c012a5d3e476b5a + ) + + file(RENAME "${LSS_SOURCE_PATH}" "${SOURCE_PATH}/src/third_party/lss") +endif() + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/check_getcontext.cc" + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadConfig.cmake" + DESTINATION + "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" INSTALL_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_RELEASE + -DINSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/client/linux/data" + "${CURRENT_PACKAGES_DIR}/include/client/linux/sender") + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + microdump_stackwalk + minidump_dump + minidump_stackwalk + core2md + pid2md + dump_syms + minidump-2-core + minidump_upload + sym_upload + core_handler + AUTO_CLEAN) +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-breakpad) + +vcpkg_copy_pdbs() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/breakpad/unofficial-breakpadConfig.cmake b/ports/breakpad/unofficial-breakpadConfig.cmake new file mode 100644 index 00000000000000..8a077c47216fee --- /dev/null +++ b/ports/breakpad/unofficial-breakpadConfig.cmake @@ -0,0 +1,6 @@ +if(@USED_ZLIB@) + include(CMakeFindDependencyMacro) + find_dependency(ZLIB) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpad-targets.cmake") diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index 28c75a24edc83f..e177b6a14c03c4 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "breakpad", - "version-date": "2022-07-12", - "port-version": 6, + "version-date": "2023-01-27", "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", @@ -19,6 +18,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "zlib", + "platform": "linux" } ], "features": { diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index e4147f50ca4f78..4f58b075833832 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "a244c96e6e67d802de17045cb395c0f11e0b3aa4", - "version-date": "2022-07-12", - "port-version": 6 + "git-tree": "b2b2523acc1c56222313e8fe01065c1e130440e1", + "version-date": "2023-01-27", + "port-version": 0 }, { "git-tree": "a451811c203f1ec086288b40dd4571d97bb7033e", diff --git a/versions/baseline.json b/versions/baseline.json index e796a857b30356..13f002386d96d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1313,8 +1313,8 @@ "port-version": 1 }, "breakpad": { - "baseline": "2022-07-12", - "port-version": 6 + "baseline": "2023-01-27", + "port-version": 0 }, "brigand": { "baseline": "1.3.0", From 583ba9175e469f7b86447cf5d5805816fb491cc3 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 12 Dec 2023 18:08:10 +0900 Subject: [PATCH 0583/1039] Update async-mqtt port to 4.0.0. (#35615) --- ports/async-mqtt/portfile.cmake | 2 +- ports/async-mqtt/vcpkg.json | 2 +- versions/a-/async-mqtt.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake index 053e9492298c98..7e10b22031a43e 100644 --- a/ports/async-mqtt/portfile.cmake +++ b/ports/async-mqtt/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/async_mqtt REF "${VERSION}" - SHA512 5eba3e50c7d48871d94babe72a0da1c4e128748d42365b4042f38baf1a6d375b0b97f08eba51a7d72bb93e840f5778737cd6519af58257cca7a1dabe0db31a85 + SHA512 5953c15f55951b367f1b981a96d75a9d267c26b47f4527c9fdba65da663123a14bba23810cfea9498e5c832a8129b22012c712d2990e6123d598e7a98b13bf11 HEAD_REF main ) diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json index d08aa353eb5b34..129a312eb04828 100644 --- a/ports/async-mqtt/vcpkg.json +++ b/ports/async-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "async-mqtt", - "version": "3.0.0", + "version": "4.0.0", "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.", "homepage": "https://github.com/redboltz/async_mqtt", "license": "BSL-1.0", diff --git a/versions/a-/async-mqtt.json b/versions/a-/async-mqtt.json index f292597c5065cd..1d5bdf2c095909 100644 --- a/versions/a-/async-mqtt.json +++ b/versions/a-/async-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cdfa2d3e21b56533c7862336237abeae866b8da", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "54a9da56ebb673479269e266208e7b1133ff128a", "version": "3.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 13f002386d96d6..c0ec598e8a1f51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -273,7 +273,7 @@ "port-version": 3 }, "async-mqtt": { - "baseline": "3.0.0", + "baseline": "4.0.0", "port-version": 0 }, "asynch": { From 4df73f711672ae77da79081a483e658187c57efd Mon Sep 17 00:00:00 2001 From: "Craig Edwards (Brain)" Date: Tue, 12 Dec 2023 09:09:10 +0000 Subject: [PATCH 0584/1039] [bot] Update DPP to v10.0.29 (#35613) --- ports/dpp/portfile.cmake | 2 +- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index a938b304e46382..daddf98ad5d5e6 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP REF "v${VERSION}" - SHA512 497451c880c92356aa7884bcd7a89a8642ab54a8141fb0b24de85a46d6d00c74e7f24cc09bd5ad9b9faff58f7837825486b261d75b63e630bf114fde5813d1e1 + SHA512 fcb9b8181827fc63fb2f9aff44e697d18a0bfd94714888492a63a04e0112f42f9506bfab8181e822aa5ce85e6b6a8aa44e0774baeac3e52c3f41348cbf55a76a ) vcpkg_cmake_configure( diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 1cd8b635a415a2..1f7df2cf6853a4 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.28", + "version": "10.0.29", "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 c0ec598e8a1f51..f1b95422c2db70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2265,7 +2265,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.28", + "baseline": "10.0.29", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index eb38d3509eee5c..57360900c73c17 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57e513b7c5b9b43418e0be4bdbb739359878baaa", + "version": "10.0.29", + "port-version": 0 + }, { "git-tree": "f9104c5be5bad205d3b5210b5ba79dfe577e51de", "version": "10.0.28", From 63875dac87bdc621db9ed110466abb1116ec1a08 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 12 Dec 2023 01:10:04 -0800 Subject: [PATCH 0585/1039] [libsystemd] Add dependency gperf (#35598) * [libsystemd] Add dependency gperf * update version --- ports/libsystemd/portfile.cmake | 2 ++ ports/libsystemd/vcpkg.json | 5 +++++ versions/baseline.json | 2 +- versions/l-/libsystemd.json | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/libsystemd/portfile.cmake b/ports/libsystemd/portfile.cmake index 7d154b8a3689c1..f6ba7b58f39562 100644 --- a/ports/libsystemd/portfile.cmake +++ b/ports/libsystemd/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( pkgconfig.patch ) +vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/libsystemd/vcpkg.json b/ports/libsystemd/vcpkg.json index 57b3119759268c..a0a36196f20689 100644 --- a/ports/libsystemd/vcpkg.json +++ b/ports/libsystemd/vcpkg.json @@ -1,11 +1,16 @@ { "name": "libsystemd", "version": "254", + "port-version": 1, "description": "Libsystemd", "homepage": "https://github.com/systemd/systemd", "license": "LGPL-2.1+", "supports": "linux", "dependencies": [ + { + "name": "gperf", + "host": true + }, "libcap", "liblzma", "libmount", diff --git a/versions/baseline.json b/versions/baseline.json index f1b95422c2db70..5b5d99d6040c7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4878,7 +4878,7 @@ }, "libsystemd": { "baseline": "254", - "port-version": 0 + "port-version": 1 }, "libtar": { "baseline": "1.2.20", diff --git a/versions/l-/libsystemd.json b/versions/l-/libsystemd.json index 24e90f3bdc4c48..94b4c47368112c 100644 --- a/versions/l-/libsystemd.json +++ b/versions/l-/libsystemd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ac525bd287e8a58992f263adce78483b0513cb0", + "version": "254", + "port-version": 1 + }, { "git-tree": "bc87d660ee35fa2665c12cbd8cb80896f21f99af", "version": "254", From 08fd0c4065567185e928df6cdc6668685b854ea4 Mon Sep 17 00:00:00 2001 From: sewon jeon Date: Tue, 12 Dec 2023 18:11:40 +0900 Subject: [PATCH 0586/1039] [openvdb] update to version 11 (#35597) * openvdb versio update to 11.0 wip update * udpate patches * revert eof * update git tree --- .../{0003-fix-cmake.patch => fix_cmake.patch} | 50 ++++++------------- ports/openvdb/fix_nanovdb.patch | 6 +-- ports/openvdb/portfile.cmake | 6 +-- ports/openvdb/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/o-/openvdb.json | 5 ++ 6 files changed, 28 insertions(+), 46 deletions(-) rename ports/openvdb/{0003-fix-cmake.patch => fix_cmake.patch} (70%) diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/fix_cmake.patch similarity index 70% rename from ports/openvdb/0003-fix-cmake.patch rename to ports/openvdb/fix_cmake.patch index ef10257c7aaf4c..8223c76f266b30 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/fix_cmake.patch @@ -1,14 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9330c29..a98516a 100644 +index 8329dda9..71f45701 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -283,13 +283,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +@@ -284,12 +284,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") if(OPENVDB_INSTALL_CMAKE_MODULES) set(OPENVDB_CMAKE_MODULES - cmake/FindBlosc.cmake cmake/FindJemalloc.cmake -- cmake/FindIlmBase.cmake cmake/FindLog4cplus.cmake - cmake/FindOpenEXR.cmake cmake/FindOpenVDB.cmake @@ -17,7 +16,7 @@ index 9330c29..a98516a 100644 cmake/OpenVDBHoudiniSetup.cmake cmake/OpenVDBMayaSetup.cmake diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 5ff96f6..c3de6f9 100644 +index c4213c85..86b24e9d 100644 --- a/cmake/FindOpenVDB.cmake +++ b/cmake/FindOpenVDB.cmake @@ -490,7 +490,7 @@ endif() @@ -26,10 +25,10 @@ index 5ff96f6..c3de6f9 100644 -find_package(TBB REQUIRED COMPONENTS tbb) +find_package(TBB CONFIG REQUIRED) + find_package(Boost REQUIRED COMPONENTS iostreams) - if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) - # @note Both of these must be set for Boost 1.70 (VFX2020) to link against -@@ -651,7 +651,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) + # Add deps for pyopenvdb +@@ -641,7 +641,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) endif() if(OpenVDB_USES_BLOSC) @@ -38,16 +37,7 @@ index 5ff96f6..c3de6f9 100644 endif() if(OpenVDB_USES_ZLIB) -@@ -665,7 +665,7 @@ endif() - if(OpenVDB_USES_IMATH_HALF) - find_package(Imath CONFIG) - if (NOT TARGET Imath::Imath) -- find_package(IlmBase REQUIRED COMPONENTS Half) -+ find_package(IlmBase CONFIG REQUIRED) - endif() - - if(WIN32) -@@ -716,7 +716,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) +@@ -694,7 +694,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) if(NOT OPENVDB_USE_STATIC_LIBS) if(OpenVDB_USES_BLOSC) @@ -57,31 +47,19 @@ index 5ff96f6..c3de6f9 100644 if(OpenVDB_USES_ZLIB) list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt -index 1b48e84..5d055ac 100644 +index 33d4e5cc..63699b2c 100644 --- a/openvdb/openvdb/CMakeLists.txt +++ b/openvdb/openvdb/CMakeLists.txt -@@ -130,9 +130,9 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) +@@ -123,7 +123,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) endif() endif() -find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) +find_package(TBB CONFIG REQUIRED) if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) -- if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) -+ if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) + if(${TBB_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " - "is deprecated and will be removed.") - endif() -@@ -141,7 +141,7 @@ endif() - if(USE_IMATH_HALF) - find_package(Imath CONFIG) - if (NOT TARGET Imath::Imath) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) -+ find_package(IlmBase CONFIG REQUIRED) - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) - if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) - message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " -@@ -160,26 +160,7 @@ endif() +@@ -152,26 +152,7 @@ endif() if(USE_BLOSC) # Find Blosc libraries @@ -109,12 +87,12 @@ index 1b48e84..5d055ac 100644 else() message(WARNING "Blosc support is disabled. It is strongly recommended to " "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -237,7 +218,11 @@ endif() +@@ -228,7 +209,11 @@ endif() # /usr/local if(USE_BLOSC) - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) -+ if(BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS) + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_shared) + else() + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc_static) @@ -123,7 +101,7 @@ index 1b48e84..5d055ac 100644 if(USE_BLOSC OR USE_ZLIB) diff --git a/openvdb_cmd/CMakeLists.txt b/openvdb_cmd/CMakeLists.txt -index c4351f4..b480334 100644 +index c4351f49..b4803341 100644 --- a/openvdb_cmd/CMakeLists.txt +++ b/openvdb_cmd/CMakeLists.txt @@ -53,7 +53,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") diff --git a/ports/openvdb/fix_nanovdb.patch b/ports/openvdb/fix_nanovdb.patch index 4d36752bb78213..91a310d257739a 100644 --- a/ports/openvdb/fix_nanovdb.patch +++ b/ports/openvdb/fix_nanovdb.patch @@ -1,8 +1,8 @@ diff --git a/nanovdb/nanovdb/CMakeLists.txt b/nanovdb/nanovdb/CMakeLists.txt -index d20b4928..257d005a 100644 +index 7bb3ab86..9311ed17 100644 --- a/nanovdb/nanovdb/CMakeLists.txt +++ b/nanovdb/nanovdb/CMakeLists.txt -@@ -128,7 +128,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb) +@@ -127,7 +127,7 @@ if(NANOVDB_USE_TBB AND NOT TARGET TBB::tbb) endif() if(NANOVDB_USE_BLOSC AND NOT TARGET Blosc::blosc) @@ -11,7 +11,7 @@ index d20b4928..257d005a 100644 endif() if(NANOVDB_USE_ZLIB AND NOT TARGET ZLIB::ZLIB) -@@ -224,7 +224,7 @@ if(NANOVDB_USE_TBB) +@@ -236,7 +236,7 @@ if(NANOVDB_USE_TBB) endif() if(NANOVDB_USE_BLOSC) diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index eb03662f38296c..b55e1f89d3b7e0 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF be0e7a78861d2b7d9643f7a0cab04f3ab5951686 # v10.0.0 - SHA512 92301bf675d700fedb0a2b3c4653158eeda6105e70623e5e4bda15d73391427cf0295a0426204888e2fe062847025542717bff34ceb923e51cffa1721e9d4105 + REF "v${VERSION}" + SHA512 f2c90ca8435ecbacefda429341000ecb555385c746a3e0233220cd78540cee2a26cc17df7b560fdfe2dc03f2b2e960a2fa226a85980189c3e018164ccc037bd4 PATCHES - 0003-fix-cmake.patch + fix_cmake.patch fix_nanovdb.patch ) diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index 6ff4b1ae290d3b..e0ae6104d6b594 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openvdb", - "version": "10.0.0", - "port-version": 6, + "version": "11.0.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5b5d99d6040c7e..0d2e3b55732684 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6365,8 +6365,8 @@ "port-version": 0 }, "openvdb": { - "baseline": "10.0.0", - "port-version": 6 + "baseline": "11.0.0", + "port-version": 0 }, "openvino": { "baseline": "2023.2.0", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 78b8486c51105a..edc8ae9cbf0bd0 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6997652c81d0f91033cb3cce2bf6e55674725400", + "version": "11.0.0", + "port-version": 0 + }, { "git-tree": "8565eefd07d9a9d108cec2545039261b53d2e3b1", "version": "10.0.0", From faf6debcab7a02b99051852c8d17591a28160e47 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 12 Dec 2023 01:15:07 -0800 Subject: [PATCH 0587/1039] [fastio] Update to 2023-11-06 (#35596) * update fastio * update version --- ports/fastio/portfile.cmake | 4 ++-- ports/fastio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fastio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fastio/portfile.cmake b/ports/fastio/portfile.cmake index 7acb25af31a030..cb460f7876c4f7 100644 --- a/ports/fastio/portfile.cmake +++ b/ports/fastio/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cppfastio/fast_io - REF e3df753a74a27e00bcb288bc97ab203645ed9579 - SHA512 9afe554570241a64e6f155419635aa6c0f97898902f7e4fcace883ed532142174e8b584e300223e0b8f2fa9831ee031f92465b2d5ffd9466de323b59efd37b59 + REF 804d943e30df0da782538d508da6ea6e427fc2cf + SHA512 543f91bb55e3dec305a5d0103b2eba9304b3d0a5f8874a38d4ebb584c027fcc2f9cedfb5716bac2951f1474b2467fe287f70b8287452f8ba277663f8342a112c HEAD_REF master ) diff --git a/ports/fastio/vcpkg.json b/ports/fastio/vcpkg.json index 72011591abfa06..39633c5359a158 100644 --- a/ports/fastio/vcpkg.json +++ b/ports/fastio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fastio", - "version-date": "2023-07-06", + "version-date": "2023-11-06", "description": "fast_io is an extremely fast C++20 input/output library aiming to replace and . It supports networking, NT apis, pipe, filesystem, winrt hstring, Qt, OpenSSL, cryptography. It is freestanding and it works on any platform, including dos, win95, wasm, linux kernel, windows kernel or your own operating system kernel. It has no dependencies.", "homepage": "https://github.com/cppfastio/fast_io", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0d2e3b55732684..a908e0d2195e0a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2565,7 +2565,7 @@ "port-version": 1 }, "fastio": { - "baseline": "2023-07-06", + "baseline": "2023-11-06", "port-version": 0 }, "fastlz": { diff --git a/versions/f-/fastio.json b/versions/f-/fastio.json index 4e49da61a46dc3..6ad0fbfd0c0816 100644 --- a/versions/f-/fastio.json +++ b/versions/f-/fastio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c900f8e88aaa9a8c41a16af374634ca5120289", + "version-date": "2023-11-06", + "port-version": 0 + }, { "git-tree": "3cfcdfee62b62a815b8ea72c22e41a40b6c24610", "version-date": "2023-07-06", From de694515640d190d23b927afa96fd069bd27d392 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Dec 2023 10:17:01 +0100 Subject: [PATCH 0588/1039] asio-grpc: Update to 2.8.0 (#35591) --- ports/asio-grpc/portfile.cmake | 2 +- ports/asio-grpc/usage | 4 ++++ ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index f2cbb84a21f117..9f90f6ff5c4553 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc REF "v${VERSION}" - SHA512 3ad088a090a506f12d73fdac1689d9aea0416f9d21762c7be1de9d5a278ac2e856541e7b433809077e5297d2953b55357380e5097d894bd511c652927ec5daba + SHA512 e41d2cf4098af9921fc8911634baa7b2c283d6afa31dbb6ff371c385ed5f6518eb870672a5c0b0fcc42b5cb767cdd82b077e85afbf0b132b74bd2c80118907b8 HEAD_REF master ) diff --git a/ports/asio-grpc/usage b/ports/asio-grpc/usage index bb11c4a9396e5e..a34fbb4160afca 100644 --- a/ports/asio-grpc/usage +++ b/ports/asio-grpc/usage @@ -13,3 +13,7 @@ The standalone Asio backend. Install "asio" and link with: The libunifex backend. Install "libunifex" and link with: target_link_libraries(main PRIVATE asio-grpc::asio-grpc-unifex) + +The stdexec backend. Install "stdexec" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc-stdexec) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index c32c28d79b9e47..8dec481bf534aa 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "2.7.0", + "version": "2.8.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 eb416112d09a8d..5695c100d05396 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab210d20b701caf5c71159529c8b4f163df0c5cc", + "version": "2.8.0", + "port-version": 0 + }, { "git-tree": "b0650c5252b1fb7f0ec616bb3aa9ef7c51732698", "version": "2.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index a908e0d2195e0a..738f0aba9c96e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -253,7 +253,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "2.7.0", + "baseline": "2.8.0", "port-version": 0 }, "asiosdk": { From 6f3385962b1385c09aebd668683b1ef1fcd78c92 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Dec 2023 10:18:35 +0100 Subject: [PATCH 0589/1039] [draco] Revise and fix build (#35589) --- ports/draco/install-linkage.diff | 19 +++++++++++++++++++ ports/draco/portfile.cmake | 22 ++++++++++++---------- ports/draco/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 5 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 ports/draco/install-linkage.diff diff --git a/ports/draco/install-linkage.diff b/ports/draco/install-linkage.diff new file mode 100644 index 00000000000000..c34a60f11cea1a --- /dev/null +++ b/ports/draco/install-linkage.diff @@ -0,0 +1,19 @@ +diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake +index 3be1ba1..b91938c 100644 +--- a/cmake/draco_install.cmake ++++ b/cmake/draco_install.cmake +@@ -65,10 +65,14 @@ macro(draco_setup_install_target) + ARCHIVE DESTINATION "${libs_path}" + LIBRARY DESTINATION "${libs_path}") + else() ++ if(BUILD_SHARED_LIBS) ++ set_target_properties(draco_static PROPERTIES EXCLUDE_FROM_ALL 1) ++ else() + install( + TARGETS draco_static + EXPORT dracoExport + DESTINATION "${libs_path}") ++ endif() + + if(BUILD_SHARED_LIBS) + install( diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index e05f9c0a06b5c8..f9c4ae86565336 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco @@ -11,24 +9,28 @@ vcpkg_from_github( fix-uwperror.patch fix-pkgconfig.patch disable-symlinks.patch + install-linkage.diff ) +if(VCPKG_TARGET_IS_EMSCRIPTEN) + set(ENV{EMSCRIPTEN} "${EMSCRIPTEN_ROOT}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPYTHON_EXECUTABLE=: # unused with DRACO_JS_GLUE off + -DDRACO_JS_GLUE=OFF ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/draco) vcpkg_fixup_pkgconfig() # Install tools and plugins -vcpkg_copy_tools( - TOOL_NAMES - draco_encoder - draco_decoder - AUTO_CLEAN -) +if(NOT VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_copy_tools(TOOL_NAMES draco_encoder draco_decoder AUTO_CLEAN) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 636f863eaa4dcd..8304f2b72873d0 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,7 @@ { "name": "draco", "version": "1.5.6", + "port-version": 1, "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 738f0aba9c96e9..1277f02a011d78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2270,7 +2270,7 @@ }, "draco": { "baseline": "1.5.6", - "port-version": 0 + "port-version": 1 }, "drlibs": { "baseline": "2023-08-16", diff --git a/versions/d-/draco.json b/versions/d-/draco.json index c4aaf83ac17128..6044af45f272b0 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7766920ec32ef9da00121a0668edf41bf9d1d76b", + "version": "1.5.6", + "port-version": 1 + }, { "git-tree": "bed378402e689e540a924f99869f7134d74bbdfb", "version": "1.5.6", From 9ca8099ffb1eb7bc4748c5d696500a7c0a9cbf11 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:20:57 +0100 Subject: [PATCH 0590/1039] [vcpkg baseline][libbson] Fix race condition during CMake configure (#35586) * Delete unused patches * disable finding Python * Fix race during CMake configure * version --- .../libbson/disable-dynamic-when-static.patch | 44 ------------------- ports/libbson/fix-missing-header.patch | 12 ----- ports/libbson/portfile.cmake | 3 ++ ports/libbson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libbson.json | 5 +++ 6 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 ports/libbson/disable-dynamic-when-static.patch delete mode 100644 ports/libbson/fix-missing-header.patch diff --git a/ports/libbson/disable-dynamic-when-static.patch b/ports/libbson/disable-dynamic-when-static.patch deleted file mode 100644 index 4bf375b05c17e7..00000000000000 --- a/ports/libbson/disable-dynamic-when-static.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 61e926747..6b4c5a911 100644 ---- a/src/libbson/CMakeLists.txt -+++ b/src/libbson/CMakeLists.txt -@@ -205,6 +205,7 @@ set (HEADERS_FORWARDING - ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h - ) - -+if(NOT MONGOC_ENABLE_STATIC_BUILD) - add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - if (MSVC AND MSVC_VERSION VERSION_LESS 1900) - message (STATUS "Disabling warning C4756 for VS 2013 and older") -@@ -282,6 +283,7 @@ if (WIN32) - # must be handled specially since we can't resolve them - set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) - endif () -+endif() - - if (MONGOC_ENABLE_STATIC_BUILD) - add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -367,7 +369,7 @@ set (BSON_HEADER_INSTALL_DIR - ) - - if (MONGOC_ENABLE_STATIC_INSTALL) -- set (TARGETS_TO_INSTALL bson_shared bson_static) -+ set (TARGETS_TO_INSTALL bson_static) - else () - set (TARGETS_TO_INSTALL bson_shared) - endif () -@@ -418,12 +420,14 @@ configure_file ( - ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc - @ONLY) - -+if(NOT MONGOC_ENABLE_STATIC_INSTALL) - install ( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -+endif() - - if (MONGOC_ENABLE_STATIC_INSTALL) - configure_file ( diff --git a/ports/libbson/fix-missing-header.patch b/ports/libbson/fix-missing-header.patch deleted file mode 100644 index eee0e1907bb244..00000000000000 --- a/ports/libbson/fix-missing-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 61e926747..715b304c0 100644 ---- a/src/libbson/CMakeLists.txt -+++ b/src/libbson/CMakeLists.txt -@@ -181,6 +181,7 @@ set (HEADERS - ${PROJECT_SOURCE_DIR}/src/bson/bson-compat.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-context.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-decimal128.h -+ ${PROJECT_SOURCE_DIR}/src/bson/bson-dsl.h # mongo-c-driver build time only - ${PROJECT_SOURCE_DIR}/src/bson/bson-endian.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-error.h - ${PROJECT_SOURCE_DIR}/src/bson/bson.h diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index e615cb7cf270ed..442999bbdc1449 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -24,6 +24,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # because it writes the file VERSION_CURRENT in the source directory OPTIONS "-DBUILD_VERSION=${VERSION}" -DENABLE_BSON=ON @@ -40,6 +41,8 @@ vcpkg_cmake_configure( -DENABLE_UNINSTALL=OFF -DENABLE_ZLIB=SYSTEM -DENABLE_ZSTD=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON MAYBE_UNUSED_VARIABLES ENABLE_ICU ) diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index 06a9579d8b7b78..923b9b9666d3e1 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libbson", "version": "1.25.1", - "port-version": 1, + "port-version": 2, "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1277f02a011d78..c0083028087a4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4110,7 +4110,7 @@ }, "libbson": { "baseline": "1.25.1", - "port-version": 1 + "port-version": 2 }, "libcaer": { "baseline": "3.3.15", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 43426bf14ca68d..df7f0eee42a727 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c", + "version": "1.25.1", + "port-version": 2 + }, { "git-tree": "4e2365e51faaf5bea56b3466e7c94342cb43a9e4", "version": "1.25.1", From dd38f20a86360d511ffc308fa402d157bc6b802c Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:22:44 +0100 Subject: [PATCH 0591/1039] [lpeg] update to 1.1.0 (#35580) --- ports/lpeg/CMakeLists.txt | 1 + ports/lpeg/portfile.cmake | 8 +++----- ports/lpeg/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/lpeg.json | 5 +++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/lpeg/CMakeLists.txt b/ports/lpeg/CMakeLists.txt index 993e570d73c56d..e3ef2bf540b6ae 100644 --- a/ports/lpeg/CMakeLists.txt +++ b/ports/lpeg/CMakeLists.txt @@ -12,6 +12,7 @@ add_library(lpeg lpprint.c lpcap.c lpcode.c + lpcset.c lpeg.def) target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES}) diff --git a/ports/lpeg/portfile.cmake b/ports/lpeg/portfile.cmake index 3a8fc8bfae3e3c..40b38be2c6ca7c 100644 --- a/ports/lpeg/portfile.cmake +++ b/ports/lpeg/portfile.cmake @@ -1,9 +1,7 @@ -set(LPEG_VER 1.0.2) - vcpkg_download_distfile(ARCHIVE - URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz" - FILENAME "lpeg-${LPEG_VER}.tar.gz" - SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 + URLS "https://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${VERSION}.tar.gz" + FILENAME "lpeg-${VERSION}.tar.gz" + SHA512 01b2a4ceb2d110e143603bc63c84a59736ea735dd0ed9866286ba115d41be48d09c9ff21c8e2327974d2296944f6508d50a5c3a18f26ac1d81b8b2fc41f61222 ) vcpkg_extract_source_archive( diff --git a/ports/lpeg/vcpkg.json b/ports/lpeg/vcpkg.json index 82fb1d2a9e75dd..e750e87a52f55c 100644 --- a/ports/lpeg/vcpkg.json +++ b/ports/lpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "lpeg", - "version": "1.0.2", - "port-version": 4, + "version": "1.1.0", "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).", "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c0083028087a4a..1dc0a94afa7240 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5277,8 +5277,8 @@ "port-version": 3 }, "lpeg": { - "baseline": "1.0.2", - "port-version": 4 + "baseline": "1.1.0", + "port-version": 0 }, "ltla-aarand": { "baseline": "2023-03-19", diff --git a/versions/l-/lpeg.json b/versions/l-/lpeg.json index 765303b41ce900..617853a15d18a2 100644 --- a/versions/l-/lpeg.json +++ b/versions/l-/lpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1832dfc0fc6e11738a1653cdf7a65ccde8903ba", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "e364c24f0029fc6589aae6051eec09af14cc02d2", "version": "1.0.2", From 87e44be6f560d836664b63174bf240b774834ddf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Dec 2023 10:28:04 +0100 Subject: [PATCH 0592/1039] [cppcms] Fix dependencies and linkage (#35578) * [cppcms] No uwp * [cppcms] Fix dependencies and linkage * [cppcms] No python for build * Fixup --- ports/cppcms/dependencies.diff | 41 +++++++++++ ports/cppcms/dllexport.diff | 13 ++++ ports/cppcms/no-tests-and-examples.patch | 91 +++++++++--------------- ports/cppcms/portfile.cmake | 24 ++++--- ports/cppcms/vcpkg.json | 6 +- versions/baseline.json | 2 +- versions/c-/cppcms.json | 5 ++ 7 files changed, 112 insertions(+), 70 deletions(-) create mode 100644 ports/cppcms/dependencies.diff create mode 100644 ports/cppcms/dllexport.diff diff --git a/ports/cppcms/dependencies.diff b/ports/cppcms/dependencies.diff new file mode 100644 index 00000000000000..5f7c0eb3876a20 --- /dev/null +++ b/ports/cppcms/dependencies.diff @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ce0d53..d2b91f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -268,8 +268,8 @@ check_cxx_source_compiles( + CPPCMS_HAVE_FSEEKI64 + ) + if(NOT DISABLE_GZIP) +- find_library(ZLIB NAMES z zdll zlib${ZLIB_SUFFIX} zlib) +- find_path(ZLIB_INCLUDE_DIR zlib.h) ++ find_package(ZLIB REQUIRED) ++ set(ZLIB "${ZLIB_LIBRARIES}") + if(NOT ZLIB OR NOT ZLIB_INCLUDE_DIR) + message(FATAL_ERROR "Can't fild zlib") + endif() +@@ -423,8 +423,8 @@ if(NOT DISABLE_GCRYPT) + endif() + + if(NOT DISABLE_OPENSSL) +- find_path(OPENSSL_INCLUDE_DIR openssl/aes.h) +- find_library(LIB_OPENSSL NAMES crypto libcrypto libeay32) ++ find_package(OpenSSL REQUIRED) ++ set(LIB_OPENSSL "${OPENSSL_CRYPTO_LIBRARIES}") + endif() + + if (OPENSSL_INCLUDE_DIR AND LIB_OPENSSL) +diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt +index 4f81833..822c470 100644 +--- a/booster/CMakeLists.txt ++++ b/booster/CMakeLists.txt +@@ -123,6 +123,10 @@ endif() + + if(NOT DISABLE_ICU_LOCALE) + message("-- Looking for ICU libraries") ++ find_package(ICU REQUIRED COMPONENTS i18n uc data) ++ include_directories(${ICU_INCLUDE_DIRS}) ++ set(ICU_I18N "${ICU_LIBRARIES}") ++elseif(0) + + if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + if(MSVC) diff --git a/ports/cppcms/dllexport.diff b/ports/cppcms/dllexport.diff new file mode 100644 index 00000000000000..aeb3d76731e210 --- /dev/null +++ b/ports/cppcms/dllexport.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c91ec97..11d475b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -692,7 +692,7 @@ target_link_libraries(hello_world ${CPPCMS_LIB}) + if(NOT DISABLE_TCPCACHE) + add_executable(cppcms_scale src/cache_server_main.cpp) + target_link_libraries(cppcms_scale ${CPPCMS_LIB}) +- if(WIN32 OR CYGWIN) ++ if(NOT DISABLE_SHARED) + set_target_properties(cppcms_scale PROPERTIES COMPILE_DEFINITIONS DLL_EXPORT) + endif() + endif() diff --git a/ports/cppcms/no-tests-and-examples.patch b/ports/cppcms/no-tests-and-examples.patch index 7d8e67bdfe0dcf..091484271670dc 100644 --- a/ports/cppcms/no-tests-and-examples.patch +++ b/ports/cppcms/no-tests-and-examples.patch @@ -1,58 +1,33 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ce0d53..5b432c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED) - endif(NOT DISABLE_SHARED) - - -- -+if(FALSE) - add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp) - target_link_libraries(hello_world ${CPPCMS_LIB}) -+endif() - - if(NOT DISABLE_TCPCACHE) - add_executable(cppcms_scale src/cache_server_main.cpp) -@@ -710,7 +711,7 @@ endif(DISABLE_SHARED) - ######################################### - # Tests - ######################################### -- -+if(FALSE) - set(ALL_TESTS - form_test - proto_test -@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) - if(NOT DISABLE_GZIP) - target_link_libraries(response_test ${ZLIB}) - endif() -- -+endif() - ##################################### - # End of tests - ##################################### - - # These are use export - if(IS_WINDOWS AND NOT DISABLE_SHARED) -- set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES -+ set_target_properties(${ALL_TESTS} cppcms PROPERTIES - COMPILE_DEFINITIONS DLL_EXPORT) - endif() - -@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include - ############# - - -- -+if(FALSE) - set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests") - - add_test(base64_test base64_test) -@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS) - PROPERTIES TIMEOUT 120) - - endif() -- -+endif() - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2b91f5..c91ec97 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,7 +647,7 @@ add_custom_command( + + + +-if(NOT DISABLE_SHARED) ++if(installing-plugins) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/skin3.cpp + COMMAND ${PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/bin/cppcms_tmpl_cc +@@ -779,6 +779,7 @@ endif() + ##################################### + # End of tests + ##################################### ++set_target_properties(${ALL_TESTS} hello_world PROPERTIES EXCLUDE_FROM_ALL 1) + + # These are use export + if(IS_WINDOWS AND NOT DISABLE_SHARED) +diff --git a/booster/CMakeLists.txt b/booster/CMakeLists.txt +index 822c470..0a95248 100644 +--- a/booster/CMakeLists.txt ++++ b/booster/CMakeLists.txt +@@ -674,6 +674,7 @@ macro(add_booster_param_test MODULE TEST PARAMETER) + add_executable(${TEST_NAME} ${TEST_SRC}) + target_link_libraries(${TEST_NAME} ${BOOSTER_LIB}) + set_target_properties(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS "${EXE_COM_DEFS}") ++ set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL 1) + add_test(${TEST_NAME} ${TEST_NAME} ${PARAMETER}) + set_tests_properties(${TEST_NAME} PROPERTIES TIMEOUT 20) + endmacro() diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index b876f77d99fa9c..f47954fc8f82a5 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -1,32 +1,40 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO artyom-beilis/cppcms REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df PATCHES + dependencies.diff + dllexport.diff no-tests-and-examples.patch fix_narrowing_error.patch ) -vcpkg_find_acquire_program(PYTHON2) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DISABLE_STATIC) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPYTHON=${PYTHON2} # Switch to python3 on the next update + -DCMAKE_CXX_STANDARD=11 + -DPYTHON=: -DUSE_WINDOWS6_API=ON - -DDISABLE_SHARED=${DISABLE_DYNAMIC} + -DDISABLE_SHARED=${DISABLE_SHARED} + -DDISABLE_STATIC=${DISABLE_STATIC} + -DDISABLE_GCRYPT=ON + -DDISABLE_ICONV=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +foreach(script IN ITEMS cppcms_tmpl_cc cppcms_run) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${script}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${script}") +endforeach() vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/MIT.TXT" "${SOURCE_PATH}/THIRD_PARTY_SOFTWARE.TXT") diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 54dbb33fefa5e3..f1f83019d811c2 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -1,11 +1,11 @@ { "name": "cppcms", "version": "1.2.1", - "port-version": 6, + "port-version": 7, "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", - "supports": "!(linux | osx | (windows & static))", + "license": null, + "supports": "!uwp", "dependencies": [ "icu", "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 1dc0a94afa7240..658e40fc44beee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1850,7 +1850,7 @@ }, "cppcms": { "baseline": "1.2.1", - "port-version": 6 + "port-version": 7 }, "cppcodec": { "baseline": "0.2", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index ca34ce0253a2e4..24139f93ae6850 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44e220f750bca1f74095cf460adb1753a4deb423", + "version": "1.2.1", + "port-version": 7 + }, { "git-tree": "e2fff22eecee1fc50eee291ea49bed2717704031", "version": "1.2.1", From 7e67ab9f0bd12a3067ea297715ac74778674c27e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Dec 2023 10:31:45 +0100 Subject: [PATCH 0593/1039] [libzim] Update to 9.0.0 (#35576) * [libzim] No uwp * [libzim] Update to 9.0.0 --- ports/libzim/cross-builds.diff | 9 ++++-- ports/libzim/disable-gtest.diff | 13 --------- ports/libzim/dllexport.diff | 50 +++++---------------------------- ports/libzim/portfile.cmake | 8 ++++-- ports/libzim/subdirs.diff | 20 +++++++++++++ ports/libzim/vcpkg.json | 5 ++-- versions/baseline.json | 4 +-- versions/l-/libzim.json | 5 ++++ 8 files changed, 48 insertions(+), 66 deletions(-) delete mode 100644 ports/libzim/disable-gtest.diff create mode 100644 ports/libzim/subdirs.diff diff --git a/ports/libzim/cross-builds.diff b/ports/libzim/cross-builds.diff index 0916513f91de73..8e3b4679ad64db 100644 --- a/ports/libzim/cross-builds.diff +++ b/ports/libzim/cross-builds.diff @@ -1,10 +1,13 @@ diff --git a/meson.build b/meson.build -index 85d8da7..7f97dbc 100644 +index f3e7a27..d946c49 100644 --- a/meson.build +++ b/meson.build -@@ -3,7 +3,7 @@ project('libzim', ['c', 'cpp'], +@@ -1,9 +1,9 @@ + project('libzim', ['c', 'cpp'], + version : '9.0.0', license : 'GPL2', - default_options : ['c_std=c11', 'cpp_std=c++11']) +- default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true']) ++ default_options : ['c_std=c11', 'cpp_std=c++17']) -if build_machine.system() != 'windows' +if host_machine.system() != 'windows' or meson.get_compiler('cpp').get_id() == 'gcc' diff --git a/ports/libzim/disable-gtest.diff b/ports/libzim/disable-gtest.diff deleted file mode 100644 index 7609c09c832ed1..00000000000000 --- a/ports/libzim/disable-gtest.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index d887f9a..270413d 100644 ---- a/meson.build -+++ b/meson.build -@@ -81,7 +81,7 @@ else - icu_dep = dependency('icu-i18n', required:false, static:static_linkage) - endif - --gtest_dep = dependency('gtest', main:true, fallback:['gtest', 'gtest_main_dep'], required:false) -+gtest_dep = dependency('', required:false) - - inc = include_directories('include') - diff --git a/ports/libzim/dllexport.diff b/ports/libzim/dllexport.diff index d643f4110237b5..212eb9e541c2a9 100644 --- a/ports/libzim/dllexport.diff +++ b/ports/libzim/dllexport.diff @@ -1,52 +1,16 @@ diff --git a/include/zim/zim.h b/include/zim/zim.h -index 5d1af80..6171f56 100644 +index 80e8596..631cfab 100644 --- a/include/zim/zim.h +++ b/include/zim/zim.h -@@ -33,14 +33,16 @@ - #define DEPRECATED - #endif +@@ -35,8 +35,10 @@ + + #include --#if (defined _WIN32 || defined __CYGWIN__) && defined LIBZIM_EXPORT_DLL -+#include -+ -+#if defined(LIBZIM_DLL) && defined(LIBZIM_BUILDING_LIBRARY) +-#if defined(_MSC_VER) && defined(LIBZIM_EXPORT_DLL) ++#if defined(_WIN32) && defined(LIBZIM_EXPORT_DLL) #define LIBZIM_API __declspec(dllexport) -+#elif defined(LIBZIM_DLL) ++#elif defined(_WIN32) && defined(LIBZIM_IMPORT_DLL) + #define LIBZIM_API __declspec(dllimport) #else #define LIBZIM_API #endif - --#include -- - namespace zim - { - // An index of an entry (in a zim file) -diff --git a/meson.build b/meson.build -index 7f97dbc..8fd13d7 100644 ---- a/meson.build -+++ b/meson.build -@@ -14,6 +14,10 @@ sizeof_size_t = cpp.sizeof('size_t') - private_conf = configuration_data() - public_conf = configuration_data() - -+if host_machine.system() == 'windows' and get_option('default_library') == 'shared' -+ public_conf.set('LIBZIM_DLL', true) -+endif -+ - private_conf.set('VERSION', '"@0@"'.format(meson.project_version())) - public_conf.set('LIBZIM_VERSION', '"@0@"'.format(meson.project_version())) - private_conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE_SIZE')) -diff --git a/src/meson.build b/src/meson.build -index 4529b7c..956b145 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -75,7 +75,7 @@ libzim = library('zim', - include_directories : inc, - dependencies : deps, - link_args : extra_link_args, -- cpp_args : extra_cpp_args, -+ cpp_args : extra_cpp_args + '-DLIBZIM_BUILDING_LIBRARY', - version: meson.project_version(), - install : true) - libzim_dep = declare_dependency(link_with: libzim, diff --git a/ports/libzim/portfile.cmake b/ports/libzim/portfile.cmake index 85b0bf595a10d0..c1a751a4b64477 100644 --- a/ports/libzim/portfile.cmake +++ b/ports/libzim/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openzim/libzim REF "${VERSION}" - SHA512 4554a9237f5167f6f94aad76ef0e847e949c47c6ee2a89bbd6e587da3b3a3e2d0a8b2d03f7a0fbde0e0dc96fb61bf8c115b3ef3cbd7eff5e880f152bee9b29f0 + SHA512 55d18535d677d3249c8331ceac1acd4afa650de1f61a0aa3ffc1c98ca2a395bc657c774d01780f1a2c2aedd7d9c5d2e7d9f5e717ed879de84dc6d1be6accfe5e HEAD_REF main PATCHES cross-builds.diff dllexport.diff - disable-gtest.diff + subdirs.diff ) set(EXTRA_OPTIONS "") @@ -29,5 +29,9 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/zim/zim.h" "defined(LIBZIM_IMPORT_DLL)" "1") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libzim/subdirs.diff b/ports/libzim/subdirs.diff new file mode 100644 index 00000000000000..a30a1444faa206 --- /dev/null +++ b/ports/libzim/subdirs.diff @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index d946c49..eded01d 100644 +--- a/meson.build ++++ b/meson.build +@@ -90,6 +90,7 @@ subdir('include') + subdir('scripts') + subdir('static') + subdir('src') ++if false + if get_option('examples') + subdir('examples') + endif +@@ -97,6 +98,7 @@ subdir('test') + if get_option('doc') + subdir('docs') + endif ++endif + + pkg_mod = import('pkgconfig') + pkg_mod.generate(libraries : libzim, diff --git a/ports/libzim/vcpkg.json b/ports/libzim/vcpkg.json index 58a4f0efbd61b9..53ab0e0a250b82 100644 --- a/ports/libzim/vcpkg.json +++ b/ports/libzim/vcpkg.json @@ -1,11 +1,10 @@ { "name": "libzim", - "version": "8.2.0", - "port-version": 2, + "version": "9.0.0", "description": "The Libzim is the reference implementation for the ZIM file format. It's a software library to read and write ZIM files on many systems and architectures. More information about the ZIM format and the openZIM project at https://openzim.org/.", "homepage": "https://github.com/openzim/libzim", "license": "GPL-2.0-or-later", - "supports": "!android & !xbox", + "supports": "!android & !uwp & !xbox", "dependencies": [ "icu", "liblzma", diff --git a/versions/baseline.json b/versions/baseline.json index 658e40fc44beee..fb41666c9b0344 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5177,8 +5177,8 @@ "port-version": 0 }, "libzim": { - "baseline": "8.2.0", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 0 }, "libzip": { "baseline": "1.10.1", diff --git a/versions/l-/libzim.json b/versions/l-/libzim.json index 9f7021ecb7f7e8..5aa24ca124ec3c 100644 --- a/versions/l-/libzim.json +++ b/versions/l-/libzim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b50ef00c5ff7e2ba8f3b064c8ffe6eb14a74f28", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "96c23c527ace6213975b81955373f37d96977063", "version": "8.2.0", From e02cf959d2e1c99e8afce79eb78bd71b703196b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 12 Dec 2023 10:35:19 +0100 Subject: [PATCH 0594/1039] [quill] Update to 3.5.1 (#35575) * [quill] Update quill to 3.5.1 * [quill] Update version files --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index c361c5ece3e5f3..73d5827ac929e2 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 fa945fa584d9771b44349b5e7322e41e5a6c0d623159ccb6e8fe9094382136d1dce7fcf72f55e7b37d9d0e19cd11cf6c2fbc02d407b1d18b6448bc72b6100d24 + SHA512 7e6b897908ad865dc4d4ddbd34c3d23ab8d67a6e3431832b86a668bc85acbb9810ab417d8a31a33acbbff8307d43038ed26c20701a497581d0de580d0730d72c HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index d68e76ff17625e..9a55165732693a 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.5.0", + "version": "3.5.1", "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 fb41666c9b0344..1b64c4a374db1a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7301,7 +7301,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.5.0", + "baseline": "3.5.1", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 07ba0bbf1239f6..a5ed91aeb96208 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d6c9021a753a5c95afe327c1e6262c3a7312506", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "9a01ed0ad565d67bf90a71b996c45b767e4f88ba", "version": "3.5.0", From 603643dcbf6a21861483139f2ffd5ee11481f287 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Dec 2023 10:42:45 +0100 Subject: [PATCH 0595/1039] [geos,libspatialite] Fix various quirks (#35574) * [geos] Fix geos-config * [libspatialite] Fix quirks --- ports/geos/fix-exported-config.patch | 4 ++-- ports/geos/vcpkg.json | 1 + ports/libspatialite/portfile.cmake | 6 +----- ports/libspatialite/vcpkg.json | 10 ++++------ versions/baseline.json | 4 ++-- versions/g-/geos.json | 5 +++++ versions/l-/libspatialite.json | 5 +++++ 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ports/geos/fix-exported-config.patch b/ports/geos/fix-exported-config.patch index 3476cfcb1d3310..7f26a29421426f 100644 --- a/ports/geos/fix-exported-config.patch +++ b/ports/geos/fix-exported-config.patch @@ -66,11 +66,11 @@ index 6eff1eb14..8827f6ac6 100644 ;; --static-clibs) - echo -L${libdir} -lgeos_c -lgeos -lstdc++ -lm -+ echo -L${libdir} -lgeos_c -lgeos -lstdc++ @EXTRA_LIBS@ ++ echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@ ;; --static-cclibs) - echo -L${libdir} -lgeos -lstdc++ -lm -+ echo -L${libdir} -lgeos -lstdc++ @EXTRA_LIBS@ ++ echo -L${libdir} -lgeos @EXTRA_LIBS@ ;; --cflags) echo -I${includedir} diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 54078ba2ae2bc8..e4c4c6f59ec2b6 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geos", "version": "3.11.3", + "port-version": 1, "description": "Geometry Engine Open Source", "homepage": "https://libgeos.org/", "license": "LGPL-2.1-only", diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 05dbe871a303aa..2d18c9b2d0ec06 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -19,7 +19,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS unused FEATURES freexl ENABLE_FREEXL gcp ENABLE_GCP - geocallbacks ENABLE_GEOCALLBACKS rttopo ENABLE_RTTOPO ) @@ -39,9 +38,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(ENABLE_GCP) string(APPEND CL_FLAGS " /DENABLE_GCP") endif() - if(NOT ENABLE_GEOCALLBACKS) - string(APPEND CL_FLAGS " /DOMIT_GEOCALLBACKS") - endif() if(ENABLE_RTTOPO) string(APPEND CL_FLAGS " /DENABLE_RTTOPO") endif() @@ -184,10 +180,10 @@ else() ${TARGET_ALIAS} ${FREEXL_OPTION} ${GCP_OPTION} - ${GEOCALLBACKS_OPTION} ${RTTOPO_OPTION} "--disable-examples" "--disable-minizip" + "cross_compiling=yes" # avoid conftest rpath trouble OPTIONS_DEBUG "LIBS=${PKGCONFIG_LIBS_DEBUG} ${SYSTEM_LIBS}" OPTIONS_RELEASE diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 448e5c7bf39c23..64ebbafd039264 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,14 +1,16 @@ { "name": "libspatialite", "version": "5.1.0", + "port-version": 1, "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", + "homepage": "https://www.gaia-gis.it/fossil/libspatialite/index", "license": null, "dependencies": [ "geos", "libiconv", { "name": "libxml2", + "default-features": false, "features": [ "http" ] @@ -28,8 +30,7 @@ "zlib" ], "default-features": [ - "freexl", - "geocallbacks" + "freexl" ], "features": { "freexl": { @@ -41,9 +42,6 @@ "gcp": { "description": "Ground control points support. This feature reduces the license options to GPLv2+." }, - "geocallbacks": { - "description": "Geometry callbacks support." - }, "rttopo": { "description": "RTTOPO support. This feature reduces the license options to GPLv2+.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1b64c4a374db1a..6ff4b96f6d100d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2914,7 +2914,7 @@ }, "geos": { "baseline": "3.11.3", - "port-version": 0 + "port-version": 1 }, "geotrans": { "baseline": "3.9", @@ -4834,7 +4834,7 @@ }, "libspatialite": { "baseline": "5.1.0", - "port-version": 0 + "port-version": 1 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 8b14e257d97bf0..fa24c1a0d2c79c 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41bb89a641e2fd76a21cdf259893ef3ab187aeaf", + "version": "3.11.3", + "port-version": 1 + }, { "git-tree": "74ed7ac2ba209cbd984174705b2e3fc7fcf99e9a", "version": "3.11.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 386712e5c87f92..15da6a32861ab3 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "583ff9e938f0ca09b16f01fc5fb228b42dc13c7a", + "version": "5.1.0", + "port-version": 1 + }, { "git-tree": "6c988a575680cb06fded62a1f63d43426d683dfd", "version": "5.1.0", From 702c4d74bd67d74685355fcad2396bb86e121c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3n=20Bjarni?= Date: Tue, 12 Dec 2023 09:43:50 +0000 Subject: [PATCH 0596/1039] [Glaze] Update to 1.9.3 (#35567) * update glaze to 1.9.3 and update requirement of gcc version * update glaze version --- ports/glaze/portfile.cmake | 4 ++-- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 8ba4db39c85ff8..80578067efe0d1 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -1,12 +1,12 @@ if(VCPKG_TARGET_IS_LINUX) - message("Warning: `glaze` requires Clang or GCC 10+ on Linux") + message("Warning: `glaze` requires Clang or GCC 11+ on Linux") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 8ca16d2f63a6a5ec866cd65f649b8f80ab0507a54b6128d26d8e355bc8a8b4202051f7d2146fbcf3d2e0b5f58f069fdf7e4fe116f7e6bb19671b95b4285fc699 + SHA512 1ea55157024846cf3973e8564f357c70b86e9e89edd2f73472078edd65300ef7056a5d392f0ed906cb576329ce13894b99adc5f5071a0ae09c80ea8fdd9d00aa ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 6c8e296783e369..d672ff993de4a2 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.9.2", + "version": "1.9.3", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6ff4b96f6d100d..b28516fe9d4270 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.9.2", + "baseline": "1.9.3", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index fdc4400aea62ec..95516a88d0ce20 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f6415b681ece13c2834e83c9876a845ce718eb4", + "version": "1.9.3", + "port-version": 0 + }, { "git-tree": "dfb0ed37ac62c7704664274ee0219d7823fec9d1", "version": "1.9.2", From 8308c141fd1ece0b7f35314f64357876b1fd80b0 Mon Sep 17 00:00:00 2001 From: Vincent Thiberville Date: Tue, 12 Dec 2023 10:45:03 +0100 Subject: [PATCH 0597/1039] [libxslt] do not require default features of libxml2 (#35565) --- ports/libxslt/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 8b9e8b83bc22c4..d3499b09e3a9ad 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,13 +1,16 @@ { "name": "libxslt", "version": "1.1.37", - "port-version": 2, + "port-version": 3, "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": [ - "libxml2", + { + "name": "libxml2", + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index b28516fe9d4270..116bba0b2445d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5146,7 +5146,7 @@ }, "libxslt": { "baseline": "1.1.37", - "port-version": 2 + "port-version": 3 }, "libxt": { "baseline": "1.2.1", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index b29b3a4855eb69..cd40773301e140 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c34fe62d32f65f3a4b188a327eda7a4f134fea2", + "version": "1.1.37", + "port-version": 3 + }, { "git-tree": "b5013956f82220811954d9ed3b68e122c11e88a0", "version": "1.1.37", From 0da40a8b53f67f98b0e210a581b82b26947ac97c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:51:55 +0800 Subject: [PATCH 0598/1039] [python3] Add a warning message for installing autoconf automake and autoconf-archive (#35548) * [python3] Add a warning message for installing autoconf automake and autoconf-archive * Apply suggestion --- ports/python3/portfile.cmake | 15 +++++++++++++++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index a39a2a0ba67384..5a498e37156185 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -3,6 +3,21 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static set(VCPKG_LIBRARY_LINKAGE static) endif() +if(NOT VCPKG_HOST_IS_WINDOWS) + message(WARNING "${PORT} currently requires the following programs from the system package manager: + autoconf automake autoconf-archive +On Debian and Ubuntu derivatives: + sudo apt-get install autoconf automake autoconf-archive +On recent Red Hat and Fedora derivatives: + sudo dnf install autoconf automake autoconf-archive +On Arch Linux and derivatives: + sudo pacman -S autoconf automake autoconf-archive +On Alpine: + apk add autoconf automake autoconf-archive +On macOS: + brew install autoconf automake autoconf-archive\n") +endif() + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" PYTHON_VERSION "${VERSION}") set(PYTHON_VERSION_MAJOR "${CMAKE_MATCH_1}") set(PYTHON_VERSION_MINOR "${CMAKE_MATCH_2}") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 7a64699ae1bfc7..4f32a58cec8834 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.11.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 116bba0b2445d3..9a2838a5072a87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6862,7 +6862,7 @@ }, "python3": { "baseline": "3.11.5", - "port-version": 2 + "port-version": 3 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6e12f40b9c378b..7fd094a947c7fb 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6acf202b9752a04a0b9557d1ea9e4fa2f427e8d", + "version": "3.11.5", + "port-version": 3 + }, { "git-tree": "f51d67945e156a17ca72a743f04455a368e73272", "version": "3.11.5", From b2a65e780a2df725111423e1e183860ffde8aaf1 Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Tue, 12 Dec 2023 23:03:22 +1100 Subject: [PATCH 0599/1039] [qwt] update to 6.2.1 and add CMake config (#35522) * update port. * update versions. * add unofficial target config (uses qmake build outputs). * update versions file. * formatting. * fix typo. * try again. * resolve comments. * update versions. * fix. * update versions file. * Add include. * update versions file. --------- Co-authored-by: Nick D'Ademo --- ports/qwt/portfile.cmake | 65 ++++++++++++++------------- ports/qwt/unofficial-qwt-config.cmake | 48 ++++++++++++++++++++ ports/qwt/vcpkg.json | 5 +-- versions/baseline.json | 4 +- versions/q-/qwt.json | 5 +++ 5 files changed, 90 insertions(+), 37 deletions(-) create mode 100644 ports/qwt/unofficial-qwt-config.cmake diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index d11f7da0f897b8..60ee82f872d8bb 100644 --- a/ports/qwt/portfile.cmake +++ b/ports/qwt/portfile.cmake @@ -1,32 +1,33 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL "https://git.code.sf.net/p/qwt/git" - REF "06d6822b595b70c9fd567a4fe0d835759bf271fe" - FETCH_REF qwt-6.2 - PATCHES - config.patch - fix_dll_install.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" IS_DYNAMIC) -set(OPTIONS "") -if(IS_DYNAMIC) - set(OPTIONS "QWT_CONFIG+=QwtDll") -endif() -vcpkg_qmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - QMAKE_OPTIONS - ${OPTIONS} - "CONFIG-=debug_and_release" - "CONFIG+=create_prl" - "CONFIG+=link_prl" -) -vcpkg_qmake_install() -vcpkg_copy_pdbs() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL "https://git.code.sf.net/p/qwt/git" + REF "907846e0e981b216349156ee83b13208faae2934" + FETCH_REF qwt-6.2 + PATCHES + config.patch + fix_dll_install.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" IS_DYNAMIC) +set(OPTIONS "") +if(IS_DYNAMIC) + list(APPEND OPTIONS "QWT_CONFIG+=QwtDll") +endif() +vcpkg_qmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + QMAKE_OPTIONS + ${OPTIONS} + "CONFIG-=debug_and_release" + "CONFIG+=create_prl" + "CONFIG+=link_prl" +) +vcpkg_qmake_install() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-qwt-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-qwt") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/qwt/unofficial-qwt-config.cmake b/ports/qwt/unofficial-qwt-config.cmake new file mode 100644 index 00000000000000..c04a5ebe834dfe --- /dev/null +++ b/ports/qwt/unofficial-qwt-config.cmake @@ -0,0 +1,48 @@ +include(CMakeFindDependencyMacro) + +if(NOT TARGET unofficial::qwt::qwt) + find_dependency(Qt6 COMPONENTS Core Gui Widgets Svg OpenGL Concurrent PrintSupport OpenGLWidgets) + + find_file(qwt_LIBRARY_RELEASE_DLL NAMES qwt.dll PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin" NO_DEFAULT_PATH) + find_file(qwt_LIBRARY_DEBUG_DLL NAMES qwtd.dll PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin" NO_DEFAULT_PATH) + + if(EXISTS "${qwt_LIBRARY_RELEASE_DLL}") + add_library(unofficial::qwt::qwt SHARED IMPORTED) + set_target_properties(unofficial::qwt::qwt PROPERTIES INTERFACE_COMPILE_DEFINITIONS QWT_DLL) + set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + find_library(qwt_LIBRARY_RELEASE NAMES qwt PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_IMPLIB_RELEASE "${qwt_LIBRARY_RELEASE}") + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_RELEASE "${qwt_LIBRARY_RELEASE_DLL}") + if(EXISTS "${qwt_LIBRARY_DEBUG_DLL}") + set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + find_library(qwt_LIBRARY_DEBUG NAMES qwtd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_IMPLIB_DEBUG "${qwt_LIBRARY_DEBUG}") + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_DEBUG "${qwt_LIBRARY_DEBUG_DLL}") + endif() + else() + add_library(unofficial::qwt::qwt UNKNOWN IMPORTED) + find_library(qwt_LIBRARY_RELEASE NAMES qwt PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + if(EXISTS "${qwt_LIBRARY_RELEASE}") + set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_RELEASE "${qwt_LIBRARY_RELEASE}") + endif() + find_library(qwt_LIBRARY_DEBUG NAMES qwtd PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + if(EXISTS "${qwt_LIBRARY_DEBUG}") + set_property(TARGET unofficial::qwt::qwt APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") + set_target_properties(unofficial::qwt::qwt PROPERTIES IMPORTED_LOCATION_DEBUG "${qwt_LIBRARY_DEBUG}") + endif() + endif() + + set_target_properties(unofficial::qwt::qwt PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" + ) + target_link_libraries(unofficial::qwt::qwt + INTERFACE + Qt::Widgets + Qt::Svg + Qt::Concurrent + Qt::PrintSupport + Qt::OpenGL + Qt::OpenGLWidgets + ) +endif() \ No newline at end of file diff --git a/ports/qwt/vcpkg.json b/ports/qwt/vcpkg.json index 18b9a2e6632caf..07b74bc8f73b27 100644 --- a/ports/qwt/vcpkg.json +++ b/ports/qwt/vcpkg.json @@ -1,8 +1,7 @@ { "name": "qwt", - "version": "6.2.0+20220616", - "port-version": 1, - "description": "qt widgets library for technical applications", + "version-date": "2023-05-12", + "description": "Widgets library for technical applications", "homepage": "https://sourceforge.net/projects/qwt", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9a2838a5072a87..d3492c49e8f1a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7309,8 +7309,8 @@ "port-version": 3 }, "qwt": { - "baseline": "6.2.0+20220616", - "port-version": 1 + "baseline": "2023-05-12", + "port-version": 0 }, "qwtw": { "baseline": "3.1.0", diff --git a/versions/q-/qwt.json b/versions/q-/qwt.json index b83b5737136b21..c3cad9280574f0 100644 --- a/versions/q-/qwt.json +++ b/versions/q-/qwt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1e2a09246f114b613350042641546934ea0ff27", + "version-date": "2023-05-12", + "port-version": 0 + }, { "git-tree": "1b200939b471ac5ff1f02f62ed38715d4efc6df8", "version": "6.2.0+20220616", From f56238700757aa05975e41fa835739c632810f3f Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Tue, 12 Dec 2023 20:17:47 +0800 Subject: [PATCH 0600/1039] [veigar] Add new port. (#35327) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. * [cpp-ipc] Update to v1.2.0 * [cpp-ipc] Update to v1.2.0 * Add new port named zoe. * Add zoe to baseline. * Add zeo.json * [zoe] Update REF * [zoe] Update version. * [zoe] Add port version. * [zoe] run x-add-version --all * [zoe] Remove port-version * [zoe] Update port-version * [zoe] Update version * [zoe] Update code ref. * [zoe] Update git-version. * [zoe] Update portfile.cmake * [zoe] overwrite-version * [zoe] Update ref. * [zoe] overwrite-version * [zoe] Update portfile. * [zoe] overwrite-version * [zoe] Not support android. * [zoe] Update zoe.json * [crashrpt-lite] Add new port. * Format manifest files * [crashrpt-lite] Instead deprecated functions. * add crashrpt-lite.json * [crashrpt-lite] update version. * Remvoe crashrpt-lite * Remvoe crashrpt-lite * [zoe] Export cmake config files. * [zoe] Export cmake config files. * [zoe] Update git-tree. * [zoe] Add usage and config fixup. * [zoe] Update git-tree * [zoe] remove usage. * [zoe] Update git-tree * use new function * vdb * [veigar] Add a new port. * [veigar] Add a new port. * [veigar] Add veigar.json * [veigar] Fix compile issue. * [veigar] Update Code. * [veigar] Fix bug. * [veigar] Update veigar.json * Fix compilation failures on non-windows platforms. * [veigar] overwrite-version * [veigar] Fix compilation failures on non-windows platforms. * [veigar] Fix compilation failures on non-windows platforms. * [veigar] Add support platform. * [veigar] overwrite-version * [veigar] Add license. * [veigar] Add license. * [veigar] Use ${VERSION} * [veigar] Use ${VERSION} * [veigar] Update code REF. * [veigar] run .\vcpkg.exe x-add-version veigar --overwrite-version * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Not support uwp. * [veigar] Not support uwp. * [veigar] Fix bug. * [veigar] Fix bug. * [veigar] Update to 1.2 * [veigar] Update to 1.2 * [veigar] Update format. * [veigar] Update format. * [veigar] Update format. * [veigar] Remove debug share files. * [veigar] Remove debug share files. * [veigar] Update version. * [veigar] Update version. --------- Co-authored-by: FrankXie Co-authored-by: admin Co-authored-by: paipai Co-authored-by: Frank <1433351828@qq.com> --- ports/veigar/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/veigar/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/v-/veigar.json | 9 +++++++++ 4 files changed, 58 insertions(+) create mode 100644 ports/veigar/portfile.cmake create mode 100644 ports/veigar/vcpkg.json create mode 100644 versions/v-/veigar.json diff --git a/ports/veigar/portfile.cmake b/ports/veigar/portfile.cmake new file mode 100644 index 00000000000000..2dc26cfd6f1de5 --- /dev/null +++ b/ports/veigar/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO winsoft666/veigar + HEAD_REF master + REF ${VERSION} + SHA512 f67f2ba3b059b734e8eaf56005dc3abd011949080591caf40a4a0f881257761e2eba9b40b1e1f3207881ab755e1ab8b4b29f17eb63e645be2c81d979fd6a87d0 +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" VEIGAR_USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVEIGAR_USE_STATIC_CRT:BOOL=${VEIGAR_USE_STATIC_CRT} + -DVEIGAR_BUILD_TESTS:BOOL=OFF + -DVEIGAR_BUILD_EXAMPLES:BOOL=OFF +) + +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_pdbs() diff --git a/ports/veigar/vcpkg.json b/ports/veigar/vcpkg.json new file mode 100644 index 00000000000000..2af5409a8cdc18 --- /dev/null +++ b/ports/veigar/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "veigar", + "version": "1.0", + "maintainers": "winsoft666 ", + "description": "Cross platform RPC library using shared memory.", + "homepage": "https://github.com/winsoft666/veigar", + "license": "GPL-3.0-or-later", + "supports": "linux | (windows & !uwp & !xbox)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d3492c49e8f1a6..34fbbec0e5d44c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8880,6 +8880,10 @@ "baseline": "2.02.00", "port-version": 0 }, + "veigar": { + "baseline": "1.0", + "port-version": 0 + }, "verdict": { "baseline": "1.4.0", "port-version": 0 diff --git a/versions/v-/veigar.json b/versions/v-/veigar.json new file mode 100644 index 00000000000000..f5dc4933f53536 --- /dev/null +++ b/versions/v-/veigar.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ac6bbfdf9847f62c07cbaaaccd15e85aa7d60bb5", + "version": "1.0", + "port-version": 0 + } + ] +} From 3f3d8b00361ff1043f27ce9ad30b399f662f4507 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 13 Dec 2023 07:23:17 +0800 Subject: [PATCH 0601/1039] [darknet] Fix dependence cuda (#35413) * [darknet] Fix dependence cuda * version * version * version * tool update * version * add option * version * option * version * update tool * version * del patch * version * Correct cuda dependencies * version * revert portfile.cmake * version --- ports/darknet/portfile.cmake | 7 +++++-- ports/darknet/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 2 +- versions/d-/darknet.json | 5 +++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ports/darknet/portfile.cmake b/ports/darknet/portfile.cmake index 91f8d347b7e4f5..4626d33f2993ba 100644 --- a/ports/darknet/portfile.cmake +++ b/ports/darknet/portfile.cmake @@ -4,7 +4,8 @@ vcpkg_from_github( REF 8a0bf84c19e38214219dbd3345f04ce778426c57 SHA512 6253d5b498f4f6eba7fc539d5a4b4e163139f4841623f11d84760bcf1ffabe6519f85e98e3d4aeac6846313fea3b98451407134b6b6f5b91137c62d1647109d9 HEAD_REF master - PATCHES fix-dependence-getopt.patch + PATCHES + fix-dependence-getopt.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -33,7 +34,8 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} -DINSTALL_BIN_DIR:STRING=bin -DINSTALL_LIB_DIR:STRING=lib -DENABLE_OPENCV:BOOL=${ENABLE_OPENCV} @@ -59,4 +61,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/scripts/download_weights.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/scripts") message(STATUS "To download weight files, please go to ${CURRENT_INSTALLED_DIR}/tools/${PORT}/scripts and run ./download_weights.ps1") + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/darknet/vcpkg.json b/ports/darknet/vcpkg.json index ff05fd5a26b63e..db3e543dfc4891 100644 --- a/ports/darknet/vcpkg.json +++ b/ports/darknet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "darknet", "version-date": "2022-03-06", - "port-version": 3, + "port-version": 4, "description": "Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.", "homepage": "https://github.com/alexeyab/darknet", "license": null, @@ -64,6 +64,12 @@ "opencv-cuda": { "description": "Build darknet with support for latest version of CUDA-enabled OpenCV", "dependencies": [ + { + "name": "darknet", + "features": [ + "cuda" + ] + }, { "name": "opencv", "features": [ @@ -114,6 +120,12 @@ "opencv3-cuda": { "description": "Build darknet with support for CUDA-enabled OpenCV3", "dependencies": [ + { + "name": "darknet", + "features": [ + "cuda" + ] + }, { "name": "opencv3", "features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 34fbbec0e5d44c..d339d58d6b5ba5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2086,7 +2086,7 @@ }, "darknet": { "baseline": "2022-03-06", - "port-version": 3 + "port-version": 4 }, "darts-clone": { "baseline": "1767ab87cffe", diff --git a/versions/d-/darknet.json b/versions/d-/darknet.json index a85c812eb51d55..3b988ac067bf85 100644 --- a/versions/d-/darknet.json +++ b/versions/d-/darknet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b61e4babb5696ae0a5b1d85f9d81540c69688675", + "version-date": "2022-03-06", + "port-version": 4 + }, { "git-tree": "0143bad2181e6280f1c59918b5c1767ff166ad31", "version-date": "2022-03-06", From c8696863d371ab7f46e213d8f5ca923c4aef2a00 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 12 Dec 2023 16:53:51 -0800 Subject: [PATCH 0602/1039] Update vcpkg-tool to 2023-12-12. (#35637) https://github.com/microsoft/vcpkg-tool/releases/tag/2023-12-12 --- scripts/vcpkg-tool-metadata.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 6ebc7fdb8a0f05..4b957bd80e99b7 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-11-16 -VCPKG_MACOS_SHA=6f9c10f8d3e3752e654e3d79a93abfb865c5a7c4dcc5c675febff8409b42fa4ea440c4a92b403731cf60f7938f70737e792b91b274770f5d864ebc9621a98ed8 -VCPKG_MUSLC_SHA=d802ab09fca9554646e7db7ad3011c81174d4e56a69d0b516b0bc1801f81b80334a7add58ce8d7caf0915fbdb9147cd537c47cfb87ad2f04d97589f2e78df4ff -VCPKG_GLIBC_SHA=fcb65141efbfff8dced31570079fcc8807e169cf60c0c2ad35605b506bbe7da26fa558eef6516077b2e54cc4ea17636352a91c163db1b77bd1fba42603f202b9 -VCPKG_TOOL_SOURCE_SHA=00da03c332e82c5c474ce241961abe5f4c71179d589a4b76ce30c379f7bafd9384fdd4f99f427bee3f72da34147ccefa367bddd9db3e353cfdc3593ce7e5554f +VCPKG_TOOL_RELEASE_TAG=2023-12-12 +VCPKG_MACOS_SHA=57acd637005d783ff0eee93e5e580b94c91533c56be2d9b1159970e9f5141c94586bb52a7ffb15a1ed6b9d3ae97ffcb390e2a8a119668d33983833bb9c979f63 +VCPKG_MUSLC_SHA=e7afae6cfa704f2f789e4b88ecdfa29ccc10a93b340bb06703cd53c671179731248a2c9c3f95955e257ae5d1bdb17aa0102e92d446d1f11fa5525687115c0f34 +VCPKG_GLIBC_SHA=be3415acf864476d4ab9eb9fd76a7cdabb4a17c9bb6a1a34efaca5a8958dfb07cabda2aae92c91737f20156d0d0f0be555d3c04285452d95591c8cc99d317cf5 +VCPKG_TOOL_SOURCE_SHA=e3620cea7b34ba2e7bc2d718d039091b9dc2abf70208aefb0b8dce03cf01223d29fcdf8c609ccb4bb45accf60de0453c080cf53757f14b59c99919cd0dd7fe4f From ff6867374598312866fecfc64736a334591ceace Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Wed, 13 Dec 2023 11:02:35 +0000 Subject: [PATCH 0603/1039] [vcpkg-tool-meson] fix pkgconfig data file installation on FreeBSD (#35003) * [fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002) move pkgconfig script into the path indicated by the diagnositic emitted by vcpkg (see comment 1 of microsoft/vcpkg#35002). * [fontconfig] force installation of pc files (microsoft/vcpkg#35002) Undo the last commit and patch meson to force the pc file installation paths demanded by `vcpkg_fixup_pkgconfig` * [fontconfig] bump portrevision (microsoft/vcpkg#35002) * [fontconfig] regenerate versions (microsoft/vcpkg#35002) * Revert "[fontconfig] regenerate versions (microsoft/vcpkg#35002)" This reverts commit 8daf0e15a67c376779631442ce926236ba2ed2e4. * Revert "[fontconfig] bump portrevision (microsoft/vcpkg#35002)" This reverts commit a9727bc32325238565428e3497ae564d2d255b86. * Revert "[fontconfig] force installation of pc files (microsoft/vcpkg#35002)" This reverts commit c0c6e017c7ab255e5532428e68f9d7c6e1ae8aad. * Revert "[fontconfig] fix pkgconfig file installation (microsoft/vcpkg#35002)" This reverts commit 616d4ce83e091cd128f4d896fcff81a1de4ed1b9. * [vcpkg-tool-meson] fix pc-file installation paths on FreeBSD (microsoft#35002) * [vcpkg-tool-meson] bump portversion (microsoft/vcpkg#35002) * [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002) * [vcpkg-tool-meson] Use vcpkg_from_github to obtain source (microsoft/vcpkg#35002) * [vcpkg-tool-meson] Regenerate versions (microsoft/vcpkg#35002) * [vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002) vcpkg@ce9f50f7 has bumped vcpkg-tool-meson's adverticed version to 0.63, but not updated the `ref` variable, which still points to 0.62.1. Update meson to 0.63 and use ${VERSION} to avoid similar issues in the future, and regenerate patches/hashes accordingly. * [vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002) * Revert "[vcpkg-tool-meson] regenerate versions (microsoft/vcpkg#35002)" This reverts commit e9a424ef16d26e791e3e108e738982138084d41a. * Revert "[vcpkg-tool-meson] Use adverticed version of meson (microsoft/vcpkg#35002)" Meson 0.63 can't build gobject-introspection on a tier 1 supported target. Upgrading meson to 0.63 and handling regressions of that update is out of scope of #35002 anyways, and should be handled either on it's own PR, microsoft/vcpkg#28084 or microsoft/vcpkg#35348 . --- ports/vcpkg-tool-meson/meson-intl.patch | 6 +-- ports/vcpkg-tool-meson/portfile.cmake | 40 ++++++++----------- ...remove-freebsd-pcfile-specialization.patch | 17 ++++++++ ports/vcpkg-tool-meson/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++ 6 files changed, 42 insertions(+), 29 deletions(-) create mode 100644 ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch index 614db056d6acfa..6e2bcc31b60d2a 100644 --- a/ports/vcpkg-tool-meson/meson-intl.patch +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -1,7 +1,5 @@ -diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py -index 537af1f89..43d7febf2 100644 ---- a/tools/meson/mesonbuild/dependencies/misc.py -+++ b/tools/meson/mesonbuild/dependencies/misc.py +--- a/mesonbuild/dependencies/misc.py ++++ b/mesonbuild/dependencies/misc.py @@ -610,7 +610,8 @@ iconv_factory = DependencyFactory( intl_factory = DependencyFactory( diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 680083a4591628..08bf2f8384c2db 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -11,11 +11,7 @@ set(search_names meson meson.py) set(interpreter PYTHON3) set(apt_package_name "meson") set(brew_package_name "meson") -set(ref bb91cea0d66d8d036063dedec1f194d663399cdf) set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") -set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") -set(download_filename "meson-${ref}.tar.gz") -set(download_sha512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da) set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) @@ -32,26 +28,22 @@ vcpkg_find_acquire_program(PYTHON3) # VERSION_COMMAND ${version_command} # ) -if(NOT "${program}") - vcpkg_download_distfile(archive_path - URLS ${download_urls} - SHA512 "${download_sha512}" - FILENAME "${download_filename}" - ) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") - vcpkg_execute_in_download_mode( - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" - ) - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") - z_vcpkg_apply_patches( - SOURCE_PATH "${CURRENT_PACKAGES_DIR}" - PATCHES - meson-intl.patch - ) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/meson/test cases") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mesonbuild/meson + REF bb91cea0d66d8d036063dedec1f194d663399cdf + SHA512 e5888eb35dd4ab5fc0a16143cfbb5a7849f6d705e211a80baf0a8b753e2cf877a4587860a79cad129ec5f3474c12a73558ffe66439b1633d80b8044eceaff2da + PATCHES + meson-intl.patch + remove-freebsd-pcfile-specialization.patch +) + +file(INSTALL "${SOURCE_PATH}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools" + RENAME "meson" +) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) z_vcpkg_find_acquire_program_find_internal("${program}" INTERPRETER "${interpreter}" diff --git a/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch b/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch new file mode 100644 index 00000000000000..c5e9e0f4f6dcc7 --- /dev/null +++ b/ports/vcpkg-tool-meson/remove-freebsd-pcfile-specialization.patch @@ -0,0 +1,17 @@ +--- a/mesonbuild/modules/pkgconfig.py ++++ b/mesonbuild/modules/pkgconfig.py +@@ -583,12 +583,8 @@ class PkgConfigModule(ExtensionModule): + pcfile = filebase + '.pc' + pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir) + if pkgroot is None: +- if mesonlib.is_freebsd(): +- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('prefix')), 'libdata', 'pkgconfig') +- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') +- else: +- pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') +- pkgroot_name = os.path.join('{libdir}', 'pkgconfig') ++ pkgroot = os.path.join(state.environment.coredata.get_option(mesonlib.OptionKey('libdir')), 'pkgconfig') ++ pkgroot_name = os.path.join('{libdir}', 'pkgconfig') + if not isinstance(pkgroot, str): + raise mesonlib.MesonException('Install_dir must be a string.') + self._generate_pkgconfig_file(state, deps, subdirs, name, description, url, diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 70c9690af8578c..bb24ed66b4f8a9 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "0.63", + "port-version": 1, "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 d339d58d6b5ba5..7ceb21b822fdc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8858,7 +8858,7 @@ }, "vcpkg-tool-meson": { "baseline": "0.63", - "port-version": 0 + "port-version": 1 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 742ccaecdb36b2..8ab8416f1e9e4e 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4234634624fc778e5d80db63cf53bac8587ebb9", + "version": "0.63", + "port-version": 1 + }, { "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", "version": "0.63", From e1aeabf283cf5e6ec5f40cae1a6f7ed5aafd62a8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 14 Dec 2023 02:36:03 +0100 Subject: [PATCH 0604/1039] [qtwebengine] Fix clang-cl and msvc in VS 17.8.3 (#35639) --- ports/qtwebengine/clang-cl.patch | 24 +++++ ports/qtwebengine/msvc-template.patch | 124 ++++++++++++++++++++++++++ ports/qtwebengine/portfile.cmake | 7 +- ports/qtwebengine/vcpkg.json | 7 +- versions/baseline.json | 2 +- versions/q-/qtwebengine.json | 5 ++ 6 files changed, 164 insertions(+), 5 deletions(-) create mode 100644 ports/qtwebengine/clang-cl.patch create mode 100644 ports/qtwebengine/msvc-template.patch diff --git a/ports/qtwebengine/clang-cl.patch b/ports/qtwebengine/clang-cl.patch new file mode 100644 index 00000000000000..03c87b84df77a0 --- /dev/null +++ b/ports/qtwebengine/clang-cl.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/gn/build/build_win.ninja.template b/src/3rdparty/gn/build/build_win.ninja.template +index 7d2704c..b14186b 100644 +--- a/src/3rdparty/gn/build/build_win.ninja.template ++++ b/src/3rdparty/gn/build/build_win.ninja.template +@@ -8,5 +8,5 @@ rule alink_thin + description = LIB $out + + rule link +- command = $ld /nologo $in /link $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs ++ command = $ld /nologo $in $ldflags /PDB:$out.pdb /OUT:$out $solibs $libs + description = LINK $out +diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt +index 0fe3e4e..1e2556f 100644 +--- a/src/gn/CMakeLists.txt ++++ b/src/gn/CMakeLists.txt +@@ -31,7 +31,7 @@ find_package(Ninja 1.7.2 REQUIRED) + + if(WIN32) + set(GN_EXECUTABLE gn.exe) +- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW) ++ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MINGW OR MSVC) + # Use lld-link instead of clang-cl. + set(GN_LINKER ${CMAKE_LINKER}) + endif() diff --git a/ports/qtwebengine/msvc-template.patch b/ports/qtwebengine/msvc-template.patch new file mode 100644 index 00000000000000..d0a61806e2b2a5 --- /dev/null +++ b/ports/qtwebengine/msvc-template.patch @@ -0,0 +1,124 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h +index 459c6a5..687a364 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h +@@ -224,60 +224,13 @@ ToStringVal MakeVal(const T& x) { + template + class LogStreamer; + +-// Base case: Before the first << argument. +-template <> +-class LogStreamer<> final { +- public: +- template ())), +- absl::enable_if_t::value || +- std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(U arg) const { +- return LogStreamer(MakeVal(arg), this); +- } +- +- template ())), +- absl::enable_if_t::value && +- !std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(const U& arg) const { +- return LogStreamer(MakeVal(arg), this); +- } +- +-#if RTC_CHECK_MSG_ENABLED +- template +- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, +- const int line, +- const char* message, +- const Us&... args) { +- static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; +- FatalLog(file, line, message, t, args.GetVal()...); +- } +- +- template +- RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, +- const int line, +- const char* message, +- const Us&... args) { +- static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., +- CheckArgType::kEnd}; +- FatalLog(file, line, message, t, args.GetVal()...); +- } +-#else +- template +- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, +- const int line) { +- FatalLog(file, line); +- } +-#endif +-}; + + // Inductive case: We've already seen at least one << argument. The most recent + // one had type `T`, and the earlier ones had types `Ts`. + template + class LogStreamer final { + public: +- RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer* prior) ++ RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer * const prior) + : arg_(arg), prior_(prior) {} + + template final { + const LogStreamer* prior_; + }; + ++ ++// Base case: Before the first << argument. ++template <> ++class LogStreamer<> final { ++ public: ++ template >::value || ++ std::is_enum::value>* = nullptr> ++ RTC_FORCE_INLINE auto operator<<(U arg) const { ++ return LogStreamer(MakeVal(arg), this); ++ } ++ ++ template >::value && ++ !std::is_enum::value>* = nullptr> ++ RTC_FORCE_INLINE auto operator<<(const U& arg) const { ++ return LogStreamer(MakeVal(arg), this); ++ } ++ ++ //RTC_FORCE_INLINE auto operator<<(const std::string& arg) const { ++ // return LogStreamer>(MakeVal(arg), this); ++ // ++ ++#if RTC_CHECK_MSG_ENABLED ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, ++ const int line, ++ const char* message, ++ const Us&... args) { ++ static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; ++ FatalLog(file, line, message, t, args.GetVal()...); ++ } ++ ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, ++ const int line, ++ const char* message, ++ const Us&... args) { ++ static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., ++ CheckArgType::kEnd}; ++ FatalLog(file, line, message, t, args.GetVal()...); ++ } ++#else ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, ++ const int line) { ++ FatalLog(file, line); ++ } ++#endif ++}; ++ + template + class FatalLogCall final { + public: diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index e927ab4850e3fe..66d20d188be793 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -1,7 +1,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES "") +set(${PORT}_PATCHES + "clang-cl.patch" + "msvc-template.patch" +) set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) @@ -29,7 +32,7 @@ set(deactivated_features webengine_webrtc_pipewire) foreach(_feat IN LISTS deactivated_features) list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") endforeach() -set(enabled_features webengine_webrtc webengine_v8_snapshot_support) +set(enabled_features webengine_webrtc) foreach(_feat IN LISTS enabled_features) list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=ON") endforeach() diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 942f49da7fc41e..2b2969d41df811 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.6.1", - "port-version": 1, + "port-version": 2, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, @@ -152,7 +152,10 @@ "dependencies": [ { "name": "qtwebchannel", - "default-features": false + "default-features": false, + "features": [ + "qml" + ] } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7ceb21b822fdc7..7ab7c137c94415 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7266,7 +7266,7 @@ }, "qtwebengine": { "baseline": "6.6.1", - "port-version": 1 + "port-version": 2 }, "qtwebsockets": { "baseline": "6.6.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index e466151563f28d..22f85a14e59c9e 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da0e5d03340ccc05f77e90cb898e62237746107", + "version": "6.6.1", + "port-version": 2 + }, { "git-tree": "f84af713f1090d7294c2707dc722373c06857114", "version": "6.6.1", From e37492a0e5147e3999073f0a70facda4d595b8e6 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:16:15 +0800 Subject: [PATCH 0605/1039] [glfw3] update to 3.3.9 (#35667) * [glfw3] update to 3.3.9 * [glfw3] update versions --- ports/glfw3/fix_win32_dllname.pacth | 29 ----------------------------- ports/glfw3/portfile.cmake | 6 ++---- ports/glfw3/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/glfw3.json | 5 +++++ 5 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 ports/glfw3/fix_win32_dllname.pacth diff --git a/ports/glfw3/fix_win32_dllname.pacth b/ports/glfw3/fix_win32_dllname.pacth deleted file mode 100644 index 99484aa61bf974..00000000000000 --- a/ports/glfw3/fix_win32_dllname.pacth +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7506916..1ec8e9e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -333,6 +333,12 @@ write_basic_package_version_file(src/glfw3ConfigVersion.cmake - COMPATIBILITY SameMajorVersion) - - configure_file(src/glfw_config.h.in src/glfw_config.h @ONLY) -+set(GLFW_LIB_NAME_SUFFIX "") -+if (BUILD_SHARED_LIBS) -+ if (WIN32) -+ set(GLFW_LIB_NAME_SUFFIX "dll") -+ endif() -+endif() - - configure_file(src/glfw3.pc.in src/glfw3.pc @ONLY) - -diff --git a/src/glfw3.pc.in b/src/glfw3.pc.in -index f74298d..17779ac 100644 ---- a/src/glfw3.pc.in -+++ b/src/glfw3.pc.in -@@ -8,6 +8,6 @@ Description: A multi-platform library for OpenGL, window and input - Version: @GLFW_VERSION@ - URL: https://www.glfw.org/ - Requires.private: @GLFW_PKG_DEPS@ --Libs: -L${libdir} -l@GLFW_LIB_NAME@ -+Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@ - Libs.private: @GLFW_PKG_LIBS@ - Cflags: -I${includedir} diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 4eba573c854ed8..c41b5a2a3c8724 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8 - SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87 + REF ${VERSION} + SHA512 9fcccd650990fa88fcb6383afa90bc6c2eca7f4a4a3d4fc58fa5bd6b7995c32989bb29d2753f438984043b294244b82ba9f094426e12f3d4da4547e73bb62e3f HEAD_REF master - PATCHES - fix_win32_dllname.pacth #https://github.com/glfw/glfw/pull/2386 ) if(VCPKG_TARGET_IS_LINUX) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index 90cd3a0dadedd9..06322a643746b7 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glfw3", - "version-semver": "3.3.8", - "port-version": 3, + "version-semver": "3.3.9", "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 7ab7c137c94415..718594be257d1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2993,8 +2993,8 @@ "port-version": 3 }, "glfw3": { - "baseline": "3.3.8", - "port-version": 3 + "baseline": "3.3.9", + "port-version": 0 }, "gli": { "baseline": "2021-07-06", diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index 52cf8a86158423..6e95d8b71dcdc3 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "347c2801030056251468ce87934b4e9b02c41741", + "version-semver": "3.3.9", + "port-version": 0 + }, { "git-tree": "c21a08a861a502b0e10c4a82de391a60bba6a4e6", "version-semver": "3.3.8", From 82ad3ea73591e984ebdfe4f045e2e55afbe74a2c Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:16:35 +0800 Subject: [PATCH 0606/1039] update to 12.6.6 (#35666) --- ports/armadillo/portfile.cmake | 2 +- ports/armadillo/vcpkg.json | 2 +- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 728e9fecf8a15e..54295f1c244236 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma FILENAME "armadillo-${VERSION}.tar.xz" - SHA512 163e81e09d3cd13aa80833ce06d9c4f1889110efa99532adfb66ffac6abb067eedb81775f9a988377d3197f75bfd3cefda56c003cbfe4f2b8256bed680a028de + SHA512 bf6a3db60256aa9789b52d92b33971a43816e73cd079d08e35350fcb251c213fba59604263595f886c4228147e75dd9308a5208ab9b290bb094128a1aee5da3d PATCHES cmake-config.patch dependencies.patch diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index d2b88a5e5f84bb..92050bc826ace2 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "armadillo", - "version": "12.4.1", + "version": "12.6.6", "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": "https://arma.sourceforge.net/", "license": "Apache-2.0", diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index ac10d14111ad83..ea55c14c0101bc 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c47c5cebd38878763558370cea0db1d527f2fc0a", + "version": "12.6.6", + "port-version": 0 + }, { "git-tree": "b90cf9e80b6fc606809b1cdfa6b61c433848e197", "version": "12.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index 718594be257d1c..c2a0679b10bc6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -225,7 +225,7 @@ "port-version": 0 }, "armadillo": { - "baseline": "12.4.1", + "baseline": "12.6.6", "port-version": 0 }, "arpack-ng": { From b842dacae7df83b1528fc56e0d88102269a2017b Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 13 Dec 2023 23:18:00 -0800 Subject: [PATCH 0607/1039] [directx-headers] update port for 1.611.0 release (#35660) * [directx-headers] update port for 1.611.0 release * Update baseline --- ports/directx-headers/portfile.cmake | 10 +++++----- ports/directx-headers/usage | 4 ++++ ports/directx-headers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directx-headers.json | 5 +++++ 5 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 ports/directx-headers/usage diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 6b09cb0aa762c0..93dce1e2dc4197 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,21 +1,21 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers REF v${VERSION} - SHA512 37781f20b533c68d2adacda36936e70d43cf83b108ec76b224b0633760f8e993467618e40b21dd4a71ff314f1b35e3812d7ec85663696bab7132222d1fb5b987 + SHA512 717ed37f6404d67a032f50358a17bcab6c6258eff321287e4a26cef203738d4e5c930a53afc43d8175637634d71dfbb7c25f13eedaa35a4626cb402fa5e56abc HEAD_REF main ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF + OPTIONS -DDXHEADERS_INSTALL=ON -DDXHEADERS_BUILD_TEST=OFF -DDXHEADERS_BUILD_GOOGLE_TEST=OFF ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directx-headers/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/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}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directx-headers/usage b/ports/directx-headers/usage new file mode 100644 index 00000000000000..bc8737563ea8d9 --- /dev/null +++ b/ports/directx-headers/usage @@ -0,0 +1,4 @@ +The DirectX Headers package provides CMake targets: + + find_package(directx-headers CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectX-Headers) diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index be90d0c0db52e2..8c070ed4c9fdb6 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directx-headers", - "version": "1.610.2", + "version": "1.611.0", "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 c2a0679b10bc6a..47c2663abb1d39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2177,7 +2177,7 @@ "port-version": 0 }, "directx-headers": { - "baseline": "1.610.2", + "baseline": "1.611.0", "port-version": 0 }, "directxmath": { diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 3775503a6ce9e1..28019e7fa6fe94 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb40a4684c1b18daa80a09fc344d94622a275161", + "version": "1.611.0", + "port-version": 0 + }, { "git-tree": "36881ec4ee5f1623dc083ef7afcfe1133c3fbd32", "version": "1.610.2", From ed2b097ffdc729598c89fd187e2ecb1fa344926f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 14 Dec 2023 14:19:47 +0700 Subject: [PATCH 0608/1039] [z3] Update to 4.12.4. (#35655) --- ports/z3/fix-cstdint-include.patch | 12 ------------ ports/z3/portfile.cmake | 5 ++--- ports/z3/remove-flag-overrides.patch | 4 ++-- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 6 +++++- 6 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 ports/z3/fix-cstdint-include.patch diff --git a/ports/z3/fix-cstdint-include.patch b/ports/z3/fix-cstdint-include.patch deleted file mode 100644 index fe3a1fcdba5112..00000000000000 --- a/ports/z3/fix-cstdint-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/util/tptr.h b/src/util/tptr.h -index 6213b2efa..2a35af535 100644 ---- a/src/util/tptr.h -+++ b/src/util/tptr.h -@@ -20,6 +20,7 @@ Revision History: - #pragma once - - #include "util/machine.h" -+#include - - #define TAG_SHIFT PTR_ALIGNMENT - #define ALIGNMENT_VALUE (1 << PTR_ALIGNMENT) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 5a8ca23df302c8..82ee908682484c 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,12 +5,11 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.12.2 - SHA512 375477cbbc9837b44e752c89916409d07bf6a73830b52878aab4f376f08b37dd5ab485da225744d394ab15f2a7e1014edc3be5eb9962934c440a8d55259317e2 + REF z3-${VERSION} + SHA512 fcb778d2e3e0d13fc68afcd8724548279f9edbbb4aac1bbb93e00959c33330ab2fd84f2c2e4b0b78f767819725a90b845fc606a9adc931ae1f0a11f4deae433b HEAD_REF master PATCHES fix-install-path.patch - fix-cstdint-include.patch remove-flag-overrides.patch ) diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index d50e6120ffc621..d872612d80da45 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -4,9 +4,9 @@ index 477410ba8..fcca03917 100644 +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ # Enforce some CMake policies - cmake_minimum_required(VERSION 3.4) + cmake_minimum_required(VERSION 3.16) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.12.2.0 LANGUAGES CXX) + project(Z3 VERSION 4.12.4.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 7f44e4c51e0c8c..9cb897f98baa83 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.12.2", + "version": "4.12.4", "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 47c2663abb1d39..39ea1fe773ddda 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9329,7 +9329,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.12.2", + "baseline": "4.12.4", "port-version": 0 }, "z4kn4fein-semver": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 504c2034a897aa..94a4e9a6bf8f2d 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,11 +1,15 @@ { "versions": [ + { + "git-tree": "98aa7c18e339247b197bab014d1a52310ba39a7a", + "version": "4.12.4", + "port-version": 0 + }, { "git-tree": "dcef04d626f19434eaf9d2a3afb43d927bbd372e", "version": "4.12.2", "port-version": 0 }, - { "git-tree": "4c57981e593026824fe9bedff234a82c13765e29", "version": "4.11.0", From 9fc945b4a28d67e76bbc7df281a52278047e4b11 Mon Sep 17 00:00:00 2001 From: winsoft666 Date: Thu, 14 Dec 2023 15:23:17 +0800 Subject: [PATCH 0609/1039] [cpp-ipc] Update 1.3.0 (#35668) * [teemo] Update to v2.7 * [teemo] Format manifest * [teemo] Update to v2.7 * [akali] Update to v1.43 * [akali] Update to v1.43 * [akali] Update to v1.43 * overwrite version * add license * overwrite version * [akali] Update string replace method. * [akali] run x-add-version command. * [cpp-ipc] Update to v1.2.0 * [cpp-ipc] Update to v1.2.0 * Add new port named zoe. * Add zoe to baseline. * Add zeo.json * [zoe] Update REF * [zoe] Update version. * [zoe] Add port version. * [zoe] run x-add-version --all * [zoe] Remove port-version * [zoe] Update port-version * [zoe] Update version * [zoe] Update code ref. * [zoe] Update git-version. * [zoe] Update portfile.cmake * [zoe] overwrite-version * [zoe] Update ref. * [zoe] overwrite-version * [zoe] Update portfile. * [zoe] overwrite-version * [zoe] Not support android. * [zoe] Update zoe.json * [crashrpt-lite] Add new port. * Format manifest files * [crashrpt-lite] Instead deprecated functions. * add crashrpt-lite.json * [crashrpt-lite] update version. * Remvoe crashrpt-lite * Remvoe crashrpt-lite * [zoe] Export cmake config files. * [zoe] Export cmake config files. * [zoe] Update git-tree. * [zoe] Add usage and config fixup. * [zoe] Update git-tree * [zoe] remove usage. * [zoe] Update git-tree * use new function * vdb * [veigar] Add a new port. * [veigar] Add a new port. * [veigar] Add veigar.json * [veigar] Fix compile issue. * [veigar] Update Code. * [veigar] Fix bug. * [veigar] Update veigar.json * Fix compilation failures on non-windows platforms. * [veigar] overwrite-version * [veigar] Fix compilation failures on non-windows platforms. * [veigar] Fix compilation failures on non-windows platforms. * [veigar] Add support platform. * [veigar] overwrite-version * [veigar] Add license. * [veigar] Add license. * [veigar] Use ${VERSION} * [veigar] Use ${VERSION} * [veigar] Update code REF. * [veigar] run .\vcpkg.exe x-add-version veigar --overwrite-version * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Update support platform. * [veigar] Not support uwp. * [veigar] Not support uwp. * [veigar] Fix bug. * [veigar] Fix bug. * [veigar] Update to 1.2 * [veigar] Update to 1.2 * [veigar] Update format. * [veigar] Update format. * [veigar] Update format. * [veigar] Remove debug share files. * [veigar] Remove debug share files. * [veigar] Update version. * [veigar] Update version. * [cpp-ipc] Update to 1.3.0 * [cpp-ipc] Update to 1.3.0 --------- Co-authored-by: FrankXie Co-authored-by: admin Co-authored-by: paipai Co-authored-by: Frank <1433351828@qq.com> --- ports/cpp-ipc/portfile.cmake | 4 ++-- ports/cpp-ipc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-ipc.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-ipc/portfile.cmake b/ports/cpp-ipc/portfile.cmake index 6dfacba15a54aa..4ce891fccbe99c 100644 --- a/ports/cpp-ipc/portfile.cmake +++ b/ports/cpp-ipc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc - REF f2f1af8f8e7877a28deb2eacdc379a22a99e4c82 #v1.2.0 - SHA512 e01fe5e2612141af64a9c44773a49c566b89ecf0a77164c6eb0a6d68bd7ff5830843ce42df5d53a863882b582a8d6a2e9f69026f244d8d1d96e83f0f4c9e8972 + REF 035d76d5aaaa420a61d5e08be841cc20e585adde #v1.3.0 + SHA512 fea7054befc143ca1b4c55f3ffb72eb81353ce08f761e7c1ca79dd016449f76fbfc19bdb046a68e4d84df0f24da0312a0f560d9a25257811689041267bb42f1a HEAD_REF master ) diff --git a/ports/cpp-ipc/vcpkg.json b/ports/cpp-ipc/vcpkg.json index 62e2bb49f1e1a9..0f18fc7a4c58c1 100644 --- a/ports/cpp-ipc/vcpkg.json +++ b/ports/cpp-ipc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-ipc", - "version": "1.2.0", + "version": "1.3.0", "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", "homepage": "https://github.com/mutouyun/cpp-ipc", "supports": "!osx", diff --git a/versions/baseline.json b/versions/baseline.json index 39ea1fe773ddda..1d0eb894de1972 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1813,7 +1813,7 @@ "port-version": 0 }, "cpp-ipc": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "cpp-jwt": { diff --git a/versions/c-/cpp-ipc.json b/versions/c-/cpp-ipc.json index 53f75c34f86f97..70e444c14f8c75 100644 --- a/versions/c-/cpp-ipc.json +++ b/versions/c-/cpp-ipc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36fd22ee76a212829a835b36934e27d825b58183", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "e86c1547d0be3d2acbe7cebdb799f24359c29e85", "version": "1.2.0", From 596bd06f1dc5c61a8fac34fb7c212d861b697bc6 Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:27:11 +0100 Subject: [PATCH 0610/1039] [configcat] Update to version 3.2.0 (#35651) * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.0 * [configcat] Update to version 3.1.1 * [configcat] Update to version 3.1.1 * [configcat] Update to version 3.2.0 * [configcat] Update to version 3.2.0 --- ports/configcat/portfile.cmake | 8 +++++++- ports/configcat/vcpkg.json | 36 ++++++++++++++++++++++------------ versions/baseline.json | 2 +- versions/c-/configcat.json | 5 +++++ 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/ports/configcat/portfile.cmake b/ports/configcat/portfile.cmake index 9714cb3a171dd4..f0390f220c7047 100644 --- a/ports/configcat/portfile.cmake +++ b/ports/configcat/portfile.cmake @@ -6,14 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO configcat/cpp-sdk REF "v${VERSION}" - SHA512 2d2c456c978babc3223783ec0e08ac7e73294703db4f932da12ce7e4b5163510689c4b996311543fd68acffc613a15a776767b144a4089eb12566a52af8017b7 + SHA512 a71706978b0a4e7b4bce7f194910b75221bc6483d38f7cda9d004abdf41dcdd97aa2754977e641c888065f3aeacd6e7e0893e5de1c9417a3d466a977a1dbb287 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + network CONFIGCAT_USE_EXTERNAL_NETWORK_ADAPTER +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCONFIGCAT_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/configcat/vcpkg.json b/ports/configcat/vcpkg.json index 90fa97b2f31189..da1ccd6119749e 100644 --- a/ports/configcat/vcpkg.json +++ b/ports/configcat/vcpkg.json @@ -1,23 +1,12 @@ { "name": "configcat", - "version": "3.1.1", + "version": "3.2.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": [ - { - "name": "curl", - "default-features": false, - "features": [ - "ssl" - ] - }, "hash-library", "nlohmann-json", - { - "name": "openssl", - "platform": "linux" - }, { "name": "vcpkg-cmake", "host": true @@ -27,5 +16,26 @@ "host": true }, "z4kn4fein-semver" - ] + ], + "default-features": [ + "network" + ], + "features": { + "network": { + "description": "Use built-in curl network adapter", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "ssl" + ] + }, + { + "name": "openssl", + "platform": "linux" + } + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 1d0eb894de1972..b4934c4f53618f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1761,7 +1761,7 @@ "port-version": 0 }, "configcat": { - "baseline": "3.1.1", + "baseline": "3.2.0", "port-version": 0 }, "console-bridge": { diff --git a/versions/c-/configcat.json b/versions/c-/configcat.json index b78bee82ea433c..09f3e0386d5e94 100644 --- a/versions/c-/configcat.json +++ b/versions/c-/configcat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f1f87e186100760a5a093476a921eb6396b46c7", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "278ce6bc975733e7807d36490f0e6d5c5c786ebb", "version": "3.1.1", From be2f582fae2a51196b88c71a7175e5615edfa63b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:27:47 +0100 Subject: [PATCH 0611/1039] [coin] fix clang-cl builds (#35647) * [coin] fix clang-cl build * v db --- ports/coin/fix-typedef.patch | 22 ++++++++++++++++++++++ ports/coin/portfile.cmake | 1 + ports/coin/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/coin.json | 5 +++++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/coin/fix-typedef.patch diff --git a/ports/coin/fix-typedef.patch b/ports/coin/fix-typedef.patch new file mode 100644 index 00000000000000..8f3481722a07ff --- /dev/null +++ b/ports/coin/fix-typedef.patch @@ -0,0 +1,22 @@ +diff --git a/include/Inventor/elements/SoGLLazyElement.h b/include/Inventor/elements/SoGLLazyElement.h +index 403711f..322f997 100644 +--- a/include/Inventor/elements/SoGLLazyElement.h ++++ b/include/Inventor/elements/SoGLLazyElement.h +@@ -74,7 +74,7 @@ public: + + void reset(SoState* state, uint32_t bitmask) const; + +- typedef struct COIN_DLL_API { ++ typedef struct COIN_DLL_API GLState { + uint32_t cachebitmask; + uint32_t diffuse; + SbColor ambient; +@@ -97,7 +97,7 @@ public: + SbUniqueId diffusenodeid; + SbUniqueId transpnodeid; + uint32_t reserved[4]; +- } GLState; ++ }; + + virtual void setDiffuseElt(SoNode*, int32_t numcolors, + const SbColor * colors, SoColorPacker * packer); diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index c14bf027b00b33..66667e0a5977c8 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES disable-cpackd.patch + fix-typedef.patch # clang-cl fix. ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index 8f7d873c4ff6b6..ace00f8fed2d28 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", "version": "4.0.0", - "port-version": 7, + "port-version": 8, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index b4934c4f53618f..5a77bc6d10032d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1694,7 +1694,7 @@ }, "coin": { "baseline": "4.0.0", - "port-version": 7 + "port-version": 8 }, "coin-or-buildtools": { "baseline": "2023-02-02", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 7c24b758415b5a..8f1b8133d5b871 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb22aa623ff6abbc31ab908a584855f8ee278e67", + "version": "4.0.0", + "port-version": 8 + }, { "git-tree": "329db8f62c8f5a6f9774670833471ad4decb75cc", "version": "4.0.0", From 812e37be7e0053d2713ba29c72594c1d2fcdedaf Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:28:56 +0800 Subject: [PATCH 0612/1039] [bootstrap] Use official cmake configuration (#35643) * [bootstrap] Use official cmake configuration * version --- ports/vk-bootstrap/portfile.cmake | 10 ++++---- ports/vk-bootstrap/vcpkg.json | 7 ++++-- ports/vk-bootstrap/vk-bootstrap-config.cmake | 24 -------------------- versions/baseline.json | 4 ++-- versions/v-/vk-bootstrap.json | 5 ++++ 5 files changed, 16 insertions(+), 34 deletions(-) delete mode 100644 ports/vk-bootstrap/vk-bootstrap-config.cmake diff --git a/ports/vk-bootstrap/portfile.cmake b/ports/vk-bootstrap/portfile.cmake index 19a68be7f249ad..ecdc47b30ce595 100644 --- a/ports/vk-bootstrap/portfile.cmake +++ b/ports/vk-bootstrap/portfile.cmake @@ -6,22 +6,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO charles-lunarg/vk-bootstrap REF "v${VERSION}" - SHA512 357ce69b080c6abcef7764652f5ab5e5fc744a9d0308bf457787f27c3c14a911480a7f9caf304ee92c33519bfbc977fb320fa3ef4a329716d0bd1b03135dd98e + SHA512 c60567a5330908380efea8ac95036e63321fe1e2e72314068a5117c9c0f64cd8b80bd5e98eed9177f1f84dc4ee10a2a2dd902d111fc1a30f503287a7e4b22640 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - # This option will disable build tests and example, and next release this option need to change as -DVK_BOOTSTRAP_TEST=OFF. The related upstream commit: https://github.com/charles-lunarg/vk-bootstrap/commit/4ae9513ff9182b9c519504a73435ed575a821300. - -DCMAKE_PROJECT_NAME= + -DVK_BOOTSTRAP_TEST=OFF + -DVK_BOOTSTRAP_INSTALL=ON ) vcpkg_cmake_install() -vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vk-bootstrap-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/vk-bootstrap/vcpkg.json b/ports/vk-bootstrap/vcpkg.json index 163137d37d3144..7c2b0e81f74c6d 100644 --- a/ports/vk-bootstrap/vcpkg.json +++ b/ports/vk-bootstrap/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vk-bootstrap", - "version": "0.7", - "port-version": 1, + "version": "1.3.273", "description": "Vulkan bootstraping library", "homepage": "https://github.com/charles-lunarg/vk-bootstrap", "license": "MIT", @@ -10,6 +9,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "vulkan-headers" ] } diff --git a/ports/vk-bootstrap/vk-bootstrap-config.cmake b/ports/vk-bootstrap/vk-bootstrap-config.cmake deleted file mode 100644 index 39ebda5c98eaa7..00000000000000 --- a/ports/vk-bootstrap/vk-bootstrap-config.cmake +++ /dev/null @@ -1,24 +0,0 @@ -if(NOT TARGET vk-bootstrap::vk-bootstrap) - 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) - - add_library(vk-bootstrap::vk-bootstrap UNKNOWN IMPORTED) - set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include") - - find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH REQUIRED) - set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Release") - set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_RELEASE "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_RELEASE}") - - find_library(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG NAMES vk-bootstrap PATHS "${_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH) - if(Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG) - set_property(TARGET vk-bootstrap::vk-bootstrap APPEND PROPERTY IMPORTED_CONFIGURATIONS "Debug") - set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_VKBOOTSTRAP_LIBRARY_DEBUG}") - endif() - - if(CMAKE_DL_LIBS) - set_target_properties(vk-bootstrap::vk-bootstrap PROPERTIES INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS}) - endif() - - unset(_IMPORT_PREFIX) -endif() diff --git a/versions/baseline.json b/versions/baseline.json index 5a77bc6d10032d..a28bc73269412a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8905,8 +8905,8 @@ "port-version": 0 }, "vk-bootstrap": { - "baseline": "0.7", - "port-version": 1 + "baseline": "1.3.273", + "port-version": 0 }, "vkfft": { "baseline": "1.2.31", diff --git a/versions/v-/vk-bootstrap.json b/versions/v-/vk-bootstrap.json index d123b38ca636a5..f45439cc39d13f 100644 --- a/versions/v-/vk-bootstrap.json +++ b/versions/v-/vk-bootstrap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3daa2be00dbf53598e2e71dd9c96fddac37d0855", + "version": "1.3.273", + "port-version": 0 + }, { "git-tree": "ff20e17db240f974d3afaae76bcf2afbe96a068c", "version": "0.7", From 47728ffbeb6931e60d53376ca335e1ddd9a177d3 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Thu, 14 Dec 2023 08:29:24 +0100 Subject: [PATCH 0613/1039] [rocksdb] Update to v8.9.1 (#35636) * [rocksdb] update to v8.9.1 * add version --- ports/rocksdb/0001-fix-dependencies.patch | 5 ++--- ports/rocksdb/portfile.cmake | 2 +- ports/rocksdb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rocksdb.json | 5 +++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/rocksdb/0001-fix-dependencies.patch b/ports/rocksdb/0001-fix-dependencies.patch index 03a8f7dae4a66d..7c16654413d7ae 100644 --- a/ports/rocksdb/0001-fix-dependencies.patch +++ b/ports/rocksdb/0001-fix-dependencies.patch @@ -3,7 +3,7 @@ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4e30f6631..b428c811b 100644 +index 23a4014bc..045f5a36d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ endif() @@ -79,7 +79,7 @@ index 4e30f6631..b428c811b 100644 endif() # Stall notifications eat some performance from inserts -@@ -1195,8 +1194,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) +@@ -1202,8 +1201,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) endforeach() endforeach() @@ -120,4 +120,3 @@ index 0bd14be11..a420d8bfe 100644 endif() find_dependency(Threads) - \ No newline at end of file diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 5bc017c80aa025..67f95bf935b73a 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb REF "v${VERSION}" - SHA512 2039a4afa9e6ee7d01aba3287f27f43cb48baf55be98b5be06f0b54982f7e28c1032ec1dbd1f10d946554c3c93a93686e7b51aab0d92f731ad4dd7d7c62bed74 + SHA512 a93720ef2ecafe2e3d51594b8a8bf6b5d36b0dfeae571cec650ee9d7b3d0c166bd6d9fbe2acb6e57cf34e73b58a2277a6465cce56a5274dd68b03bc9009e0323 HEAD_REF main PATCHES 0001-fix-dependencies.patch diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index 6faa032263c283..ca25d8e0219659 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rocksdb", - "version": "8.5.3", + "version": "8.9.1", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", "license": "GPL-2.0-only OR Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a28bc73269412a..74e50d9ddfdbbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7533,7 +7533,7 @@ "port-version": 0 }, "rocksdb": { - "baseline": "8.5.3", + "baseline": "8.9.1", "port-version": 0 }, "rpclib": { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index 0b4cd7b95ff3b4..1d412bc06dfd38 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0262aa76211da9eacdd5e70f88bf172eaef286bd", + "version": "8.9.1", + "port-version": 0 + }, { "git-tree": "caf00463e9aa52209110783d90fa39066eaa4249", "version": "8.5.3", From 9bc9d5794371207bc0c768acf0eaab6a6f40d244 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 14 Dec 2023 14:32:44 +0700 Subject: [PATCH 0614/1039] [catch2] Update to 3.5.0 (#35634) Also, update the description as v3 is no longer header-only. --- ports/catch2/portfile.cmake | 2 +- ports/catch2/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index c60cc95ee416d6..2f9549c927f858 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 REF v${VERSION} - SHA512 3b452378201ac53c9ffba7801231aa3b32c5fb496f01d670fcee25baf95f405e565ae2aafba49ea5694f906fc61a8b04592c68b9fb12839767070587a48c89fa + SHA512 2ffdc8e7851cacc2ab3062ee2c9531d7d90e9a906da8e0f9b3db4a93967a34d3f25e674b03facd7b63367bc2545e39e00ec30f8e10896967993dd01af9a5af92 HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 077d4e63b6d006..64ef09d789e260 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "catch2", - "version-semver": "3.4.0", - "description": "A modern, header-only test framework for unit testing.", + "version-semver": "3.5.0", + "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 74e50d9ddfdbbc..038b9fe2ae26c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1461,7 +1461,7 @@ "port-version": 2 }, "catch2": { - "baseline": "3.4.0", + "baseline": "3.5.0", "port-version": 0 }, "cccapstone": { diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 79141fb4e5b5a3..9440649740f706 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bac6509e806556e539c116680228c6df5802ed4", + "version-semver": "3.5.0", + "port-version": 0 + }, { "git-tree": "5796c1c0513a7b49f135e8acdd1976f53e9944ea", "version-semver": "3.4.0", From 60adafa10a12686bc02542f9452e2b54cd10787b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Thu, 14 Dec 2023 07:33:52 +0000 Subject: [PATCH 0615/1039] [Glaze] Update 1.9.5 (#35631) * Glaze update 1.9.5 * vcpkg update database --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 80578067efe0d1..696edb61af2a48 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 1ea55157024846cf3973e8564f357c70b86e9e89edd2f73472078edd65300ef7056a5d392f0ed906cb576329ce13894b99adc5f5071a0ae09c80ea8fdd9d00aa + SHA512 59c2b332c53c33c4410e3617c65ddf0aa592b985400a7ec7247af0fe561d33de3b94e8ea4ea143dcb7e55bd29f4b169ee79e99281bf493a8185172194195e574 ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index d672ff993de4a2..d9c81aa8f00871 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.9.3", + "version": "1.9.5", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 038b9fe2ae26c3..9a14a781250819 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.9.3", + "baseline": "1.9.5", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 95516a88d0ce20..0582befe2c7c88 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddf42a4875b810fc720e4bf4ae95613e1d79e29b", + "version": "1.9.5", + "port-version": 0 + }, { "git-tree": "8f6415b681ece13c2834e83c9876a845ce718eb4", "version": "1.9.3", From af29329bfb1706ef07b3d3bad75ed227af8815f1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:35:12 +0100 Subject: [PATCH 0616/1039] [qtbase] fix feature dbus (#35630) --- ports/qtbase/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c04355031fd5f4..f05210012f4aed 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.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, @@ -104,7 +104,16 @@ ] }, "dbus": { - "description": "Qt D-Bus" + "description": "Qt D-Bus", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "thread" + ] + } + ] }, "default-features": { "description": "Platform-dependent default features", diff --git a/versions/baseline.json b/versions/baseline.json index 9a14a781250819..fc250a5874e306 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7102,7 +7102,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index b53ba6c70d8ca1..2a1eac7f35d64c 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43986c6051eb870340850c13b94ea6cb9a28925c", + "version": "6.6.1", + "port-version": 2 + }, { "git-tree": "1a05b4f8f0ecf48816dfe2dd648bf0b1202d771e", "version": "6.6.1", From 4ec4584501ef975d968783ff7574369a554f69be Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 14 Dec 2023 02:36:20 -0500 Subject: [PATCH 0617/1039] [Jsonifier] to v0.9.93 and [DiscordCoreAPI] to v2.0.4 (#35625) Updating the necessary files. --- ports/discordcoreapi/portfile.cmake | 2 +- ports/discordcoreapi/vcpkg.json | 2 +- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 232672b5e8113d..3d740bae9a4280 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 12302c6ef374ee7e88538c4f736642ab15b6455f3db08ffd2028a84c843c0c13300f3ee300f5e12d3c7621fa9f914d3ceb29da52587ed678f6d0ce41c3d9e0d5 + SHA512 4fcffa23be80bd7cf13ded5b8a78d7b94832d1d80996d315c5ee333b7a4006903f4d9f7ec1046f01658887349e5bf29406fe2eb5c979578b6bdad188798f4173 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 26b3062d758527..0a63f45a675f2b 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.3", + "version": "2.0.4", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index a7af2bf0ccd9e8..2eab200578aeef 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 436dc66699ef924ca953e4d05b035ff7279fbbae932e74902eed0c6b9fd3e2bf282425c82f0d7d65392307602b5c603cf956d513df4c080c76566d4d9c61b373 + SHA512 da9a67e6987970462c22ac2174231c4c2d5531bd0ebd329cdaf8147f8777e03fb9a7c9ac2b23297dbe51fdf894720ac101ca11277f8a610a089fe9d06d0dbd38 HEAD_REF main PATCHES uninstall-head.patch diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index 370186fce6f1ef..e5237dc3bafaef 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.92", + "version": "0.9.93", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fc250a5874e306..593e7b9e30a244 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2217,7 +2217,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0.3", + "baseline": "2.0.4", "port-version": 0 }, "discount": { @@ -3701,7 +3701,7 @@ "port-version": 2 }, "jsonifier": { - "baseline": "0.9.92", + "baseline": "0.9.93", "port-version": 0 }, "jsonnet": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index c7bf7a26e01307..9cd30c25ee27e9 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ee6373146d5c81a3e7bd75e4f32da5ec846299d", + "version": "2.0.4", + "port-version": 0 + }, { "git-tree": "a836f4645f8f1dd567ed87160f62c4026b8db784", "version": "2.0.3", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 5fb5c6e2bcdc61..1c7ad700aeba46 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250b98a91d7bf114d5616c193cfb8ed3f8ee7aa7", + "version": "0.9.93", + "port-version": 0 + }, { "git-tree": "58dc6092ed3ff864e9b96b10b265586bffac3eeb", "version": "0.9.92", From bc998b3cb9b0be819e73fb413db992cb70ae3b73 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 14 Dec 2023 08:37:27 +0100 Subject: [PATCH 0618/1039] utf8-range: Add port (#35622) --- ports/utf8-range/fix-cmake.patch | 12 ++++++++++++ ports/utf8-range/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/utf8-range/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/u-/utf8-range.json | 9 +++++++++ 5 files changed, 70 insertions(+) create mode 100644 ports/utf8-range/fix-cmake.patch create mode 100644 ports/utf8-range/portfile.cmake create mode 100644 ports/utf8-range/vcpkg.json create mode 100644 versions/u-/utf8-range.json diff --git a/ports/utf8-range/fix-cmake.patch b/ports/utf8-range/fix-cmake.patch new file mode 100644 index 00000000000000..d006c70f1713d7 --- /dev/null +++ b/ports/utf8-range/fix-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/utf8_range/CMakeLists.txt b/third_party/utf8_range/CMakeLists.txt +index 344952d38..dd855df17 100644 +--- a/third_party/utf8_range/CMakeLists.txt ++++ b/third_party/utf8_range/CMakeLists.txt +@@ -63,6 +63,7 @@ if (utf8_range_ENABLE_INSTALL) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) + + configure_package_config_file( diff --git a/ports/utf8-range/portfile.cmake b/ports/utf8-range/portfile.cmake new file mode 100644 index 00000000000000..c54d38aef9c1a9 --- /dev/null +++ b/ports/utf8-range/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO protocolbuffers/protobuf + REF d30e326ca1f511ab537d9b2f73ce69b2f8f0c865 + SHA512 5f22493cfb6536d3a8a7bd752505baccacb85b0eade53b35763c3a30fab9197a8ff04bc9d4b6c2f66dc295b77c09a1b670d242f509f8705c0d699767d222eb38 + HEAD_REF main + PATCHES + fix-cmake.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/third_party/utf8_range" + OPTIONS + "-Dutf8_range_ENABLE_TESTS=off" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "utf8_range" CONFIG_PATH "lib/cmake/utf8_range") + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/third_party/utf8_range/LICENSE") diff --git a/ports/utf8-range/vcpkg.json b/ports/utf8-range/vcpkg.json new file mode 100644 index 00000000000000..13f9c3ea38ae7e --- /dev/null +++ b/ports/utf8-range/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "utf8-range", + "version-date": "2023-11-09", + "description": "Fast UTF-8 validation with Range algorithm (NEON+SSE4+AVX2)", + "homepage": "https://github.com/protocolbuffers/protobuf", + "license": "MIT", + "dependencies": [ + "abseil", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 593e7b9e30a244..788a648a4f3894 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8736,6 +8736,10 @@ "baseline": "0.9.5.0", "port-version": 2 }, + "utf8-range": { + "baseline": "2023-11-09", + "port-version": 0 + }, "utf8h": { "baseline": "2021-11-18", "port-version": 1 diff --git a/versions/u-/utf8-range.json b/versions/u-/utf8-range.json new file mode 100644 index 00000000000000..37bf59624fd0de --- /dev/null +++ b/versions/u-/utf8-range.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dd54a8c4b774935b2c164d0902185fa56a8694bb", + "version-date": "2023-11-09", + "port-version": 0 + } + ] +} From 32e4877eecf2609395d83227c3215c8769c26e7a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:38:31 +0100 Subject: [PATCH 0619/1039] [google-cloud-cpp] fix feature sql (#35609) --- ports/google-cloud-cpp/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 304a85e22acee3..9a9055931d7d2b 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.19.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", @@ -1247,6 +1248,7 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ + "grpc-common", "rest-common" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 788a648a4f3894..4ccab797ecbb53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3058,7 +3058,7 @@ }, "google-cloud-cpp": { "baseline": "2.19.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 9de8f823c46bfd..63cf94c174c503 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "815f9e2c25c4aa47b16ec69ac6c41e2d52655d89", + "version": "2.19.0", + "port-version": 1 + }, { "git-tree": "cda5a5192b0d1310376b1370890e1d38755c076a", "version": "2.19.0", From 77c73ede011c4cb9f20f23ceb54f4b9e392b386c Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 14 Dec 2023 14:39:34 +0700 Subject: [PATCH 0620/1039] [cglm] Allow building for arm platforms. (#35607) This works for arm (at least on macOS). --- ports/cglm/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cglm.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cglm/vcpkg.json b/ports/cglm/vcpkg.json index beac8c9277d739..9596c7c57a5702 100644 --- a/ports/cglm/vcpkg.json +++ b/ports/cglm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cglm", "version-semver": "0.9.1", + "port-version": 1, "description": "Highly Optimized Graphics Math (glm) for C", "homepage": "https://github.com/recp/cglm", "license": "MIT", - "supports": "!(arm | uwp)", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 4ccab797ecbb53..876b150c5a2628 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1518,7 +1518,7 @@ }, "cglm": { "baseline": "0.9.1", - "port-version": 0 + "port-version": 1 }, "cgltf": { "baseline": "1.13", diff --git a/versions/c-/cglm.json b/versions/c-/cglm.json index 9c425f33e67999..7588a78c64ae8b 100644 --- a/versions/c-/cglm.json +++ b/versions/c-/cglm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "996a91ff669c42bc3976231465129ab0f706eb54", + "version-semver": "0.9.1", + "port-version": 1 + }, { "git-tree": "bd33408300b3151706176a80ff4ef80bf6e10284", "version-semver": "0.9.1", From 85ade256c807ac335fb837a4b18abbb7b38ad0b7 Mon Sep 17 00:00:00 2001 From: Wentsing Nee <28091833+WentsingNee@users.noreply.github.com> Date: Thu, 14 Dec 2023 15:43:11 +0800 Subject: [PATCH 0621/1039] [kerbal] Add port files for new library Kerbal (#35600) Co-authored-by: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> --- ports/kerbal/portfile.cmake | 19 +++++++++++++++++++ ports/kerbal/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kerbal.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/kerbal/portfile.cmake create mode 100644 ports/kerbal/vcpkg.json create mode 100644 versions/k-/kerbal.json diff --git a/ports/kerbal/portfile.cmake b/ports/kerbal/portfile.cmake new file mode 100644 index 00000000000000..5ecb47487779ae --- /dev/null +++ b/ports/kerbal/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO WentsingNee/Kerbal + REF "v${VERSION}" + SHA512 d974fbf29ae7226a26a73db58b4c7c6c9f2e826b6524c1b861a824e85bd2c4fbdd52d1ff0c930a026fca0f795d871bac074481ac45023a25e894c23b685f784c + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH "share/cmake/Kerbal" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/kerbal/vcpkg.json b/ports/kerbal/vcpkg.json new file mode 100644 index 00000000000000..c67fdc40869b90 --- /dev/null +++ b/ports/kerbal/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kerbal", + "version": "2023.12.1", + "description": "Kerbal C++ Template Library", + "homepage": "https://github.com/WentsingNee/Kerbal", + "license": "LGPL-3.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 876b150c5a2628..12a437e8d60674 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3756,6 +3756,10 @@ "baseline": "20230531", "port-version": 0 }, + "kerbal": { + "baseline": "2023.12.1", + "port-version": 0 + }, "keystone": { "baseline": "0.9.2", "port-version": 3 diff --git a/versions/k-/kerbal.json b/versions/k-/kerbal.json new file mode 100644 index 00000000000000..7930f39585bbda --- /dev/null +++ b/versions/k-/kerbal.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b4d5ce6370b4c2a345ba96cbebbce8632667fac1", + "version": "2023.12.1", + "port-version": 0 + } + ] +} From 6186ec51c83865afa962938a961bc015493b2400 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 13 Dec 2023 23:44:51 -0800 Subject: [PATCH 0622/1039] [at-spi2-core, at-spi2-atk] Add dependency dbus (#35599) * [at-spi2-core, at-spi2-atk] Add dependency dbus * update version --- ports/at-spi2-atk/portfile.cmake | 6 +----- ports/at-spi2-atk/vcpkg.json | 5 +++++ ports/at-spi2-core/portfile.cmake | 4 ++-- ports/at-spi2-core/vcpkg.json | 6 +++++- versions/a-/at-spi2-atk.json | 5 +++++ versions/a-/at-spi2-core.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ports/at-spi2-atk/portfile.cmake b/ports/at-spi2-atk/portfile.cmake index 9b7ba9134b5d71..a0972148cb2f57 100644 --- a/ports/at-spi2-atk/portfile.cmake +++ b/ports/at-spi2-atk/portfile.cmake @@ -1,7 +1,3 @@ -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 @@ -22,7 +18,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/at-spi2-atk/vcpkg.json b/ports/at-spi2-atk/vcpkg.json index 27c85cbdd925e1..232abaf70b4426 100644 --- a/ports/at-spi2-atk/vcpkg.json +++ b/ports/at-spi2-atk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "at-spi2-atk", "version": "2.38.0", + "port-version": 1, "description": "Implementation of the ATK interfaces in terms of the libatspi2 API.", "homepage": "https://www.gtk.org/", "license": null, @@ -8,6 +9,10 @@ "dependencies": [ "at-spi2-core", "atk", + { + "name": "dbus", + "platform": "linux" + }, "libxml2", { "name": "vcpkg-tool-meson", diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake index fcb68416044dae..3084f71f36e51a 100644 --- a/ports/at-spi2-core/portfile.cmake +++ b/ports/at-spi2-core/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libdbus-1-dev\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") + message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libxi-dev\n libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libxtst-dev") endif() vcpkg_from_gitlab( @@ -36,7 +36,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") ) endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/defaults") diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json index 9985253c0b5a3c..b82464a6c93e9b 100644 --- a/ports/at-spi2-core/vcpkg.json +++ b/ports/at-spi2-core/vcpkg.json @@ -1,12 +1,16 @@ { "name": "at-spi2-core", "version": "2.44.1", - "port-version": 2, + "port-version": 3, "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", "homepage": "https://www.gtk.org/", "license": null, "supports": "linux", "dependencies": [ + { + "name": "dbus", + "platform": "linux" + }, "glib", { "name": "glib", diff --git a/versions/a-/at-spi2-atk.json b/versions/a-/at-spi2-atk.json index a97e2158faa94e..69e2bf28d116f5 100644 --- a/versions/a-/at-spi2-atk.json +++ b/versions/a-/at-spi2-atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97535464d9f15ce3bcadaf78ad8031fa3df5eda5", + "version": "2.38.0", + "port-version": 1 + }, { "git-tree": "ebb28a9cdbd06d3185ba2e0cfc1945be23a0a608", "version": "2.38.0", diff --git a/versions/a-/at-spi2-core.json b/versions/a-/at-spi2-core.json index 07921b889b36d3..b3509184cd6d02 100644 --- a/versions/a-/at-spi2-core.json +++ b/versions/a-/at-spi2-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5143414003b96ead1ffe40c57c9bf764bf64b0c0", + "version": "2.44.1", + "port-version": 3 + }, { "git-tree": "897df7693a8a1addc3a5ab84efabef89e4cef1d8", "version": "2.44.1", diff --git a/versions/baseline.json b/versions/baseline.json index 12a437e8d60674..47e01113621427 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -286,11 +286,11 @@ }, "at-spi2-atk": { "baseline": "2.38.0", - "port-version": 0 + "port-version": 1 }, "at-spi2-core": { "baseline": "2.44.1", - "port-version": 2 + "port-version": 3 }, "atk": { "baseline": "2.38.0", From 7eeaa3cabb85fc8466c634cb30ca953ef647b766 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:45:12 +0100 Subject: [PATCH 0623/1039] [wavpack] fix usage (#35608) --- ports/wavpack/portfile.cmake | 1 + ports/wavpack/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/w-/wavpack.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 5651b7c9d2d6f0..a45e4b6b44af68 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_cmake_configure( -DWAVPACK_BUILD_WINAMP_PLUGIN=OFF -DBUILD_TESTING=OFF -DWAVPACK_BUILD_DOCS=OFF + -DWAVPACK_ENABLE_LIBCRYPTO=OFF ) vcpkg_cmake_install() diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index c956b776e82d25..e4a04667ae7760 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wavpack", "version": "5.6.0", + "port-version": 1, "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 47e01113621427..ddff3532b77bc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9006,7 +9006,7 @@ }, "wavpack": { "baseline": "5.6.0", - "port-version": 0 + "port-version": 1 }, "wayland": { "baseline": "1.21.0", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 55cdf3c16d30e4..9d0b775c22dc0a 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d58b3734d0a42c7309216ade0432f7787fbd6ff5", + "version": "5.6.0", + "port-version": 1 + }, { "git-tree": "040113ae230d1d94918ce7495157b1d404589a8b", "version": "5.6.0", From 7d10d3d55dd8dbec78f05345e82e9d02b9a750e9 Mon Sep 17 00:00:00 2001 From: Ivan Milov <522518+ivanmilov@users.noreply.github.com> Date: Thu, 14 Dec 2023 08:55:38 +0100 Subject: [PATCH 0624/1039] [aklomp-base64] update to 0.5.1 (#35550) --- ports/aklomp-base64/portfile.cmake | 8 ++++---- ports/aklomp-base64/vcpkg.json | 3 +-- versions/a-/aklomp-base64.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/aklomp-base64/portfile.cmake b/ports/aklomp-base64/portfile.cmake index 2c9550a50c2980..d55cc8732b1cb8 100644 --- a/ports/aklomp-base64/portfile.cmake +++ b/ports/aklomp-base64/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aklomp/base64 - REF e77bd70bdd860c52c561568cffb251d88bba064c - SHA512 bc0cf64f6a24226a64c51983e8b73b4d4e893b8242bc6ac39361d977996de453d9f95ed0ab68a7544f21b0be1d76ae53af96521207a651c95673b02954cc5bbe + REF "v${VERSION}" + SHA512 d63c6b36c99abcdfadf3730096c3a7cd36593526dd3dae815035ce196d3354ece7da1d92ecec800a81e1ab5e1d878b24f0b1de62b7aca516170d06a07c1b42a2 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${SOURCE_PATH} ) vcpkg_cmake_install() @@ -19,4 +19,4 @@ vcpkg_cmake_config_fixup( CONFIG_PATH "lib/cmake/base64" ) -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/aklomp-base64/vcpkg.json b/ports/aklomp-base64/vcpkg.json index 889c35790f767d..e63dced64254e5 100644 --- a/ports/aklomp-base64/vcpkg.json +++ b/ports/aklomp-base64/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aklomp-base64", - "version-date": "2023-01-06", - "port-version": 1, + "version": "0.5.1", "description": "Implementation of a base64 stream encoding/decoding library in C99 with SIMD (AVX2, AVX512, NEON, AArch64/NEON, SSSE3, SSE4.1, SSE4.2, AVX) and OpenMP acceleration", "homepage": "https://github.com/aklomp/base64", "license": "BSD-2-Clause", diff --git a/versions/a-/aklomp-base64.json b/versions/a-/aklomp-base64.json index 0a1712393e4b8a..d5495e2921bc9b 100644 --- a/versions/a-/aklomp-base64.json +++ b/versions/a-/aklomp-base64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed49981a592ca849cbb3274159c8ed21392e73df", + "version": "0.5.1", + "port-version": 0 + }, { "git-tree": "4785f09421c2636709249ad7a555c7420b9bcfe8", "version-date": "2023-01-06", diff --git a/versions/baseline.json b/versions/baseline.json index ddff3532b77bc7..4f7d0dd5d3441a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -61,8 +61,8 @@ "port-version": 1 }, "aklomp-base64": { - "baseline": "2023-01-06", - "port-version": 1 + "baseline": "0.5.1", + "port-version": 0 }, "alac": { "baseline": "2017-11-03-c38887c5", From 8abeb71402ddb232304a53ceddf17f98a49cba9e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:07:17 -0800 Subject: [PATCH 0625/1039] [libusb] Fix usage (#35498) * fix usage * update version * redo x64-windows.cmake * resolve conflicts * updaet git-tree * fix downstream * update version * fix libirecovery * update git-tree * fix pkg_check_modules * update git-tree * fix libfreenect2 * update version * fix libuvc * update version * fix libuvc patch * update git-tree * fix libuvc build_fix.patch * update git-tree * format * update git-tree * undo supports * update git-tree * fix azure-kinect-sensor-sdk * update version * add pkg-config.exe * update git-tree * disable build examples and tests * update git-tree --------- Co-authored-by: Monica --- .../azure-kinect-sensor-sdk/fix-builds.patch | 17 +++--- ports/azure-kinect-sensor-sdk/portfile.cmake | 9 ++- ports/azure-kinect-sensor-sdk/vcpkg.json | 2 +- ports/dv-processing/portfile.cmake | 3 + ports/dv-processing/vcpkg.json | 1 + ports/libcaer/fix-libusb.diff | 57 +++++++++++++++++-- ports/libcaer/vcpkg.json | 1 + .../libfreenect2/fix-dependency-libusb.patch | 14 ++--- ports/libfreenect2/portfile.cmake | 13 +++++ ports/libfreenect2/vcpkg.json | 1 + ports/libirecovery/CMakeLists.txt | 12 ++-- ports/libirecovery/portfile.cmake | 4 ++ ports/libirecovery/vcpkg.json | 2 +- ports/libusb/portfile.cmake | 6 +- ports/libusb/usage | 8 +-- ports/libusb/vcpkg-cmake-wrapper.cmake | 17 ------ ports/libusb/vcpkg.json | 2 +- ports/libuvc/build_fix.patch | 23 ++++---- ports/libuvc/portfile.cmake | 6 +- ports/libuvc/vcpkg.json | 3 +- ports/usbmuxd/CMakeLists.txt | 6 +- ports/usbmuxd/vcpkg.json | 1 + versions/a-/azure-kinect-sensor-sdk.json | 5 ++ versions/baseline.json | 18 +++--- versions/d-/dv-processing.json | 5 ++ versions/l-/libcaer.json | 5 ++ versions/l-/libfreenect2.json | 5 ++ versions/l-/libirecovery.json | 5 ++ versions/l-/libusb.json | 5 ++ versions/l-/libuvc.json | 5 ++ versions/u-/usbmuxd.json | 5 ++ 31 files changed, 181 insertions(+), 85 deletions(-) delete mode 100644 ports/libusb/vcpkg-cmake-wrapper.cmake diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 750667eef279b8..881d5abe2e8d6e 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f002b5..d48f3f2 100644 +index 4f002b5..dd9b1df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF) @@ -11,7 +11,7 @@ index 4f002b5..d48f3f2 100644 # Set the project version include(K4AProjectVersion) -@@ -100,6 +98,43 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL +@@ -100,6 +98,42 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) endif() @@ -34,14 +34,13 @@ index 4f002b5..d48f3f2 100644 +add_definitions(-DMATROSKA_VERSION=2) +find_package(libsoundio CONFIG REQUIRED) +if (NOT WIN32) -+ find_package(libusb CONFIG REQUIRED) + find_package(libuvc CONFIG REQUIRED) + add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) + find_package(OpenSSL REQUIRED) + find_package(ZLIB REQUIRED) -+else() -+ find_library(LibUSB libusb-1.0 REQUIRED) +endif() ++FIND_PACKAGE(PkgConfig REQUIRED) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) +find_package(libyuv CONFIG REQUIRED) +find_package(spdlog CONFIG REQUIRED) +if (BUILD_TOOLS) @@ -295,7 +294,7 @@ index e4a696e..6ee6696 100644 k4ainternal::deloader) diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt -index f75bd55..5403216 100644 +index f75bd55..7130728 100644 --- a/src/usbcommand/CMakeLists.txt +++ b/src/usbcommand/CMakeLists.txt @@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC @@ -305,7 +304,7 @@ index f75bd55..5403216 100644 - azure::aziotsharedutil - LibUSB::LibUSB + aziotsharedutil -+ ${LibUSB} ++ PkgConfig::libusb k4ainternal::allocator k4ainternal::image k4ainternal::logging) @@ -585,7 +584,7 @@ index c544e1e..9489bf8 100644 k4ainternal::logging k4ainternal::utcommon) diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt -index 98578c0..6ab38d9 100644 +index 98578c0..244c867 100644 --- a/tools/k4aviewer/CMakeLists.txt +++ b/tools/k4aviewer/CMakeLists.txt @@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES @@ -595,7 +594,7 @@ index 98578c0..6ab38d9 100644 - LibUSB::LibUSB - libyuv::libyuv - glfw::glfw -+ ${LibUSB} ++ PkgConfig::libusb + yuv + glfw ${OPENGL_LIBRARIES} diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 0bbc78a5220e12..dbdcc27c4dd66d 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -2,7 +2,7 @@ set(VERSION 1.4.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/Azure-Kinect-Sensor-SDK - REF v${VERSION} + REF "v${VERSION}" SHA512 ef94c072caae43b0a105b192013e09082d267d4064e6676fac981b52e7576a663f59fcb53f0afe66b425ef2cea0cb3aa224ff7be6485c0b5543ff9cdabd82d4d HEAD_REF master PATCHES @@ -14,6 +14,7 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON3) +vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") @@ -27,7 +28,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + ${FEATURE_OPTIONS} -DK4A_SOURCE_LINK=OFF -DK4A_MTE_VERSION=ON -DBUILD_EXAMPLES=OFF @@ -88,4 +91,4 @@ else() endif() # 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/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 9726bd8cdb0e33..5bff0fea5f505c 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 5, + "port-version": 6, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", "supports": "linux | windows", diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index dd0d8015966fa2..92bb3d13474efc 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -24,11 +24,14 @@ vcpkg_check_features( tools ENABLE_UTILITIES ) +vcpkg_find_acquire_program(PKGCONFIG) + set(VCPKG_BUILD_TYPE release) # no lib binaries vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # writes to include/dv-processing/version.hpp OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ${FEATURE_OPTIONS} "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index 7f619c57698523..9e85867e808fec 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dv-processing", "version": "1.7.9", + "port-version": 1, "description": "Generic algorithms for event cameras. (C++20 required.)", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/ports/libcaer/fix-libusb.diff b/ports/libcaer/fix-libusb.diff index d95120ccffc2d5..926f77fb1c76b6 100644 --- a/ports/libcaer/fix-libusb.diff +++ b/ports/libcaer/fix-libusb.diff @@ -1,17 +1,62 @@ diff --git a/cmakemod/libcaerConfig.cmake.in b/cmakemod/libcaerConfig.cmake.in -index cdf9f88..475d543 100644 +index cdf9f88..f0a17ba 100644 --- a/cmakemod/libcaerConfig.cmake.in +++ b/cmakemod/libcaerConfig.cmake.in -@@ -21,6 +21,12 @@ +@@ -21,6 +21,10 @@ CMAKE_POLICY(PUSH) CMAKE_POLICY(VERSION 3.10) +include(CMakeFindDependencyMacro) -+if(NOT "@CC_MSVC@") -+ find_dependency(PkgConfig) -+ pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) -+endif() ++find_dependency(PkgConfig) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) + INCLUDE(@PACKAGE_export_destination@/libcaer-exports.cmake) SET(libcaer_INCLUDE_DIRS @PACKAGE_include_dirs@) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ce94a6..f03d7ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,16 +52,12 @@ MESSAGE(STATUS "Base libraries: ${BASE_LIBS}") + INCLUDE(FindPkgConfig) + + # Required: basic USB devices support +-IF(CC_MSVC) +- FIND_PACKAGE(libusb CONFIG REQUIRED) +-ELSE() +- PKG_CHECK_MODULES( +- libusb +- REQUIRED +- IMPORTED_TARGET +- libusb-1.0>=1.0.17) +- SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17") +-ENDIF() ++PKG_CHECK_MODULES( ++ libusb ++ REQUIRED ++ IMPORTED_TARGET ++ libusb-1.0>=1.0.17) ++SET(LIBCAER_PKGCONFIG_REQUIRES_PRIVATE "libusb-1.0 >= 1.0.17") + + # Optional: serial devices support + IF(ENABLE_SERIALDEV) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0ef4ac7..6f70a26 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -49,12 +49,11 @@ ENDIF() + + IF(CC_MSVC) + LIST(APPEND LIBCAER_SOURCES ../thirdparty/simple-stdatomic/stdatomic.c) +- INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS}) +- LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE ${LIBUSB_LIBRARIES}) +-ELSE() +- LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb) + ENDIF() + ++LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE PkgConfig::libusb) ++ ++ + # Set full RPATH + SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + diff --git a/ports/libcaer/vcpkg.json b/ports/libcaer/vcpkg.json index 8b1a588522cbe2..58d88c9c3b9549 100644 --- a/ports/libcaer/vcpkg.json +++ b/ports/libcaer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libcaer", "version": "3.3.15", + "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 AND Apache-2.0", diff --git a/ports/libfreenect2/fix-dependency-libusb.patch b/ports/libfreenect2/fix-dependency-libusb.patch index a5de8f3bee1940..f8f21044902924 100644 --- a/ports/libfreenect2/fix-dependency-libusb.patch +++ b/ports/libfreenect2/fix-dependency-libusb.patch @@ -1,31 +1,31 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e0d192..aedc576 100644 +index 3648fb5..43c3d28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,7 +90,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +@@ -91,7 +91,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) # dependencies FIND_PACKAGE(PkgConfig) # try find PKGConfig as it will be used if found -FIND_PACKAGE(LibUSB REQUIRED) -+FIND_PACKAGE(libusb CONFIG REQUIRED) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) # Add includes INCLUDE_DIRECTORIES( -@@ -98,7 +98,7 @@ INCLUDE_DIRECTORIES( +@@ -99,7 +99,7 @@ INCLUDE_DIRECTORIES( "${MY_DIR}/include/internal" ${PROJECT_BINARY_DIR} # for generated headers ${LIBFREENECT2_THREADING_INCLUDE_DIR} - ${LibUSB_INCLUDE_DIRS} -+ ${LIBUSB_INCLUDE_DIRS} ++ ${libusb_INCLUDE_DIRS} ) SET(RESOURCES_INC_FILE "${PROJECT_BINARY_DIR}/resources.inc.h") -@@ -154,7 +154,7 @@ SET(SOURCES +@@ -157,7 +157,7 @@ SET(SOURCES ) SET(LIBRARIES - ${LibUSB_LIBRARIES} -+ ${LIBUSB_LIBRARIES} ++ PkgConfig::libusb ${LIBFREENECT2_THREADING_LIBRARIES} ) diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 770dd0faa69861..efc6c9980d8c35 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -21,13 +21,26 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openni2 BUILD_OPENNI2_DRIVER ) +vcpkg_find_acquire_program(PKGCONFIG) + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(path_suffix "/debug") +endif() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(path_suffix "") +endif() +vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) +vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} "${CURRENT_INSTALLED_DIR}${path_suffix}/lib/pkgconfig") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DENABLE_CUDA=OFF -DBUILD_EXAMPLES=OFF ${FEATURE_OPTIONS} ) +vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) vcpkg_cmake_install() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index 59e75a596f55c3..4c78115ec169ce 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libfreenect2", "version": "0.2.1", + "port-version": 1, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "license": "GPL-2.0-only", diff --git a/ports/libirecovery/CMakeLists.txt b/ports/libirecovery/CMakeLists.txt index 7e8a728ac3100c..5345b32980e965 100644 --- a/ports/libirecovery/CMakeLists.txt +++ b/ports/libirecovery/CMakeLists.txt @@ -41,9 +41,9 @@ target_link_libraries(libirecovery unofficial::libimobiledevice-glue::libimobiledevice-glue ) if(NOT WIN32 AND NOT APPLE) - find_package(libusb CONFIG REQUIRED) - target_include_directories(libirecovery PRIVATE ${LIBUSB_INCLUDE_DIRS}) - target_link_libraries(libirecovery PRIVATE ${LIBUSB_LIBRARIES}) + find_package(PkgConfig REQUIRED) + pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) + target_link_libraries(libirecovery PRIVATE PkgConfig::libusb) endif() set_target_properties(libirecovery PROPERTIES OUTPUT_NAME irecovery-1.0) @@ -111,9 +111,9 @@ if(BUILD_TOOLS) target_link_libraries(irecovery PRIVATE "-framework IOKit" "-framework CoreFoundation") endif() if(NOT WIN32 AND NOT APPLE) - find_package(libusb CONFIG REQUIRED) - target_include_directories(irecovery PRIVATE ${LIBUSB_INCLUDE_DIRS}) - target_link_libraries(irecovery PRIVATE ${LIBUSB_LIBRARIES}) + find_package(PkgConfig REQUIRED) + pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) + target_link_libraries(irecovery PRIVATE PkgConfig::libusb) endif() find_package(PkgConfig REQUIRED) pkg_check_modules(readline REQUIRED IMPORTED_TARGET readline) diff --git a/ports/libirecovery/portfile.cmake b/ports/libirecovery/portfile.cmake index 0f7e0f238b8782..2ef67eda46d0e3 100644 --- a/ports/libirecovery/portfile.cmake +++ b/ports/libirecovery/portfile.cmake @@ -50,6 +50,10 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-c file(WRITE "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" "include(CMakeFindDependencyMacro) find_dependency(unofficial-libimobiledevice-glue CONFIG) +if(NOT WIN32 AND NOT APPLE) + find_package(PkgConfig REQUIRED) + pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) +endif() ${cmake_config} ") diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json index 21265f5f162c07..ac8b919579f444 100644 --- a/ports/libirecovery/vcpkg.json +++ b/ports/libirecovery/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libirecovery", "version-date": "2023-05-13", - "port-version": 1, + "port-version": 2, "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", "homepage": "https://libimobiledevice.org/", "license": "LGPL-2.1-or-later", diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 4c69b06c6dead8..9f9da9dbb3c926 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -55,7 +55,10 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - OPTIONS ${MAKE_OPTIONS} + OPTIONS + ${MAKE_OPTIONS} + "--enable-examples-build=no" + "--enable-tests-build=no" ) vcpkg_install_make() endif() @@ -63,5 +66,4 @@ endif() vcpkg_fixup_pkgconfig() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libusb/usage b/ports/libusb/usage index b61e18c68a0d2d..98cce9c0149665 100644 --- a/ports/libusb/usage +++ b/ports/libusb/usage @@ -1,5 +1,5 @@ -libusb provides CMake targets: +libusb can be imported via CMake FindPkgConfig module: + find_package(PkgConfig REQUIRED) + pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) - find_package(libusb CONFIG REQUIRED) - target_include_directories(main PRIVATE ${LIBUSB_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${LIBUSB_LIBRARIES}) + target_link_libraries(main PRIVATE PkgConfig::libusb) diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 5efe90d4686c10..00000000000000 --- a/ports/libusb/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,17 +0,0 @@ -include(SelectLibraryConfigurations) - -find_path(LIBUSB_INCLUDE_DIR libusb.h PATH_SUFFIXES libusb-1.0) -find_library(LIBUSB_LIBRARY_DEBUG NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) -find_library(LIBUSB_LIBRARY_RELEASE NAMES libusb-1.0 usb-1.0 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - -select_library_configurations(LIBUSB) - -set(LIBUSB_INCLUDE_DIRS "${LIBUSB_INCLUDE_DIR}") - -list(APPEND LIBUSB_LIBRARIES @LIBUSB_LINK_LIBRARIES@) - -if (@VCPKG_TARGET_IS_OSX@) - list(APPEND LIBUSB_LIBRARIES "-framework Cocoa") - list(APPEND LIBUSB_LIBRARIES "-framework IOKit") - list(APPEND LIBUSB_LIBRARIES "-framework Security") -endif() diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 0dd6263bb26fea..8e2ebd1033ef1f 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", - "port-version": 5, + "port-version": 6, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", diff --git a/ports/libuvc/build_fix.patch b/ports/libuvc/build_fix.patch index 3c5bfcd44cdac0..74d618a5fecd0a 100644 --- a/ports/libuvc/build_fix.patch +++ b/ports/libuvc/build_fix.patch @@ -1,13 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3c8116..b9a6d38 100644 +index fbaffc9..451b689 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,10 +39,10 @@ set(SOURCES +@@ -39,10 +39,11 @@ set(SOURCES src/misc.c ) -find_package(LibUSB) -+find_package(libusb CONFIG REQUIRED) ++FIND_PACKAGE(PkgConfig REQUIRED) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) # JpegPkg name to differ from shipped with CMake -find_package(JpegPkg QUIET) @@ -15,23 +16,20 @@ index f3c8116..b9a6d38 100644 if(JPEG_FOUND) message(STATUS "Building libuvc with JPEG support.") set(LIBUVC_HAS_JPEG TRUE) -@@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS) - $ - $ +@@ -116,7 +117,7 @@ foreach(target_name IN LISTS UVC_TARGETS) ) -+ target_include_directories(${target_name} PRIVATE ${LIBUSB_INCLUDE_DIRS}) target_link_libraries(${target_name} # libusb-1.0 used internally so we link to it privately. -- PRIVATE LibUSB::LibUSB -+ PRIVATE ${LIBUSB_LIBRARIES} +- PRIVATE LibUSB::LibUSB ${threads} ++ PRIVATE PkgConfig::libusb ${threads} ) if(JPEG_FOUND) target_link_libraries(${target_name} diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake -index b9887ea..e8f09dc 100644 +index b9887ea..c704ab5 100644 --- a/libuvcConfig.cmake +++ b/libuvcConfig.cmake -@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) +@@ -10,8 +10,11 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) list(APPEND extraArgs REQUIRED) endif() @@ -39,6 +37,9 @@ index b9887ea..e8f09dc 100644 -find_package(LibUSB ${extraArgs}) +include(CMakeFindDependencyMacro) +find_dependency(JPEG ${extraArgs}) ++find_dependency(Threads) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake") set(libuvc_FOUND TRUE) diff --git a/ports/libuvc/portfile.cmake b/ports/libuvc/portfile.cmake index 6f68f14b7ac48d..b95ca4589d84ed 100644 --- a/ports/libuvc/portfile.cmake +++ b/ports/libuvc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuvc/libuvc - REF c612d4509eb0ff19ce414abc3dca18d0f6263a84 - SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32 + REF "v${VERSION}" + SHA512 cf2c0a6cc04717f284f25bed17f178a4b2b2a2bb3e5937e50be144e88db2c481c5ea763c164fe0234834fea4837f96fcc13bdbdafd4610d2985943562dfcc72f HEAD_REF master PATCHES build_fix.patch ) @@ -29,4 +29,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_ vcpkg_fixup_pkgconfig() # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json index 1880ed85d197c3..46a243bd5d5e4f 100644 --- a/ports/libuvc/vcpkg.json +++ b/ports/libuvc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libuvc", - "version-date": "2020-11-24", - "port-version": 4, + "version": "0.0.7", "description": "a cross-platform library for USB video devices", "homepage": "https://github.com/libuvc/libuvc", "supports": "linux", diff --git a/ports/usbmuxd/CMakeLists.txt b/ports/usbmuxd/CMakeLists.txt index 7e9c5843b5a39e..d32f69d18403b2 100644 --- a/ports/usbmuxd/CMakeLists.txt +++ b/ports/usbmuxd/CMakeLists.txt @@ -28,19 +28,19 @@ endif() find_package(unofficial-libimobiledevice CONFIG REQUIRED) find_package(unofficial-libimobiledevice-glue CONFIG REQUIRED) -find_package(libusb CONFIG REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) find_path(DIRENT_INCLUDE_DIR dirent.h REQUIRED) add_executable(usbmuxd ${USBMUXD_SOURCE}) target_include_directories(usbmuxd PRIVATE - ${LIBUSB_INCLUDE_DIRS} ${DIRENT_INCLUDE_DIR} ) target_compile_definitions(usbmuxd PRIVATE ${DEFINITIONS}) target_link_libraries(usbmuxd PRIVATE unofficial::libimobiledevice::libimobiledevice unofficial::libimobiledevice-glue::libimobiledevice-glue - ${LIBUSB_LIBRARIES} + PkgConfig::libusb ) if(WIN32) find_package(PThreads4W REQUIRED) diff --git a/ports/usbmuxd/vcpkg.json b/ports/usbmuxd/vcpkg.json index eabbdd9b4306c2..952d781df3b9e1 100644 --- a/ports/usbmuxd/vcpkg.json +++ b/ports/usbmuxd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "usbmuxd", "version-date": "2023-07-21", + "port-version": 1, "description": "A socket daemon to multiplex connections from and to iOS devices", "homepage": "http://www.libimobiledevice.org", "license": "LGPL-2.0-or-later", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 8df675151fc028..773adf3b1958b6 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5fbd0b39a805bc47da22f4bc462bec175518ae1", + "version": "1.4.1", + "port-version": 6 + }, { "git-tree": "e2a1e6a1a145f9436731cbcc9019f807325298c1", "version": "1.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4f7d0dd5d3441a..d34b991a484ba5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -438,7 +438,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 5 + "port-version": 6 }, "azure-macro-utils-c": { "baseline": "2022-01-21", @@ -2310,7 +2310,7 @@ }, "dv-processing": { "baseline": "1.7.9", - "port-version": 0 + "port-version": 1 }, "dx": { "baseline": "1.0.1", @@ -4118,7 +4118,7 @@ }, "libcaer": { "baseline": "3.3.15", - "port-version": 0 + "port-version": 1 }, "libcanberra": { "baseline": "0.30", @@ -4298,7 +4298,7 @@ }, "libfreenect2": { "baseline": "0.2.1", - "port-version": 0 + "port-version": 1 }, "libfs": { "baseline": "1.0.8", @@ -4438,7 +4438,7 @@ }, "libirecovery": { "baseline": "2023-05-13", - "port-version": 1 + "port-version": 2 }, "libjpeg-turbo": { "baseline": "3.0.1", @@ -4974,7 +4974,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 5 + "port-version": 6 }, "libusb-win32": { "baseline": "1.2.6.0", @@ -4993,8 +4993,8 @@ "port-version": 1 }, "libuvc": { - "baseline": "2020-11-24", - "port-version": 4 + "baseline": "0.0.7", + "port-version": 0 }, "libvault": { "baseline": "0.56.0", @@ -8722,7 +8722,7 @@ }, "usbmuxd": { "baseline": "2023-07-21", - "port-version": 0 + "port-version": 1 }, "usd": { "baseline": "23.5", diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index f87690c9e166c7..a3526399de32ed 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd165ee3da5e52cb1a2a9bf22a87d04c2e100d4e", + "version": "1.7.9", + "port-version": 1 + }, { "git-tree": "70c0ee933303903d8a550f89a138bba0541222dc", "version": "1.7.9", diff --git a/versions/l-/libcaer.json b/versions/l-/libcaer.json index 9b413413d358f3..8740283ca97c45 100644 --- a/versions/l-/libcaer.json +++ b/versions/l-/libcaer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45485054e1276ff51ad1ec68a8c31de0ecf9d795", + "version": "3.3.15", + "port-version": 1 + }, { "git-tree": "f90f31425f85b3bb2544a34fc0b9247491ecbf2b", "version": "3.3.15", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index 19640318d55208..5e459c46dd6779 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41b1ddb75208930631ff81c5a19a86c7f0308791", + "version": "0.2.1", + "port-version": 1 + }, { "git-tree": "bfa5e96443079122b324178a6ed421423067039a", "version": "0.2.1", diff --git a/versions/l-/libirecovery.json b/versions/l-/libirecovery.json index 98cd10b21d1b81..d831fbc0b4a0c7 100644 --- a/versions/l-/libirecovery.json +++ b/versions/l-/libirecovery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d47bd1d38f72799238f2d815b96b11bb11d9ea14", + "version-date": "2023-05-13", + "port-version": 2 + }, { "git-tree": "72b9637bc62e62eb478d09618545c419bf21ed48", "version-date": "2023-05-13", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 15dcbcc464ecd0..e9e3dad4cc12b7 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53ad48778a3278668b2ede66ac49fa20a9d03414", + "version": "1.0.26.11791", + "port-version": 6 + }, { "git-tree": "f4d325ede3cd1de2acd9a2d8f2708ec1e758cf0a", "version": "1.0.26.11791", diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json index f6d6c39f3b3346..f5933a53294997 100644 --- a/versions/l-/libuvc.json +++ b/versions/l-/libuvc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "930185d807e87c0ebec6aefd21e2ca336ee0cc3c", + "version": "0.0.7", + "port-version": 0 + }, { "git-tree": "578c4d06e3d518e46edee324e3c8048826c503ec", "version-date": "2020-11-24", diff --git a/versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json index 5edeadcf1d8e4e..6117b5faf7e030 100644 --- a/versions/u-/usbmuxd.json +++ b/versions/u-/usbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4aa97c2a8eb36aa9f4a3a7ca0fb028dc27f8215b", + "version-date": "2023-07-21", + "port-version": 1 + }, { "git-tree": "edc61063b642372c7d9de82f7ecc55ed39971c3d", "version-date": "2023-07-21", From 7077a44304c6ebc10102f920c6ff1d91528ae48d Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 14 Dec 2023 16:13:36 +0800 Subject: [PATCH 0626/1039] [getdns] update to 1.7.3 (#34188) * [getdns] update to 1.7.3 * [getdns] update to 1.7.3 * fix deps * delete nouse patch chunk * fix deps * fix deps --------- Co-authored-by: MonicaLiu --- ports/getdns/disable-docs.patch | 24 +++++++++++----------- ports/getdns/fix-include.patch | 30 ++++++++++++++++++++++++++++ ports/getdns/fix-libuv-deps.patch | 33 +++++++++++++++++++++++++++++++ ports/getdns/portfile.cmake | 14 ++++++------- ports/getdns/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/getdns.json | 5 +++++ 7 files changed, 89 insertions(+), 24 deletions(-) create mode 100644 ports/getdns/fix-include.patch create mode 100644 ports/getdns/fix-libuv-deps.patch diff --git a/ports/getdns/disable-docs.patch b/ports/getdns/disable-docs.patch index ffa7afa5623f9d..3d0670e27d16ef 100644 --- a/ports/getdns/disable-docs.patch +++ b/ports/getdns/disable-docs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 413709da..d3dd03f0 100644 +index 9170be7..def3758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1039,9 +1039,9 @@ configure_file(src/version.c.in version.c) +@@ -1036,9 +1036,9 @@ configure_file(src/version.c.in version.c) set(version ${PACKAGE_VERSION}) set(date ${API_VERSION}) @@ -15,7 +15,7 @@ index 413709da..d3dd03f0 100644 get_filename_component(out ${man} NAME_WE) configure_file(${man} man3/${out}.3 @ONLY) -@@ -1061,7 +1061,7 @@ foreach (man ${mans}) +@@ -1058,7 +1058,7 @@ foreach (man ${mans}) configure_file(${man} man3/${alt}.3 @ONLY) endif () endforeach() @@ -23,20 +23,18 @@ index 413709da..d3dd03f0 100644 +endif() set(prefix ${CMAKE_INSTALL_PREFIX}) - configure_file(getdns.pc.in getdns.pc @ONLY) -@@ -1099,11 +1099,11 @@ if (BUILD_GETDNS_SERVER_MON) + cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") +@@ -1098,10 +1098,10 @@ if (BUILD_GETDNS_SERVER_MON) endif () install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) -+#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) +-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR}) ++#install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION ${CMAKE_INSTALL_MANDIR}) --set(docdir share/doc/getdns) --install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) --install(FILES spec/index.html DESTINATION ${docdir}/spec) -+#set(docdir share/doc/getdns) -+#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) -+#install(FILES spec/index.html DESTINATION ${docdir}/spec) +-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec) ++#install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) ++#install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(CODE "message(\"\ diff --git a/ports/getdns/fix-include.patch b/ports/getdns/fix-include.patch new file mode 100644 index 00000000000000..27ea5fa210d313 --- /dev/null +++ b/ports/getdns/fix-include.patch @@ -0,0 +1,30 @@ +diff --git a/src/gldns/parse.c b/src/gldns/parse.c +index 367fa80..79fa527 100644 +--- a/src/gldns/parse.c ++++ b/src/gldns/parse.c +@@ -13,7 +13,7 @@ + #include "gldns/gbuffer.h" + + #include +-#include ++#include + + gldns_lookup_table gldns_directive_types[] = { + { GLDNS_DIR_TTL, "$TTL" }, +diff --git a/src/gldns/parseutil.c b/src/gldns/parseutil.c +index 293496a..bcd8e6f 100644 +--- a/src/gldns/parseutil.c ++++ b/src/gldns/parseutil.c +@@ -14,8 +14,12 @@ + + #include "config.h" + #include "gldns/parseutil.h" ++#ifdef HAVE_SYS_TIME_H + #include ++#endif ++#ifdef HAVE_TIME_H + #include ++#endif + #include + + gldns_lookup_table * diff --git a/ports/getdns/fix-libuv-deps.patch b/ports/getdns/fix-libuv-deps.patch new file mode 100644 index 00000000000000..71720ce3eca4e9 --- /dev/null +++ b/ports/getdns/fix-libuv-deps.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5b711e..6bd9ee2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -872,7 +872,7 @@ endif () + + # libuv extension. + if (USE_LIBUV) +- find_package(Libuv) ++ find_package(libuv CONFIG REQUIRED) + if (Libuv_FOUND) + # Check for new-style callbacks. + try_compile(HAVE_NEW_UV_TIMER_CB +@@ -894,8 +894,7 @@ if (USE_LIBUV) + set_property(TARGET uv_objects PROPERTY C_STANDARD 11) + if (ENABLE_STATIC) + add_library(getdns_ext_uv STATIC $) +- target_include_directories(getdns_ext_uv PRIVATE Libuv::Libuv) +- target_link_libraries(getdns_ext_uv PUBLIC getdns Libuv::Libuv) ++ target_link_libraries(getdns_ext_uv PUBLIC getdns $,libuv::uv_a,libuv::uv>) + if (Libunbound_FOUND) + target_link_libraries(getdns_ext_uv PUBLIC Libunbound::Libunbound) + endif () +@@ -903,8 +902,7 @@ if (USE_LIBUV) + endif () + if (ENABLE_SHARED) + add_library(getdns_ext_uv_shared SHARED $) +- target_include_directories(getdns_ext_uv_shared PRIVATE Libuv::Libuv) +- target_link_libraries(getdns_ext_uv_shared PUBLIC getdns_shared Libuv::Libuv) ++ target_link_libraries(getdns_ext_uv_shared PUBLIC getdns $,libuv::uv_a,libuv::uv>) + if (Libunbound_FOUND) + target_link_libraries(getdns_ext_uv_shared PUBLIC Libunbound::Libunbound) + endif () diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 07a11fe8040366..64eccdfdd353dd 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -1,19 +1,19 @@ -set(GETDNS_VERSION 1.7.0) -set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED) vcpkg_download_distfile(ARCHIVE - URLS "https://getdnsapi.net/dist/getdns-${GETDNS_VERSION}.tar.gz" - FILENAME "getdns-${GETDNS_VERSION}.tar.gz" - SHA512 ${GETDNS_HASH} + URLS "https://getdnsapi.net/dist/getdns-${VERSION}.tar.gz" + FILENAME "getdns-${VERSION}.tar.gz" + SHA512 d5725a24378b6fe0018daefdaba5565d2d4d51109ef66609fc34270a0a69accb95f5f895d0cdfc5caca51d2ec586db126f367439f05aed12507395af26739e2f ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES disable-docs.patch + PATCHES + disable-docs.patch + fix-include.patch + fix-libuv-deps.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index 98b9d330476ce0..92ee276fbf62d8 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,7 +1,6 @@ { "name": "getdns", - "version": "1.7.0", - "port-version": 3, + "version": "1.7.3", "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d34b991a484ba5..ee50342808ae64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2921,8 +2921,8 @@ "port-version": 1 }, "getdns": { - "baseline": "1.7.0", - "port-version": 3 + "baseline": "1.7.3", + "port-version": 0 }, "getopt": { "baseline": "0", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 33ed8e70d415cc..858c315f95c517 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc99e968335624d1ff606befa894103b540fbde2", + "version": "1.7.3", + "port-version": 0 + }, { "git-tree": "b604fb24c9b81bf4bc5c30e7ca86e52750a86935", "version": "1.7.0", From eb33d2f7583405fca184bcdf7fdd5828ec88ac05 Mon Sep 17 00:00:00 2001 From: Julia DeMille <8127111+judemille@users.noreply.github.com> Date: Thu, 14 Dec 2023 02:19:20 -0600 Subject: [PATCH 0627/1039] [x-plane] Update to 4.0.1, effectively new port (#35032) * [xplane-sdk] New port * [xplane-sdk] This build should work. * [xplane-sdk] updated versions. i forgor. * [xplane-sdk] Build fixed for Mac. * [x-plane-sdk] xplane-sdk renamed to x-plane-sdk. xplane-sdk has not yet been published, so this is okay. * [x-plane-sdk] Renaming fixes. * [x-plane-sdk] Clarify license. The license seems to be a weird mix of the MIT, BSD 1-clause, and BSD 3-clause licenses. I can't work it out. It's permissive, but it's not any one license. * [x-plane-sdk] Switch to vcpkg_install_copyright. * [x-plane-sdk] Fixup config. * Rename x-plane-sdk to x-plane. Includes also moved to include root. Signed-off-by: Julia DeMille * Forgot to format and update versions. Signed-off-by: Julia DeMille --------- Signed-off-by: Julia DeMille --- ports/x-plane/CMakeLists.txt | 99 +++++++++++++++++++ ports/x-plane/portfile.cmake | 51 +++++----- .../unofficial-x-plane-config.cmake.in | 62 ++++++++++++ ports/x-plane/usage | 4 + ports/x-plane/vcpkg.json | 16 ++- versions/baseline.json | 4 +- versions/x-/x-plane.json | 5 + 7 files changed, 207 insertions(+), 34 deletions(-) create mode 100644 ports/x-plane/CMakeLists.txt create mode 100644 ports/x-plane/unofficial-x-plane-config.cmake.in create mode 100644 ports/x-plane/usage diff --git a/ports/x-plane/CMakeLists.txt b/ports/x-plane/CMakeLists.txt new file mode 100644 index 00000000000000..a04fbbc9720279 --- /dev/null +++ b/ports/x-plane/CMakeLists.txt @@ -0,0 +1,99 @@ +cmake_minimum_required(VERSION 3.21) +project(x-plane LANGUAGES C CXX) + +if(WIN32 OR APPLE) + add_library(unofficial::x-plane::xplm SHARED IMPORTED) + if(WIN32) + set_target_properties( + unofficial::x-plane::xplm + PROPERTIES IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Win/XPLM_64.lib") + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=1;-DAPL=0;-DLIN=0") + else() + set_target_properties( + unofficial::x-plane::xplm + PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Mac/XPLM.framework/XPLM") + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=0;-DAPL=1;-DLIN=0") + endif() +else() + add_library(unofficial::x-plane::xplm INTERFACE IMPORTED) + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=0;-DAPL=0;-DLIN=1") +endif() +set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + "${CMAKE_CURRENT_SOURCE_DIR}/CHeaders/XPLM") + +if(WIN32 OR APPLE) + add_library(unofficial::x-plane::xpwidgets SHARED IMPORTED) + if(WIN32) + set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES IMPORTED_IMPLIB "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Win/XPWidgets_64.lib") + else() + set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES IMPORTED_LOCATION + "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/Mac/XPWidgets.framework/XPWidgets") + endif() +else() + add_library(unofficial::x-plane::xpwidgets INTERFACE IMPORTED) +endif() +set_target_properties( + unofficial::x-plane::xpwidgets PROPERTIES INTERFACE_LINK_LIBRARIES + "unofficial::x-plane::xplm") +set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/CHeaders/Widgets") + +add_library(xplm_cpp STATIC) + +target_sources( + xplm_cpp + PRIVATE CHeaders/Wrappers/XPCBroadcaster.cpp + CHeaders/Wrappers/XPCDisplay.cpp + CHeaders/Wrappers/XPCListener.cpp + CHeaders/Wrappers/XPCProcessing.cpp + CHeaders/Wrappers/XPCWidget.cpp + CHeaders/Wrappers/XPCWidgetAttachments.cpp) + +target_include_directories( + xplm_cpp + INTERFACE $ + $) + +target_link_libraries(xplm_cpp PUBLIC unofficial::x-plane::xplm + unofficial::x-plane::xpwidgets) + +install( + TARGETS xplm_cpp + EXPORT xplm-targets + ARCHIVE DESTINATION lib) + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/XPLM/*.h") +install(FILES ${HEADERS} DESTINATION "include") + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/Widgets/*.h") +install(FILES ${HEADERS} DESTINATION "include") + +file(GLOB HEADERS "${CMAKE_CURRENT_LIST_DIR}/CHeaders/Wrappers/*.h") +install(FILES ${HEADERS} DESTINATION "include") + +include(CMakePackageConfigHelpers) +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/unofficial-x-plane-config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/unofficial-x-plane-config.cmake" + INSTALL_DESTINATION "share/unofficial-x-plane") + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-x-plane-config.cmake" + DESTINATION "share/unofficial-x-plane") + +install( + EXPORT xplm-targets + DESTINATION share/unofficial-x-plane + FILE unofficial-x-plane-targets.cmake + NAMESPACE unofficial::x-plane::) diff --git a/ports/x-plane/portfile.cmake b/ports/x-plane/portfile.cmake index f7a291feea9287..eebc06d6c178a0 100644 --- a/ports/x-plane/portfile.cmake +++ b/ports/x-plane/portfile.cmake @@ -1,37 +1,30 @@ -vcpkg_download_distfile(ARCHIVE - URLS "http://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip" - FILENAME "XPSDK303.zip" - SHA512 23a1efc893fdb838ce90307ac2e1bf592b03880e9c7bf7aac51cf0d358816931b56a3d603e266f3c9041620190c689dc4d3b28b288bc39cf6e653db6f2125395 -) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +set(XPSDK_VERSION "401") +vcpkg_download_distfile( + XPLANE_SDK_ZIP + URLS "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK${XPSDK_VERSION}.zip" + FILENAME "XPSDK${XPSDK_VERSION}.zip" + SHA512 8e00789befd15f5b1cb4f426ddf9c3f7f021c5fba50b907e8af5fbf09abbc362804b5d1543332855d01e8ae91b9c50a55933e63df6e11e88e58c10ca8f949bf4 +) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${XPLANE_SDK_ZIP}" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-x-plane-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -# create lib dir -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) - file(MAKE_DIRECTORY - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug/lib - ) -endif() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-x-plane) -# copy headers & sources -file(COPY ${SOURCE_PATH}/CHeaders/Widgets/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/CHeaders/Wrappers/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/CHeaders/XPLM/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") -# copy prebuilt libs -if(VCPKG_TARGET_IS_WINDOWS) - file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Win/XPLM_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Win/XPWidgets_64.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -elseif (VCPKG_TARGET_IS_OSX) - file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) - file(COPY ${SOURCE_PATH}/Libraries/Mac/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/license.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") diff --git a/ports/x-plane/unofficial-x-plane-config.cmake.in b/ports/x-plane/unofficial-x-plane-config.cmake.in new file mode 100644 index 00000000000000..f4b7e77ed874bd --- /dev/null +++ b/ports/x-plane/unofficial-x-plane-config.cmake.in @@ -0,0 +1,62 @@ +@PACKAGE_INIT@ + +get_filename_component(ROOT "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(ROOT "${ROOT}" PATH) + +if(NOT TARGET unofficial::x-plane::xplm) + if(WIN32 OR APPLE) + add_library(unofficial::x-plane::xplm SHARED IMPORTED) + if(WIN32) + set_target_properties( + unofficial::x-plane::xplm + PROPERTIES IMPORTED_IMPLIB "${ROOT}/lib/x-plane/XPLM_64.lib") + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=1;-DAPL=0;-DLIN=0") + else() + set_target_properties( + unofficial::x-plane::xplm + PROPERTIES IMPORTED_LOCATION "${ROOT}/lib/x-plane/XPLM.framework/XPLM") + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=0;-DAPL=1;-DLIN=0") + endif() + else() + add_library(unofficial::x-plane::xplm INTERFACE IMPORTED) + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_COMPILE_DEFINITIONS + "-DIBM=0;-DAPL=0;-DLIN=1") + endif() + set_target_properties( + unofficial::x-plane::xplm PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + "${ROOT}/include") +endif() + +if(NOT TARGET unofficial::x-plane::xpwidgets) + if(WIN32 OR APPLE) + add_library(unofficial::x-plane::xpwidgets SHARED IMPORTED) + if(WIN32) + set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES IMPORTED_IMPLIB "${ROOT}/lib/x-plane/XPWidgets_64.lib") + else() + set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES IMPORTED_LOCATION + "${ROOT}/lib/x-plane/XPWidgets.framework/XPWidgets") + endif() + else() + add_library(unofficial::x-plane::xpwidgets INTERFACE IMPORTED) + endif() + set_target_properties( + unofficial::x-plane::xpwidgets PROPERTIES INTERFACE_LINK_LIBRARIES + "unofficial::x-plane::xplm") + set_target_properties( + unofficial::x-plane::xpwidgets + PROPERTIES INTERFACE_INCLUDE_DIRECTORIES + "${ROOT}/include") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-x-plane-targets.cmake") + +check_required_components(unofficial-x-plane) diff --git a/ports/x-plane/usage b/ports/x-plane/usage new file mode 100644 index 00000000000000..de07716df2063b --- /dev/null +++ b/ports/x-plane/usage @@ -0,0 +1,4 @@ +x-plane provides CMake targets: + + find_package(unofficial-x-plane CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::x-plane::xplm unofficial::x-plane::xpwidgets unofficial::x-plane::xplm_cpp) diff --git a/ports/x-plane/vcpkg.json b/ports/x-plane/vcpkg.json index 156986edd84b9a..9dbb8e9e9835ea 100644 --- a/ports/x-plane/vcpkg.json +++ b/ports/x-plane/vcpkg.json @@ -1,8 +1,18 @@ { "name": "x-plane", - "version": "3.0.3", - "port-version": 2, + "version": "4.0.1", "description": "The X-Plane Plugin SDK", "homepage": "https://developer.x-plane.com/sdk/", - "supports": "!(x86 | arm | wasm32)" + "license": null, + "supports": "(windows & !uwp & x64) | (osx & (x64 | arm64)) | (linux & x64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ee50342808ae64..332897d665a35f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9141,8 +9141,8 @@ "port-version": 0 }, "x-plane": { - "baseline": "3.0.3", - "port-version": 2 + "baseline": "4.0.1", + "port-version": 0 }, "x264": { "baseline": "0.164.3107", diff --git a/versions/x-/x-plane.json b/versions/x-/x-plane.json index 62e2c66012d35b..572bc3d7894af7 100644 --- a/versions/x-/x-plane.json +++ b/versions/x-/x-plane.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be6ff276d2a18e64a2cf91a50ef1a53d26a33fa8", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "4f081103e3e99e2d77b5b3124824ad6f0d7410fc", "version": "3.0.3", From a1e13e8d589cca3c89075561cd68aa34bc32b9a2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 15 Dec 2023 02:37:17 +0100 Subject: [PATCH 0628/1039] [icu] Update, enable uwp, fix osx-dynamic (#35530) * [cppcms] No uwp * [libzim] No uwp * [cppcms] Fix dependencies and linkage * [libzim] Update to 9.0.0 * [cppcms] No python for build * Fixup * CI: uwp * [vcpkg-ci-boost] Enable boost-regex[icu] * [icu] Enable uwp * [icu] Update to 74.1 * [icu] Cleanup * v * [icu] Set install names during linking * Revert "CI: uwp" This reverts commit 127afe8aa1518b1148f57b071bdee2ff22838d24. * CI * [icu] Use --enable-rpath on osx --- ports/icu/darwin-rpath.patch | 14 +++ ports/icu/portfile.cmake | 123 ++++--------------- ports/icu/vcpkg.json | 7 +- scripts/test_ports/vcpkg-ci-boost/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/i-/icu.json | 5 + 6 files changed, 49 insertions(+), 107 deletions(-) create mode 100644 ports/icu/darwin-rpath.patch diff --git a/ports/icu/darwin-rpath.patch b/ports/icu/darwin-rpath.patch new file mode 100644 index 00000000000000..3de84594fdcb96 --- /dev/null +++ b/ports/icu/darwin-rpath.patch @@ -0,0 +1,14 @@ +diff --git a/source/config/mh-darwin b/source/config/mh-darwin +index 7b15709..e2cdbdb 100644 +--- a/source/config/mh-darwin ++++ b/source/config/mh-darwin +@@ -31,7 +31,8 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS) + + ## Compiler switches to embed a library name and version information + ifeq ($(ENABLE_RPATH),YES) +-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) ++ID_PREFIX = @rpath ++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(ID_PREFIX)/$(notdir $(MIDDLE_SO_TARGET)) + else + LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE) + endif diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 36cddcc09ec5dd..0beaa236228593 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 e788e372716eecebc39b56bbc88f3a458e21c3ef20631c2a3d7ef05794a678fe8dad482a03a40fdb9717109a613978c7146682e98ee16fade5668d641d5c48f8 + SHA512 32c28270aa5d94c58d2b1ef46d4ab73149b5eaa2e0621d4a4c11597b71d146812f5e66db95f044e8aaa11b94e99edd4a48ab1aa8efbe3d72a73870cd56b564c2 ) vcpkg_extract_source_archive(SOURCE_PATH @@ -20,36 +20,33 @@ vcpkg_extract_source_archive(SOURCE_PATH disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. fix-win-build.patch vcpkg-cross-data.patch + darwin-rpath.patch ) vcpkg_find_acquire_program(PYTHON3) set(ENV{PYTHON} "${PYTHON3}") vcpkg_list(SET CONFIGURE_OPTIONS) -vcpkg_list(SET CONFIGURE_OPTIONS_RELEASE) -vcpkg_list(SET CONFIGURE_OPTIONS_DEBUG) vcpkg_list(SET BUILD_OPTIONS) if(VCPKG_TARGET_IS_EMSCRIPTEN) vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras) vcpkg_list(APPEND BUILD_OPTIONS "PKGDATA_OPTS=--without-assembly -O ../data/icupkg.inc") +elseif(VCPKG_TARGET_IS_UWP) + vcpkg_list(APPEND CONFIGURE_OPTIONS --disable-extras ac_cv_func_tzset=no ac_cv_func__tzset=no) + string(APPEND VCPKG_C_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1") + string(APPEND VCPKG_CXX_FLAGS " -DU_PLATFORM_HAS_WINUWP_API=1") +elseif(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_list(APPEND CONFIGURE_OPTIONS --enable-rpath) + if(DEFINED CMAKE_INSTALL_NAME_DIR) + vcpkg_list(APPEND BUILD_OPTIONS "ID_PREFIX=${CMAKE_INSTALL_NAME_DIR}") + endif() endif() if(VCPKG_TARGET_IS_WINDOWS) list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) endif() -list(APPEND CONFIGURE_OPTIONS --disable-samples --disable-tests --disable-layoutex) - -list(APPEND CONFIGURE_OPTIONS_RELEASE --disable-debug --enable-release) -list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release) - -set(CONFIG_TRIPLETS) -list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-rel) -if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - list(APPEND CONFIG_TRIPLETS ${TARGET_TRIPLET}-dbg) -endif() - if("tools" IN_LIST FEATURES) list(APPEND CONFIGURE_OPTIONS --enable-tools) else() @@ -67,94 +64,22 @@ endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG PROJECT_SUBPATH source - ADDITIONAL_MSYS_PACKAGES autoconf-archive - OPTIONS ${CONFIGURE_OPTIONS} - OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} - OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} + AUTOCONFIG DETERMINE_BUILD_TRIPLET + ADDITIONAL_MSYS_PACKAGES autoconf-archive + OPTIONS + ${CONFIGURE_OPTIONS} + --disable-samples + --disable-tests + --disable-layoutex + OPTIONS_RELEASE + --disable-debug + --enable-release + OPTIONS_DEBUG + --enable-debug + --disable-release ) - -if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - - vcpkg_build_make() - # remove this block if https://unicode-org.atlassian.net/browse/ICU-21458 - # is resolved and use the configure script instead - if(DEFINED CMAKE_INSTALL_NAME_DIR) - set(ID_PREFIX "${CMAKE_INSTALL_NAME_DIR}") - else() - set(ID_PREFIX "@rpath") - endif() - - # install_name_tool may be missing if cross-compiling - find_program( - INSTALL_NAME_TOOL - install_name_tool - HINTS /usr/bin /Library/Developer/CommandLineTools/usr/bin/ - DOC "Absolute path of install_name_tool" - REQUIRED - ) - - message(STATUS "setting rpath prefix for macOS dynamic libraries") - - if("tools" IN_LIST FEATURES) - set(LIBICUTU_RPATH "libicutu") - endif() - - #31680: Fix @rpath in both debug and release build - foreach(CONFIG_TRIPLE IN LISTS CONFIG_TRIPLETS) - # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc - foreach(LIB_NAME IN ITEMS libicudata libicui18n libicuio ${LIBICUTU_RPATH} libicuuc) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -id "${ID_PREFIX}/${LIB_NAME}.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" - LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" - ) - endforeach() - - # add ID_PREFIX to libicui18n libicuio libicutu dependencies - foreach(LIB_NAME IN ITEMS libicui18n libicuio) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicuuc.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" - LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" - ) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" - LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" - ) - endforeach() - - # add ID_PREFIX to remaining libicuio libicutu dependencies - foreach(LIB_NAME libicuio libicutu) - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicui18n.${ICU_VERSION_MAJOR}.dylib" - "${LIB_NAME}.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" - LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" - ) - endforeach() - - # add ID_PREFIX to libicuuc dependencies - vcpkg_execute_build_process( - COMMAND "${INSTALL_NAME_TOOL}" -change "libicudata.${ICU_VERSION_MAJOR}.dylib" - "${ID_PREFIX}/libicudata.${ICU_VERSION_MAJOR}.dylib" - "libicuuc.${VERSION}.dylib" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${CONFIG_TRIPLE}/lib" - LOGNAME "make-build-fix-rpath-${CONFIG_TRIPLE}" - ) - endforeach() - -endif() - vcpkg_install_make(OPTIONS ${BUILD_OPTIONS}) file(REMOVE_RECURSE diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index d80834ecb61e81..441d2be0b75b5e 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,11 +1,9 @@ { "name": "icu", - "version": "73.1", - "port-version": 2, + "version": "74.1", "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "license": "ICU", - "supports": "!uwp", "dependencies": [ { "name": "icu", @@ -17,7 +15,8 @@ ], "features": { "tools": { - "description": "Build tools" + "description": "Build tools", + "supports": "!uwp" } } } diff --git a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json index c4bdf2a85a4a52..0721b95e33381e 100644 --- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -79,8 +79,7 @@ "default-features": false, "features": [ "icu" - ], - "platform":"!uwp" + ] } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 332897d665a35f..3cea19980a689d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3385,8 +3385,8 @@ "port-version": 0 }, "icu": { - "baseline": "73.1", - "port-version": 2 + "baseline": "74.1", + "port-version": 0 }, "ideviceinstaller": { "baseline": "2023-07-21", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index d76f3d6c058d36..9c091e0df39f21 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a6f5ea29d6445c8af30f19952c62cc5dd5e2a5b", + "version": "74.1", + "port-version": 0 + }, { "git-tree": "b6ac20c2420a4f7118d5db326c8c599e50b2c5a4", "version": "73.1", From 4d973549d7dce0c3bd9c7f2a06333363764aba1a Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 15 Dec 2023 02:43:04 +0100 Subject: [PATCH 0629/1039] [roaring] Update to 2.0.4 (#35691) * [roaring] Update to 2.0.4 * version * Fix race * version --- ports/roaring/portfile.cmake | 16 +++++----------- ports/roaring/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/roaring.json | 5 +++++ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake index 0b5d13f4499946..811632bfd1d6d7 100644 --- a/ports/roaring/portfile.cmake +++ b/ports/roaring/portfile.cmake @@ -1,20 +1,15 @@ -if (TARGET_TRIPLET MATCHES "^x86") - message(WARNING "The CRoaring authors recommend users of this lib against using a 32-bit build.") -endif () - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RoaringBitmap/CRoaring REF "v${VERSION}" - - SHA512 c51e426c13045f45b907bc2801fcb01a2bb0620054ad5c2bb113fe486f77e292c85f29348e7d4d1c61f0263845be9403b754f418d81c293c5e2fb9e5407386b0 + SHA512 bfffdde8b9e870fd509f83a073cace14c0bcd969f6f8649ae8fd2c679174d8c6549fee59d9e166f9c409f1f26f73951e24664dc0098a5ccc4e024d0f14cdd881 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC} @@ -25,11 +20,10 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/roaring) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json index 4634f1457c61a2..52002a54a7f8ae 100644 --- a/ports/roaring/vcpkg.json +++ b/ports/roaring/vcpkg.json @@ -1,6 +1,6 @@ { "name": "roaring", - "version": "0.9.6", + "version": "2.0.4", "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 3cea19980a689d..4bec34e2c5458d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7525,7 +7525,7 @@ "port-version": 0 }, "roaring": { - "baseline": "0.9.6", + "baseline": "2.0.4", "port-version": 0 }, "robin-hood-hashing": { diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json index 4e24e50e07fe48..2e81b9abe19ebe 100644 --- a/versions/r-/roaring.json +++ b/versions/r-/roaring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0179f926fd785b55019104fb010fb99ebcfa5e06", + "version": "2.0.4", + "port-version": 0 + }, { "git-tree": "d1f8636ba82d39c12bea0f5a09409a5a5321432a", "version": "0.9.6", From 057a7d1470d8b006c3ab6f327b072cf607a9cf74 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos Date: Thu, 14 Dec 2023 20:49:36 -0500 Subject: [PATCH 0630/1039] Update version of type-safe (#35690) * update version of type-safe * format manifest * vcpkg x-add-version --- ports/type-safe/portfile.cmake | 4 ++-- ports/type-safe/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/type-safe.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/type-safe/portfile.cmake b/ports/type-safe/portfile.cmake index de3a4080f95499..fd81bc3b8a9cf4 100644 --- a/ports/type-safe/portfile.cmake +++ b/ports/type-safe/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO foonathan/type_safe - REF v0.2.2 - SHA512 5dbc9e906e066cfc5eb8fd9a308e952e33c7463b5d2abaadd4303ebe8c38a1d8e79865076ad6422f4c56ffa23113b291e3c11d6dd28e73ec3d6fe2e3e7a233a3 + REF v0.2.3 + SHA512 2064995421c5b6bad1b336adf71af9ad1dd3d2245411be1f531d3b72db782a9a959f20597c18a1bd8a71fd3e9e87e396b4fe5595a5e99a32e2d814d6a7c6222b HEAD_REF main ) diff --git a/ports/type-safe/vcpkg.json b/ports/type-safe/vcpkg.json index 4d659c40920fa6..8d4c3d8890cced 100644 --- a/ports/type-safe/vcpkg.json +++ b/ports/type-safe/vcpkg.json @@ -1,7 +1,6 @@ { "name": "type-safe", - "version": "0.2.2", - "port-version": 1, + "version": "0.2.3", "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.", "homepage": "https://github.com/foonathan/type_safe", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4bec34e2c5458d..e8c468081720b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8649,8 +8649,8 @@ "port-version": 3 }, "type-safe": { - "baseline": "0.2.2", - "port-version": 1 + "baseline": "0.2.3", + "port-version": 0 }, "uchardet": { "baseline": "0.0.8", diff --git a/versions/t-/type-safe.json b/versions/t-/type-safe.json index 83500881985141..36d0c1032725ab 100644 --- a/versions/t-/type-safe.json +++ b/versions/t-/type-safe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "803fe8770512e68321e60560d9a303e4782c266e", + "version": "0.2.3", + "port-version": 0 + }, { "git-tree": "63cdf2cb69a2a7f3de1a5bf82d63e556b742e909", "version": "0.2.2", From 08c98c7c40228beebfece6f221a4ff21fb180542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Fri, 15 Dec 2023 01:56:43 +0000 Subject: [PATCH 0631/1039] [Glaze] Update to version 1.9.6 (#35687) * Glaze version 1.9.6 * Vcpkg update database --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 696edb61af2a48..cdb6ecc511d641 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 59c2b332c53c33c4410e3617c65ddf0aa592b985400a7ec7247af0fe561d33de3b94e8ea4ea143dcb7e55bd29f4b169ee79e99281bf493a8185172194195e574 + SHA512 ffc2c2d007e736c4ef44407c639c89ba82e2e90d9e6ec9d3d507bdf20e197659e6963439d83e0b311efddb1f089552fa36edfc5af6c6b620f9dd3fdc06e5a52d ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index d9c81aa8f00871..89d53e6f4a49b8 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.9.5", + "version": "1.9.6", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e8c468081720b7..2a7429f4cbf0e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.9.5", + "baseline": "1.9.6", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 0582befe2c7c88..d639f9b83ca481 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90e9524cec84329ef65d58ce265d64567ff861f5", + "version": "1.9.6", + "port-version": 0 + }, { "git-tree": "ddf42a4875b810fc720e4bf4ae95613e1d79e29b", "version": "1.9.5", From 4f038c1ec67acc614728376cde6747fa7c8e44eb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:45:53 +0100 Subject: [PATCH 0632/1039] [string-theory] Update to 3.8 (#35692) * [string-theory] Update to 3.8 * version --- ports/string-theory/portfile.cmake | 8 +++++--- ports/string-theory/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/string-theory.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake index 3277af3a96fa95..6cf306ad681684 100644 --- a/ports/string-theory/portfile.cmake +++ b/ports/string-theory/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zrax/string_theory - REF 3.6 - SHA512 2bbd8e6c5c2501cc9616ee6a77b60a7cac5e7c9fa58d6616f6ba39cfdee33dc1b072c5d1b34bd2f88726fb4d65d32032595be7a67854a2e894eb3d81d4a8eea9 + REF "${VERSION}" + SHA512 5071fb091dd5b5279776c2949b2bff7033c6bce336b1b4916e04957228884104b07e64ff3aa248b6498889fd50947c1fa7807e5d07a74c60203ffd1aade4a5a4 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DST_BUILD_TESTS=OFF ) vcpkg_cmake_install() @@ -16,4 +18,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME string_theory CONFIG_PATH lib/cmake/string file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/string-theory/vcpkg.json b/ports/string-theory/vcpkg.json index ba3752a6206868..95880ba7acbdbb 100644 --- a/ports/string-theory/vcpkg.json +++ b/ports/string-theory/vcpkg.json @@ -1,6 +1,6 @@ { "name": "string-theory", - "version": "3.6", + "version": "3.8", "description": "Flexible modern C++ string library with type-safe formatting.", "homepage": "https://github.com/zrax/string_theory", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2a7429f4cbf0e2..39c5cc1f9415dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8233,7 +8233,7 @@ "port-version": 2 }, "string-theory": { - "baseline": "3.6", + "baseline": "3.8", "port-version": 0 }, "string-view-lite": { diff --git a/versions/s-/string-theory.json b/versions/s-/string-theory.json index 6408f41352f9e4..77a43aa7388815 100644 --- a/versions/s-/string-theory.json +++ b/versions/s-/string-theory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca2ab2f3286c4b1f945ea10f070bfb0845755018", + "version": "3.8", + "port-version": 0 + }, { "git-tree": "e3c6df91d194be6ca56d8f4044cf0137041d4f04", "version": "3.6", From 9021cb001a46855a4c5061b63c8ce6d36372df2d Mon Sep 17 00:00:00 2001 From: Marc <31337222+marcbull@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:51:50 +0100 Subject: [PATCH 0633/1039] [gstreamer] add feature to enable aom support (#35680) * [gstreamer] add feature to enable aom support * Update version database * [gstreamer] disable aom feature on windows * Update version database --- ports/gstreamer/portfile.cmake | 2 +- ports/gstreamer/vcpkg.json | 16 +++++++++++++++- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 099427ba6a2606..bd3908ff2bb95e 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -80,6 +80,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS plugins-bad bad aes gst-plugins-bad:aes + aom gst-plugins-bad:aom assrender gst-plugins-bad:assrender bzip2-bad gst-plugins-bad:bz2 chromaprint gst-plugins-bad:chromaprint @@ -214,7 +215,6 @@ vcpkg_configure_meson( -Dgst-plugins-ugly:mpeg2dec=disabled # libmpeg2 not found -Dgst-plugins-ugly:sidplay=disabled # gst-plugins-bad - -Dgst-plugins-bad:aom=disabled # Error during plugin build -Dgst-plugins-bad:avtp=disabled -Dgst-plugins-bad:androidmedia=auto -Dgst-plugins-bad:applemedia=auto diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index bbe5f43c3dfdcb..921550bb761a66 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 5, + "port-version": 6, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -55,6 +55,20 @@ } ] }, + "aom": { + "description": "Enable support for the Alliance for Open Media (AOM) AV1 encoder and decoder", + "supports": "!windows", + "dependencies": [ + "aom", + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-bad" + ] + } + ] + }, "asio": { "description": "Enable support for the Steinberg Audio Streaming Input Output (ASIO) library (Windows only)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 39c5cc1f9415dd..1f9c479a5c5f8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3146,7 +3146,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 5 + "port-version": 6 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index d24e474933c0f2..453418a498f7e2 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27425db97df2c329de0baf5d00c719982659c9c4", + "version": "1.22.5", + "port-version": 6 + }, { "git-tree": "c6339c24dbe60ed13ff8d6b5e646d11e192f4ec0", "version": "1.22.5", From 4eb186792a3c027c3e912434e3fe19049ff2e77e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Fri, 15 Dec 2023 06:52:38 +0000 Subject: [PATCH 0634/1039] [mp-units] Update to version 2.1.0 (#35689) * Update mp-units to 2.1.0 * vcpkg database update * Patch updated * Update database --- ports/mp-units/config.patch | 9 ++++----- ports/mp-units/portfile.cmake | 2 +- ports/mp-units/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mp-units.json | 5 +++++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/mp-units/config.patch b/ports/mp-units/config.patch index 1642d2b2fcb57d..12539f7f00a612 100644 --- a/ports/mp-units/config.patch +++ b/ports/mp-units/config.patch @@ -1,17 +1,16 @@ diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake -index 10f82a82..ea637abd 100644 +index 519b180b..6005e9f8 100644 --- a/src/mp-unitsConfig.cmake +++ b/src/mp-unitsConfig.cmake -@@ -42,10 +42,10 @@ endfunction() +@@ -23,9 +23,9 @@ include(CMakeFindDependencyMacro) if(MP_UNITS_USE_LIBFMT) - find_dependency(fmt) -+ find_dependency(fmt CONFIG) ++ find_dependency(fmt CONFIG) endif() -find_dependency(gsl-lite) +find_dependency(gsl-lite CONFIG) - # add range-v3 dependency only for clang + libc++ - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + include("${CMAKE_CURRENT_LIST_DIR}/mp-unitsTargets.cmake") diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index 4b626bfedd98b2..68ead3a493cb2e 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpusz/units REF "v${VERSION}" - SHA512 994922a391ed5c1d0e023545beeb0bbeb8ec067be408f715d553e509d9106cdb5b27cfbaa69f0ca1a27cdf9532edacaff7d2cabaafd54b1713f9c8add93bc389 + SHA512 d23589ba6e5e18e3477a9bab9fe25cffed5e8777862b4811e4335e294f86d129a48c7e001d57cec0739ddd1f0a936e42d06f2b4782b1bd8b8bb15f86f8d32d53 PATCHES config.patch ) diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index 8ad032daa8db51..ada675dc7b5e07 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mp-units", - "version": "2.0.0", + "version": "2.1.0", "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1f9c479a5c5f8e..3d9d107efeeb44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5697,7 +5697,7 @@ "port-version": 0 }, "mp-units": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "mp3lame": { diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index 0b0664eb299f3c..7c0bddaa7b3f62 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ecbe0c671bd440c941d9c88fb326743a5584f00", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "f410b971351069e2e9f1b140104a8e836b76c1b8", "version": "2.0.0", From 1d206dae085048388c7034eff0058899fedcb1ba Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:56:23 -0800 Subject: [PATCH 0635/1039] [libtorch] Fix core dependencies (#35682) * fix libtorch dependencies * update version --------- Co-authored-by: Monica --- ports/libtorch/vcpkg-dependencies.cmake | 26 +++++++++++++++---------- ports/libtorch/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libtorch.json | 5 +++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ports/libtorch/vcpkg-dependencies.cmake b/ports/libtorch/vcpkg-dependencies.cmake index bf6028b9229c6e..184d0f29eec3ca 100644 --- a/ports/libtorch/vcpkg-dependencies.cmake +++ b/ports/libtorch/vcpkg-dependencies.cmake @@ -23,9 +23,13 @@ if(BUILD_PYTHON) list(APPEND Caffe2_DEPENDENCY_LIBS pybind11::pybind11) endif() +#Caffe2 depends on FP16 library for half-precision conversions find_path(FP16_INCLUDE_DIRS "fp16.h" REQUIRED) +# PSIMD is required by FP16 find_path(PSIMD_INCLUDE_DIRS "psimd.h" REQUIRED) -find_path(FXDIV_INCLUDE_DIRS "fxdiv.h" REQUIRED) +if(USE_NNPACK OR USE_QNNPACK OR USE_PYTORCH_QNNPACK OR USE_XNNPACK) + find_path(FXDIV_INCLUDE_DIRS "fxdiv.h" REQUIRED) +endif() find_library(FOXI_LOADER_LIBPATH NAMES foxi_loader REQUIRED) list(APPEND Caffe2_DEPENDENCY_LIBS ${FOXI_LOADER_LIBPATH}) @@ -35,20 +39,22 @@ find_package(gemmlowp CONFIG REQUIRED) # gemmlowp::gemmlowp find_package(gflags CONFIG REQUIRED) # gflags::gflags find_package(glog CONFIG REQUIRED) # glog::glog find_package(cpuinfo CONFIG REQUIRED) # cpuinfo::clog cpuinfo::cpuinfo -find_package(unofficial-pthreadpool CONFIG REQUIRED) # unofficial::pthreadpool -list(APPEND Caffe2_DEPENDENCY_LIBS - gemmlowp::gemmlowp gflags::gflags glog::glog - cpuinfo::clog cpuinfo::cpuinfo unofficial::pthreadpool -) +list(APPEND Caffe2_DEPENDENCY_LIBS gemmlowp::gemmlowp gflags::gflags glog::glog cpuinfo::clog cpuinfo::cpuinfo) + +# Only add a dependency on pthreadpool if we are on a mobile build or are building any of the libraries in the {Q/X}NNPACK family. +if(INTERN_BUILD_MOBILE OR USE_NNPACK OR USE_QNNPACK OR USE_PYTORCH_QNNPACK OR USE_XNNPACK) + find_package(unofficial-pthreadpool CONFIG REQUIRED) # unofficial::pthreadpool + list(APPEND Caffe2_DEPENDENCY_LIBS unofficial::pthreadpool) + set(USE_PTHREADPOOL 1) + set(USE_INTERNAL_PTHREADPOOL_IMPL 0) + add_compile_definitions(USE_PTHREADPOOL) +endif() + link_directories( $<$:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib> $<$:${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib> ) -set(USE_PTHREADPOOL 1) -set(USE_INTERNAL_PTHREADPOOL_IMPL 0) -add_compile_definitions(USE_PTHREADPOOL) - find_package(fmt CONFIG REQUIRED) # fmt::fmt-header-only list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index 2e0e8b9d1ccc0e..1b27ee499e321a 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "1.12.1", - "port-version": 3, + "port-version": 4, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, @@ -16,6 +16,7 @@ }, "fmt", "foxi", + "fp16", "gemmlowp", "gflags", "glog", diff --git a/versions/baseline.json b/versions/baseline.json index 3d9d107efeeb44..825f282698a5c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4918,7 +4918,7 @@ }, "libtorch": { "baseline": "1.12.1", - "port-version": 3 + "port-version": 4 }, "libtorrent": { "baseline": "2.0.9", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 3d8f6af2599683..4fa4e5ed68c84c 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de2d4bfd4a26268b29c3be02790c16d23ecd3d5e", + "version": "1.12.1", + "port-version": 4 + }, { "git-tree": "7f8ee520ffcef31a008c2c73b1155b38151ebae4", "version": "1.12.1", From 0e62a1d67018082164589fc6eb79e0c336188caa Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:57:21 -0800 Subject: [PATCH 0636/1039] [opensubdiv] Fix feature cuda build with opening Visual Studio (#35678) * [opensubdiv] Fix feature cuda build with opening Visual Studio * update version --- ports/opensubdiv/fix-feature-cuda.patch | 13 +++++++++++++ ports/opensubdiv/portfile.cmake | 3 ++- ports/opensubdiv/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/opensubdiv.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/opensubdiv/fix-feature-cuda.patch diff --git a/ports/opensubdiv/fix-feature-cuda.patch b/ports/opensubdiv/fix-feature-cuda.patch new file mode 100644 index 00000000000000..e9c4e933e14504 --- /dev/null +++ b/ports/opensubdiv/fix-feature-cuda.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 098df7d..9314d03 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -730,7 +730,7 @@ endmacro() + # use when cross compiling or building multi-architecture binaries. + # We also provide a C++ binary implementation so that Python is not + # required (for backward compatibility). +-if (OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR METAL_FOUND) ++if (OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR METAL_FOUND OR CUDA_FOUND) + if(Python_Interpreter_FOUND) + set(OSD_STRINGIFY_TOOL ${CMAKE_CURRENT_SOURCE_DIR}/tools/stringify/stringify.py) + set(OSD_STRINGIFY ${Python_EXECUTABLE} ${OSD_STRINGIFY_TOOL}) diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index 6f36a19316133b..2d7606c52d226d 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-version-search.patch fix-build-type.patch fix-dependencies.patch + fix-feature-cuda.patch ) if(VCPKG_TARGET_IS_LINUX) @@ -135,4 +136,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/bin" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index 3f95fcaf3ab8df..d5bcb8f9aa0037 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.5.0", + "port-version": 1, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 825f282698a5c6..d069cbb905e9ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6350,7 +6350,7 @@ }, "opensubdiv": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "opentelemetry-cpp": { "baseline": "1.12.0", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index dc5e1a7fff4226..b5b28391bcf231 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cc627798709caed394f31456098644f359f0936", + "version-semver": "3.5.0", + "port-version": 1 + }, { "git-tree": "38f4d0720a8f9f0610f327382977951421d3ce98", "version-semver": "3.5.0", From db68d1dee93a14fed7ef8ddc81ecd497f27aea1a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:58:19 +0100 Subject: [PATCH 0637/1039] [pcl] fix clang-cl builds (#35676) * [pcl] fix clang-cl build * v db --- ports/pcl/fix-clang-cl.patch | 62 ++++++++++++++++++++++++++++++++++++ ports/pcl/portfile.cmake | 1 + ports/pcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcl.json | 5 +++ 5 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 ports/pcl/fix-clang-cl.patch diff --git a/ports/pcl/fix-clang-cl.patch b/ports/pcl/fix-clang-cl.patch new file mode 100644 index 00000000000000..a80f6b9c62df1d --- /dev/null +++ b/ports/pcl/fix-clang-cl.patch @@ -0,0 +1,62 @@ +diff --git a/common/include/pcl/impl/instantiate.hpp b/common/include/pcl/impl/instantiate.hpp +index ea73a0c..4cfc92b 100644 +--- a/common/include/pcl/impl/instantiate.hpp ++++ b/common/include/pcl/impl/instantiate.hpp +@@ -95,7 +95,7 @@ + // + // ((x)(y)(z))((1)(2)(3))((dracula)(radu)) + // +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && ! defined(__clang__) + #define PCL_INSTANTIATE_PRODUCT_IMPL(r, product) \ + BOOST_PP_CAT(PCL_INSTANTIATE_, BOOST_PP_SEQ_HEAD(product)) \ + BOOST_PP_EXPAND(BOOST_PP_SEQ_TO_TUPLE(BOOST_PP_SEQ_TAIL(product))) +diff --git a/common/src/colors.cpp b/common/src/colors.cpp +index 4d53ab1..ba0c114 100644 +--- a/common/src/colors.cpp ++++ b/common/src/colors.cpp +@@ -39,6 +39,7 @@ + #include + + #include ++#include + + /// Glasbey lookup table + static constexpr std::array GLASBEY_LUT = +diff --git a/common/src/gaussian.cpp b/common/src/gaussian.cpp +index 69bbd12..2b6a667 100644 +--- a/common/src/gaussian.cpp ++++ b/common/src/gaussian.cpp +@@ -36,6 +36,7 @@ + */ + + #include ++#include + + void + pcl::GaussianKernel::compute (float sigma, +diff --git a/common/src/range_image_planar.cpp b/common/src/range_image_planar.cpp +index 97b249b..dddd7f7 100644 +--- a/common/src/range_image_planar.cpp ++++ b/common/src/range_image_planar.cpp +@@ -35,6 +35,7 @@ + /** \author Bastian Steder */ + + #include ++#include + using std::cout; + using std::cerr; + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fad95c9..b4ca305 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING + # Compiler identification + # Define a variable CMAKE_COMPILER_IS_X where X is the compiler short name. + # Note: CMake automatically defines one for GNUCXX, nothing to do in this case. +-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + set(CMAKE_COMPILER_IS_CLANG 1) + elseif(__COMPILER_PATHSCALE) + set(CMAKE_COMPILER_IS_PATHSCALE 1) diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 02fedfdf9e584c..297467a59ba38a 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( install-examples.patch no-absolute.patch devendor-zlib.patch + fix-clang-cl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index f9834ad4036999..d2011d740f2b07 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcl", "version": "1.13.1", - "port-version": 1, + "port-version": 2, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d069cbb905e9ab..d5b058a78c9f5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6518,7 +6518,7 @@ }, "pcl": { "baseline": "1.13.1", - "port-version": 1 + "port-version": 2 }, "pcre": { "baseline": "8.45", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 35655855fb70fe..e6884c400fcca6 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55fa760d44b858555a5c350ec8b2a1f26e97e84e", + "version": "1.13.1", + "port-version": 2 + }, { "git-tree": "8f4bb7a9a1e628b9444dad7f5a36a2163df572ac", "version": "1.13.1", From a82865a4a154d53406f24451ef877e6009bb59ef Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 14 Dec 2023 22:59:35 -0800 Subject: [PATCH 0638/1039] [mlpack] update to 4.3.0 (#35675) * update mlpack * update version * remove features * update git-tree --------- Co-authored-by: Monica --- ports/mlpack/portfile.cmake | 2 +- ports/mlpack/vcpkg.json | 25 +++---------------------- versions/baseline.json | 2 +- versions/m-/mlpack.json | 5 +++++ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 95058e350d1eb6..069b2f106e0e16 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/mlpack REF "${VERSION}" - SHA512 899a70f76bee626ef00993bedea188f8a2e9db5f0faec41cf125607b7c4bbda16d0e0343aac757618cd48fcb520f968539a8a97d89cf577037f69c624caf8bc6 + SHA512 6b7c16190fa5106dde76cbedddc42ed0a4a97fcc606dc0b962744fdc812ac81f59a21b6cf071e3a8661c58cb9de2654a4eabd03c4f44d6091f99175887735c41 HEAD_REF master ) diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index c421b4746f1924..8c68206a7ad38b 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mlpack", - "version": "4.2.0", + "version": "4.3.0", "description": "mlpack is an intuitive, fast, and flexible header-only C++ machine learning library with bindings to other languages.", "homepage": "https://github.com/mlpack/mlpack", "license": "BSD-3-Clause", @@ -9,25 +9,6 @@ "armadillo", "cereal", "ensmallen", - "stb", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "openmp": { - "description": "use OpenMP for parallelization." - }, - "tools": { - "description": "Build command-line executables.", - "dependencies": [ - "boost-format" - ] - } - } + "stb" + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d5b058a78c9f5a..90e135d80470f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 0 }, "mlpack": { - "baseline": "4.2.0", + "baseline": "4.3.0", "port-version": 0 }, "mman": { diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 32b8a0afcf5d68..92440685a030e5 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7439b5dbdc37394f6bb291343d634642d919f9d1", + "version": "4.3.0", + "port-version": 0 + }, { "git-tree": "e749963ad973dd29c0c573e0307fd4eaecea29d6", "version": "4.2.0", From 94cf042e6b7713913a3b3150f3ca3d0f4550f7c4 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:00:22 +0800 Subject: [PATCH 0639/1039] [breakpad] Fixing find_package(unofficial-breakpad) failure (#35673) --- ports/breakpad/unofficial-breakpadConfig.cmake | 2 +- ports/breakpad/vcpkg.json | 1 + versions/b-/breakpad.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/breakpad/unofficial-breakpadConfig.cmake b/ports/breakpad/unofficial-breakpadConfig.cmake index 8a077c47216fee..67d55984f4ba86 100644 --- a/ports/breakpad/unofficial-breakpadConfig.cmake +++ b/ports/breakpad/unofficial-breakpadConfig.cmake @@ -3,4 +3,4 @@ if(@USED_ZLIB@) find_dependency(ZLIB) endif() -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpad-targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-breakpadTargets.cmake") diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index e177b6a14c03c4..6c69b3978dae74 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,6 +1,7 @@ { "name": "breakpad", "version-date": "2023-01-27", + "port-version": 1, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", "license": "BSD-3-Clause", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 4f58b075833832..1c8d222967767d 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5643527026fecb43d487919191b02c41bfced6f9", + "version-date": "2023-01-27", + "port-version": 1 + }, { "git-tree": "b2b2523acc1c56222313e8fe01065c1e130440e1", "version-date": "2023-01-27", diff --git a/versions/baseline.json b/versions/baseline.json index 90e135d80470f4..b5a24959974575 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1314,7 +1314,7 @@ }, "breakpad": { "baseline": "2023-01-27", - "port-version": 0 + "port-version": 1 }, "brigand": { "baseline": "1.3.0", From cd5d9f3f83ad80772397c9131c6eb448789b29ec Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 15 Dec 2023 14:01:05 +0700 Subject: [PATCH 0640/1039] [harfbuzz] Update to 8.3.0 (#35653) --- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 09d9777cf882e5..510f40d2e1d8e0 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79 + SHA512 3fe54adbdd457c7dd8186c897436982a43e195a62bc0e830fe2dd06ca2c52511b9a717c659a7e30d235ac964df071e8ba1d9f36ee20496a1a80945d7c63fce86 HEAD_REF master PATCHES fix-win32-build.patch diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 022969c466c700..bf9bb9ddc56109 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version": "8.2.1", - "port-version": 3, + "version": "8.3.0", "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 b5a24959974575..b6b20a7b5e5e4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3273,8 +3273,8 @@ "port-version": 1 }, "harfbuzz": { - "baseline": "8.2.1", - "port-version": 3 + "baseline": "8.3.0", + "port-version": 0 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 1cf75441ac7ca1..faa4855c570288 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43649e54cfda3d4673975cf61daf8e501edf63e6", + "version": "8.3.0", + "port-version": 0 + }, { "git-tree": "5baafcf92a1de9e3b94fba26f36f4287dad722fb", "version": "8.2.1", From 209485d769dfa674872dacfef5b2755a77d5f2fe Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Fri, 15 Dec 2023 08:02:21 +0100 Subject: [PATCH 0641/1039] [shader-slang] Update to version 2023.5.0 (#35635) * [shader-slang] Update to 2023.5.0 * [shader-slang] Update to 2023.5.1 * [shader-slang] running version update * [shader-slang] Change SHA512s to lowercase * [shader-slang] running version update again --- ports/shader-slang/portfile.cmake | 12 ++++++------ ports/shader-slang/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shader-slang.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake index 943f6c67d77c13..529eb2079df066 100644 --- a/ports/shader-slang/portfile.cmake +++ b/ports/shader-slang/portfile.cmake @@ -10,7 +10,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win64.zip" FILENAME "slang-${VERSION}-win64.zip" - SHA512 db8404de1e1aa7b4deac258f1d3aed4287d6babc37538c76914da87e1bfcc5919d8013cf9054ae1c0aa32a5a14a25a668fd7f6fb23b8b2e1275bcfc9fe256eac + SHA512 3b35447655e6223b481d402654d15eb5997535d5f0dda4ed3237fdce9709ab23619397faf3cd98170466be3735a4c624e0979d7cfc6839addb06503c629f9cee ) set(SLANG_BIN_PATH "bin/windows-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") @@ -18,7 +18,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-win32.zip" FILENAME "slang-${VERSION}-win32.zip" - SHA512 1045f37b02ae93c2b8a7b9a7b8c98cd5b7c2d1a86704888c778ae12bc5bd701284d356685010ba4405893c9c0bfec2e117b329c00d8c218e08df578d607a9f80 + SHA512 e64c8c5a46c2288ea51a768c525cbd79990c76f8a239e21fb0bcfa896e06437165a10d7dba9812485d934292aac7c173a6e7233369d77711f03c5eed4f6fd47a ) set(SLANG_BIN_PATH "bin/windows-x86/release") else() @@ -34,7 +34,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-x64.zip" FILENAME "slang-${VERSION}-macos-x64.zip" - SHA512 627d77d83eef56e25815c30d0e99ae472c9189c760d1a620daebf49407c97e5e4da4b7880781c7788e85c5ccfba3a9e938e50ede2be0e93c0635050b11ad22a0 + SHA512 fbf6994dab9afe0a20853d2417b11f0d7436a6ca96c9124c0239fe421bf697f970c0f28b1e5c67aa36b3a0b5b8f7260214aa6587bcc95a1d55ffeac8446c46d4 ) set(SLANG_BIN_PATH "bin/macos-x64/release") elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") @@ -42,7 +42,7 @@ elseif (VCPKG_TARGET_IS_OSX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-aarch64.zip" FILENAME "slang-${VERSION}-macos-aarch64.zip" - SHA512 e898c20c60b4f3e8bbb262fef4cad88fba35b66dafb4784eec8b1603d8ee0293a71faeac1f84a9df96f33e206503ed717f7a068370e40a49bac90c009bbe4336 + SHA512 87025c2bd3537b4730cfac9f2c954b92d696b7cf71595cebe1199cd94baa4f90d80678efa440e56767a3a4d52d993301ffd9d54f27dc547094b136793331baa5 ) set(SLANG_BIN_PATH "bin/macos-aarch64/release") else() @@ -58,7 +58,7 @@ elseif(VCPKG_TARGET_IS_LINUX) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-x86_64.tar.gz" FILENAME "slang-${VERSION}-linux-x86_64.tar.gz" - SHA512 2291e7ee0e1998eb8cf3725154bade4ebd2873f18ba2dc04e598ffee63298780e6906a6257762a84ba4d81f32b1fb4548b1aaea4a79852f4fc6827faeba4426f + SHA512 b6ac7a41dc3278974887ebb21b7abc6df75df0da77dc36e64e71f1740ff34a8724ddda3cdc04f4c14569c4085586f7ea50de0859799658c5c3bf59b93de98e5e ) set(SLANG_BIN_PATH "bin/linux-x64/release") else() @@ -98,7 +98,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO shader-slang/slang REF v${VERSION} - SHA512 cc89a8a8eeab494c2558d2699bad75520cb44640d17881b0e35f618df68090a7fcee03e812e77998fe953206790d284fdfa084a0d30d0b4fca33991fe9ec8775 + SHA512 01bd7c75101371e7bee848c8ca78a88fe05215610958e2406f802f04bbbd36e013c8fa4ea9f0c11c06b64ce1e147e1dd1030469d676dcc9e1c65017e972c1c49 HEAD_REF master ) diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json index 990f384cea8b78..8f4a2be4a3e868 100644 --- a/ports/shader-slang/vcpkg.json +++ b/ports/shader-slang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shader-slang", - "version": "0.27.20", + "version": "2023.5.1", "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.", "homepage": "https://github.com/shader-slang/slang", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b6b20a7b5e5e4a..254b7d3d211333 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7833,7 +7833,7 @@ "port-version": 1 }, "shader-slang": { - "baseline": "0.27.20", + "baseline": "2023.5.1", "port-version": 0 }, "shaderc": { diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json index aded3cbcb4e222..a05703e90ccc82 100644 --- a/versions/s-/shader-slang.json +++ b/versions/s-/shader-slang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fddc74efcc306f4a4d24364f0a3b9dddbcda7f18", + "version": "2023.5.1", + "port-version": 0 + }, { "git-tree": "1a21463df58c9c2fb4af01bc6c9197ddb98804db", "version": "0.27.20", From 50bffcc62d7f6571eb32bc1a0b1807e77af1166c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 15 Dec 2023 08:33:39 +0100 Subject: [PATCH 0642/1039] [vulkan] install required sdk parts (#35479) * Install vulkan. * add gfxreconstruct * format manifest and cr changes * remove moltenvk * fix ci part 1 * fix a dep * more fixes * remove vulkan failures from CI pipeline * remove annoying stuff to deal with in static builds * fix trailing , * remove vendored cmakelists * force ci to be green * format manifest * Fix more ci issues * fix hikogui * make ci happier * add jsoncpp dep * only remove the debug folder if targeting windows * bump port-version * v db * vulkan-loader add usage * Rename vulkantools to lunarg-vulkantools * Make VMA install headers platform dependent * Remove vcpkg_check_linkage * readd vulkan-validationlayers * v db --- ports/hikogui/portfile.cmake | 2 + ports/hikogui/vcpkg.json | 7 +++ ports/lunarg-vulkantools/portfile.cmake | 37 +++++++++++++++ ports/lunarg-vulkantools/vcpkg.json | 27 +++++++++++ ports/spirv-cross/portfile.cmake | 9 ++-- ports/spirv-cross/vcpkg.json | 3 +- ports/spirv-headers/portfile.cmake | 4 +- ports/spirv-headers/vcpkg.json | 2 +- ports/spirv-reflect/CMakeLists.txt | 45 ------------------- ports/spirv-reflect/portfile.cmake | 13 +++--- ports/spirv-reflect/vcpkg.json | 2 +- ports/spirv-tools/portfile.cmake | 4 +- ports/spirv-tools/vcpkg.json | 2 +- ports/vsgxchange/portfile.cmake | 4 ++ ports/vsgxchange/vcpkg.json | 1 + ports/vulkan-headers/portfile.cmake | 5 ++- ports/vulkan-headers/vcpkg.json | 2 +- ports/vulkan-loader/portfile.cmake | 24 ++++++++++ ports/vulkan-loader/usage | 2 + ports/vulkan-loader/vcpkg.json | 19 ++++++++ ports/vulkan-memory-allocator/portfile.cmake | 11 ++++- ports/vulkan-memory-allocator/vcpkg.json | 2 +- ports/vulkan-tools/portfile.cmake | 24 ++++++++++ ports/vulkan-tools/vcpkg.json | 21 +++++++++ ports/vulkan-utility-libraries/portfile.cmake | 20 +++++++++ ports/vulkan-utility-libraries/vcpkg.json | 19 ++++++++ ports/vulkan-validationlayers/portfile.cmake | 33 ++++++++++++++ ports/vulkan-validationlayers/usage | 2 + ports/vulkan-validationlayers/vcpkg.json | 25 +++++++++++ ports/vulkan/portfile.cmake | 5 --- ports/vulkan/vcpkg.json | 40 +++++++++++++++-- scripts/ci.baseline.txt | 12 +---- versions/baseline.json | 42 ++++++++++++----- versions/h-/hikogui.json | 5 +++ versions/l-/lunarg-vulkantools.json | 9 ++++ versions/s-/spirv-cross.json | 5 +++ versions/s-/spirv-headers.json | 5 +++ versions/s-/spirv-reflect.json | 5 +++ versions/s-/spirv-tools.json | 5 +++ versions/v-/vsgxchange.json | 5 +++ versions/v-/vulkan-headers.json | 5 +++ versions/v-/vulkan-loader.json | 9 ++++ versions/v-/vulkan-memory-allocator.json | 5 +++ versions/v-/vulkan-tools.json | 9 ++++ versions/v-/vulkan-utility-libraries.json | 9 ++++ versions/v-/vulkan-validationlayers.json | 9 ++++ versions/v-/vulkan.json | 5 +++ 47 files changed, 462 insertions(+), 98 deletions(-) create mode 100644 ports/lunarg-vulkantools/portfile.cmake create mode 100644 ports/lunarg-vulkantools/vcpkg.json delete mode 100644 ports/spirv-reflect/CMakeLists.txt create mode 100644 ports/vulkan-loader/portfile.cmake create mode 100644 ports/vulkan-loader/usage create mode 100644 ports/vulkan-loader/vcpkg.json create mode 100644 ports/vulkan-tools/portfile.cmake create mode 100644 ports/vulkan-tools/vcpkg.json create mode 100644 ports/vulkan-utility-libraries/portfile.cmake create mode 100644 ports/vulkan-utility-libraries/vcpkg.json create mode 100644 ports/vulkan-validationlayers/portfile.cmake create mode 100644 ports/vulkan-validationlayers/usage create mode 100644 ports/vulkan-validationlayers/vcpkg.json create mode 100644 versions/l-/lunarg-vulkantools.json create mode 100644 versions/v-/vulkan-loader.json create mode 100644 versions/v-/vulkan-tools.json create mode 100644 versions/v-/vulkan-utility-libraries.json create mode 100644 versions/v-/vulkan-validationlayers.json diff --git a/ports/hikogui/portfile.cmake b/ports/hikogui/portfile.cmake index ad82c5ab39c107..8a9da44e8cab76 100644 --- a/ports/hikogui/portfile.cmake +++ b/ports/hikogui/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( HEAD_REF main ) +set(ENV{VULKAN_SDK} "${CURRENT_INSTALLED_DIR}") + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json index 402a7003f71519..31679e93171636 100644 --- a/ports/hikogui/vcpkg.json +++ b/ports/hikogui/vcpkg.json @@ -1,12 +1,19 @@ { "name": "hikogui", "version": "0.8.1", + "port-version": 1, "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": "glslang", + "features": [ + "tools" + ] + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/lunarg-vulkantools/portfile.cmake b/ports/lunarg-vulkantools/portfile.cmake new file mode 100644 index 00000000000000..357c8aaa0fc88d --- /dev/null +++ b/ports/lunarg-vulkantools/portfile.cmake @@ -0,0 +1,37 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LunarG/VulkanTools + REF "vulkan-sdk-${VERSION}" + SHA512 83be64eccb2841de4ae67f3936b6dd4433cdbd2b604329914a8bc43c1f7fc6dd2dba0eaf2f9527b231c6d54d3d390d79defc6de228baff5cba1add8c5ad6d9cd + HEAD_REF main +) + +vcpkg_replace_string("${SOURCE_PATH}/via/CMakeLists.txt" "jsoncpp_static" "JsonCpp::JsonCpp") + +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES jsonschema OUT_PYTHON_VAR PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVULKAN_HEADERS_INSTALL_DIR=${CURRENT_INSTALLED_DIR} + -DBUILD_TESTS:BOOL=OFF + OPTIONS_RELEASE + -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR} + OPTIONS_DEBUG + -DVULKAN_LOADER_INSTALL_DIR=${CURRENT_INSTALLED_DIR}/debug + +) +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +vcpkg_copy_tools(TOOL_NAMES vkvia vkconfig AUTO_CLEAN ) + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + diff --git a/ports/lunarg-vulkantools/vcpkg.json b/ports/lunarg-vulkantools/vcpkg.json new file mode 100644 index 00000000000000..ef7d606b9f8fd4 --- /dev/null +++ b/ports/lunarg-vulkantools/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "lunarg-vulkantools", + "version": "1.3.268.0", + "description": "Vulkan header files and API registry", + "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", + "license": null, + "supports": "!osx", + "dependencies": [ + "jsoncpp", + "qt5-base", + "valijson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-get-python-packages", + "host": true + }, + "vulkan-loader", + "vulkan-utility-libraries" + ] +} diff --git a/ports/spirv-cross/portfile.cmake b/ports/spirv-cross/portfile.cmake index e177784fe73161..25fb8e52b407b0 100644 --- a/ports/spirv-cross/portfile.cmake +++ b/ports/spirv-cross/portfile.cmake @@ -3,13 +3,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Cross - REF 2021-01-15 - SHA512 f934ef61602223f6fe6d9c826ed5beb129beb7a30b18b389625d4fc0b1efa1b8df930a2a2d2a0b4f377ef2899e8e034239819a4c6629a78c666f72004464da93 + REF vulkan-sdk-${VERSION} + SHA512 27cf3c1455c0edeba0a494ef7c8f23d3b22e3427ac7ce0681d3c15c8f1510cf449054a98793e6d3f3bbe7c6ef92f0203bb50b93f806e02676727a2cf38233547 HEAD_REF master ) if(VCPKG_TARGET_IS_IOS) - message(STATUS "Using iOS trplet. Executables won't be created...") + message(STATUS "Using iOS triplet. Executables won't be created...") set(BUILD_CLI OFF) else() set(BUILD_CLI ON) @@ -25,6 +25,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() foreach(COMPONENT core c cpp glsl hlsl msl reflect util) vcpkg_cmake_config_fixup(CONFIG_PATH share/spirv_cross_${COMPONENT}/cmake PACKAGE_NAME spirv_cross_${COMPONENT}) @@ -39,4 +40,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/spirv-cross/vcpkg.json b/ports/spirv-cross/vcpkg.json index dc05fe0589704e..e7413219b8bae0 100644 --- a/ports/spirv-cross/vcpkg.json +++ b/ports/spirv-cross/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spirv-cross", - "version-date": "2021-01-15", - "port-version": 2, + "version": "1.3.268.0", "description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.", "homepage": "https://github.com/KhronosGroup/SPIRV-Cross", "dependencies": [ diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake index d280ecc01d5083..df8090a8efc3ca 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-${VERSION}" - SHA512 436c6ce11d918091ce4a5ef2821f51af811c9a289e220b4a2b0bb4417b1f9f3b1f56a6366cfdf56848a9b1fb612ee3ba31d35c3d73d3d24de964ee05f96a7bbc + REF "vulkan-sdk-${VERSION}" + SHA512 3500c299a51dacc3e89066cfcfa8762cb6bc1be10ffff492fb3041831627e065cd836e3e0165df750dd22873a1772d916158e1e1c4701dc60efbb2edb17753ca HEAD_REF master ) diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index b69a2cf1f67acf..838e69aa665f63 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version": "1.3.246.1", + "version": "1.3.268.0", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers", "dependencies": [ diff --git a/ports/spirv-reflect/CMakeLists.txt b/ports/spirv-reflect/CMakeLists.txt deleted file mode 100644 index a76d0657722c07..00000000000000 --- a/ports/spirv-reflect/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(spirv-reflect) - -set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -find_package(SPIRV-Headers REQUIRED) - -add_library(spirv-reflect ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h - ${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.c) -if (SPIRV_REFLECT_ENABLE_ASSERTS) - target_compile_definitions(spirv-reflect PRIVATE SPIRV_REFLECT_ENABLE_ASSERTS) -endif() -set_target_properties(spirv-reflect PROPERTIES CXX_STANDARD 11) -if(WIN32) - target_compile_definitions(spirv-reflect PRIVATE _CRT_SECURE_NO_WARNINGS) -endif() -target_link_libraries(spirv-reflect PUBLIC SPIRV-Headers::SPIRV-Headers) -target_compile_definitions(spirv-reflect PUBLIC SPIRV_REFLECT_USE_SYSTEM_SPIRV_H) - -target_include_directories(spirv-reflect INTERFACE $) - -set(config_file ${CMAKE_CURRENT_BINARY_DIR}/unofficial-spirv-reflect-config.cmake) -set(targets unofficial-spirv-reflect-targets) - -file(WRITE ${config_file} -"include(CMakeFindDependencyMacro) -find_dependency(SPIRV-Headers) -include(\${CMAKE_CURRENT_LIST_DIR}/${targets}.cmake)") - -install(FILES ${config_file} DESTINATION share/unofficial-spirv-reflect) - -install( - TARGETS spirv-reflect EXPORT ${targets} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install( - EXPORT ${targets} - NAMESPACE unofficial::spirv-reflect:: - DESTINATION share/unofficial-spirv-reflect -) - -install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/spirv_reflect.h" DESTINATION include) diff --git a/ports/spirv-reflect/portfile.cmake b/ports/spirv-reflect/portfile.cmake index ee877ecabc4fd9..a54bb56795ee61 100644 --- a/ports/spirv-reflect/portfile.cmake +++ b/ports/spirv-reflect/portfile.cmake @@ -3,15 +3,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Reflect - REF sdk-1.3.236.0 - SHA512 8ee0b88e46feac0ece478c6584e0ceb96b2ac976c2d1dc5813e0e26b20de8fa0264499cc9eea973bb3dd9a6877a421d00557f0fef7e323926df1db314373ea90 + REF "vulkan-sdk-${VERSION}" + SHA512 fdc6d6fe707d21296c5c0a84388e8b9c687945264fb602e286e5ba399ac674e68bc89b25f4bb0a3fc4d59deb2dafe5fbe3e07b59162c420c25c9e923f3220849 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DSPIRV_REFLECT_STATIC_LIB=ON ) vcpkg_cmake_install() @@ -19,4 +18,8 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/spirv-reflect" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_copy_tools(TOOL_NAMES spirv-reflect-pp spirv-reflect AUTO_CLEAN) diff --git a/ports/spirv-reflect/vcpkg.json b/ports/spirv-reflect/vcpkg.json index 2a118298f2337d..6f427ed4d1eab1 100644 --- a/ports/spirv-reflect/vcpkg.json +++ b/ports/spirv-reflect/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-reflect", - "version": "1.3.236.0", + "version": "1.3.268.0", "description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.", "homepage": "https://github.com/KhronosGroup/SPIRV-Reflect", "license": "Apache-2.0", diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 8e50dfbefff9ab..27477af40add73 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 "v${VERSION}" - SHA512 988f5e31508e3f19c1dd9d9a013c8e9ff89eba86207a769d7d804f9ee0201c794f412a874c860167b2c040b2c5e1fb1c835ae3684c70feaac86e47f90c1a5010 + REF "vulkan-sdk-${VERSION}" + SHA512 317ce91ae229efddb98028840fbb6c9000c6a09aace2f04c2f59fdeb3a73b8fdb75048bf5a2189135a734a30b1ead57dc7dc5fcfd70a7267d17c743238a19899 PATCHES cmake-config-dir.diff spirv-tools-shared.diff diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index 79e525a05f8141..7ee61573457d53 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-tools", - "version": "2023.2", + "version": "1.3.268.0", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", diff --git a/ports/vsgxchange/portfile.cmake b/ports/vsgxchange/portfile.cmake index cc617fd399bc43..0c556a19a0bb9b 100644 --- a/ports/vsgxchange/portfile.cmake +++ b/ports/vsgxchange/portfile.cmake @@ -28,6 +28,10 @@ vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES vsgconv AUTO_CLEAN) file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/vsgconvd${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + 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") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/vsgxchange/vcpkg.json b/ports/vsgxchange/vcpkg.json index c8ad67528c45ea..a058aeea4b4653 100644 --- a/ports/vsgxchange/vcpkg.json +++ b/ports/vsgxchange/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vsgxchange", "version": "1.0.5", + "port-version": 1, "description": "Utility library for converting 3rd party images, models and fonts formats to/from VulkanSceneGraph.", "homepage": "https://github.com/vsg-dev/vsgXchange", "license": "MIT", diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index 39a1529e330421..97dc2d2b133955 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF "v${VERSION}" - SHA512 afd3a617fdd83d3e11559b4530e249dea4dbed66a44aba4fe1a39af2220ddcb8c45e49eaa087bbd62454709015b659eccfcdd6c3ad7950a2a7b1b674cf65e957 + REF "vulkan-sdk-${VERSION}" + SHA512 adab4c97050aeb396445cd5352e4252b74d2a02856ffd369caa0df50ba544b8b8ab9e1630f30ce73c56751c987e2435263214547457b8ca9430c5ad2dadaabaf HEAD_REF main ) @@ -10,5 +10,6 @@ set(VCPKG_BUILD_TYPE release) # header-only port vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index 749f793fbaac44..797dce26b42a0c 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.3.260", + "version": "1.3.268.0", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", "license": "Apache-2.0 OR MIT", diff --git a/ports/vulkan-loader/portfile.cmake b/ports/vulkan-loader/portfile.cmake new file mode 100644 index 00000000000000..bb90293f91f971 --- /dev/null +++ b/ports/vulkan-loader/portfile.cmake @@ -0,0 +1,24 @@ +set(VCPKG_LIBRARY_LINKAGE dynamic) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Loader + REF "vulkan-sdk-${VERSION}" + SHA512 15a326480e8d47f35a5e0c08ac915e047c90f2b99e8b6ac483bc1835e5b8bf2fd759b6fbf61dae9f89103e91067e60ff5f1817ce6aebecf95529bcc6d1326e66 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF +) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/VulkanLoader" PACKAGE_NAME VulkanLoader) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/vulkan-loader/usage b/ports/vulkan-loader/usage new file mode 100644 index 00000000000000..a260c301a765c5 --- /dev/null +++ b/ports/vulkan-loader/usage @@ -0,0 +1,2 @@ +The package @PORT@ provides the vulkan loader. +Please be aware of https://github.com/KhronosGroup/Vulkan-Loader/blob/main/docs/LoaderApplicationInterface.md#bundling-the-loader-with-an-application diff --git a/ports/vulkan-loader/vcpkg.json b/ports/vulkan-loader/vcpkg.json new file mode 100644 index 00000000000000..46d42263283e88 --- /dev/null +++ b/ports/vulkan-loader/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vulkan-loader", + "version": "1.3.268.0", + "description": "Vulkan Development Tools", + "homepage": "https://github.com/KhronosGroup/Vulkan-Loader", + "license": null, + "supports": "!android", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index c17a430cca193e..93b1ecb5794c9c 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -6,8 +6,17 @@ vcpkg_from_github( HEAD_REF master ) +set(opts "") +if(VCPKG_TARGET_IS_WINDOWS) + set(opts "-DCMAKE_INSTALL_INCLUDEDIR=include/vma") # Vulkan SDK layout! +endif() + set(VCPKG_BUILD_TYPE release) # header-only port -vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${opts} + +) vcpkg_cmake_install() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index 380521ab5a7691..6aed8f35f68871 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vulkan-memory-allocator", "version": "3.0.1", - "port-version": 3, + "port-version": 4, "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", "license": "MIT", diff --git a/ports/vulkan-tools/portfile.cmake b/ports/vulkan-tools/portfile.cmake new file mode 100644 index 00000000000000..18f49802c1b713 --- /dev/null +++ b/ports/vulkan-tools/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Tools + REF "vulkan-sdk-${VERSION}" + SHA512 9359e9528bfe507870bd83f9e8860b3d82555c0d8a6a19284f150dd2288b204f2c9dc9b3f62be4efbbb5e2983862459b2131de126a603cc5531ef8df72f4458f + HEAD_REF main +) + +set(VCPKG_BUILD_TYPE release) # only builds tools + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF +) +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +vcpkg_copy_tools(TOOL_NAMES vkcube vkcubepp vulkaninfo AUTO_CLEAN ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/vulkan-tools/vcpkg.json b/ports/vulkan-tools/vcpkg.json new file mode 100644 index 00000000000000..b3d45f988cc1fc --- /dev/null +++ b/ports/vulkan-tools/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "vulkan-tools", + "version": "1.3.268.0", + "description": "Vulkan Development Tools", + "homepage": "https://github.com/KhronosGroup/Vulkan-Tools", + "license": "Apache-2.0", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "volk", + "vulkan-headers", + "vulkan-loader" + ] +} diff --git a/ports/vulkan-utility-libraries/portfile.cmake b/ports/vulkan-utility-libraries/portfile.cmake new file mode 100644 index 00000000000000..98db4748279dbe --- /dev/null +++ b/ports/vulkan-utility-libraries/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-Utility-Libraries + REF "vulkan-sdk-${VERSION}" + SHA512 4bcb3f5f9a1567427675c5186a04c9d152b791989aaaba5f43a46cc8db7a8ab08626d5f9a101234b595fe283aa493655e26a521c17cf28752d30437d896fce40 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS:BOOL=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/VulkanUtilityLibraries PACKAGE_NAME VulkanUtilityLibraries) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/vulkan-utility-libraries/vcpkg.json b/ports/vulkan-utility-libraries/vcpkg.json new file mode 100644 index 00000000000000..70c054eef61cbe --- /dev/null +++ b/ports/vulkan-utility-libraries/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "vulkan-utility-libraries", + "version": "1.3.268.0", + "description": "Utility libraries for Vulkan developers", + "homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries", + "license": null, + "supports": "!android", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers" + ] +} diff --git a/ports/vulkan-validationlayers/portfile.cmake b/ports/vulkan-validationlayers/portfile.cmake new file mode 100644 index 00000000000000..bad363fbd43eff --- /dev/null +++ b/ports/vulkan-validationlayers/portfile.cmake @@ -0,0 +1,33 @@ +set(VCPKG_LIBRARY_LINKAGE dynamic) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KhronosGroup/Vulkan-ValidationLayers + REF "vulkan-sdk-${VERSION}" + SHA512 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd + HEAD_REF main +) + +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 + -DBUILD_TESTS:BOOL=OFF +) +vcpkg_cmake_install() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") + +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +set(layer_path "/bin") +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(layer_path "/share/vulkan/explicit_layer.d") +endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/vulkan-validationlayers/usage b/ports/vulkan-validationlayers/usage new file mode 100644 index 00000000000000..d74b33490f5ff9 --- /dev/null +++ b/ports/vulkan-validationlayers/usage @@ -0,0 +1,2 @@ +The package @PORT@ provides the vulkan validationlayers. +To make vulkan use them you have to manually add the vcpkg path "@layer_path@" to the environment variable VK_ADD_LAYER_PATH. \ No newline at end of file diff --git a/ports/vulkan-validationlayers/vcpkg.json b/ports/vulkan-validationlayers/vcpkg.json new file mode 100644 index 00000000000000..b24f81aba90c8a --- /dev/null +++ b/ports/vulkan-validationlayers/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "vulkan-validationlayers", + "version": "1.3.268.0", + "description": "Vulkan Validation Layers (VVL)", + "homepage": "https://github.com/KhronosGroup/Vulkan-ValidationLayers", + "license": null, + "dependencies": [ + "mimalloc", + "robin-hood-hashing", + "spirv-cross", + "spirv-headers", + "spirv-reflect", + "spirv-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan-headers", + "vulkan-utility-libraries" + ] +} diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index 6dc9e17b48bf0a..d48d9d0f8f23ec 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -1,10 +1,5 @@ -# This package just verifies that the Vulkan SDK is installed. -set(VCPKG_BUILD_TYPE release) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(DEFINED ENV{VULKAN_SDK}) - message(STATUS "VULKAN_SDK environment variable: $ENV{VULKAN_SDK}") -endif() set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log") vcpkg_cmake_configure( diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index d44d80e84126c1..a8cb3174e0d1b4 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -1,14 +1,48 @@ { + "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.268.0/windows/config.json", "name": "vulkan", - "version": "1.1.82.1", - "port-version": 6, + "version": "1.3.268.0", "description": "A stub package that ensures that the Vulkan SDK is installed.", "license": null, "supports": "!uwp & !xbox", "dependencies": [ + { + "name": "directx-dxc", + "platform": "windows" + }, + "glm", + "glslang", + "jsoncpp", + { + "name": "mimalloc", + "platform": "windows" + }, + "robin-hood-hashing", + "sdl2", + "shaderc", + "spirv-cross", + "spirv-headers", + "valijson", { "name": "vcpkg-cmake", "host": true + }, + "volk", + "vulkan-headers", + "vulkan-loader", + "vulkan-memory-allocator", + "vulkan-utility-libraries", + "vulkan-validationlayers" + ], + "features": { + "tools": { + "description": "Build Vulkan related tools", + "dependencies": [ + "lunarg-vulkantools", + "spirv-reflect", + "spirv-tools", + "vulkan-tools" + ] } - ] + } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9adcc1f1d3a971..08026e7c7f71dc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1193,17 +1193,6 @@ vowpal-wabbit:x64-android=fail vtk-m:arm-neon-android=fail vtk-m:arm64-android=fail vtk-m:x64-android=fail -vulkan:arm-neon-android=fail -vulkan:arm64-android=fail -vulkan:arm64-windows=fail -vulkan:x64-android=fail -vulkan:x64-linux=fail -vulkan:x64-osx=fail -vulkan:arm64-osx=fail -vulkan:x64-windows=fail -vulkan:x64-windows-static=fail -vulkan:x64-windows-static-md=fail -vulkan:x86-windows=fail # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location vxl:arm-neon-android=skip @@ -1346,3 +1335,4 @@ vcpkg-ci-wxwidgets:x64-windows-static-md=pass vcpkg-ci-wxwidgets:x64-windows-static=pass vcpkg-ci-wxwidgets:x64-windows=pass vcpkg-ci-wxwidgets:x86-windows=pass +vulkan-loader:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 254b7d3d211333..c32604de4af845 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3334,7 +3334,7 @@ }, "hikogui": { "baseline": "0.8.1", - "port-version": 0 + "port-version": 1 }, "hiredis": { "baseline": "1.2.0", @@ -5344,6 +5344,10 @@ "baseline": "0.10.1", "port-version": 1 }, + "lunarg-vulkantools": { + "baseline": "1.3.268.0", + "port-version": 0 + }, "lunasvg": { "baseline": "2.3.8", "port-version": 1 @@ -8105,19 +8109,19 @@ "port-version": 3 }, "spirv-cross": { - "baseline": "2021-01-15", - "port-version": 2 + "baseline": "1.3.268.0", + "port-version": 0 }, "spirv-headers": { - "baseline": "1.3.246.1", + "baseline": "1.3.268.0", "port-version": 0 }, "spirv-reflect": { - "baseline": "1.3.236.0", + "baseline": "1.3.268.0", "port-version": 0 }, "spirv-tools": { - "baseline": "2023.2", + "baseline": "1.3.268.0", "port-version": 0 }, "spout2": { @@ -8946,7 +8950,7 @@ }, "vsgxchange": { "baseline": "1.0.5", - "port-version": 0 + "port-version": 1 }, "vtk": { "baseline": "9.2.0-pv5.11.0", @@ -8961,25 +8965,41 @@ "port-version": 2 }, "vulkan": { - "baseline": "1.1.82.1", - "port-version": 6 + "baseline": "1.3.268.0", + "port-version": 0 }, "vulkan-headers": { - "baseline": "1.3.260", + "baseline": "1.3.268.0", "port-version": 0 }, "vulkan-hpp": { "baseline": "deprecated", "port-version": 0 }, + "vulkan-loader": { + "baseline": "1.3.268.0", + "port-version": 0 + }, "vulkan-memory-allocator": { "baseline": "3.0.1", - "port-version": 3 + "port-version": 4 }, "vulkan-memory-allocator-hpp": { "baseline": "3.0.1.1", "port-version": 0 }, + "vulkan-tools": { + "baseline": "1.3.268.0", + "port-version": 0 + }, + "vulkan-utility-libraries": { + "baseline": "1.3.268.0", + "port-version": 0 + }, + "vulkan-validationlayers": { + "baseline": "1.3.268.0", + "port-version": 0 + }, "vvenc": { "baseline": "1.7.0", "port-version": 0 diff --git a/versions/h-/hikogui.json b/versions/h-/hikogui.json index f23b1bd3d5abfc..bcf1b2c4921dea 100644 --- a/versions/h-/hikogui.json +++ b/versions/h-/hikogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89a94b29c6cf63fb3e99c979281751279f02031e", + "version": "0.8.1", + "port-version": 1 + }, { "git-tree": "92a9a5aedbc104981ec2fe41b097e8f2c65896f7", "version": "0.8.1", diff --git a/versions/l-/lunarg-vulkantools.json b/versions/l-/lunarg-vulkantools.json new file mode 100644 index 00000000000000..9ab69a1797890c --- /dev/null +++ b/versions/l-/lunarg-vulkantools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6b2a11e7bfefb0423ba878f8bbf6030c27f5c77", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/s-/spirv-cross.json b/versions/s-/spirv-cross.json index 89d92c9502d4a4..49d6d921a625e5 100644 --- a/versions/s-/spirv-cross.json +++ b/versions/s-/spirv-cross.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c3a9c2839a67379dfebc9e4f3df038359a8383c", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "9adc9e1ab78dd956558b40aa39767262a251eca6", "version-date": "2021-01-15", diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index 645357860b9b0c..ab0e0e5ee8c558 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a169757648a3ab575795f1d4b417d5c1e545fb81", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "9745c8474cd0d67262164092fe7283b7ecb36914", "version": "1.3.246.1", diff --git a/versions/s-/spirv-reflect.json b/versions/s-/spirv-reflect.json index 7c6916c2edf3ac..789f20e81c1ddf 100644 --- a/versions/s-/spirv-reflect.json +++ b/versions/s-/spirv-reflect.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "640aba022004347ac98e964b8a932dde3f677d5f", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "e36ea589e8b33e978c90da2c33ee457cd948dfce", "version": "1.3.236.0", diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index cca863cb85f1fd..62ac967603b7b0 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73ef0c502cabbe79cfcef62b67ec352e8675c721", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "47e4151499f10ce55584fc6818822bdc4a913353", "version": "2023.2", diff --git a/versions/v-/vsgxchange.json b/versions/v-/vsgxchange.json index e285a83e573aeb..47a0ea99ad9ee1 100644 --- a/versions/v-/vsgxchange.json +++ b/versions/v-/vsgxchange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73b799a8d58def43da13c3642687cabbb917c630", + "version": "1.0.5", + "port-version": 1 + }, { "git-tree": "8a026d7763afb5ffa6081e9baf6de63a8d500790", "version": "1.0.5", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 15d0b5a134bc91..8967e1c0fd7076 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffd9715c99bc1d2b115a27616e17319ab10d47d2", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "4a67e5648f3203af599c115390d12fceb828b8fa", "version": "1.3.260", diff --git a/versions/v-/vulkan-loader.json b/versions/v-/vulkan-loader.json new file mode 100644 index 00000000000000..c588b69c2c9e56 --- /dev/null +++ b/versions/v-/vulkan-loader.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "058ede4fd9458f7fc471ea3663e4e8e6f455f638", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 1e1d981a343a61..657ffbef727b3f 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a687cd3066c8effcdec670ce92d389c36c217c14", + "version": "3.0.1", + "port-version": 4 + }, { "git-tree": "d57ebd5ba820e5d8a5f55d797199abe4734d5af8", "version": "3.0.1", diff --git a/versions/v-/vulkan-tools.json b/versions/v-/vulkan-tools.json new file mode 100644 index 00000000000000..e4179424678f77 --- /dev/null +++ b/versions/v-/vulkan-tools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "720b109686183339d148fb303b53abfd128e9ec2", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vulkan-utility-libraries.json b/versions/v-/vulkan-utility-libraries.json new file mode 100644 index 00000000000000..0f9febe89fe3cb --- /dev/null +++ b/versions/v-/vulkan-utility-libraries.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0849291de2e14ef941d30aef9a17e45547329e44", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vulkan-validationlayers.json b/versions/v-/vulkan-validationlayers.json new file mode 100644 index 00000000000000..856fb40c5462dd --- /dev/null +++ b/versions/v-/vulkan-validationlayers.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "993862940154ca8e6692e31ad7387261566ca757", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index 022bb1bc162424..6f41769dcb2308 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27c107c7bd16ff68d2c9da45b0020713d4b2ea03", + "version": "1.3.268.0", + "port-version": 0 + }, { "git-tree": "ea62236a3c91051f5ccb340442b60a026bf160c6", "version": "1.1.82.1", From a78464841a8290473704959d383b8d76ff01db59 Mon Sep 17 00:00:00 2001 From: Ali Saki <3alisaki@gmail.com> Date: Sat, 16 Dec 2023 03:03:44 +0330 Subject: [PATCH 0643/1039] [node-api-headers/node-addon-api] update node-api-headers to 1.1.0, and update node-addon-api to 7.0.0 (#35658) * [node-api-headers] update to version 1.1.0 * [node-addon-api] update to version 7.0.0 * Update version database --- ports/node-addon-api/portfile.cmake | 2 +- ports/node-addon-api/vcpkg.json | 2 +- ports/node-api-headers/portfile.cmake | 2 +- ports/node-api-headers/vcpkg.json | 3 +-- versions/baseline.json | 6 +++--- versions/n-/node-addon-api.json | 5 +++++ versions/n-/node-api-headers.json | 5 +++++ 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ports/node-addon-api/portfile.cmake b/ports/node-addon-api/portfile.cmake index b56a1894bbb18c..d70301a1bee15f 100644 --- a/ports/node-addon-api/portfile.cmake +++ b/ports/node-addon-api/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/node-addon-api REF "v${VERSION}" - SHA512 1b39c0faef74f29e0e709d54e4c8f3bf04adbfb601b4c5aa1199626abf1e0fa7681c2fe7dc7423da6852dcbd128efbadb7012ddccf3fa2868a09f934f656ac8d + SHA512 ff7b712b53479c10ebf34b6723b91a3e70eb946c39fc7feeebc5485a3928f15ce2af92126d3c331e54fbb852bec8286aa5ddd8211f1315f3b133fcede6e2f53c HEAD_REF main ) diff --git a/ports/node-addon-api/vcpkg.json b/ports/node-addon-api/vcpkg.json index a8091a169062b3..74a31d37a82584 100644 --- a/ports/node-addon-api/vcpkg.json +++ b/ports/node-addon-api/vcpkg.json @@ -1,6 +1,6 @@ { "name": "node-addon-api", - "version": "6.1.0", + "version": "7.0.0", "description": "Module for using Node-API from C++", "homepage": "https://github.com/nodejs/node-addon-api", "license": "MIT", diff --git a/ports/node-api-headers/portfile.cmake b/ports/node-api-headers/portfile.cmake index 062e2eef2ef165..0d01ee222af10c 100644 --- a/ports/node-api-headers/portfile.cmake +++ b/ports/node-api-headers/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nodejs/node-api-headers REF "v${VERSION}" - SHA512 e80d9b8cc2d96929a6d73fc1e5bcfbf6d585bef114946f939b93195aefb91bf8e6ef8720625394d344636626fd74548db71ff178f9f529ab5b20db980f09b197 + SHA512 70871b8fd1fc16f3f525953fd229ceff99110fb604f039e35e44f21d74aa9d50d2d3be1eadc5700bf576fd27e750c71868b273277858195fb6c5739672d4455e HEAD_REF main ) diff --git a/ports/node-api-headers/vcpkg.json b/ports/node-api-headers/vcpkg.json index 24c6c3a21781b7..fb54df90e055bd 100644 --- a/ports/node-api-headers/vcpkg.json +++ b/ports/node-api-headers/vcpkg.json @@ -1,7 +1,6 @@ { "name": "node-api-headers", - "version": "1.0.0", - "port-version": 1, + "version": "1.1.0", "description": "NodeJS API for writing modules in C++", "homepage": "https://nodejs.org/api/addons.html", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c32604de4af845..b53f19895b3505 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6005,12 +6005,12 @@ "port-version": 3 }, "node-addon-api": { - "baseline": "6.1.0", + "baseline": "7.0.0", "port-version": 0 }, "node-api-headers": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "nodesoup": { "baseline": "2023-06-12", diff --git a/versions/n-/node-addon-api.json b/versions/n-/node-addon-api.json index 64c0ca7d2a05b5..079963974847a9 100644 --- a/versions/n-/node-addon-api.json +++ b/versions/n-/node-addon-api.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81fa7773a3a022325f43fa266ce809c1bb3ceffd", + "version": "7.0.0", + "port-version": 0 + }, { "git-tree": "33617d9929f3a05c2f3a98781dd6508a1b2ba1cd", "version": "6.1.0", diff --git a/versions/n-/node-api-headers.json b/versions/n-/node-api-headers.json index 2a7b0bb2eac1c2..2fc654d28796b5 100644 --- a/versions/n-/node-api-headers.json +++ b/versions/n-/node-api-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "913a99892edcb72bcc2a479471caf0f9edb35311", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "273191974015356594e8288781f46c01fd882d43", "version": "1.0.0", From 0e47c1985273129e4d0ee52ff73bed9125555de8 Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Sat, 16 Dec 2023 00:34:57 +0100 Subject: [PATCH 0644/1039] fix: find_package broken on Ableton-Link (#35603) --- ports/ableton-link/portfile.cmake | 4 ++-- ports/ableton-link/vcpkg.json | 2 +- versions/a-/ableton-link.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ableton-link/portfile.cmake b/ports/ableton-link/portfile.cmake index 521563e857668f..b816349384cd22 100644 --- a/ports/ableton-link/portfile.cmake +++ b/ports/ableton-link/portfile.cmake @@ -76,8 +76,8 @@ vcpkg_apply_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}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink") +file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink/cmake_include/") file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE) # Handle copyright diff --git a/ports/ableton-link/vcpkg.json b/ports/ableton-link/vcpkg.json index 463aabaf71d861..ad5a5628448897 100644 --- a/ports/ableton-link/vcpkg.json +++ b/ports/ableton-link/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ableton-link", "version": "3.0.6", - "port-version": 1, + "port-version": 2, "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/", diff --git a/versions/a-/ableton-link.json b/versions/a-/ableton-link.json index 54d3152a5ee010..2214fa7afe3e84 100644 --- a/versions/a-/ableton-link.json +++ b/versions/a-/ableton-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c37c3cf9ca37c0c0d9ddffec58b8deb9c968723", + "version": "3.0.6", + "port-version": 2 + }, { "git-tree": "e88d1fcc5959b44924c1bec7ae3b5535327f41ef", "version": "3.0.6", diff --git a/versions/baseline.json b/versions/baseline.json index b53f19895b3505..23b005b4b70949 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -14,7 +14,7 @@ }, "ableton-link": { "baseline": "3.0.6", - "port-version": 1 + "port-version": 2 }, "abseil": { "baseline": "20230802.1", From ab00a636c7b65b0245104ddd7d3de4fffdffd36b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 18 Dec 2023 10:27:45 -0800 Subject: [PATCH 0645/1039] Update Windows Fleet for December 2023 Patch Tuesday (#35640) --- ...able-uninitialized-resize-on-new-stl.patch | 40 +++ ports/folly/portfile.cmake | 1 + ports/folly/vcpkg.json | 1 + ports/qtwebengine/msvc-template.patch | 264 ++++++++++-------- ports/qtwebengine/vcpkg.json | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 2 +- .../azure-pipelines/generate-sas-tokens.ps1 | 12 +- .../patch-tuesday-checklist.md | 7 +- scripts/azure-pipelines/roll-sas-tokens.ps1 | 15 + .../azure-pipelines/test-modified-ports.ps1 | 5 +- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- scripts/ci.baseline.txt | 3 + versions/baseline.json | 4 +- versions/f-/folly.json | 5 + versions/q-/qtwebengine.json | 5 + 15 files changed, 230 insertions(+), 138 deletions(-) create mode 100644 ports/folly/disable-uninitialized-resize-on-new-stl.patch create mode 100644 scripts/azure-pipelines/roll-sas-tokens.ps1 diff --git a/ports/folly/disable-uninitialized-resize-on-new-stl.patch b/ports/folly/disable-uninitialized-resize-on-new-stl.patch new file mode 100644 index 00000000000000..29931bc1db99c9 --- /dev/null +++ b/ports/folly/disable-uninitialized-resize-on-new-stl.patch @@ -0,0 +1,40 @@ +diff --git a/folly/memory/UninitializedMemoryHacks.h b/folly/memory/UninitializedMemoryHacks.h +index bd31c88..9f640a8 100644 +--- a/folly/memory/UninitializedMemoryHacks.h ++++ b/folly/memory/UninitializedMemoryHacks.h +@@ -101,6 +101,9 @@ template < + typename std::enable_if::value>::type> + inline void resizeWithoutInitialization( + std::basic_string& s, std::size_t n) { ++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L ++ s.resize(n); ++#else + if (n <= s.size()) { + s.resize(n); + } else { +@@ -111,6 +114,7 @@ inline void resizeWithoutInitialization( + } + detail::unsafeStringSetLargerSize(s, n); + } ++#endif // STL workaround + } + + /** +@@ -244,6 +248,8 @@ struct MakeUnsafeStringSetLargerSize { + #elif defined(_MSC_VER) + // MSVC + ++#if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L ++#else + template + struct MakeUnsafeStringSetLargerSize { + friend void unsafeStringSetLargerSizeImpl( +@@ -262,7 +268,7 @@ struct MakeUnsafeStringSetLargerSize { + void (std::basic_string::*)(std::size_t), \ + &std::basic_string::_Eos>; \ + FOLLY_DECLARE_STRING_RESIZE_WITHOUT_INIT_IMPL(TYPE) +- ++#endif // workaround + #else + #warning \ + "No implementation for resizeWithoutInitialization of std::basic_string" diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 63f5c61733c7fd..aea538cdd39f7b 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_github( fix-windows-minmax.patch fix-deps.patch openssl.patch # from https://github.com/facebook/folly/pull/2016 + disable-uninitialized-resize-on-new-stl.patch ) file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index ea1d8b0df33fb2..2501067d20c937 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "folly", "version-string": "2023.10.02.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", diff --git a/ports/qtwebengine/msvc-template.patch b/ports/qtwebengine/msvc-template.patch index d0a61806e2b2a5..90dc0320abeb15 100644 --- a/ports/qtwebengine/msvc-template.patch +++ b/ports/qtwebengine/msvc-template.patch @@ -1,124 +1,140 @@ -diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h -index 459c6a5..687a364 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h -+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h -@@ -224,60 +224,13 @@ ToStringVal MakeVal(const T& x) { - template - class LogStreamer; - --// Base case: Before the first << argument. --template <> --class LogStreamer<> final { -- public: -- template ())), -- absl::enable_if_t::value || -- std::is_enum::value>* = nullptr> -- RTC_FORCE_INLINE LogStreamer operator<<(U arg) const { -- return LogStreamer(MakeVal(arg), this); -- } -- -- template ())), -- absl::enable_if_t::value && -- !std::is_enum::value>* = nullptr> -- RTC_FORCE_INLINE LogStreamer operator<<(const U& arg) const { -- return LogStreamer(MakeVal(arg), this); -- } -- --#if RTC_CHECK_MSG_ENABLED -- template -- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, -- const int line, -- const char* message, -- const Us&... args) { -- static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; -- FatalLog(file, line, message, t, args.GetVal()...); -- } -- -- template -- RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, -- const int line, -- const char* message, -- const Us&... args) { -- static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., -- CheckArgType::kEnd}; -- FatalLog(file, line, message, t, args.GetVal()...); -- } --#else -- template -- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, -- const int line) { -- FatalLog(file, line); -- } --#endif --}; - - // Inductive case: We've already seen at least one << argument. The most recent - // one had type `T`, and the earlier ones had types `Ts`. - template - class LogStreamer final { - public: -- RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer* prior) -+ RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer * const prior) - : arg_(arg), prior_(prior) {} - - template final { - const LogStreamer* prior_; - }; - -+ -+// Base case: Before the first << argument. -+template <> -+class LogStreamer<> final { -+ public: -+ template >::value || -+ std::is_enum::value>* = nullptr> -+ RTC_FORCE_INLINE auto operator<<(U arg) const { -+ return LogStreamer(MakeVal(arg), this); -+ } -+ -+ template >::value && -+ !std::is_enum::value>* = nullptr> -+ RTC_FORCE_INLINE auto operator<<(const U& arg) const { -+ return LogStreamer(MakeVal(arg), this); -+ } -+ -+ //RTC_FORCE_INLINE auto operator<<(const std::string& arg) const { -+ // return LogStreamer>(MakeVal(arg), this); -+ // -+ -+#if RTC_CHECK_MSG_ENABLED -+ template -+ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, -+ const int line, -+ const char* message, -+ const Us&... args) { -+ static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; -+ FatalLog(file, line, message, t, args.GetVal()...); -+ } -+ -+ template -+ RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, -+ const int line, -+ const char* message, -+ const Us&... args) { -+ static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., -+ CheckArgType::kEnd}; -+ FatalLog(file, line, message, t, args.GetVal()...); -+ } -+#else -+ template -+ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, -+ const int line) { -+ FatalLog(file, line); -+ } -+#endif -+}; -+ - template - class FatalLogCall final { - public: +diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h +index 459c6a5..4bc8da8 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h ++++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/checks.h +@@ -224,76 +224,27 @@ ToStringVal MakeVal(const T& x) { + template + class LogStreamer; + +-// Base case: Before the first << argument. +-template <> +-class LogStreamer<> final { +- public: +- template ())), +- absl::enable_if_t::value || +- std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(U arg) const { +- return LogStreamer(MakeVal(arg), this); +- } +- +- template ())), +- absl::enable_if_t::value && +- !std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(const U& arg) const { +- return LogStreamer(MakeVal(arg), this); +- } +- +-#if RTC_CHECK_MSG_ENABLED +- template +- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, +- const int line, +- const char* message, +- const Us&... args) { +- static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; +- FatalLog(file, line, message, t, args.GetVal()...); +- } +- +- template +- RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, +- const int line, +- const char* message, +- const Us&... args) { +- static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., +- CheckArgType::kEnd}; +- FatalLog(file, line, message, t, args.GetVal()...); +- } +-#else +- template +- RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, +- const int line) { +- FatalLog(file, line); +- } +-#endif +-}; + + // Inductive case: We've already seen at least one << argument. The most recent + // one had type `T`, and the earlier ones had types `Ts`. + template + class LogStreamer final { + public: +- RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer* prior) ++ RTC_FORCE_INLINE LogStreamer(T arg, const LogStreamer * const prior) + : arg_(arg), prior_(prior) {} + + template ())), + absl::enable_if_t::value || + std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(U arg) const { +- return LogStreamer(MakeVal(arg), this); ++ RTC_FORCE_INLINE auto operator<<(U arg) const { ++ return LogStreamer(MakeVal(arg), this); + } + + template ())), + absl::enable_if_t::value && + !std::is_enum::value>* = nullptr> +- RTC_FORCE_INLINE LogStreamer operator<<(const U& arg) const { +- return LogStreamer(MakeVal(arg), this); ++ RTC_FORCE_INLINE auto operator<<(const U& arg) const { ++ return LogStreamer(MakeVal(arg), this); + } + + #if RTC_CHECK_MSG_ENABLED +@@ -328,6 +279,53 @@ class LogStreamer final { + const LogStreamer* prior_; + }; + ++ ++// Base case: Before the first << argument. ++template <> ++class LogStreamer<> final { ++ public: ++ template ::value || ++ std::is_enum::value>* = nullptr> ++ RTC_FORCE_INLINE auto operator<<(U arg) const { ++ return LogStreamer(MakeVal(arg), this); ++ } ++ ++ template ::value && ++ !std::is_enum::value>* = nullptr> ++ RTC_FORCE_INLINE auto operator<<(const U& arg) const { ++ return LogStreamer(MakeVal(arg), this); ++ } ++ ++#if RTC_CHECK_MSG_ENABLED ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, ++ const int line, ++ const char* message, ++ const Us&... args) { ++ static constexpr CheckArgType t[] = {Us::Type()..., CheckArgType::kEnd}; ++ FatalLog(file, line, message, t, args.GetVal()...); ++ } ++ ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void CallCheckOp(const char* file, ++ const int line, ++ const char* message, ++ const Us&... args) { ++ static constexpr CheckArgType t[] = {CheckArgType::kCheckOp, Us::Type()..., ++ CheckArgType::kEnd}; ++ FatalLog(file, line, message, t, args.GetVal()...); ++ } ++#else ++ template ++ RTC_NORETURN RTC_FORCE_INLINE static void Call(const char* file, ++ const int line) { ++ FatalLog(file, line); ++ } ++#endif ++}; ++ + template + class FatalLogCall final { + public: diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 2b2969d41df811..11800b39e67af1 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.6.1", - "port-version": 2, + "port-version": 3, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 97d382694d3199..1a826aa5d5ce0f 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,7 +4,7 @@ variables: android-pool: 'PrAnd-1ES-Pool' linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2023-10-11' + windows-pool: 'PrWin-2023-12-12' osx-pool: 'PrOsx-2023-09-11' linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05' diff --git a/scripts/azure-pipelines/generate-sas-tokens.ps1 b/scripts/azure-pipelines/generate-sas-tokens.ps1 index 86848e88bb124a..04cc8a534edd37 100644 --- a/scripts/azure-pipelines/generate-sas-tokens.ps1 +++ b/scripts/azure-pipelines/generate-sas-tokens.ps1 @@ -1,3 +1,7 @@ +Param( + [Parameter(Mandatory=$true)] + [int]$KeyNumber +) function Get-SasToken { Param( @@ -28,13 +32,13 @@ function Get-SasToken { # Asset Cache: # Read, Create, List -$assetSas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl +$assetSas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -ContainerName cache -Permission rcl # Binary Cache: # Read, Create, List, Write -$binarySas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw -$binaryEASas = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw -$binaryWUS3as = Get-SasToken -KeyNumber 1 -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -ContainerName cache -Permission rclw +$binarySas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -ContainerName cache -Permission rclw +$binaryEASas = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -ContainerName cache -Permission rclw +$binaryWUS3as = Get-SasToken -KeyNumber $KeyNumber -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -ContainerName cache -Permission rclw $response = "Asset Cache SAS: Update`n" + ` "https://dev.azure.com/vcpkg/public/_library?itemType=VariableGroups&view=VariableGroupView&variableGroupId=6&path=vcpkg-asset-caching-credentials`n" + ` diff --git a/scripts/azure-pipelines/patch-tuesday-checklist.md b/scripts/azure-pipelines/patch-tuesday-checklist.md index cb5857467aabc3..e27c919b26858b 100644 --- a/scripts/azure-pipelines/patch-tuesday-checklist.md +++ b/scripts/azure-pipelines/patch-tuesday-checklist.md @@ -30,7 +30,10 @@ * West US 2, 1 Replica * West US 3, 1 Replica * [ ] After the last build finishes on the previous pool, delete it in the Azure Devops *Organization* UI and its Resource Group. ( https://dev.azure.com/vcpkg/_settings/agentpools ?) -* [ ] Run `generate-sas-tokens.ps1` and update the relevant libraries on dev.azure.com/vcpkg and - devdiv.visualstudio.com. +* [ ] Run `generate-sas-tokens.ps1 -KeyNumber N`, where N is whether the month is even + (Jan = 1, Feb = 2, Mar = 1, and so on) and update the relevant libraries on + dev.azure.com/vcpkg and devdiv.visualstudio.com +* [ ] After builds using previous SAS tokens complete, run `roll-sas-tokens.ps1 -KeyNumber N` where + this N is the other key. (Jan = 2, Feb = 1, Mar = 2, and so on) * [ ] Mint a new macOS base box. (See instructions in `scripts/azure-pipelines/osx/README.md`) * [ ] Deploy the new base box to all hosts. diff --git a/scripts/azure-pipelines/roll-sas-tokens.ps1 b/scripts/azure-pipelines/roll-sas-tokens.ps1 new file mode 100644 index 00000000000000..5968a4da3a5044 --- /dev/null +++ b/scripts/azure-pipelines/roll-sas-tokens.ps1 @@ -0,0 +1,15 @@ + +Param( + [Parameter(Mandatory=$true)] + [int]$KeyNumber +) + +$keyName = "key$KeyNumber" + +# Asset Cache: +New-AzStorageAccountKey -ResourceGroupName vcpkg-asset-cache -StorageAccountName vcpkgassetcacheeastasia -KeyName $keyName + +# Binary Cache: +New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycache -KeyName $keyName +New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycacheeastasia -KeyName $keyName +New-AzStorageAccountKey -ResourceGroupName vcpkg-binary-cache -StorageAccountName vcpkgbinarycachewus3 -KeyName $keyName diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index e51bf08a55f5f9..e392ed64df94ff 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -71,10 +71,9 @@ if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { $BinarySourceStub = "files,$ArchivesRoot" } -$env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' -$buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' +$buildtreesRoot = Join-Path $WorkingRoot 'b' $installRoot = Join-Path $WorkingRoot 'installed' -$packagesRoot = Join-Path $WorkingRoot 'packages' +$packagesRoot = Join-Path $WorkingRoot 'p' $commonArgs = @( "--x-buildtrees-root=$buildtreesRoot", diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 9a5a02afc506fa..298fe59ffac7e9 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/PowerShell-7.3.8-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 08026e7c7f71dc..338b8b9b1de5cf 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -630,6 +630,9 @@ libtcod:arm64-android=fail libtcod:x64-android=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm64-uwp=fail +# D:\b\libtorch\src\v1.12.1-e1cb316ec6.clean\aten\src\ATen/cpu/vec/vec_base.h(134): fatal error C1001: Internal compiler error. +# (compiler file 'D:\a\_work\1\s\src\vctools\Compiler\CxxFE\sl\p1\c\toinil.c', line 910) +libtorch:x64-windows=fail libtorch:x64-osx=fail libusb-win32:arm64-uwp=fail libusb-win32:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 23b005b4b70949..f57afdb6114487 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2718,7 +2718,7 @@ }, "folly": { "baseline": "2023.10.02.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", @@ -7274,7 +7274,7 @@ }, "qtwebengine": { "baseline": "6.6.1", - "port-version": 2 + "port-version": 3 }, "qtwebsockets": { "baseline": "6.6.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 79366706fa5c61..a4d67dd333eaa5 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d4dff9c56b8324d2e6b7ca2ba6ad0b60845de56", + "version-string": "2023.10.02.00", + "port-version": 1 + }, { "git-tree": "a909b9222ac4ded463976431d65b6b24fa486bd3", "version-string": "2023.10.02.00", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 22f85a14e59c9e..b08a904993fc76 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2585496a5eec4f9f08df3a69483157640acb3cf", + "version": "6.6.1", + "port-version": 3 + }, { "git-tree": "0da0e5d03340ccc05f77e90cb898e62237746107", "version": "6.6.1", From 07d509eb0bf3d50a17f141169161777e705bb837 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:14:33 +0800 Subject: [PATCH 0646/1039] passing remove from fail (#35697) --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 338b8b9b1de5cf..0b90e36937da8f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -222,9 +222,6 @@ coroutine:x64-osx=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail -cppcms:arm-neon-android=fail -cppcms:arm64-android=fail -cppcms:x64-android=fail cppgraphqlgen:arm-neon-android=fail cppgraphqlgen:arm64-android=fail cppgraphqlgen:x64-android=fail From e3b4728c3e1c390194bcff1b1def88685af6ea2e Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 18 Dec 2023 11:14:52 -0800 Subject: [PATCH 0647/1039] [vcpkg baseline][vulkan-loader] passing remove from fail (#35750) * fix pipelines * undo cppcms --------- Co-authored-by: Monica --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0b90e36937da8f..1e01183a4ced7a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1335,4 +1335,3 @@ vcpkg-ci-wxwidgets:x64-windows-static-md=pass vcpkg-ci-wxwidgets:x64-windows-static=pass vcpkg-ci-wxwidgets:x64-windows=pass vcpkg-ci-wxwidgets:x86-windows=pass -vulkan-loader:x64-windows-static=fail From 1c79e2659d6a5766cd426b1b643f82faf7b89b84 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Dec 2023 22:09:44 +0100 Subject: [PATCH 0648/1039] [gettext] Update to 0.22.4 (#35585) --- ports/gettext-libintl/android.patch | 12 ----- ports/gettext-libintl/portfile.cmake | 33 ++++-------- ports/gettext-libintl/uwp.patch | 39 ++------------ ports/gettext-libintl/vcpkg.json | 3 +- ports/gettext/android.patch | 12 ----- ports/gettext/config-step-order.patch | 76 +++++++++++++++++++++++++++ ports/gettext/macosx-libs.patch | 13 ----- ports/gettext/portfile.cmake | 29 +++++++--- ports/gettext/subdirs.patch | 28 +++++++--- ports/gettext/uwp.patch | 34 ++++-------- ports/gettext/vcpkg.json | 11 ++-- ports/gettext/win-gethostname.patch | 45 ---------------- versions/baseline.json | 8 +-- versions/g-/gettext-libintl.json | 5 ++ versions/g-/gettext.json | 5 ++ 15 files changed, 163 insertions(+), 190 deletions(-) delete mode 100644 ports/gettext-libintl/android.patch delete mode 100644 ports/gettext/android.patch create mode 100644 ports/gettext/config-step-order.patch delete mode 100644 ports/gettext/macosx-libs.patch delete mode 100644 ports/gettext/win-gethostname.patch diff --git a/ports/gettext-libintl/android.patch b/ports/gettext-libintl/android.patch deleted file mode 100644 index 6f2a7d43faf95f..00000000000000 --- a/ports/gettext-libintl/android.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c ---- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 -+++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 -@@ -143,7 +143,7 @@ - # else - # if VMS - # define getcwd(buf, max) (getcwd) (buf, max, 0) --# else -+# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) - char *getcwd (); - # endif - # endif diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake index e65edae63d4c60..a52c9fff061813 100644 --- a/ports/gettext-libintl/portfile.cmake +++ b/ports/gettext-libintl/portfile.cmake @@ -16,14 +16,12 @@ vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz" FILENAME "gettext-${VERSION}.tar.gz" - SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 + SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - # Shared with port gettext - android.patch uwp.patch 0003-Fix-win-unicode-paths.patch ) @@ -43,29 +41,19 @@ endif() set(OPTIONS --no-recursion --enable-relocatable #symbol duplication with glib-init.c? - --enable-c++ - --disable-acl - --disable-csharp - --disable-curses - --disable-java - --disable-libasprintf - --disable-openmp --with-included-gettext --without-libintl-prefix - --disable-dependency-tracking # Faster ? - ac_cv_path_DVIPS=: - ac_cv_path_GMSGFMT=: - ac_cv_path_MSGFMT=: - ac_cv_path_MSGMERGE=: - ac_cv_path_TEXI2PDF=: - ac_cv_path_XGETTEXT=: - ac_cv_prog_INTLBISON=: + --disable-dependency-tracking + ac_cv_path_GMSGFMT=false + ac_cv_path_MSGFMT=false + ac_cv_path_MSGMERGE=false + ac_cv_path_XGETTEXT=false + ac_cv_prog_INTLBISON=false ) if(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS # Avoid unnecessary tests. am_cv_func_iconv_works=yes - "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" ## This is required. For some reason these do not get correctly identified for release builds. ac_cv_func_wcslen=yes ac_cv_func_memmove=yes @@ -88,7 +76,7 @@ endif() file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log") file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log") -vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" +vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime/intl" DETERMINE_BUILD_TRIPLET USE_WRAPPERS OPTIONS @@ -103,17 +91,18 @@ vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" # - Avoid an extra command to move a temporary file, we are building out of source. # - Avoid a subshell just to add comments, the build dir is temporary. # - Avoid cygpath -w when other tools handle this for us. -file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/intl/Makefile") +file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/Makefile") foreach(file IN LISTS makefiles) file(READ "${file}" rules) string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}") string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}") string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}") string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}") + string(REPLACE " ../config.h" " config.h" rules "${rules}") file(WRITE "${file}" "${rules}") endforeach() -vcpkg_install_make(SUBPATH intl) +vcpkg_install_make() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gettext-libintl/uwp.patch b/ports/gettext-libintl/uwp.patch index 416e2ea3c5e361..c16a0f5f4309e5 100644 --- a/ports/gettext-libintl/uwp.patch +++ b/ports/gettext-libintl/uwp.patch @@ -1,20 +1,3 @@ -diff --git a/gettext-runtime/gnulib-lib/fcntl.c b/gettext-runtime/gnulib-lib/fcntl.c -index f9753c4..3a3caee 100644 ---- a/gettext-runtime/gnulib-lib/fcntl.c -+++ b/gettext-runtime/gnulib-lib/fcntl.c -@@ -38,6 +38,12 @@ - # define WIN32_LEAN_AND_MEAN - # include - -+# if defined(WINAPI_FAMILY_PARTITION) -+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -+# define HANDLE_FLAG_INHERIT 0 -+# endif -+# endif -+ - /* Get _get_osfhandle. */ - # if GNULIB_MSVC_NOTHROW - # include "msvc-nothrow.h" diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c index f774ba2..f488b7f 100644 --- a/gettext-runtime/intl/langprefs.c @@ -31,10 +14,10 @@ index f774ba2..f488b7f 100644 #endif #ifdef WIN32_NATIVE -diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +diff --git a/gettext-runtime/intl/gnulib-lib/localcharset.c b/gettext-runtime/intl/gnulib-lib/localcharset.c index ec75427..9e063e4 100644 ---- a/gettext-runtime/intl/localcharset.c -+++ b/gettext-runtime/intl/localcharset.c +--- a/gettext-runtime/intl/gnulib-lib/localcharset.c ++++ b/gettext-runtime/intl/gnulib-lib/localcharset.c @@ -34,6 +34,9 @@ #if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE @@ -54,19 +37,3 @@ index ec75427..9e063e4 100644 # elif defined WINDOWS_NATIVE char buf[2 + 10 + 1]; -diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c -index d77bb81..3c6e055 100644 ---- a/gettext-runtime/intl/localename.c -+++ b/gettext-runtime/intl/localename.c -@@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t); - - #if defined _WIN32 && !defined __CYGWIN__ - # define WINDOWS_NATIVE -+# if defined(WINAPI_FAMILY_PARTITION) -+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -+# undef WIN32_NATIVE -+# endif -+# endif - # if !defined IN_LIBINTL - # include "glthread/lock.h" - # endif diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json index 89ad8f2fa2f64d..3721740c09f19b 100644 --- a/ports/gettext-libintl/vcpkg.json +++ b/ports/gettext-libintl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gettext-libintl", - "version": "0.21.1", - "port-version": 1, + "version": "0.22.4", "description": "The libintl C library from GNU gettext-runtime.", "homepage": "https://www.gnu.org/software/gettext/", "license": "LGPL-2.1-or-later", diff --git a/ports/gettext/android.patch b/ports/gettext/android.patch deleted file mode 100644 index 6f2a7d43faf95f..00000000000000 --- a/ports/gettext/android.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c ---- a/gettext-runtime/intl/dcigettext.c 2021-05-26 16:27:55.420544597 +0200 -+++ src/gettext-runtime/intl/dcigettext.c 2021-05-26 16:29:14.546516701 +0200 -@@ -143,7 +143,7 @@ - # else - # if VMS - # define getcwd(buf, max) (getcwd) (buf, max, 0) --# else -+# elif !(defined(__clang__) && defined(__BIONIC_FORTIFY)) - char *getcwd (); - # endif - # endif diff --git a/ports/gettext/config-step-order.patch b/ports/gettext/config-step-order.patch new file mode 100644 index 00000000000000..b2aa8587e1b212 --- /dev/null +++ b/ports/gettext/config-step-order.patch @@ -0,0 +1,76 @@ +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index ed6cb37..780cc84 100644 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -22346,6 +22346,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } + + + ++### Configuration step reordering ++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4 ++### Pull iconv lookup before actual GNU gettext lookup. ++for configuration_step in gettext-iconv gettext-main; do ++case "$configuration_step" in ++gettext-main) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 + printf %s "checking for CFPreferencesCopyAppValue... " >&6; } + if test ${gt_cv_func_CFPreferencesCopyAppValue+y} +@@ -29535,6 +29541,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + + ++### Configuration step reordering ++;; ++gettext-iconv) + use_additional=yes + + acl_save_prefix="$prefix" +@@ -30464,6 +30473,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; } + gl_next_as_first_directive=$gl_cv_next_iconv_h + fi + NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive ++### Configuration step reordering ++;; ++esac ++done + + + +diff --git a/gettext-tools/configure b/gettext-tools/configure +index b4a4f93..17b05c8 100644 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -25735,6 +25735,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } + + + ++### Configuration step reordering ++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4 ++### Pull iconv lookup before actual GNU gettext lookup. ++for configuration_step in gettext-iconv gettext-main; do ++case "$configuration_step" in ++gettext-main) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 + printf %s "checking for CFPreferencesCopyAppValue... " >&6; } + if test ${gt_cv_func_CFPreferencesCopyAppValue+y} +@@ -37529,6 +37535,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h + + + ++### Configuration step reordering ++;; ++gettext-iconv) + use_additional=yes + + acl_save_prefix="$prefix" +@@ -38458,6 +38467,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; } + gl_next_as_first_directive=$gl_cv_next_iconv_h + fi + NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive ++### Configuration step reordering ++;; ++esac ++done + + + diff --git a/ports/gettext/macosx-libs.patch b/ports/gettext/macosx-libs.patch deleted file mode 100644 index c8936492b40707..00000000000000 --- a/ports/gettext/macosx-libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gettext-runtime/configure b/gettext-runtime/configure -index c21955a..902729a 100755 ---- a/gettext-runtime/configure -+++ b/gettext-runtime/configure -@@ -26819,7 +26819,7 @@ else $as_nop - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" -- LIBS="$LIBS $LIBINTL" -+ LIBS="$LIBS $LIBINTL $INTL_MACOSX_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index fa30dde8f761ca..c9e513879c15fc 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -16,22 +16,17 @@ vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz" FILENAME "gettext-${VERSION}.tar.gz" - SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05 + SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5 ) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - # shared with port gettext-libintl - android.patch uwp.patch - 0003-Fix-win-unicode-paths.patch - # unique to port gettext - win-gethostname.patch rel_path.patch subdirs.patch parallel-gettext-tools.patch - macosx-libs.patch + config-step-order.patch ) set(subdirs "") @@ -45,7 +40,8 @@ if(subdirs) set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}") vcpkg_find_acquire_program(BISON) - get_filename_component(BISON_PATH "${BISON}" DIRECTORY) + cmake_path(GET BISON FILENAME BISON_NAME) + cmake_path(GET BISON PARENT_PATH BISON_PATH) vcpkg_add_to_path("${BISON_PATH}") if(VCPKG_HOST_IS_WINDOWS) @@ -81,7 +77,23 @@ if(subdirs) --without-libncurses-prefix --without-libtermcap-prefix --without-libxcurses-prefix + "INTLBISON=${BISON_NAME}" + "TOOLS_BISON=${BISON_NAME}" ) + + if("nls" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-nls") + else() + vcpkg_list(APPEND options "--disable-nls") + endif() + + if(VCPKG_TARGET_IS_LINUX) + # Cannot use gettext-libintl, empty port on linux + set(ENV{VCPKG_INTL} intl) + else() + # Relying on gettext-libintl + list(APPEND OPTIONS --with-included-gettext=no) + endif() if(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS # Faster, but not for export @@ -176,6 +188,7 @@ endif() # We want to install these files also for fast "core" builds without "tools". # Cf. PACKAGING for the file list. file(INSTALL + "${SOURCE_PATH}/gettext-runtime/m4/build-to-host.m4" "${SOURCE_PATH}/gettext-runtime/m4/gettext.m4" "${SOURCE_PATH}/gettext-runtime/m4/iconv.m4" "${SOURCE_PATH}/gettext-runtime/m4/intlmacosx.m4" diff --git a/ports/gettext/subdirs.patch b/ports/gettext/subdirs.patch index 21964d6e5475c6..15a354cfb3a174 100644 --- a/ports/gettext/subdirs.patch +++ b/ports/gettext/subdirs.patch @@ -7,7 +7,7 @@ index 904bdf5..e751ffc 100755 -subdirs="$subdirs gettext-runtime libtextstyle gettext-tools" -+subdirs="$subdirs $VCPKG_GETTEXT_SUBDIRS" ++subdirs="$subdirs gettext-runtime ${VCPKG_GETTEXT_SUBDIRS/gettext-runtime/}" @@ -47,9 +47,9 @@ index a7594ed..296f3b7 100644 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != pristine-gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then + && test "$PACKAGE" != gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes - else diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure --- a/gettext-runtime/libasprintf/configure +++ b/gettext-runtime/libasprintf/configure @@ -70,8 +70,8 @@ index 59e81a8..107856d 100644 top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc -+SUBDIRS = intl gnulib-lib libgrep src po its projects styles misc +-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc ++SUBDIRS = gnulib-lib libgrep src po its projects styles misc # Allow users to use "gnulib-tool --update". @@ -83,11 +83,11 @@ index 056a830..9abca7e 100644 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ -- && test "$PACKAGE" != gettext-tools; }; then -+ && test "$PACKAGE" != pristine-gettext-tools; }; then +- && test "$PACKAGE" != gettext-tools \ ++ && test "$PACKAGE" != pristine-gettext-tools \ + && test "$PACKAGE" != libintl; }; then gt_use_preinstalled_gnugettext=yes else - LIBINTL= diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure --- a/gettext-tools/examples/configure +++ b/gettext-tools/examples/configure @@ -100,6 +100,18 @@ index ff1c212..0c0dbcd 100644 ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## +diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in +--- a/gettext-tools/src/Makefile.in ++++ b/gettext-tools/src/Makefile.in +index ff1c212..0c0dbcd 100644 +@@ -4381,6 +4381,7 @@ + $(AM_V_GEN)$(msgfilter_LINK) $(msgfilter_OBJECTS) $(msgfilter_LDADD) $(LIBS) + ../../gettext-runtime/intl/$(am__dirstamp): + @$(MKDIR_P) ../../gettext-runtime/intl ++ @$(MAKE) -C ../../gettext-runtime/intl libgnuintl.h + @: > ../../gettext-runtime/intl/$(am__dirstamp) + ../../gettext-runtime/intl/msgfmt-hash-string.$(OBJEXT): \ + ../../gettext-runtime/intl/$(am__dirstamp) diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in index ff1c212..0c0dbcd 100644 --- a/libtextstyle/Makefile.in diff --git a/ports/gettext/uwp.patch b/ports/gettext/uwp.patch index 416e2ea3c5e361..69dc5872deb0de 100644 --- a/ports/gettext/uwp.patch +++ b/ports/gettext/uwp.patch @@ -15,26 +15,10 @@ index f9753c4..3a3caee 100644 /* Get _get_osfhandle. */ # if GNULIB_MSVC_NOTHROW # include "msvc-nothrow.h" -diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c -index f774ba2..f488b7f 100644 ---- a/gettext-runtime/intl/langprefs.c -+++ b/gettext-runtime/intl/langprefs.c -@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name); - - #if defined _WIN32 - # define WIN32_NATIVE -+# if defined(WINAPI_FAMILY_PARTITION) -+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -+# undef WIN32_NATIVE -+# endif -+# endif - #endif - - #ifdef WIN32_NATIVE -diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c +diff --git a/gettext-runtime/gnulib-lib/localcharset.c b/gettext-runtime/gnulib-lib/localcharset.c index ec75427..9e063e4 100644 ---- a/gettext-runtime/intl/localcharset.c -+++ b/gettext-runtime/intl/localcharset.c +--- a/gettext-runtime/gnulib-lib/localcharset.c ++++ b/gettext-runtime/gnulib-lib/localcharset.c @@ -34,6 +34,9 @@ #if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE @@ -54,10 +38,10 @@ index ec75427..9e063e4 100644 # elif defined WINDOWS_NATIVE char buf[2 + 10 + 1]; -diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c +diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c index d77bb81..3c6e055 100644 ---- a/gettext-runtime/intl/localename.c -+++ b/gettext-runtime/intl/localename.c +--- a/gettext-runtime/gnulib-lib/localename.c ++++ b/gettext-runtime/gnulib-lib/localename.c @@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t); #if defined _WIN32 && !defined __CYGWIN__ @@ -67,6 +51,6 @@ index d77bb81..3c6e055 100644 +# undef WIN32_NATIVE +# endif +# endif - # if !defined IN_LIBINTL - # include "glthread/lock.h" - # endif + # include "glthread/lock.h" + #endif + diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index e3428cfaeb59c1..a96078e3db3ab2 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gettext", - "version": "0.21.1", - "port-version": 3, + "version": "0.22.4", "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "license": "GPL-3.0-only", @@ -10,9 +9,15 @@ "gettext-libintl" ], "features": { + "nls": { + "description": "Enable native language support" + }, "runtime-tools": { "description": "Build runtime tools for internationalization of scripts", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + "libiconv" + ] }, "tools": { "description": "Build gettext tools", diff --git a/ports/gettext/win-gethostname.patch b/ports/gettext/win-gethostname.patch deleted file mode 100644 index 3e3f399df6b803..00000000000000 --- a/ports/gettext/win-gethostname.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c -index e909637..c2e8065 100644 ---- a/gettext-tools/src/hostname.c -+++ b/gettext-tools/src/hostname.c -@@ -29,7 +29,9 @@ - #include - - #if defined _WIN32 -+# if !HAVE_GETHOSTNAME - # define WIN32_NATIVE -+# endif - #endif - - /* Get gethostname(). */ -@@ -56,6 +58,9 @@ - - /* Support for using gethostbyname(). */ - #if HAVE_GETHOSTBYNAME -+# if HAVE_WINSOCK2_H -+# include -+# else - # include - # include /* defines AF_INET, AF_INET6 */ - # include /* declares ntohs(), defines struct sockaddr_in */ -@@ -76,6 +81,7 @@ - # endif - # endif - # include /* defines struct hostent, declares gethostbyname() */ -+# endif - #endif - - /* Include this after , to avoid a syntax error on BeOS. */ -diff --git a/libtextstyle/lib/unistd.in.h b/libtextstyle/lib/unistd.in.h -index fd69a48..4ebdcaa 100644 ---- a/libtextstyle/lib/unistd.in.h -+++ b/libtextstyle/lib/unistd.in.h -@@ -1240,7 +1240,7 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - " - Null terminate it if the name is shorter than LEN. - If the host name is longer than LEN, set errno = EINVAL and return -1. - Return 0 if successful, otherwise set errno and return -1. */ --# if @UNISTD_H_HAVE_WINSOCK2_H@ -+# if @UNISTD_H_HAVE_WINSOCK2_H@ && !@HAVE_GETHOSTNAME@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) - # undef gethostname - # define gethostname rpl_gethostname diff --git a/versions/baseline.json b/versions/baseline.json index f57afdb6114487..b0a0b8ed88a35b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2933,12 +2933,12 @@ "port-version": 0 }, "gettext": { - "baseline": "0.21.1", - "port-version": 3 + "baseline": "0.22.4", + "port-version": 0 }, "gettext-libintl": { - "baseline": "0.21.1", - "port-version": 1 + "baseline": "0.22.4", + "port-version": 0 }, "gettimeofday": { "baseline": "2017-10-14", diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json index 0b3eb690337107..148d85c3e00af1 100644 --- a/versions/g-/gettext-libintl.json +++ b/versions/g-/gettext-libintl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "003232270da6a899ac59d4e61d7fead638584deb", + "version": "0.22.4", + "port-version": 0 + }, { "git-tree": "25450f3473f6c62f28af9702a772d8b48a6170b7", "version": "0.21.1", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 97e763e29be3b2..0a07806920581f 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e30ed5daac31351d72a221b74c1b8c4ecd06b694", + "version": "0.22.4", + "port-version": 0 + }, { "git-tree": "20e8e3535959bba6066d8887bb1c95e622d86f5a", "version": "0.21.1", From 1bb45db72f2618db852ea28a68cfcfe878ed6b66 Mon Sep 17 00:00:00 2001 From: Mark Sinkovics Date: Mon, 18 Dec 2023 16:15:04 -0500 Subject: [PATCH 0649/1039] [curl] fix config on iOS (#35662) --- ports/curl/cmake-config-ios.patch | 24 ++++++++++++++++++++++++ ports/curl/portfile.cmake | 1 + ports/curl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 ports/curl/cmake-config-ios.patch diff --git a/ports/curl/cmake-config-ios.patch b/ports/curl/cmake-config-ios.patch new file mode 100644 index 00000000000000..c3ed5d98ca49b8 --- /dev/null +++ b/ports/curl/cmake-config-ios.patch @@ -0,0 +1,24 @@ +diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake +index d67a905..dcd1eee 100644 +--- a/CMake/OtherTests.cmake ++++ b/CMake/OtherTests.cmake +@@ -87,7 +87,7 @@ endif() + unset(CMAKE_TRY_COMPILE_TARGET_TYPE) + + if(NOT CMAKE_CROSSCOMPILING) +- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS") ++ if(NOT APPLE) + # only try this on non-apple platforms + + # if not cross-compilation... +@@ -140,8 +140,8 @@ if(WIN32) + set(HAVE_GETADDRINFO_THREADSAFE ${HAVE_GETADDRINFO}) + elseif(NOT HAVE_GETADDRINFO) + set(HAVE_GETADDRINFO_THREADSAFE FALSE) +-elseif(CMAKE_SYSTEM_NAME STREQUAL "AIX" OR +- CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR ++elseif(APPLE OR ++ CMAKE_SYSTEM_NAME STREQUAL "AIX" OR + CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR + CMAKE_SYSTEM_NAME STREQUAL "HP-UX" OR + CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD" OR diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index bdc544e9e8daa1..c3ac95e2a31e2e 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( export-components.patch dependencies.patch cmake-config.patch # https://github.com/curl/curl/pull/11913 + cmake-config-ios.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index e028d38970b833..a63858e34207e5 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.4.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b0a0b8ed88a35b..086c52d9d551df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2038,7 +2038,7 @@ }, "curl": { "baseline": "8.4.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 6d4b362adff634..2324cd7644cab6 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ad22809b9ba0e1e140a8ef45c4502bb2d669e1f", + "version": "8.4.0", + "port-version": 1 + }, { "git-tree": "6125c796d6e2913a89a2996d7082375ce16b02dd", "version": "8.4.0", From 9b9ec90df40cdd3877b43c11f15a9967231794b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Mon, 18 Dec 2023 21:17:23 +0000 Subject: [PATCH 0650/1039] [Openmpi] configuration error (#35706) --- ports/openmpi/portfile.cmake | 1 + ports/openmpi/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openmpi.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index bb30fd9ed2c705..0bfdca4a84e871 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_make( OPTIONS --with-hwloc=internal --with-libevent=internal + --with-pmix=internal --disable-mpi-fortran OPTIONS_DEBUG --enable-debug diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index a14612dea010c5..e76173b15634de 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openmpi", "version": "4.1.6", + "port-version": 1, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index 086c52d9d551df..101018cde26dfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6314,7 +6314,7 @@ }, "openmpi": { "baseline": "4.1.6", - "port-version": 0 + "port-version": 1 }, "openmvg": { "baseline": "2.0", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index 147953942d6827..62d6743008619e 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a63c7aeb8e42d6ebdac726767ec7a0ba46ddf86f", + "version": "4.1.6", + "port-version": 1 + }, { "git-tree": "a35bc145d32795f1a71cbe596de040805c3af780", "version": "4.1.6", From 063265300c2c5f8573269212bf0cf6e598c056bb Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:18:02 +0100 Subject: [PATCH 0651/1039] [coin] update to version 4.0.2 (#35711) Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/coin/disable-cpackd.patch | 10 ---------- ports/coin/fix-typedef.patch | 22 ---------------------- ports/coin/portfile.cmake | 9 ++++----- ports/coin/remove-default-config.patch | 13 +++++++++++++ ports/coin/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/coin.json | 5 +++++ 7 files changed, 25 insertions(+), 41 deletions(-) delete mode 100644 ports/coin/disable-cpackd.patch delete mode 100644 ports/coin/fix-typedef.patch create mode 100644 ports/coin/remove-default-config.patch diff --git a/ports/coin/disable-cpackd.patch b/ports/coin/disable-cpackd.patch deleted file mode 100644 index 81afeb668d26d2..00000000000000 --- a/ports/coin/disable-cpackd.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f32f6ffe3..639fc4109 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -815,4 +815,4 @@ endif() - - # ############################################################################ - # New CPACK section, please see the README file inside cpack.d directory. --add_subdirectory(cpack.d) -+#add_subdirectory(cpack.d) diff --git a/ports/coin/fix-typedef.patch b/ports/coin/fix-typedef.patch deleted file mode 100644 index 8f3481722a07ff..00000000000000 --- a/ports/coin/fix-typedef.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/include/Inventor/elements/SoGLLazyElement.h b/include/Inventor/elements/SoGLLazyElement.h -index 403711f..322f997 100644 ---- a/include/Inventor/elements/SoGLLazyElement.h -+++ b/include/Inventor/elements/SoGLLazyElement.h -@@ -74,7 +74,7 @@ public: - - void reset(SoState* state, uint32_t bitmask) const; - -- typedef struct COIN_DLL_API { -+ typedef struct COIN_DLL_API GLState { - uint32_t cachebitmask; - uint32_t diffuse; - SbColor ambient; -@@ -97,7 +97,7 @@ public: - SbUniqueId diffusenodeid; - SbUniqueId transpnodeid; - uint32_t reserved[4]; -- } GLState; -+ }; - - virtual void setDiffuseElt(SoNode*, int32_t numcolors, - const SbColor * colors, SoColorPacker * packer); diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index 66667e0a5977c8..f8ebaaa069ae96 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/coin - REF Coin-4.0.0 - SHA512 8a0289cab3e02a7417022fe659ec30a2dd705b9bacb254e0269ada9155c76c6aea0285c475cd6e663f5d7f2b49e60244b16baac7188d57e3d7f8ab08d228f21f + REF v${VERSION} + SHA512 f913f1b1ec5819d72e054dc94702effe9ee2a28547fc9bebc2f6b2e55d8a67c6cfa05e43239461e806cbead0a7548f82b31d5b86181eed4ffc5c801d3b94aa67 HEAD_REF master PATCHES - disable-cpackd.patch - fix-typedef.patch # clang-cl fix. + remove-default-config.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -32,7 +31,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-4.0.0) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-${VERSION}) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/coin/remove-default-config.patch b/ports/coin/remove-default-config.patch new file mode 100644 index 00000000000000..b10f1ec6e21812 --- /dev/null +++ b/ports/coin/remove-default-config.patch @@ -0,0 +1,13 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -395,8 +395,8 @@ + configure_file("${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" @ONLY) + install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install(PROGRAMS "${CMAKE_SOURCE_DIR}/bin/coin-config" DESTINATION ${CMAKE_INSTALL_BINDIR}) +- configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY) +- install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf) ++ #configure_file("${CMAKE_SOURCE_DIR}/coin.cfg.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" @ONLY) ++ #install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME_LOWER}-default.cfg" DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Coin/conf) + endif() + endif() + diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index ace00f8fed2d28..989345ff389ded 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,6 @@ { "name": "coin", - "version": "4.0.0", - "port-version": 8, + "version": "4.0.2", "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 101018cde26dfa..81a9d358e8a03e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1693,8 +1693,8 @@ "port-version": 1 }, "coin": { - "baseline": "4.0.0", - "port-version": 8 + "baseline": "4.0.2", + "port-version": 0 }, "coin-or-buildtools": { "baseline": "2023-02-02", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 8f1b8133d5b871..8ce9e08d4599de 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f151412ad103c9cafd511a97783d60b85aae246", + "version": "4.0.2", + "port-version": 0 + }, { "git-tree": "bb22aa623ff6abbc31ab908a584855f8ee278e67", "version": "4.0.0", From 8e03049b8cfaab97623f4d62457bf214ced7067a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Dec 2023 22:21:13 +0100 Subject: [PATCH 0652/1039] [mimalloc] Fix android, clarify usage (#35713) --- ports/mimalloc/portfile.cmake | 6 ++++-- ports/mimalloc/template-param-types.diff | 22 ++++++++++++++++++++++ ports/mimalloc/usage | 4 ++++ ports/mimalloc/vcpkg.json | 1 + scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 +++++ 7 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 ports/mimalloc/template-param-types.diff create mode 100644 ports/mimalloc/usage diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 54f8e81ca2f9e0..88f33916d0e7f7 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF "v${VERSION}" - SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 + REF "v${VERSION}" + SHA512 927b046e67783b325a6e41e3a9a6d3d78306fa1c82255defd1f3a7a60a27fd809a601f65b1b27fa38f2064e124f29856d7c0e5ccc33c54c2e4b6ebb9816d74b1 HEAD_REF master PATCHES fix-cmake.patch + template-param-types.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -39,6 +40,7 @@ vcpkg_copy_pdbs() file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mimalloc) diff --git a/ports/mimalloc/template-param-types.diff b/ports/mimalloc/template-param-types.diff new file mode 100644 index 00000000000000..1f1b7037491253 --- /dev/null +++ b/ports/mimalloc/template-param-types.diff @@ -0,0 +1,22 @@ +diff --git a/src/arena.c b/src/arena.c +index a04a04c..1340a96 100644 +--- a/src/arena.c ++++ b/src/arena.c +@@ -476,7 +476,7 @@ static void mi_arena_schedule_purge(mi_arena_t* arena, size_t bitmap_idx, size_t + // schedule decommit + mi_msecs_t expire = mi_atomic_loadi64_relaxed(&arena->purge_expire); + if (expire != 0) { +- mi_atomic_addi64_acq_rel(&arena->purge_expire, delay/10); // add smallish extra delay ++ mi_atomic_addi64_acq_rel(&arena->purge_expire, (mi_msecs_t)delay/10); // add smallish extra delay + } + else { + mi_atomic_storei64_release(&arena->purge_expire, _mi_clock_now() + delay); +@@ -520,7 +520,7 @@ static bool mi_arena_try_purge(mi_arena_t* arena, mi_msecs_t now, bool force, mi + if (!force && expire > now) return false; + + // reset expire (if not already set concurrently) +- mi_atomic_casi64_strong_acq_rel(&arena->purge_expire, &expire, 0); ++ mi_atomic_casi64_strong_acq_rel(&arena->purge_expire, &expire, (mi_msecs_t)0); + + // potential purges scheduled, walk through the bitmap + bool any_purged = false; diff --git a/ports/mimalloc/usage b/ports/mimalloc/usage new file mode 100644 index 00000000000000..45cd37e753dac9 --- /dev/null +++ b/ports/mimalloc/usage @@ -0,0 +1,4 @@ +mimalloc provides CMake targets: + + find_package(mimalloc CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,mimalloc-static,mimalloc) diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 3a71c9aa0263e0..0a3c8e93a7048e 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mimalloc", "version": "2.1.2", + "port-version": 1, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1e01183a4ced7a..782cbfc26e2780 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -695,9 +695,6 @@ mfx-dispatch:arm-neon-android=fail mfx-dispatch:arm64-android=fail mfx-dispatch:x64-android=fail milerius-sfml-imgui:x64-windows-static=fail -mimalloc:arm-neon-android=fail -mimalloc:arm64-android=fail -mimalloc:x64-android=fail minifb:arm-neon-android=fail minifb:arm64-android=fail minifb:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 81a9d358e8a03e..2ced8370999a2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5574,7 +5574,7 @@ }, "mimalloc": { "baseline": "2.1.2", - "port-version": 0 + "port-version": 1 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index b8f82ea2484320..8c46547423fdfa 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db19c496e6855e8aeb3a8666ffae862910b403c4", + "version": "2.1.2", + "port-version": 1 + }, { "git-tree": "bffb93e0abd806e613f2d6dbe35db0768368cae2", "version": "2.1.2", From a8362a126de4e5f42ea6f635c43243ff4ac80725 Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:22:00 +0100 Subject: [PATCH 0653/1039] [simage] update to 1.8.3 (#35717) Co-authored-by: Kai Pastor --- ports/simage/portfile.cmake | 4 ++-- ports/simage/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/simage.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index e381261b6ca981..f791c0e6f9ed33 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/simage - REF 3940692136e02b9e62b3061cf72f053827b5494e #v1.8.2 - SHA512 9a39738e32004bdd3e2882fe96778c773758b6d74398a62ba1c5ab09836c0637f89b8a46e8485b9d4196f33864f31f75511f441cfc24d7536659fa610ddf1875 + REF "v${VERSION}" + SHA512 42981f1dc67f17bc6bfc49ecbf035444b79ab467d5ece4310841856f5ec87d2b4352d5a7cb5713fb14ac5a25928f7d657fb74c93acdcd86b8b0dd89f26a5008a HEAD_REF master PATCHES requies-all-dependencies.patch ) diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index 04b5077442cdb7..346ea7217bd5c4 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simage", - "version-semver": "1.8.2", - "port-version": 2, + "version-semver": "1.8.3", "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index 2ced8370999a2d..8c36912176bc77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7889,8 +7889,8 @@ "port-version": 5 }, "simage": { - "baseline": "1.8.2", - "port-version": 2 + "baseline": "1.8.3", + "port-version": 0 }, "simbody": { "baseline": "2023-01-10", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index c8d5ae9c07a192..96ada004fe190c 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "824535538b2f13b732f661d657380b480bebea82", + "version-semver": "1.8.3", + "port-version": 0 + }, { "git-tree": "1e3fa3cf60c5fa543b313ed36d80a09d7a9ec8cd", "version-semver": "1.8.2", From 7ef1cf340bd768f14dcb559a31e1264d2b100799 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Dec 2023 22:22:40 +0100 Subject: [PATCH 0654/1039] [aws-sdk-cpp] Update, minor fixes (#35721) --- .../aws-sdk-cpp/fix-awsmigrationhub-build.patch | 10 ---------- ports/aws-sdk-cpp/portfile.cmake | 17 +++++++++-------- ports/aws-sdk-cpp/vcpkg.json | 3 +-- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch diff --git a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch b/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch deleted file mode 100644 index c2d98030136e81..00000000000000 --- a/ports/aws-sdk-cpp/fix-awsmigrationhub-build.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt -index a8a888d..574b985 100644 ---- a/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt -+++ b/generated/src/aws-cpp-sdk-AWSMigrationHub/CMakeLists.txt -@@ -1,4 +1,4 @@ --add_project(aws-cpp-sdk-AWSMigrationHub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) -+add_project(aws-cpp-sdk-awsmigrationhub "C++ SDK for the AWS AWSMigrationHub service" aws-cpp-sdk-core) - - file(GLOB AWS_AWSMIGRATIONHUB_HEADERS - "include/aws/AWSMigrationHub/*.h" diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 1dc66c5f4b3ce4..b7f676f4688947 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,17 +4,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 4410eaff815ce7b6c0bc0d37bd4175754d5103d2e3cfd60755df57dad103ab7e7705b79fc6039d2c8b7d1ccec650912f5ff0aa73baa2d9cf6d6608a493d11088 + SHA512 1288e462881fba65462922a7ffe920eb3d72483c349a20ddae0d9e9ac1c0a0cee2959a76a451127bcee680f510023a6466757d11e5a08bf3624f73bb0c204598 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch lock-curl-http-and-tls-settings.patch - fix-awsmigrationhub-build.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) -set(EXTRA_ARGS) +set(EXTRA_ARGS "") if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") elseif (VCPKG_TARGET_IS_ANDROID) @@ -30,6 +29,7 @@ else() set(rpath "\$ORIGIN") endif() +string(REPLACE "awsmigrationhub" "AWSMigrationHub" targets "${FEATURES}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -38,7 +38,7 @@ vcpkg_cmake_configure( "-DENABLE_UNITY_BUILD=ON" "-DENABLE_TESTING=OFF" "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" - "-DBUILD_ONLY=${FEATURES}" + "-DBUILD_ONLY=${targets}" "-DBUILD_DEPS=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DAWS_SDK_WARNINGS_ARE_ERRORS=OFF" @@ -47,10 +47,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -foreach(TARGET IN LISTS FEATURES) - vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +foreach(TARGET IN LISTS targets) + string(TOLOWER "aws-cpp-sdk-${TARGET}" package) + vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) endforeach() -vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") +vcpkg_cmake_config_fixup(PACKAGE_NAME "awssdk" CONFIG_PATH "lib/cmake/AWSSDK") vcpkg_copy_pdbs() @@ -80,7 +81,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/nuget" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) if(LIB_FILES) file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index d41fe2bd21726d..b389fae0aeb2f7 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.215", - "port-version": 1, + "version": "1.11.225", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 70e2486caebcc0..bee0696de6eac9 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2390f58d566a9a1a25ae4cf7b7862e344eaff2b1", + "version": "1.11.225", + "port-version": 0 + }, { "git-tree": "eeab7418483a9b578bb186acde08a1130301e0a1", "version": "1.11.215", diff --git a/versions/baseline.json b/versions/baseline.json index 8c36912176bc77..2150d60be1b514 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -405,8 +405,8 @@ "port-version": 0 }, "aws-sdk-cpp": { - "baseline": "1.11.215", - "port-version": 1 + "baseline": "1.11.225", + "port-version": 0 }, "azmq": { "baseline": "2023-03-23", From b72c0c19a0ebba98769ed12c594f31a5c6ede91a Mon Sep 17 00:00:00 2001 From: simolis3 <31894010+simolis3@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:23:13 +0200 Subject: [PATCH 0655/1039] [freetype-gl] GLEW as default feature (#35726) --- ports/freetype-gl/portfile.cmake | 1 + ports/freetype-gl/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/f-/freetype-gl.json | 5 +++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 6632f01f6c2992..45e30cbe7ea3eb 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + "glew" freetype-gl_WITH_GLEW "glad" freetype-gl_WITH_GLAD ) diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 80d4541f7be1dc..f3f70985a85f22 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,12 +1,11 @@ { "name": "freetype-gl", "version-date": "2022-01-17", - "port-version": 2, + "port-version": 3, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ "freetype", - "glew", { "name": "vcpkg-cmake", "host": true @@ -16,12 +15,21 @@ "host": true } ], + "default-features": [ + "glew" + ], "features": { "glad": { "description": "Use the GLAD gl loader", "dependencies": [ "glad" ] + }, + "glew": { + "description": "Use the GLEW gl loader", + "dependencies": [ + "glew" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 2150d60be1b514..be572738e2aa93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2786,7 +2786,7 @@ }, "freetype-gl": { "baseline": "2022-01-17", - "port-version": 2 + "port-version": 3 }, "freexl": { "baseline": "2.0.0", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index bd11fbff9fd5fe..56ff994fa9df61 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e61e27b5a7928879435242d50ac2470fe79cb3e3", + "version-date": "2022-01-17", + "port-version": 3 + }, { "git-tree": "a356f56c15dd0a66094c00cc35670791c545027e", "version-date": "2022-01-17", From c66d6969d240b79fdd9f98aac93a1f6e882d56f6 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Tue, 19 Dec 2023 00:23:35 +0300 Subject: [PATCH 0656/1039] [libatomic-ops] Update to v7.8.2 (#35728) --- ports/libatomic-ops/portfile.cmake | 2 +- ports/libatomic-ops/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libatomic-ops.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libatomic-ops/portfile.cmake b/ports/libatomic-ops/portfile.cmake index e18f9f38c64b54..45be0c270f90a3 100644 --- a/ports/libatomic-ops/portfile.cmake +++ b/ports/libatomic-ops/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/libatomic_ops REF "v${VERSION}" - SHA512 2b33aaaef0b4ed995044ba818b6acfedf1a70efea419338eece90b3cb453d7dba6ca55cd7fb36dce6143ede511284e75b6e17cd773d8da8f32d7888cb029dfd1 + SHA512 6b0ab1c01600346413184f66eaff1f707d1bc46fad9fd52ac855f2c66a55097dfad620c68b898459527142c1eb7ba50fde34498f962f24cec83268500c5bcccb HEAD_REF master ) diff --git a/ports/libatomic-ops/vcpkg.json b/ports/libatomic-ops/vcpkg.json index e5f0099baf9164..b85015f8f222ad 100644 --- a/ports/libatomic-ops/vcpkg.json +++ b/ports/libatomic-ops/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libatomic-ops", - "version": "7.8.0", + "version": "7.8.2", "description": "The atomic_ops project (Atomic memory update operations portable implementation)", "homepage": "https://github.com/ivmai/libatomic_ops", "license": "MIT OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index be572738e2aa93..47e6f69215ab3e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4093,7 +4093,7 @@ "port-version": 0 }, "libatomic-ops": { - "baseline": "7.8.0", + "baseline": "7.8.2", "port-version": 0 }, "libavif": { diff --git a/versions/l-/libatomic-ops.json b/versions/l-/libatomic-ops.json index 94614a488aa582..5c72cb4191155f 100644 --- a/versions/l-/libatomic-ops.json +++ b/versions/l-/libatomic-ops.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46231da262a01373e326ad31eeb8ac03cecbbeb3", + "version": "7.8.2", + "port-version": 0 + }, { "git-tree": "c4a1f1354f550bce6ae190b82bf984c3827937a3", "version": "7.8.0", From b1632ec26f8004ab98dcc59c64d1fa0ccd2c8357 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:24:05 +0100 Subject: [PATCH 0657/1039] [imgui] fix allegro feature (#35729) --- ports/imgui/CMakeLists.txt | 4 ++-- ports/imgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index f447f5ebb2ef71..d5e22724860799 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -31,8 +31,8 @@ target_sources( target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) if(IMGUI_BUILD_ALLEGRO5_BINDING) - find_package(unofficial-allegro5 CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PRIVATE unofficial-allegro5::allegro unofficial-allegro5::allegro_ttf unofficial-allegro5::allegro_font unofficial-allegro5::allegro_main) + find_package(allegro CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE Allegro::allegro Allegro::allegro_ttf Allegro::allegro_font Allegro::allegro_main) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index be7e03519c8c40..4c20ad104a236b 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.90", + "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 47e6f69215ab3e..c69750cbe84989 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3510,7 +3510,7 @@ }, "imgui": { "baseline": "1.90", - "port-version": 0 + "port-version": 1 }, "imgui-node-editor": { "baseline": "0.9.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 753bb14734264e..20c568fa8cd7ec 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "027b657658f9b4dd643fd35895496c685d300021", + "version": "1.90", + "port-version": 1 + }, { "git-tree": "f570e820b63f5f087134076b2343e390eb62daad", "version": "1.90", From fafa83c8bf1527a70b57fbcd6a8cb23e0ac6cc3d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Dec 2023 22:24:28 +0100 Subject: [PATCH 0658/1039] [libcap] Fix native build with prefixed CC (#35735) --- ports/libcap/configure | 2 +- ports/libcap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libcap.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libcap/configure b/ports/libcap/configure index 4e7cfe6daab593..fc3874839b89fa 100755 --- a/ports/libcap/configure +++ b/ports/libcap/configure @@ -19,7 +19,7 @@ cat > Makefile.vcpkg < Date: Tue, 19 Dec 2023 00:25:01 +0300 Subject: [PATCH 0659/1039] [libsystemd] Fix build when specifying release-only build (#35737) --- ports/libsystemd/portfile.cmake | 16 ++++++++++------ ports/libsystemd/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsystemd.json | 5 +++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ports/libsystemd/portfile.cmake b/ports/libsystemd/portfile.cmake index f6ba7b58f39562..2db5d2866d8eba 100644 --- a/ports/libsystemd/portfile.cmake +++ b/ports/libsystemd/portfile.cmake @@ -41,15 +41,19 @@ else() file(INSTALL "${BUILD_DIR_RELEASE}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FOLLOW_SYMLINK_CHAIN) endif() -set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -else() - file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN) +if(NOT VCPKG_BUILD_TYPE) + set(BUILD_DIR_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${BUILD_DIR_DEBUG}/libsystemd.so" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FOLLOW_SYMLINK_CHAIN) + endif() endif() file(INSTALL "${BUILD_DIR_RELEASE}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +if(NOT VCPKG_BUILD_TYPE) + file(INSTALL "${BUILD_DIR_DEBUG}/src/libsystemd/libsystemd.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libsystemd/vcpkg.json b/ports/libsystemd/vcpkg.json index a0a36196f20689..71bd3765593bd0 100644 --- a/ports/libsystemd/vcpkg.json +++ b/ports/libsystemd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsystemd", "version": "254", - "port-version": 1, + "port-version": 2, "description": "Libsystemd", "homepage": "https://github.com/systemd/systemd", "license": "LGPL-2.1+", diff --git a/versions/baseline.json b/versions/baseline.json index 944b98ba94fb64..a569096fc566fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4882,7 +4882,7 @@ }, "libsystemd": { "baseline": "254", - "port-version": 1 + "port-version": 2 }, "libtar": { "baseline": "1.2.20", diff --git a/versions/l-/libsystemd.json b/versions/l-/libsystemd.json index 94b4c47368112c..984f74d8425c3a 100644 --- a/versions/l-/libsystemd.json +++ b/versions/l-/libsystemd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5213227454790bf5e953a66d807e04059742381e", + "version": "254", + "port-version": 2 + }, { "git-tree": "2ac525bd287e8a58992f263adce78483b0513cb0", "version": "254", From 6b24a06502962fbb80b58d4118d315e1b9cff424 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Dec 2023 22:26:01 +0100 Subject: [PATCH 0660/1039] [libmount] Update to 2.39 and fix (#35738) --- ports/libmount/portfile.cmake | 37 ++++++++++++++++++++++------------- ports/libmount/vcpkg.json | 22 +++++++++++++++++---- versions/baseline.json | 4 ++-- versions/l-/libmount.json | 5 +++++ 4 files changed, 48 insertions(+), 20 deletions(-) diff --git a/ports/libmount/portfile.cmake b/ports/libmount/portfile.cmake index 30f90c0009c33a..3bba418e28eed6 100644 --- a/ports/libmount/portfile.cmake +++ b/ports/libmount/portfile.cmake @@ -1,11 +1,7 @@ -set(VERSION_MAJOR 2) -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" + URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION}/util-linux-${VERSION}.tar.xz" FILENAME "util-linux-${VERSION}.tar.xz" - SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c + SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94 ) vcpkg_extract_source_archive( @@ -16,26 +12,39 @@ vcpkg_extract_source_archive( set(ENV{GTKDOCIZE} true) +vcpkg_list(SET options) +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_configure_make( AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${options} --disable-asciidoc --disable-all-programs + --disable-dependency-tracking --enable-libmount --enable-libblkid + "--mandir=${CURRENT_PACKAGES_DIR}/share/man" ) vcpkg_install_make() vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/sbin" "${CURRENT_PACKAGES_DIR}/debug/sbin") -endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/sbin" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/sbin" + "${CURRENT_PACKAGES_DIR}/share" + "${CURRENT_PACKAGES_DIR}/tools" +) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/README.licensing" "${SOURCE_PATH}/COPYING") diff --git a/ports/libmount/vcpkg.json b/ports/libmount/vcpkg.json index 559b0169eaf8b4..55da323da6d298 100644 --- a/ports/libmount/vcpkg.json +++ b/ports/libmount/vcpkg.json @@ -1,9 +1,23 @@ { "name": "libmount", - "version": "2.38", - "port-version": 2, + "version": "2.39", "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" + "license": null, + "supports": "linux", + "features": { + "nls": { + "description": "Enable native language support", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gettext-libintl" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index a569096fc566fa..e623f73b5a3db9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4553,8 +4553,8 @@ "port-version": 0 }, "libmount": { - "baseline": "2.38", - "port-version": 2 + "baseline": "2.39", + "port-version": 0 }, "libmpeg2": { "baseline": "0.5.1", diff --git a/versions/l-/libmount.json b/versions/l-/libmount.json index eeeb5fe352b877..a75dfb568b594b 100644 --- a/versions/l-/libmount.json +++ b/versions/l-/libmount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fbc2733330a3bac410e90c460db96f54e39e0a5", + "version": "2.39", + "port-version": 0 + }, { "git-tree": "747604a5c97736ced9e0ef3b2963c2c949bdc655", "version": "2.38", From e45bb5052f09f722ee2d17022b39912d2710e759 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 19 Dec 2023 05:26:22 +0800 Subject: [PATCH 0661/1039] update to 1.6.0 (#35749) --- ports/nng/portfile.cmake | 6 +++--- ports/nng/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nng.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index 3dd2b297411d6b..6be784c917c984 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF v1.5.2 - SHA512 33cda9e0422c6e8cb56e48bd812f381bf07a92a0aa2fbadddbca7cfde585c66299142186a3a76a97163e5570042452a62c1e53180ebfbf016a44eee998b16286 + REF "v${VERSION}" + SHA512 b4f2c812e65f0a5cb57827d80e632912679902b50f06eb10805d5fe86ab30fc97c4441b0b4d1d8c15dbf09ac7628f4c863d699121fa14bbad0a7782c40a1e4bf HEAD_REF master ) @@ -50,6 +50,6 @@ if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES nngcat AUTO_CLEAN) endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") vcpkg_copy_pdbs() diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index dc061e924151a3..fcf2c8a544e3ba 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nng", - "version-semver": "1.5.2", - "port-version": 1, + "version-semver": "1.6.0", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e623f73b5a3db9..cb78551a623f2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5993,8 +5993,8 @@ "port-version": 1 }, "nng": { - "baseline": "1.5.2", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "nngpp": { "baseline": "1.3.0", diff --git a/versions/n-/nng.json b/versions/n-/nng.json index 0e3d7329a4e653..3a9d2765a3e818 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ac0d0be55aed606e5db8e253d9bf5cc8586e7c2", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "83ce54077bc3c44805db7725549b28e7bc90d536", "version-semver": "1.5.2", From c36e905c050f3cc59ef3100887affbf248aa7003 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:27:22 +0100 Subject: [PATCH 0662/1039] [tmxlite] Fixes and Update to 1.4.4 (#35760) --- ports/tmxlite/dependencies.patch | 29 +++++++++++++++++++++++++++++ ports/tmxlite/portfile.cmake | 29 +++++++++++++++++++++++------ ports/tmxlite/vcpkg.json | 9 ++++++--- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 4 ++-- versions/t-/tmxlite.json | 5 +++++ 6 files changed, 65 insertions(+), 14 deletions(-) create mode 100644 ports/tmxlite/dependencies.patch diff --git a/ports/tmxlite/dependencies.patch b/ports/tmxlite/dependencies.patch new file mode 100644 index 00000000000000..e06180650a6f5f --- /dev/null +++ b/ports/tmxlite/dependencies.patch @@ -0,0 +1,29 @@ +diff --git a/tmxlite/CMakeLists.txt b/tmxlite/CMakeLists.txt +index a1b1882..8c0aad6 100644 +--- a/tmxlite/CMakeLists.txt ++++ b/tmxlite/CMakeLists.txt +@@ -68,10 +68,9 @@ if(USE_EXTLIBS) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") + + find_package(ZLIB REQUIRED) +- find_package(PUGIXML REQUIRED) +- find_package(Zstd REQUIRED) ++ find_package(pugixml CONFIG REQUIRED) ++ find_package(zstd CONFIG REQUIRED) + +- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR}) + + else() + #add miniz and pugixml from source +@@ -102,7 +101,10 @@ else() + endif() + + if(USE_EXTLIBS) +- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY}) ++ target_link_libraries(${PROJECT_NAME} PRIVATE ++ $,zstd::libzstd_shared,zstd::libzstd_static> ++ pugixml::pugixml ++ ZLIB::ZLIB) + else() + if(USE_ZSTD) + target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY}) diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake index aaf079cb776199..592746d2651b9b 100644 --- a/ports/tmxlite/portfile.cmake +++ b/ports/tmxlite/portfile.cmake @@ -1,21 +1,38 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fallahn/tmxlite - REF v1.3.0 + REF "v${VERSION}" HEAD_REF master - SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 + SHA512 0ffe0505329f00ef9872998673a7c220a9a5352f830688ef17952c0c4f001e0c2994a3a28f0e7de60cc82fff2701561cccbc2143fd51984bf4870e7d1fd0a2ba + PATCHES + dependencies.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TMXLITE_STATIC_LIB) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/tmxlite" + OPTIONS + -DTMXLITE_STATIC_LIB=${TMXLITE_STATIC_LIB} + -DUSE_EXTLIBS=ON + -DPKGCONF_REQ_PUB=pugixml ) vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +set(STATIC_POSTFIX "") +if(TMXLITE_STATIC_LIB) + set(STATIC_POSTFIX "-s") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/tmxlite.pc" "-ltmxlite" "-ltmxlite${STATIC_POSTFIX}") +endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tmxlite.pc" "-ltmxlite" "-ltmxlite${STATIC_POSTFIX}-d") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/tmxlite/vcpkg.json b/ports/tmxlite/vcpkg.json index fdecfa92ae3006..80a34c80baf4a6 100644 --- a/ports/tmxlite/vcpkg.json +++ b/ports/tmxlite/vcpkg.json @@ -1,10 +1,11 @@ { "name": "tmxlite", - "version": "1.3.0", - "port-version": 1, + "version": "1.4.4", "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", + "homepage": "https://github.com/fallahn/tmxlite", "license": "Zlib", "dependencies": [ + "pugixml", { "name": "vcpkg-cmake", "host": true @@ -12,6 +13,8 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "zlib", + "zstd" ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 782cbfc26e2780..97db342bd6d3d6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1152,9 +1152,6 @@ tinycthread:x64-android=fail tlx:arm-neon-android=fail tlx:arm64-android=fail tlx:x64-android=fail -tmxlite:arm-neon-android=fail -tmxlite:arm64-android=fail -tmxlite:x64-android=fail torch-th:arm-neon-android=fail torch-th:arm64-android=fail torch-th:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index cb78551a623f2d..71b7669005617c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8553,8 +8553,8 @@ "port-version": 2 }, "tmxlite": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.4.4", + "port-version": 0 }, "tmxparser": { "baseline": "2019-10-14", diff --git a/versions/t-/tmxlite.json b/versions/t-/tmxlite.json index 2469531f202fcb..45f9bcb295f543 100644 --- a/versions/t-/tmxlite.json +++ b/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b18995c78b7b6057c2a1d69eba2118bfcb17fa36", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "b176cf2abbb6262dc616d68625f90f35e65fe4c1", "version": "1.3.0", From fca018f029deeef1b8b6c69d8feeb3d6caab722e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:33:41 +0100 Subject: [PATCH 0663/1039] Update arm64-osx baseline for 2023-12-18 (#35748) --- scripts/ci.baseline.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 97db342bd6d3d6..65f154b29837ed 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,7 +74,6 @@ berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail berkeleydb:x64-android=fail binlog:arm-neon-android=fail -bitserializer:arm64-osx=fail blitz:x64-android=fail blitz:x64-linux=fail # python2 blitz:x64-osx=fail @@ -219,6 +218,7 @@ coroutine:arm-neon-android=fail coroutine:arm64-android=fail coroutine:x64-android=fail coroutine:x64-osx=fail +coroutine:arm64-osx=fail cpp-ipc:arm-neon-android=fail cpp-ipc:arm64-android=fail cpp-ipc:x64-android=fail @@ -237,6 +237,7 @@ cppslippi:arm64-android=fail cppslippi:x64-android=fail cppslippi:x64-linux=fail cppslippi:x64-osx=fail +cppslippi:arm64-osx=fail cppcoro:x64-linux=fail cpputest:arm-neon-android=fail crashpad:x64-linux=fail @@ -244,6 +245,7 @@ cserialport:arm-neon-android=fail cserialport:arm64-android=fail cserialport:x64-android=fail ctbench:x64-osx=fail +ctbench:arm64-osx=fail czmq:arm-neon-android=fail czmq:arm64-android=fail czmq:x64-android=fail @@ -334,6 +336,7 @@ folly:arm64-android=fail folly:x64-android=fail # Needs XQuartz freeglut:x64-osx=fail +freeglut:arm64-osx=fail # Needs /bigobj freeopcua:arm-neon-android=fail freeopcua:arm64-android=fail @@ -515,6 +518,7 @@ libcoro:arm-neon-android=fail libcoro:arm64-android=fail libcoro:x64-android=fail libcoro:x64-osx=fail +libcoro:arm64-osx=fail libcpplocate:arm-neon-android=fail libcpplocate:arm64-android=fail libcpplocate:x64-android=fail @@ -790,7 +794,6 @@ ode:arm64-windows=fail offscale-libetcd-cpp:arm64-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-android=fail -ogre:arm64-osx=fail ois:x64-android=fail # ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency # does not resolve the issue @@ -857,6 +860,7 @@ openscap:arm-neon-android=fail openscap:arm64-android=fail openscap:x64-android=fail openscap:x64-osx=fail +openscap:arm64-osx=fail openscap:x64-windows-static-md=fail openscap:x64-windows-static=fail opensubdiv:x64-android=fail @@ -944,7 +948,6 @@ qt5-x11extras:x64-osx=fail qt5-x11extras:arm64-osx=fail quickfix:arm-neon-android=fail quickfix:arm64-android=fail -qwt:arm64-osx=fail qwt-qt6:x64-osx=fail rabit:arm-neon-android=fail rabit:arm64-android=fail @@ -1230,6 +1233,7 @@ xbitmaps:arm-neon-android=fail xbitmaps:arm64-android=fail xbitmaps:x64-android=fail xbitmaps:x64-osx=skip +xbitmaps:arm64-osx=skip zeroc-ice:arm-neon-android=fail zeroc-ice:arm64-android=fail zeroc-ice:x64-android=fail From 06a5b0d0f433d06af313ebba9c12f73b0aad30bb Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Mon, 18 Dec 2023 16:40:12 -0500 Subject: [PATCH 0664/1039] [flecs] Update to 3.2.10 (#35756) --- ports/flecs/portfile.cmake | 2 +- ports/flecs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 282daaa04ecfd7..0e6a65f70bb650 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SanderMertens/flecs REF "v${VERSION}" - SHA512 9573e57432ea6117b59e8dff9470e71ed2283d9ab0a16affbef2c3f73cc8dad3d00243482c9bb34b9ddc936ac2d7941eb35fd68443431fc9feb825d57beae1ba + SHA512 a42c193e46e15a1ab8a27b447d7c71d378d0e7ae9ab71744d00e3b9fd13aecbe79c75938e534ba49e191d279114bc25a9cd293e4f9a97ba8f873dcc1fa9f6d9a HEAD_REF master ) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index 24370967a2408b..81969f2e1b3e7a 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flecs", - "version": "3.2.9", + "version": "3.2.10", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 71b7669005617c..26051a52a49a71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2677,7 +2677,7 @@ "port-version": 0 }, "flecs": { - "baseline": "3.2.9", + "baseline": "3.2.10", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index e4f24b2d8c2f38..afd42451feaed2 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6771a5d63e42bb0cfe6c732ead2b0724352f3a59", + "version": "3.2.10", + "port-version": 0 + }, { "git-tree": "a3e457520cb62f9b06079dc826ef63666ceb132b", "version": "3.2.9", From 7fbe1ef1c070c588202f54a89239a48d7b3964e0 Mon Sep 17 00:00:00 2001 From: Justen Di Ruscio <10579359+justend29@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:40:33 -0400 Subject: [PATCH 0665/1039] [drogon]: list new yaml-cpp dep under yaml feature (#35715) --- ports/drogon/portfile.cmake | 3 ++- ports/drogon/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/d-/drogon.json | 7 ++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index fc8adb4ba77eb5..129cd03666162e 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -27,6 +27,7 @@ vcpkg_check_features( postgres LIBPQ_BATCH_MODE redis BUILD_REDIS sqlite3 BUILD_SQLITE + yaml BUILD_YAML_CONFIG ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DROGON_SHARED) @@ -40,7 +41,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON -DUSE_SUBMODULE=OFF "-DDROGON_CTL_TOOL=${DROGON_CTL_TOOL}" - ${FEATURE_OPTIONS} + ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Boost ) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 89e688af2d2b07..f2c3e23857bb4e 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,7 @@ { "name": "drogon", "version-semver": "1.9.1", + "port-version": 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/", @@ -98,6 +99,12 @@ }, "sqlite3" ] + }, + "yaml": { + "description": "Support YAML Drogon configuration files", + "dependencies": [ + "yaml-cpp" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 26051a52a49a71..1fd7b2244da4e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2278,7 +2278,7 @@ }, "drogon": { "baseline": "1.9.1", - "port-version": 0 + "port-version": 1 }, "dstorage": { "baseline": "1.2.2", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index e97555bc2b999f..032aafc568a942 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "2258c21d158a9c39a058f30d88d6a8a9e8172e5b", + "version-semver": "1.9.1", + "port-version": 1 + }, { "git-tree": "72953f06e1c7a3195daa8549c9d2b46d42125822", "version-semver": "1.9.1", - "port-version": 0 + "port-version": 0 }, { "git-tree": "3dc8fd6d40ad624513353e295fbd39a0dd237c91", From 48e95d1aa3fedd24234f1d436226d07fc2b4f45f Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:02:02 +0100 Subject: [PATCH 0666/1039] [tinygltf] update to 2.8.19 (#35719) --- ports/tinygltf/portfile.cmake | 2 +- ports/tinygltf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tinygltf.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/tinygltf/portfile.cmake b/ports/tinygltf/portfile.cmake index 86b654f53c49ab..fa6603b33e3edf 100644 --- a/ports/tinygltf/portfile.cmake +++ b/ports/tinygltf/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO syoyo/tinygltf REF "v${VERSION}" - SHA512 b745fea9e7291494d3bda225b90885ee7923d8a98f515908f3c3390dc3eb76207b9f7d3464254ef68031d0a8428935064dcf40e9c0f1858bd465c4b5dd660382 + SHA512 56bed2a2590abb8382c304f741ae842cd0c150d5a1fc2e2e4acdc596f432fdb3c79e73436456534f4a13b36107887c892468e17a683c01aed860aa6db535e1f4 HEAD_REF master ) diff --git a/ports/tinygltf/vcpkg.json b/ports/tinygltf/vcpkg.json index 1084ba4e261936..174fa4f44b5a7c 100644 --- a/ports/tinygltf/vcpkg.json +++ b/ports/tinygltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinygltf", - "version": "2.8.17", + "version": "2.8.19", "description": "A header only C++11 glTF 2.0 library.", "homepage": "https://github.com/syoyo/tinygltf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1fd7b2244da4e4..e6f36a39793946 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8481,7 +8481,7 @@ "port-version": 0 }, "tinygltf": { - "baseline": "2.8.17", + "baseline": "2.8.19", "port-version": 0 }, "tinynpy": { diff --git a/versions/t-/tinygltf.json b/versions/t-/tinygltf.json index 2c795115547ea7..b7e339595a8da8 100644 --- a/versions/t-/tinygltf.json +++ b/versions/t-/tinygltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7a75083fb4ff9692e03a87d477b6e7b18ddb4b6", + "version": "2.8.19", + "port-version": 0 + }, { "git-tree": "a828c964c3dac5b5b48545da10e8e357c3759042", "version": "2.8.17", From d67c1d59cf8dbd5230a9ac90475c560baf3794d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 19 Dec 2023 23:58:08 +0100 Subject: [PATCH 0667/1039] [harfbuzz] Make use IMPORTED_CONFIGURATIONS (#35533) This allows to use the Release library if the debug library is not built. --- ports/harfbuzz/harfbuzzConfig.cmake.in | 47 ++++++++++++++------------ ports/harfbuzz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++ 4 files changed, 32 insertions(+), 23 deletions(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index 8c69106d5b4c4f..d072e5171e2b94 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -3,6 +3,8 @@ cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) + # Traditional find module variables (vcpkg polyfill) set(HARFBUZZ_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/harfbuzz" CACHE INTERNAL "") set(HARFBUZZ_INCLUDE_DIRS "${HARFBUZZ_INCLUDE_DIR}") @@ -14,18 +16,25 @@ if(TARGET harfbuzz) return() endif() -include(CMakeFindDependencyMacro) - -add_library(harfbuzz INTERFACE IMPORTED GLOBAL) +add_library(harfbuzz UNKNOWN IMPORTED) add_library(harfbuzz::harfbuzz ALIAS harfbuzz) find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) -if(HARFBUZZ_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${HARFBUZZ_LIBRARY_DEBUG}>) -endif() - find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) +if(NOT HARFBUZZ_LIBRARY_DEBUG) + set_target_properties(harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "RELEASE" + IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}" + ) +else() + set_target_properties(harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${HARFBUZZ_LIBRARY_DEBUG}" + ) +endif() set(HARFBUZZ_FEATURES @FEATURES@) @@ -41,25 +50,21 @@ target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GRAPHITE2_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${GRAPHITE2_LIBRARY_DEBUG}>) - endif() - find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GRAPHITE2_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${GRAPHITE2_LIBRARY_RELEASE}>) + if(NOT GRAPHITE2_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE "${GRAPHITE2_LIBRARY_RELEASE}") + else() + target_link_libraries(harfbuzz INTERFACE "$<$>:${GRAPHITE2_LIBRARY_RELEASE}>$<$:${GRAPHITE2_LIBRARY_DEBUG}>") endif() endif() if ("glib" IN_LIST HARFBUZZ_FEATURES) find_library(GLIB_LIBRARY_DEBUG NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GLIB_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${GLIB_LIBRARY_DEBUG}>) - endif() - find_library(GLIB_LIBRARY_RELEASE NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GLIB_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${GLIB_LIBRARY_RELEASE}>) + if(NOT GLIB_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE "${GLIB_LIBRARY_RELEASE}") + else() + target_link_libraries(harfbuzz INTERFACE "$<$>:${GLIB_LIBRARY_RELEASE}>$<$:${GLIB_LIBRARY_DEBUG}>") endif() endif() @@ -67,5 +72,3 @@ if ("icu" IN_LIST HARFBUZZ_FEATURES) find_dependency(ICU 61 COMPONENTS uc) target_link_libraries(harfbuzz INTERFACE ICU::uc) endif() - -target_include_directories(harfbuzz INTERFACE "${HARFBUZZ_INCLUDE_DIR}") diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index bf9bb9ddc56109..89367789e143b7 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version": "8.3.0", + "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 e6f36a39793946..c3ea81d11719d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3274,7 +3274,7 @@ }, "harfbuzz": { "baseline": "8.3.0", - "port-version": 0 + "port-version": 1 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index faa4855c570288..b6d5550fefdd8f 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e2d07391d009a33797b19b707bf5bc60cdb17e5", + "version": "8.3.0", + "port-version": 1 + }, { "git-tree": "43649e54cfda3d4673975cf61daf8e501edf63e6", "version": "8.3.0", From 16e9142b566e71a38dd7c0bf88c907f579d7b70e Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Tue, 19 Dec 2023 22:58:28 +0000 Subject: [PATCH 0668/1039] [libvpx] resolve bash by PATH rather then hard-coding its' location (#35605) --- ports/libvpx/portfile.cmake | 4 ++-- ports/libvpx/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libvpx.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 30f79431492949..71f2f7b6fb0480 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -19,12 +19,12 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") else() - set(BASH /bin/bash) set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() +find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE) + vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 0a11ff7eab8d56..9e47d6d4749c11 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", "version": "1.13.1", + "port-version": 1, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c3ea81d11719d0..dd07f76c7b4bfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5010,7 +5010,7 @@ }, "libvpx": { "baseline": "1.13.1", - "port-version": 0 + "port-version": 1 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index ffe6435098b8be..2597b1bff569db 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577", + "version": "1.13.1", + "port-version": 1 + }, { "git-tree": "1484fb529e99fdedd95f2b46f65738a9e95fcaa1", "version": "1.13.1", From 2b0ce4c2f6a524efb03e37735b185d91f9735b14 Mon Sep 17 00:00:00 2001 From: Marcus Behel Date: Tue, 19 Dec 2023 18:00:10 -0500 Subject: [PATCH 0669/1039] [qtbase] Add feature for gtk3 platform theme (#35657) --- ports/qtbase/portfile.cmake | 12 ++++++------ ports/qtbase/vcpkg.json | 16 +++++++++++++++- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 41aa53d9c273a1..96a39760f57532 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -258,12 +258,12 @@ endforeach() # ) list(APPEND FEATURE_PRINTSUPPORT_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_CUPS:BOOL=ON) -# widgets features: -# vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS - # "gtk3" FEATURE_gtk3 - # There are a lot of additional features here to deactivate parts of widgets. - # ) -list(APPEND FEATURE_WIDGETS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_GTK3:BOOL=ON) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_WIDGETS_OPTIONS + FEATURES + "gtk3" FEATURE_gtk3 + INVERTED_FEATURES + "gtk3" CMAKE_DISABLE_FIND_PACKAGE_GTK3 +) set(TOOL_NAMES androiddeployqt diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f05210012f4aed..fb4ea151fb92d4 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 2, + "port-version": 3, "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, @@ -207,6 +207,20 @@ "glib" ] }, + "gtk3": { + "description": "GTK3 platform theme plugin", + "supports": "linux", + "dependencies": [ + "gtk3", + { + "name": "qtbase", + "default-features": false, + "features": [ + "glib" + ] + } + ] + }, "gui": { "description": "Qt Gui", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dd07f76c7b4bfc..e7e26f60e0c97f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7110,7 +7110,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 2 + "port-version": 3 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 2a1eac7f35d64c..2e26c906730eb2 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b85d2c16c027edb173f51037d9c5a3e05746efa0", + "version": "6.6.1", + "port-version": 3 + }, { "git-tree": "43986c6051eb870340850c13b94ea6cb9a28925c", "version": "6.6.1", From 0fc8290ae4041111f8dcb122867613bcccc9d4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 20 Dec 2023 00:01:37 +0100 Subject: [PATCH 0670/1039] [quill] Update to 3.6.0 (#35759) --- ports/quill/portfile.cmake | 2 +- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 73d5827ac929e2..528e416db9e97e 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill REF v${VERSION} - SHA512 7e6b897908ad865dc4d4ddbd34c3d23ab8d67a6e3431832b86a668bc85acbb9810ab417d8a31a33acbbff8307d43038ed26c20701a497581d0de580d0730d72c + SHA512 65aa38c0c279916b6a861587834deff393fd2d7bdbcdc9b91de922a72e90d813581db20a822d47c3c4ee2c46da09a10ed4020d06fc2bf456c54e1469f3ce66ef HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index 9a55165732693a..711981f2c727d9 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "3.5.1", + "version": "3.6.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 e7e26f60e0c97f..4313331bed68ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7309,7 +7309,7 @@ "port-version": 9 }, "quill": { - "baseline": "3.5.1", + "baseline": "3.6.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index a5ed91aeb96208..6e1875f3711eb7 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b89cd42d5b7c6ea3fb7ca7daa2469d661b9f4b94", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "9d6c9021a753a5c95afe327c1e6262c3a7312506", "version": "3.5.1", From fa1eedf5a6156bd03bcb936cfe6f5bb2a3cc3fe6 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 20 Dec 2023 07:02:02 +0800 Subject: [PATCH 0671/1039] [llgi] Update to 2023-12-19 (#35767) --- ports/llgi/portfile.cmake | 4 ++-- ports/llgi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/llgi.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/llgi/portfile.cmake b/ports/llgi/portfile.cmake index 82f84694fb94f4..9ddbcda297d311 100644 --- a/ports/llgi/portfile.cmake +++ b/ports/llgi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO altseed/LLGI - REF 1b6b59b9f5bc9f81b4c2af2333d69f6e23670b3e - SHA512 c9011dee560897caf5ae53d8fa58869b774bd3bc7ce2e0cc4696ac034fc89a36adf3f5285e82cffe6430ca61f6509fd7fbadf5c77aef896c74e8d70e70ff4312 + REF 8f8510e2dffa1d747ff6ebb0da341198e75291ec + SHA512 d521b47f293b90faed28f9648facdfae327c6122ea6391683a08e48558fdf62ce0d3977f78aef3bc276d77ab19fc40ab3cc4d27311dd5a292e0884635fe7c9d3 HEAD_REF master PATCHES fix-cmake-use-vcpkg.patch diff --git a/ports/llgi/vcpkg.json b/ports/llgi/vcpkg.json index f7773cd1d66826..8bc8e525bc723e 100644 --- a/ports/llgi/vcpkg.json +++ b/ports/llgi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "llgi", - "version-date": "2023-11-04", + "version-date": "2023-12-19", "homepage": "https://github.com/altseed/LLGI", "license": null, "supports": "!(uwp | android)", diff --git a/versions/baseline.json b/versions/baseline.json index 4313331bed68ad..a303332de48337 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5233,7 +5233,7 @@ "port-version": 0 }, "llgi": { - "baseline": "2023-11-04", + "baseline": "2023-12-19", "port-version": 0 }, "llgl": { diff --git a/versions/l-/llgi.json b/versions/l-/llgi.json index 5dbfa458169866..6c69b259818068 100644 --- a/versions/l-/llgi.json +++ b/versions/l-/llgi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70bc60ef323833846200e1ffe0937de2cfaaf77e", + "version-date": "2023-12-19", + "port-version": 0 + }, { "git-tree": "a0f885d3531458ac1a7748ce8af641b30a80a166", "version-date": "2023-11-04", From e9001ee53d8827177b14a84d29215ac32a5597d9 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:02:21 -0800 Subject: [PATCH 0672/1039] [imgui] Fix usage of feature allegro5 (#35768) --- ports/imgui/imgui-config.cmake.in | 2 +- ports/imgui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index 2a2c494f24513f..5916bad89dc8a9 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -31,7 +31,7 @@ if (@IMGUI_FREETYPE_LUNASVG@) endif() if (@IMGUI_BUILD_ALLEGRO5_BINDING@) - find_dependency(unofficial-allegro5 CONFIG) + find_dependency(Allegro CONFIG) endif() include("${CMAKE_CURRENT_LIST_DIR}/imgui-targets.cmake") diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 4c20ad104a236b..484ce1be3c1c22 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "imgui", "version": "1.90", - "port-version": 1, + "port-version": 2, "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 a303332de48337..16b06990aba75f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3510,7 +3510,7 @@ }, "imgui": { "baseline": "1.90", - "port-version": 1 + "port-version": 2 }, "imgui-node-editor": { "baseline": "0.9.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 20c568fa8cd7ec..547500fa4c2b16 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9fd7997ab3813f71b87171213ea8fbd4e70b863", + "version": "1.90", + "port-version": 2 + }, { "git-tree": "027b657658f9b4dd643fd35895496c685d300021", "version": "1.90", From ab799ff3030a22987a91184acbb0e9d5fcf7df8a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 20 Dec 2023 00:03:12 +0100 Subject: [PATCH 0673/1039] [gstreamer] disable internal downloads (#35780) --- ports/gstreamer/no-downloads.patch | 17 +++++++++++++++++ ports/gstreamer/portfile.cmake | 1 + ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ports/gstreamer/no-downloads.patch diff --git a/ports/gstreamer/no-downloads.patch b/ports/gstreamer/no-downloads.patch new file mode 100644 index 00000000000000..caf12802170957 --- /dev/null +++ b/ports/gstreamer/no-downloads.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index df015cb..93cf7e9 100644 +--- a/meson.build ++++ b/meson.build +@@ -105,12 +105,6 @@ subprojects = [ + ['gst-plugins-rs', { 'option': get_option('rs'), 'build-hotdoc': true, 'match_gst_version': false}], + ] + +-if build_system == 'windows' +- subproject('win-flex-bison-binaries') +- subproject('win-nasm') +-elif build_system == 'darwin' +- subproject('macos-bison-binary') +-endif + + orc_option = get_option('orc') + # There is a check below to keep this in sync with subprojects/gst-plugins-base/meson.build diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index bd3908ff2bb95e..b60de171b90b12 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_gitlab( srtp_fix.patch fix-bz2-windows-debug-dependency.patch base-must-be-enabled.patch + no-downloads.patch ${PATCHES} ) diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 921550bb761a66..a9f0d5184b0824 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.22.5", - "port-version": 6, + "port-version": 7, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 16b06990aba75f..94e213379e6cda 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3146,7 +3146,7 @@ }, "gstreamer": { "baseline": "1.22.5", - "port-version": 6 + "port-version": 7 }, "gtest": { "baseline": "1.14.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 453418a498f7e2..4ab5d33bdfd9c1 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "563a58509d4f74fed0d8819ec9182a5da8700d02", + "version": "1.22.5", + "port-version": 7 + }, { "git-tree": "27425db97df2c329de0baf5d00c719982659c9c4", "version": "1.22.5", From d12c1de72e9d932baaacd823103547dbc33aaf6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 20 Dec 2023 00:18:48 +0100 Subject: [PATCH 0674/1039] [unordered-dense] Update to 4.3.1 (#35758) --- ports/unordered-dense/portfile.cmake | 2 +- ports/unordered-dense/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/unordered-dense.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/unordered-dense/portfile.cmake b/ports/unordered-dense/portfile.cmake index 0330f93f9f48d5..a607dad3edec39 100644 --- a/ports/unordered-dense/portfile.cmake +++ b/ports/unordered-dense/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/unordered_dense REF v${VERSION} - SHA512 3df9824f793553df91c253431e08244584de3cdf96bda2561df1e1b10779214bb75f3801e3b03b98671a38091d3e672db85bcebd74ad5d781d4a9edcf6a83677 + SHA512 a3d29c7dc6673a55e4b9c0e33ce9585b1cb4617173fcb5b09480b8ef75a0b4ae77c971f3477699965d4312e721479168ca77aaa9b23bac9795d72c385d334b9c HEAD_REF master ) diff --git a/ports/unordered-dense/vcpkg.json b/ports/unordered-dense/vcpkg.json index 66f9b6b3f6bad4..b15e88bcdb435b 100644 --- a/ports/unordered-dense/vcpkg.json +++ b/ports/unordered-dense/vcpkg.json @@ -1,6 +1,6 @@ { "name": "unordered-dense", - "version": "4.1.2", + "version": "4.3.1", "description": "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion", "homepage": "https://github.com/martinus/unordered_dense", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 94e213379e6cda..92dcd7807876b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8693,7 +8693,7 @@ "port-version": 2 }, "unordered-dense": { - "baseline": "4.1.2", + "baseline": "4.3.1", "port-version": 0 }, "unqlite": { diff --git a/versions/u-/unordered-dense.json b/versions/u-/unordered-dense.json index 629deeccb5d1ee..830b5c239dbce4 100644 --- a/versions/u-/unordered-dense.json +++ b/versions/u-/unordered-dense.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92b6f3cc16f6fe577511e094a9b918b8af8fa360", + "version": "4.3.1", + "port-version": 0 + }, { "git-tree": "c25f50471fcb367451a465853e405a50e372e279", "version": "4.1.2", From e2f6384a79f01b1b619446a55a5b11b7d8d55b53 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 20 Dec 2023 01:31:02 +0100 Subject: [PATCH 0675/1039] [openssl] Update to 3.2.0 (#35734) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: مهدي شينون (Mehdi Chinoune) --- ports/freerdp/openssl-3.patch | 15 + ports/freerdp/portfile.cmake | 1 + ports/freerdp/vcpkg.json | 2 +- ports/openssl/asm-comments.patch | 704 +++++++++++++++++++++++ ports/openssl/declspec-align.patch | 188 ++++++ ports/openssl/disable-apps.patch | 12 - ports/openssl/disable-install-docs.patch | 26 - ports/openssl/portfile.cmake | 8 +- ports/openssl/qt-msvc.patch | 21 + ports/openssl/vcpkg.json | 3 +- ports/openssl/windows/portfile.cmake | 21 +- versions/baseline.json | 6 +- versions/f-/freerdp.json | 5 + versions/o-/openssl.json | 5 + 14 files changed, 958 insertions(+), 59 deletions(-) create mode 100644 ports/freerdp/openssl-3.patch create mode 100644 ports/openssl/asm-comments.patch create mode 100644 ports/openssl/declspec-align.patch delete mode 100644 ports/openssl/disable-apps.patch delete mode 100644 ports/openssl/disable-install-docs.patch create mode 100644 ports/openssl/qt-msvc.patch diff --git a/ports/freerdp/openssl-3.patch b/ports/freerdp/openssl-3.patch new file mode 100644 index 00000000000000..0b7757f4c15cce --- /dev/null +++ b/ports/freerdp/openssl-3.patch @@ -0,0 +1,15 @@ +diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h +index e273ec3..3cc265e 100644 +--- a/include/freerdp/crypto/tls.h ++++ b/include/freerdp/crypto/tls.h +@@ -34,6 +34,10 @@ + + #include + ++#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3 ++ #define tls_free freerdp_tls_free ++#endif ++ + #define TLS_ALERT_LEVEL_WARNING 1 + #define TLS_ALERT_LEVEL_FATAL 2 + diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index b83e406b5abd2a..bca6a14bd249ef 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( pr-7060-jni-onload.patch find-dependency.patch export-include.patch + openssl-3.patch # Remove in freerdp 3.0.0 ) file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg") diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index a4efbd88b9538f..8a2865c3004dc2 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freerdp", "version": "2.11.2", - "port-version": 1, + "port-version": 2, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/ports/openssl/asm-comments.patch b/ports/openssl/asm-comments.patch new file mode 100644 index 00000000000000..56e2ced26d6f3f --- /dev/null +++ b/ports/openssl/asm-comments.patch @@ -0,0 +1,704 @@ +diff --git a/crypto/ec/asm/ecp_sm2p256-armv8.pl b/crypto/ec/asm/ecp_sm2p256-armv8.pl +index 5095086..62fadc0 100644 +--- a/crypto/ec/asm/ecp_sm2p256-armv8.pl ++++ b/crypto/ec/asm/ecp_sm2p256-armv8.pl +@@ -28,44 +28,44 @@ my ($t4,$t5,$t6,$t7,$t8)=map("x$_",(15..19)); + sub bn_mod_add() { + my $mod = shift; + $code.=<<___; +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Addition ++ // Addition + adds $s0,$s0,$s4 + adcs $s1,$s1,$s5 + adcs $s2,$s2,$s6 + adcs $s3,$s3,$s7 + adc $t4,xzr,xzr + +- # Load polynomial ++ // Load polynomial + adr x2,$mod + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Backup Addition ++ // Backup Addition + mov $t0,$s0 + mov $t1,$s1 + mov $t2,$s2 + mov $t3,$s3 + +- # Sub polynomial ++ // Sub polynomial + subs $t0,$t0,$s4 + sbcs $t1,$t1,$s5 + sbcs $t2,$t2,$s6 + sbcs $t3,$t3,$s7 + sbcs $t4,$t4,xzr + +- # Select based on carry ++ // Select based on carry + csel $s0,$s0,$t0,cc + csel $s1,$s1,$t1,cc + csel $s2,$s2,$t2,cc + csel $s3,$s3,$t3,cc + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + ___ +@@ -74,44 +74,44 @@ ___ + sub bn_mod_sub() { + my $mod = shift; + $code.=<<___; +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Subtraction ++ // Subtraction + subs $s0,$s0,$s4 + sbcs $s1,$s1,$s5 + sbcs $s2,$s2,$s6 + sbcs $s3,$s3,$s7 + sbc $t4,xzr,xzr + +- # Load polynomial ++ // Load polynomial + adr x2,$mod + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Backup subtraction ++ // Backup subtraction + mov $t0,$s0 + mov $t1,$s1 + mov $t2,$s2 + mov $t3,$s3 + +- # Add polynomial ++ // Add polynomial + adds $t0,$t0,$s4 + adcs $t1,$t1,$s5 + adcs $t2,$t2,$s6 + adcs $t3,$t3,$s7 + tst $t4,$t4 + +- # Select based on carry ++ // Select based on carry + csel $s0,$s0,$t0,eq + csel $s1,$s1,$t1,eq + csel $s2,$s2,$t2,eq + csel $s3,$s3,$t3,eq + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + ___ +@@ -120,38 +120,38 @@ ___ + sub bn_mod_div_by_2() { + my $mod = shift; + $code.=<<___; +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + +- # Save the least significant bit ++ // Save the least significant bit + mov $t0,$s0 + +- # Right shift 1 ++ // Right shift 1 + extr $s0,$s1,$s0,#1 + extr $s1,$s2,$s1,#1 + extr $s2,$s3,$s2,#1 + lsr $s3,$s3,#1 + +- # Load mod ++ // Load mod + adr x2,$mod + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Parity check ++ // Parity check + tst $t0,#1 + csel $s4,xzr,$s4,eq + csel $s5,xzr,$s5,eq + csel $s6,xzr,$s6,eq + csel $s7,xzr,$s7,eq + +- # Add ++ // Add + adds $s0,$s0,$s4 + adcs $s1,$s1,$s5 + adcs $s2,$s2,$s6 + adc $s3,$s3,$s7 + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + ___ +@@ -183,17 +183,17 @@ $code.=<<___; + .align 5 + bn_rshift1: + AARCH64_VALID_CALL_TARGET +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x0] + ldp $s2,$s3,[x0,#16] + +- # Right shift ++ // Right shift + extr $s0,$s1,$s0,#1 + extr $s1,$s2,$s1,#1 + extr $s2,$s3,$s2,#1 + lsr $s3,$s3,#1 + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + +@@ -206,19 +206,19 @@ bn_rshift1: + .align 5 + bn_sub: + AARCH64_VALID_CALL_TARGET +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +- # Subtraction ++ // Subtraction + subs $s0,$s0,$s4 + sbcs $s1,$s1,$s5 + sbcs $s2,$s2,$s6 + sbc $s3,$s3,$s7 + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + +@@ -255,11 +255,11 @@ $code.=<<___; + .align 5 + ecp_sm2p256_mul_by_3: + AARCH64_VALID_CALL_TARGET +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + +- # 2*a ++ // 2*a + adds $s0,$s0,$s0 + adcs $s1,$s1,$s1 + adcs $s2,$s2,$s2 +@@ -271,7 +271,7 @@ ecp_sm2p256_mul_by_3: + mov $t2,$s2 + mov $t3,$s3 + +- # Sub polynomial ++ // Sub polynomial + adr x2,.Lpoly + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] +@@ -287,7 +287,7 @@ ecp_sm2p256_mul_by_3: + csel $s3,$s3,$t3,cs + eor $t4,$t4,$t4 + +- # 3*a ++ // 3*a + ldp $s4,$s5,[x1] + ldp $s6,$s7,[x1,#16] + adds $s0,$s0,$s4 +@@ -301,7 +301,7 @@ ecp_sm2p256_mul_by_3: + mov $t2,$s2 + mov $t3,$s3 + +- # Sub polynomial ++ // Sub polynomial + adr x2,.Lpoly + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] +@@ -316,7 +316,7 @@ ecp_sm2p256_mul_by_3: + csel $s2,$s2,$t2,cs + csel $s3,$s3,$t3,cs + +- # Store results ++ // Store results + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + +@@ -360,45 +360,45 @@ $code.=<<___; + .size ecp_sm2p256_sub_mod_ord,.-ecp_sm2p256_sub_mod_ord + + .macro RDC +- # a = | s7 | ... | s0 |, where si are 64-bit quantities +- # = |a15|a14| ... |a1|a0|, where ai are 32-bit quantities +- # | s7 | s6 | s5 | s4 | +- # | a15 | a14 | a13 | a12 | a11 | a10 | a9 | a8 | +- # | s3 | s2 | s1 | s0 | +- # | a7 | a6 | a5 | a4 | a3 | a2 | a1 | a0 | +- # ================================================= +- # | a8 | a11 | a10 | a9 | a8 | 0 | s4 | (+) +- # | a9 | a15 | s6 | a11 | 0 | a10 | a9 | (+) +- # | a10 | 0 | a14 | a13 | a12 | 0 | s5 | (+) +- # | a11 | 0 | s7 | a13 | 0 | a12 | a11 | (+) +- # | a12 | 0 | s7 | a13 | 0 | s6 | (+) +- # | a12 | 0 | 0 | a15 | a14 | 0 | a14 | a13 | (+) +- # | a13 | 0 | 0 | 0 | a15 | 0 | a14 | a13 | (+) +- # | a13 | 0 | 0 | 0 | 0 | 0 | s7 | (+) +- # | a14 | 0 | 0 | 0 | 0 | 0 | s7 | (+) +- # | a14 | 0 | 0 | 0 | 0 | 0 | 0 | a15 | (+) +- # | a15 | 0 | 0 | 0 | 0 | 0 | 0 | a15 | (+) +- # | a15 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | (+) +- # | s7 | 0 | 0 | 0 | 0 | 0 | 0 | (+) +- # | 0 | 0 | 0 | 0 | 0 | a8 | 0 | 0 | (-) +- # | 0 | 0 | 0 | 0 | 0 | a9 | 0 | 0 | (-) +- # | 0 | 0 | 0 | 0 | 0 | a13 | 0 | 0 | (-) +- # | 0 | 0 | 0 | 0 | 0 | a14 | 0 | 0 | (-) +- # | U[7]| U[6]| U[5]| U[4]| U[3]| U[2]| U[1]| U[0]| +- # | V[3] | V[2] | V[1] | V[0] | +- +- # 1. 64-bit addition +- # t2=s6+s7+s7 ++ // a = | s7 | ... | s0 |, where si are 64-bit quantities ++ // = |a15|a14| ... |a1|a0|, where ai are 32-bit quantities ++ // | s7 | s6 | s5 | s4 | ++ // | a15 | a14 | a13 | a12 | a11 | a10 | a9 | a8 | ++ // | s3 | s2 | s1 | s0 | ++ // | a7 | a6 | a5 | a4 | a3 | a2 | a1 | a0 | ++ // ================================================= ++ // | a8 | a11 | a10 | a9 | a8 | 0 | s4 | (+) ++ // | a9 | a15 | s6 | a11 | 0 | a10 | a9 | (+) ++ // | a10 | 0 | a14 | a13 | a12 | 0 | s5 | (+) ++ // | a11 | 0 | s7 | a13 | 0 | a12 | a11 | (+) ++ // | a12 | 0 | s7 | a13 | 0 | s6 | (+) ++ // | a12 | 0 | 0 | a15 | a14 | 0 | a14 | a13 | (+) ++ // | a13 | 0 | 0 | 0 | a15 | 0 | a14 | a13 | (+) ++ // | a13 | 0 | 0 | 0 | 0 | 0 | s7 | (+) ++ // | a14 | 0 | 0 | 0 | 0 | 0 | s7 | (+) ++ // | a14 | 0 | 0 | 0 | 0 | 0 | 0 | a15 | (+) ++ // | a15 | 0 | 0 | 0 | 0 | 0 | 0 | a15 | (+) ++ // | a15 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | (+) ++ // | s7 | 0 | 0 | 0 | 0 | 0 | 0 | (+) ++ // | 0 | 0 | 0 | 0 | 0 | a8 | 0 | 0 | (-) ++ // | 0 | 0 | 0 | 0 | 0 | a9 | 0 | 0 | (-) ++ // | 0 | 0 | 0 | 0 | 0 | a13 | 0 | 0 | (-) ++ // | 0 | 0 | 0 | 0 | 0 | a14 | 0 | 0 | (-) ++ // | U[7]| U[6]| U[5]| U[4]| U[3]| U[2]| U[1]| U[0]| ++ // | V[3] | V[2] | V[1] | V[0] | ++ ++ // 1. 64-bit addition ++ // t2=s6+s7+s7 + adds $t2,$s6,$s7 + adcs $t1,xzr,xzr + adds $t2,$t2,$s7 + adcs $t1,$t1,xzr +- # t3=s4+s5+t2 ++ // t3=s4+s5+t2 + adds $t3,$s4,$t2 + adcs $t4,$t1,xzr + adds $t3,$t3,$s5 + adcs $t4,$t4,xzr +- # sum ++ // sum + adds $s0,$s0,$t3 + adcs $s1,$s1,$t4 + adcs $s2,$s2,$t2 +@@ -410,7 +410,7 @@ $code.=<<___; + stp $s0,$s1,[sp,#32] + stp $s2,$s3,[sp,#48] + +- # 2. 64-bit to 32-bit spread ++ // 2. 64-bit to 32-bit spread + mov $t1,#0xffffffff + mov $s0,$s4 + mov $s1,$s5 +@@ -425,7 +425,7 @@ $code.=<<___; + lsr $s6,$s6,#32 // a13 + lsr $s7,$s7,#32 // a15 + +- # 3. 32-bit addition ++ // 3. 32-bit addition + add $t1,$a14,$a12 // t1 <- a12 + a14 + add $t2,$a15,$a13 // t2 <- a13 + a15 + add $t3,$a8,$a9 // t3 <- a8 + a9 +@@ -446,53 +446,53 @@ $code.=<<___; + add $a11,$a11,$t2 // a11 <- a9 + a11 + 2*(a13 + a15) + add $t1,$t1,$t4 // t1 <- a10 + a12 + 2*a14 + +- # U[0] s5 a9 + a11 + 2*(a13 + a15) +- # U[1] t1 a10 + a12 + 2*a14 +- # U[2] -t3 a8 + a9 + a13 + a14 +- # U[3] s2 a8 + a11 + a12 + 2*a13 + a14 + a15 +- # U[4] s4 a9 + a13 + a15 +- # U[5] t4 a10 + a14 +- # U[6] s7 a11 + a15 +- # U[7] s1 a8 + a9 + a10 + a11 + 2*(a12 + a13 + a14 + a15) ++ // U[0] s5 a9 + a11 + 2*(a13 + a15) ++ // U[1] t1 a10 + a12 + 2*a14 ++ // U[2] -t3 a8 + a9 + a13 + a14 ++ // U[3] s2 a8 + a11 + a12 + 2*a13 + a14 + a15 ++ // U[4] s4 a9 + a13 + a15 ++ // U[5] t4 a10 + a14 ++ // U[6] s7 a11 + a15 ++ // U[7] s1 a8 + a9 + a10 + a11 + 2*(a12 + a13 + a14 + a15) + +- # 4. 32-bit to 64-bit ++ // 4. 32-bit to 64-bit + lsl $s0,$t1,#32 + extr $t1,$s2,$t1,#32 + extr $s2,$t4,$s2,#32 + extr $t4,$s1,$t4,#32 + lsr $s1,$s1,#32 + +- # 5. 64-bit addition ++ // 5. 64-bit addition + adds $s5,$s5,$s0 + adcs $t1,$t1,xzr + adcs $s4,$s4,$s2 + adcs $s7,$s7,$t4 + adcs $t0,$t0,$s1 + +- # V[0] s5 +- # V[1] t1 +- # V[2] s4 +- # V[3] s7 +- # carry t0 +- # sub t3 ++ // V[0] s5 ++ // V[1] t1 ++ // V[2] s4 ++ // V[3] s7 ++ // carry t0 ++ // sub t3 + +- # 5. Process s0-s3 ++ // 5. Process s0-s3 + ldp $s0,$s1,[sp,#32] + ldp $s2,$s3,[sp,#48] +- # add with V0-V3 ++ // add with V0-V3 + adds $s0,$s0,$s5 + adcs $s1,$s1,$t1 + adcs $s2,$s2,$s4 + adcs $s3,$s3,$s7 + adcs $t0,$t0,xzr +- # sub with t3 ++ // sub with t3 + subs $s1,$s1,$t3 + sbcs $s2,$s2,xzr + sbcs $s3,$s3,xzr + sbcs $t0,$t0,xzr + +- # 6. MOD +- # First Mod ++ // 6. MOD ++ // First Mod + lsl $t1,$t0,#32 + subs $t2,$t1,$t0 + +@@ -501,8 +501,8 @@ $code.=<<___; + adcs $s2,$s2,xzr + adcs $s3,$s3,$t1 + +- # Last Mod +- # return y - p if y > p else y ++ // Last Mod ++ // return y - p if y > p else y + mov $s4,$s0 + mov $s5,$s1 + mov $s6,$s2 +@@ -533,44 +533,44 @@ $code.=<<___; + .align 5 + ecp_sm2p256_mul: + AARCH64_SIGN_LINK_REGISTER +- # Store scalar registers ++ // Store scalar registers + stp x29,x30,[sp,#-80]! + add x29,sp,#0 + stp x16,x17,[sp,#16] + stp x18,x19,[sp,#64] + +- # Load inputs ++ // Load inputs + ldp $s0,$s1,[x1] + ldp $s2,$s3,[x1,#16] + ldp $s4,$s5,[x2] + ldp $s6,$s7,[x2,#16] + +-### multiplication ### +- # ======================== +- # s3 s2 s1 s0 +- # * s7 s6 s5 s4 +- # ------------------------ +- # + s0 s0 s0 s0 +- # * * * * +- # s7 s6 s5 s4 +- # s1 s1 s1 s1 +- # * * * * +- # s7 s6 s5 s4 +- # s2 s2 s2 s2 +- # * * * * +- # s7 s6 s5 s4 +- # s3 s3 s3 s3 +- # * * * * +- # s7 s6 s5 s4 +- # ------------------------ +- # s7 s6 s5 s4 s3 s2 s1 s0 +- # ======================== +- +-### s0*s4 ### ++// ### multiplication ### ++ // ======================== ++ // s3 s2 s1 s0 ++ // * s7 s6 s5 s4 ++ // ------------------------ ++ // + s0 s0 s0 s0 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s1 s1 s1 s1 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s2 s2 s2 s2 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s3 s3 s3 s3 ++ // * * * * ++ // s7 s6 s5 s4 ++ // ------------------------ ++ // s7 s6 s5 s4 s3 s2 s1 s0 ++ // ======================== ++ ++// ### s0*s4 ### + mul $t5,$s0,$s4 + umulh $t2,$s0,$s4 + +-### s1*s4 + s0*s5 ### ++// ### s1*s4 + s0*s5 ### + mul $t0,$s1,$s4 + umulh $t1,$s1,$s4 + adds $t2,$t2,$t0 +@@ -582,7 +582,7 @@ ecp_sm2p256_mul: + adcs $t3,$t3,$t1 + adcs $t4,xzr,xzr + +-### s2*s4 + s1*s5 + s0*s6 ### ++// ### s2*s4 + s1*s5 + s0*s6 ### + mul $t0,$s2,$s4 + umulh $t1,$s2,$s4 + adds $t3,$t3,$t0 +@@ -600,7 +600,7 @@ ecp_sm2p256_mul: + adcs $t4,$t4,$t1 + adcs $t6,$t6,xzr + +-### s3*s4 + s2*s5 + s1*s6 + s0*s7 ### ++// ### s3*s4 + s2*s5 + s1*s6 + s0*s7 ### + mul $t0,$s3,$s4 + umulh $t1,$s3,$s4 + adds $t4,$t4,$t0 +@@ -625,7 +625,7 @@ ecp_sm2p256_mul: + adcs $t6,$t6,$t1 + adcs $t7,$t7,xzr + +-### s3*s5 + s2*s6 + s1*s7 ### ++// ### s3*s5 + s2*s6 + s1*s7 ### + mul $t0,$s3,$s5 + umulh $t1,$s3,$s5 + adds $t6,$t6,$t0 +@@ -644,7 +644,7 @@ ecp_sm2p256_mul: + adcs $t7,$t7,$t1 + adcs $t8,$t8,xzr + +-### s3*s6 + s2*s7 ### ++// ### s3*s6 + s2*s7 ### + mul $t0,$s3,$s6 + umulh $t1,$s3,$s6 + adds $t7,$t7,$t0 +@@ -657,7 +657,7 @@ ecp_sm2p256_mul: + adcs $t8,$t8,$t1 + adcs $t6,$t6,xzr + +-### s3*s7 ### ++// ### s3*s7 ### + mul $t0,$s3,$s7 + umulh $t1,$s3,$s7 + adds $s6,$t8,$t0 +@@ -668,15 +668,15 @@ ecp_sm2p256_mul: + mov $s2,$t3 + mov $s3,$t4 + +- # result of mul: s7 s6 s5 s4 s3 s2 s1 s0 ++ // result of mul: s7 s6 s5 s4 s3 s2 s1 s0 + +-### Reduction ### ++// ### Reduction ### + RDC + + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + +- # Restore scalar registers ++ // Restore scalar registers + ldp x16,x17,[sp,#16] + ldp x18,x19,[sp,#64] + ldp x29,x30,[sp],#80 +@@ -692,48 +692,48 @@ ecp_sm2p256_mul: + + ecp_sm2p256_sqr: + AARCH64_SIGN_LINK_REGISTER +- # Store scalar registers ++ // Store scalar registers + stp x29,x30,[sp,#-80]! + add x29,sp,#0 + stp x16,x17,[sp,#16] + stp x18,x19,[sp,#64] + +- # Load inputs ++ // Load inputs + ldp $s4,$s5,[x1] + ldp $s6,$s7,[x1,#16] + +-### square ### +- # ======================== +- # s7 s6 s5 s4 +- # * s7 s6 s5 s4 +- # ------------------------ +- # + s4 s4 s4 s4 +- # * * * * +- # s7 s6 s5 s4 +- # s5 s5 s5 s5 +- # * * * * +- # s7 s6 s5 s4 +- # s6 s6 s6 s6 +- # * * * * +- # s7 s6 s5 s4 +- # s7 s7 s7 s7 +- # * * * * +- # s7 s6 s5 s4 +- # ------------------------ +- # s7 s6 s5 s4 s3 s2 s1 s0 +- # ======================== +- +-### s4*s5 ### ++// ### square ### ++ // ======================== ++ // s7 s6 s5 s4 ++ // * s7 s6 s5 s4 ++ // ------------------------ ++ // + s4 s4 s4 s4 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s5 s5 s5 s5 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s6 s6 s6 s6 ++ // * * * * ++ // s7 s6 s5 s4 ++ // s7 s7 s7 s7 ++ // * * * * ++ // s7 s6 s5 s4 ++ // ------------------------ ++ // s7 s6 s5 s4 s3 s2 s1 s0 ++ // ======================== ++ ++// ### s4*s5 ### + mul $s1,$s4,$s5 + umulh $s2,$s4,$s5 + +-### s4*s6 ### ++// ### s4*s6 ### + mul $t0,$s6,$s4 + umulh $s3,$s6,$s4 + adds $s2,$s2,$t0 + adcs $s3,$s3,xzr + +-### s4*s7 + s5*s6 ### ++// ### s4*s7 + s5*s6 ### + mul $t0,$s7,$s4 + umulh $t1,$s7,$s4 + adds $s3,$s3,$t0 +@@ -745,19 +745,19 @@ ecp_sm2p256_sqr: + adcs $s0,$s0,$t1 + adcs $t2,xzr,xzr + +-### s5*s7 ### ++// ### s5*s7 ### + mul $t0,$s7,$s5 + umulh $t1,$s7,$s5 + adds $s0,$s0,$t0 + adcs $t2,$t2,$t1 + +-### s6*s7 ### ++// ### s6*s7 ### + mul $t0,$s7,$s6 + umulh $t1,$s7,$s6 + adds $t2,$t2,$t0 + adcs $t3,$t1,xzr + +-### 2*(t3,t2,s0,s3,s2,s1) ### ++// ### 2*(t3,t2,s0,s3,s2,s1) ### + adds $s1,$s1,$s1 + adcs $s2,$s2,$s2 + adcs $s3,$s3,$s3 +@@ -766,19 +766,19 @@ ecp_sm2p256_sqr: + adcs $t3,$t3,$t3 + adcs $t4,xzr,xzr + +-### s4*s4 ### ++// ### s4*s4 ### + mul $t5,$s4,$s4 + umulh $t6,$s4,$s4 + +-### s5*s5 ### ++// ### s5*s5 ### + mul $s4,$s5,$s5 + umulh $s5,$s5,$s5 + +-### s6*s6 ### ++// ### s6*s6 ### + mul $t0,$s6,$s6 + umulh $t1,$s6,$s6 + +-### s7*s7 ### ++// ### s7*s7 ### + mul $t7,$s7,$s7 + umulh $t8,$s7,$s7 + +@@ -796,15 +796,15 @@ ecp_sm2p256_sqr: + mov $s6,$t3 + mov $s7,$t4 + +- # result of mul: s7 s6 s5 s4 s3 s2 s1 s0 ++ // result of mul: s7 s6 s5 s4 s3 s2 s1 s0 + +-### Reduction ### ++// ### Reduction ### + RDC + + stp $s0,$s1,[x0] + stp $s2,$s3,[x0,#16] + +- # Restore scalar registers ++ // Restore scalar registers + ldp x16,x17,[sp,#16] + ldp x18,x19,[sp,#64] + ldp x29,x30,[sp],#80 diff --git a/ports/openssl/declspec-align.patch b/ports/openssl/declspec-align.patch new file mode 100644 index 00000000000000..83849c94414292 --- /dev/null +++ b/ports/openssl/declspec-align.patch @@ -0,0 +1,188 @@ +diff --git a/crypto/ec/ecp_sm2p256.c b/crypto/ec/ecp_sm2p256.c +index 6ec4245..d47689a 100644 +--- a/crypto/ec/ecp_sm2p256.c ++++ b/crypto/ec/ecp_sm2p256.c +@@ -40,28 +40,28 @@ typedef struct { + + #if !defined(OPENSSL_NO_SM2_PRECOMP) + /* Coordinates of G, for which we have precomputed tables */ +-static const BN_ULONG def_xG[P256_LIMBS] ALIGN32 = { ++ALIGN32 static const BN_ULONG def_xG[P256_LIMBS] = { + 0x715a4589334c74c7, 0x8fe30bbff2660be1, + 0x5f9904466a39c994, 0x32c4ae2c1f198119 + }; + +-static const BN_ULONG def_yG[P256_LIMBS] ALIGN32 = { ++ALIGN32 static const BN_ULONG def_yG[P256_LIMBS] = { + 0x02df32e52139f0a0, 0xd0a9877cc62a4740, + 0x59bdcee36b692153, 0xbc3736a2f4f6779c, + }; + #endif + + /* p and order for SM2 according to GB/T 32918.5-2017 */ +-static const BN_ULONG def_p[P256_LIMBS] ALIGN32 = { ++ALIGN32 static const BN_ULONG def_p[P256_LIMBS] = { + 0xffffffffffffffff, 0xffffffff00000000, + 0xffffffffffffffff, 0xfffffffeffffffff + }; +-static const BN_ULONG def_ord[P256_LIMBS] ALIGN32 = { ++ALIGN32 static const BN_ULONG def_ord[P256_LIMBS] = { + 0x53bbf40939d54123, 0x7203df6b21c6052b, + 0xffffffffffffffff, 0xfffffffeffffffff + }; + +-static const BN_ULONG ONE[P256_LIMBS] ALIGN32 = {1, 0, 0, 0}; ++ALIGN32 static const BN_ULONG ONE[P256_LIMBS] = {1, 0, 0, 0}; + + /* Functions implemented in assembly */ + /* +@@ -139,10 +139,10 @@ static ossl_inline int is_greater(const BN_ULONG *a, const BN_ULONG *b) + /* Binary algorithm for inversion in Fp */ + #define BN_MOD_INV(out, in, mod_div, mod_sub, mod) \ + do { \ +- BN_ULONG u[4] ALIGN32; \ +- BN_ULONG v[4] ALIGN32; \ +- BN_ULONG x1[4] ALIGN32 = {1, 0, 0, 0}; \ +- BN_ULONG x2[4] ALIGN32 = {0}; \ ++ ALIGN32 BN_ULONG u[4] ; \ ++ ALIGN32 BN_ULONG v[4] ; \ ++ ALIGN32 BN_ULONG x1[4] = {1, 0, 0, 0}; \ ++ ALIGN32 BN_ULONG x2[4] = {0}; \ + \ + if (is_zeros(in)) \ + return; \ +@@ -188,9 +188,9 @@ static ossl_inline void ecp_sm2p256_mod_ord_inverse(BN_ULONG* out, + static void ecp_sm2p256_point_double(P256_POINT *R, const P256_POINT *P) + { + unsigned int i; +- BN_ULONG tmp0[P256_LIMBS] ALIGN32; +- BN_ULONG tmp1[P256_LIMBS] ALIGN32; +- BN_ULONG tmp2[P256_LIMBS] ALIGN32; ++ ALIGN32 BN_ULONG tmp0[P256_LIMBS] ; ++ ALIGN32 BN_ULONG tmp1[P256_LIMBS] ; ++ ALIGN32 BN_ULONG tmp2[P256_LIMBS] ; + + /* zero-check P->Z */ + if (is_zeros(P->Z)) { +@@ -225,10 +225,10 @@ static void ecp_sm2p256_point_add_affine(P256_POINT *R, const P256_POINT *P, + const P256_POINT_AFFINE *Q) + { + unsigned int i; +- BN_ULONG tmp0[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG tmp1[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG tmp2[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG tmp3[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG tmp3[P256_LIMBS] = {0}; + + /* zero-check P->Z */ + if (is_zeros(P->Z)) { +@@ -288,9 +288,9 @@ static void ecp_sm2p256_point_add(P256_POINT *R, const P256_POINT *P, + const P256_POINT *Q) + { + unsigned int i; +- BN_ULONG tmp0[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG tmp1[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG tmp2[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG tmp0[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG tmp1[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG tmp2[P256_LIMBS] = {0}; + + /* zero-check P | Q ->Z */ + if (is_zeros(P->Z)) { +@@ -382,7 +382,7 @@ static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k, + { + int i, init = 0; + unsigned int index, mask = 0x0f; +- P256_POINT precomputed[16] ALIGN64; ++ ALIGN64 P256_POINT precomputed[16] ; + + memset(R, 0, sizeof(P256_POINT)); + +@@ -427,8 +427,8 @@ static void ecp_sm2p256_point_P_mul_by_scalar(P256_POINT *R, const BN_ULONG *k, + static void ecp_sm2p256_point_get_affine(P256_POINT_AFFINE *R, + const P256_POINT *P) + { +- BN_ULONG z_inv3[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG z_inv2[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = {0}; + + if (is_one(P->Z)) { + memcpy(R->X, P->X, 32); +@@ -461,13 +461,13 @@ static int ecp_sm2p256_get_affine(const EC_GROUP *group, + const EC_POINT *point, + BIGNUM *x, BIGNUM *y, BN_CTX *ctx) + { +- BN_ULONG z_inv2[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG z_inv3[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG x_aff[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG y_aff[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG point_x[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG point_y[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG point_z[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG z_inv2[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG z_inv3[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG x_aff[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG y_aff[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG point_x[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG point_y[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG point_z[P256_LIMBS] = {0}; + + if (EC_POINT_is_at_infinity(group, point)) { + ECerr(ERR_LIB_EC, EC_R_POINT_AT_INFINITY); +@@ -510,7 +510,7 @@ static int ecp_sm2p256_windowed_mul(const EC_GROUP *group, + unsigned int i; + int ret = 0; + const BIGNUM **scalars = NULL; +- BN_ULONG k[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG k[P256_LIMBS] = {0}; + P256_POINT kP; + ALIGN32 union { + P256_POINT p; +@@ -572,7 +572,7 @@ static int ecp_sm2p256_points_mul(const EC_GROUP *group, + { + int ret = 0, p_is_infinity = 0; + const EC_POINT *generator = NULL; +- BN_ULONG k[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG k[P256_LIMBS] = {0}; + ALIGN32 union { + P256_POINT p; + P256_POINT_AFFINE a; +@@ -646,9 +646,9 @@ err: + static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r, + const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) + { +- BN_ULONG a_fe[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG b_fe[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG r_fe[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG b_fe[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0}; + + if (a == NULL || b == NULL || r == NULL) + return 0; +@@ -670,8 +670,8 @@ static int ecp_sm2p256_field_mul(const EC_GROUP *group, BIGNUM *r, + static int ecp_sm2p256_field_sqr(const EC_GROUP *group, BIGNUM *r, + const BIGNUM *a, BN_CTX *ctx) + { +- BN_ULONG a_fe[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG r_fe[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG a_fe[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG r_fe[P256_LIMBS] = {0}; + + if (a == NULL || r == NULL) + return 0; +@@ -693,8 +693,8 @@ static int ecp_sm2p256_inv_mod_ord(const EC_GROUP *group, BIGNUM *r, + const BIGNUM *x, BN_CTX *ctx) + { + int ret = 0; +- BN_ULONG t[P256_LIMBS] ALIGN32 = {0}; +- BN_ULONG out[P256_LIMBS] ALIGN32 = {0}; ++ ALIGN32 BN_ULONG t[P256_LIMBS] = {0}; ++ ALIGN32 BN_ULONG out[P256_LIMBS] = {0}; + + if (bn_wexpand(r, P256_LIMBS) == NULL) { + ECerr(ERR_LIB_EC, ERR_R_BN_LIB); diff --git a/ports/openssl/disable-apps.patch b/ports/openssl/disable-apps.patch deleted file mode 100644 index 8dac3d68355283..00000000000000 --- a/ports/openssl/disable-apps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Configure b/Configure -index 5ac4b52..ad638e8 100755 ---- a/Configure -+++ b/Configure -@@ -401,6 +401,7 @@ my @dtls = qw(dtls1 dtls1_2); - my @disablables = ( - "acvp-tests", - "afalgeng", -+ "apps", - "aria", - "asan", - "asm", diff --git a/ports/openssl/disable-install-docs.patch b/ports/openssl/disable-install-docs.patch deleted file mode 100644 index cfeae0b10983ed..00000000000000 --- a/ports/openssl/disable-install-docs.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl -index a48fae5..c82c086 100644 ---- a/Configurations/unix-Makefile.tmpl -+++ b/Configurations/unix-Makefile.tmpl -@@ -611,7 +611,7 @@ install_sw: install_dev install_engines install_modules install_runtime - - uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev - --install_docs: install_man_docs install_html_docs -+install_docs: - - uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r "$(DESTDIR)$(DOCDIR)" -diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl -index 9250b98..2b63c85 100644 ---- a/Configurations/windows-makefile.tmpl -+++ b/Configurations/windows-makefile.tmpl -@@ -493,7 +493,7 @@ install_sw: install_dev install_engines install_modules install_runtime - - uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev - --install_docs: install_html_docs -+install_docs: - - uninstall_docs: uninstall_html_docs - diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index e03e4964c78e39..2f9f5be911d705 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -19,10 +19,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF "openssl-${VERSION}" - SHA512 04349ba554ddc5a9c26ff44714c1adca3c6431e98d11af5e7b6a5f58ed44e016da68c09cc53415716ab1936c6aaac04887ced470707dbc3f7816c04e06be69c1 + SHA512 aaf4f13b7b8020be37837f8084ab7aa3db64e6eb1ecabf04473ed5bd09bcabb8790f0dc1f7604febbbf974702b1fbe41795a7b575e7f88b07cbe094493926a6b PATCHES - disable-apps.patch - disable-install-docs.patch + asm-comments.patch + declspec-align.patch + qt-msvc.patch script-prefix.patch windows/install-layout.patch windows/install-pdbs.patch @@ -38,6 +39,7 @@ vcpkg_list(SET CONFIGURE_OPTIONS no-ssl3 no-weak-ssl-ciphers no-tests + no-docs ) set(INSTALL_FIPS "") diff --git a/ports/openssl/qt-msvc.patch b/ports/openssl/qt-msvc.patch new file mode 100644 index 00000000000000..50f945d9893cfb --- /dev/null +++ b/ports/openssl/qt-msvc.patch @@ -0,0 +1,21 @@ +diff --git a/include/openssl/e_ostime.h b/include/openssl/e_ostime.h +index 8a7cc9880fa79..0e17487504992 100644 +--- a/include/openssl/e_ostime.h ++++ b/include/openssl/e_ostime.h +@@ -22,7 +22,15 @@ + */ + + # if defined(OPENSSL_SYS_WINDOWS) +-# include ++# if !defined(_WINSOCKAPI_) ++ /* ++ * winsock2.h defines _WINSOCK2API_ and both winsock2.h and winsock.h define ++ * _WINSOCKAPI_. Both of these provide struct timeval. Don't include ++ * winsock2.h if either header has been included to avoid breakage with ++ * applications that prefer to use over . ++ */ ++# include ++# endif + # else + # include + # endif diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d4ec96caa43bef..d5b1417827f2a6 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.1.4", - "port-version": 1, + "version": "3.2.0", "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 d992bc28766770..59da6897fe242c 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -1,7 +1,3 @@ -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) -vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") - vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") @@ -48,22 +44,23 @@ if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE set(OPENSSL_BUILD_MAKES_PDBS OFF) endif() -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND NOT VCPKG_TARGET_IS_UWP) +cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc) +if(OPENSSL_ARCH MATCHES "CLANG") vcpkg_find_acquire_program(CLANG) - set(clang "${CLANG}") - cmake_path(GET clang PARENT_PATH clang_path) + cmake_path(GET CLANG PARENT_PATH clang_path) vcpkg_add_to_path("${clang_path}") - - set(as clang-cl) - - vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc") if(VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang") string(APPEND VCPKG_COMBINED_C_FLAGS_DEBUG " --target=aarch64-win32-msvc") string(APPEND VCPKG_COMBINED_C_FLAGS_RELEASE " --target=aarch64-win32-msvc") endif() +endif() +if(OPENSSL_ARCH MATCHES "CLANGASM") + vcpkg_list(APPEND CONFIGURE_OPTIONS "ASFLAGS=--target=aarch64-win32-msvc") else() + vcpkg_find_acquire_program(NASM) cmake_path(NATIVE_PATH NASM NORMALIZE as) - cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_C_COMPILER NORMALIZE cc) + cmake_path(GET NASM PARENT_PATH nasm_path) + vcpkg_add_to_path("${nasm_path}") # Needed by Configure endif() cmake_path(NATIVE_PATH VCPKG_DETECTED_CMAKE_AR NORMALIZE ar) diff --git a/versions/baseline.json b/versions/baseline.json index 92dcd7807876b2..10d8295d53ee80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2774,7 +2774,7 @@ }, "freerdp": { "baseline": "2.11.2", - "port-version": 1 + "port-version": 2 }, "freetds": { "baseline": "1.3.10", @@ -6337,8 +6337,8 @@ "port-version": 3 }, "openssl": { - "baseline": "3.1.4", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 0 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index e273fb62262e7c..0058f46a85a432 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00aea4e71fcfa8fa2ea4c294996726290abe3243", + "version": "2.11.2", + "port-version": 2 + }, { "git-tree": "980f914c0856191ef155ede267bc4553ccc49ac2", "version": "2.11.2", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index f1a26dbda41b3e..721249cf36aabe 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9b4587c2e00e793e735d8ac5094f64dbfcf44e1", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "5ee74387a1dd212dc9754c614809ff86bd0638fa", "version": "3.1.4", From 62a471f00693d138ad597ffa6bb2802d1c18e469 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 20 Dec 2023 01:49:46 +0100 Subject: [PATCH 0676/1039] vcpkg_find_acquire_program(BISON).cmake: Also search default brew installation on arm64-osx (#35765) --- scripts/cmake/vcpkg_find_acquire_program(BISON).cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake b/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake index fae680bf137706..10f9a7d7a36a87 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(BISON).cmake @@ -15,6 +15,6 @@ else() set(apt_package_name bison) set(brew_package_name bison) if (APPLE) - set(paths_to_search /usr/local/opt/bison/bin) + set(paths_to_search /opt/homebrew/opt/bison/bin /usr/local/opt/bison/bin) endif() endif() From d6341bc4de5c5f71ffcd129b952a42e823b21bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 20 Dec 2023 06:12:00 +0100 Subject: [PATCH 0677/1039] [arrow] Update to 14.0.2 (#35775) --- ports/arrow/portfile.cmake | 2 +- ports/arrow/vcpkg.json | 3 +-- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 6da29ed9041ce3..2d3859eee98e12 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 31d19f0ca80349f63db74bae813256b47907f85725a9bf01ef6f32406e79828ebb4701faedb52696b6a5b3bb89ad4e136485fd5eb35d396dd42147c11d4d2713 + SHA512 dd6cf6cbb817a48ef5275bb409367e5904526a3c16a17a37ea75101085ea19a71ba6bf936a6f099012e7c528811db1728ef2f14dcb16a1056a22088839280ce0 ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index e26fd4df3bbe52..9d3a45c7fbf605 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "14.0.1", - "port-version": 2, + "version": "14.0.2", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 574f16a24777a5..2fbb58ec6407c2 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8cadbfff7756e4b3ae2589f7312f80b82e0ff88", + "version": "14.0.2", + "port-version": 0 + }, { "git-tree": "f73c538acb0a7dbda211654b354286af98b399f0", "version": "14.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 10d8295d53ee80..094c6b81ecc504 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -237,8 +237,8 @@ "port-version": 5 }, "arrow": { - "baseline": "14.0.1", - "port-version": 2 + "baseline": "14.0.2", + "port-version": 0 }, "arsenalgear": { "baseline": "2.1.0", From f1a46998aef207e6f289f4f0ea3c476c55805c9a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:12:16 +0800 Subject: [PATCH 0678/1039] [live555] update to 2023.11.30 (#35774) --- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index 9954827036c898..f79d5fcdb533e8 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://live555.com/liveMedia/public/live.2023.11.08.tar.gz" - FILENAME "live.2023.11.08.tar.gz" - SHA512 b9c0c8a96607325b81e5829b0a57917f155d0767f02a0ee4d887ec7985e5f4a2252961dc4f48de6b66a9ea566fa2a3bea87004c44e565da87b8fa06a3e08954d + URLS "http://live555.com/liveMedia/public/live.2023.11.30.tar.gz" + FILENAME "live.2023.11.30.tar.gz" + SHA512 c91703197448f65d63a8a6e07597791da1ee63d3b59a0809454468a3869d86e21533c7fc434d0178a179d5a2e0e5614539e47daad813fbbe7468028419026892 ) vcpkg_extract_source_archive( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index 4eab98d196c4b1..a6cebf49bb031b 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,6 @@ { "name": "live555", - "version-date": "2023-11-08", + "version-date": "2023-11-30", "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 094c6b81ecc504..089384a01097d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5225,7 +5225,7 @@ "port-version": 2 }, "live555": { - "baseline": "2023-11-08", + "baseline": "2023-11-30", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index a4d0bf7f38b5ff..efba17ae30018a 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80eb597529bc497ceb274509b6224bf0524930c1", + "version-date": "2023-11-30", + "port-version": 0 + }, { "git-tree": "302e545ae4e1386eb3048b429fff813c336ff0c7", "version-date": "2023-11-08", From 4b2d315482086d487565287eed618aaff8b49c31 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 20 Dec 2023 15:16:05 +0800 Subject: [PATCH 0679/1039] [libsodium] update to 1.0.19 (#35753) * [libsodium] update to 1.0.19 * Fix config error * Fixes cnats and proxygen failed with undefined reference to `_crypto_aead_aegis128l_pick_best_implementation' and `_crypto_aead_aegis256_pick_best_implementation' * Fixes undefined reference to `aegis128l_aesni_implementation' and `aegis256_aesni_implementation' --- ports/libsodium/CMakeLists.txt | 31 ++++++++++++++++++++++++++----- ports/libsodium/portfile.cmake | 2 +- ports/libsodium/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsodium.json | 5 +++++ 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt index e9d44635953864..24701e2ae69f9a 100644 --- a/ports/libsodium/CMakeLists.txt +++ b/ports/libsodium/CMakeLists.txt @@ -689,9 +689,21 @@ else () target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR}/sodium/version.h - - ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c - ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c + + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_common.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_soft.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/implementations.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aead_aegis256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_common.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_soft.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_soft.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/implementations.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aes256gcm/aead_aes256gcm.c + + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/chacha20poly1305/aead_chacha20poly1305.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/xchacha20poly1305/aead_xchacha20poly1305.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/crypto_auth.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512.c @@ -705,6 +717,7 @@ else () ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/hsalsa20/core_hsalsa20.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_core/softaes/softaes.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/crypto_generichash.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/generichash_blake2.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_generichash/blake2b/ref/blake2.h @@ -721,6 +734,8 @@ else () ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/blake2b/kdf_blake2b.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/crypto_kdf.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha256.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kdf/hkdf/kdf_hkdf_sha512.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_kx/crypto_kx.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c @@ -769,13 +784,15 @@ else () ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.c ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/salsa20/stream_salsa20.h ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c - ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_verify/sodium/verify.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_verify/verify.c + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/asm_cet.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/chacha20_ietf_ext.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/common.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/ed25519_ref10.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/implementations.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/mutex.h ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/sse2_64_32.h + ${PROJECT_SOURCE_DIR}/src/libsodium/include/sodium/private/softaes.h ${PROJECT_SOURCE_DIR}/src/libsodium/randombytes/randombytes.c ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/codecs.c ${PROJECT_SOURCE_DIR}/src/libsodium/sodium/core.c @@ -826,7 +843,6 @@ else () ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder.S - ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_scalarmult/curve25519/sandy2x/ladder_base.S ) if (HAVE_AVX_ASM) @@ -889,6 +905,10 @@ else () add_library(${PROJECT_NAME}_aesni OBJECT + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_aesni.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis128l/aegis128l_aesni.h + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_aesni.c + ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aegis256/aegis256_aesni.h ${PROJECT_SOURCE_DIR}/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c ) @@ -1097,6 +1117,7 @@ install(DIRECTORY src/libsodium/include/ USE_SOURCE_PERMISSIONS PATTERN "*.h" PATTERN "*.h.in" EXCLUDE + PATTERN "*.in" EXCLUDE REGEX "private($|/)" EXCLUDE ) diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 4ff90b12f2b054..50035ed5230f18 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jedisct1/libsodium REF ${VERSION} - SHA512 727fe50a5fb1df86ec5d807770f408a52609cbeb8510b4f4183b2a35a537905719bdb6348afcb103ff00ce946a8094ac9559b6e3e5b2ccc2a2d0c08f75577eeb + SHA512 6094d7bf191ea3be85f2ddab76b71f1b9c69c786493db5b84d3c5d5a0237003377ddf6a8687a962ea651fe4a9369cf5ee1676ba0bae82690f5f7ef31a698efa9 HEAD_REF master ) diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json index 9af42f2bece34f..10d93456cb94a8 100644 --- a/ports/libsodium/vcpkg.json +++ b/ports/libsodium/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsodium", - "version": "1.0.18", - "port-version": 9, + "version": "1.0.19", "description": "A modern and easy-to-use crypto library", "homepage": "https://github.com/jedisct1/libsodium", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index 089384a01097d9..bbf28d245d568b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4821,8 +4821,8 @@ "port-version": 2 }, "libsodium": { - "baseline": "1.0.18", - "port-version": 9 + "baseline": "1.0.19", + "port-version": 0 }, "libsonic": { "baseline": "0.2.0", diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json index 48aadca12c5c0b..a30678407f565f 100644 --- a/versions/l-/libsodium.json +++ b/versions/l-/libsodium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8fa2db17dd4845eaa7b2ffd3c165a9d1fa31cce", + "version": "1.0.19", + "port-version": 0 + }, { "git-tree": "6c75abf2ec95a8c9b498d2e18e9f854d75941048", "version": "1.0.18", From cd8067150ed02f48adb2c6460dce5120b088d93f Mon Sep 17 00:00:00 2001 From: Eidolon Date: Wed, 20 Dec 2023 02:30:40 -0600 Subject: [PATCH 0680/1039] [libvpx] Use msys2 perl on win32 hosts (#35593) --- ports/libvpx/portfile.cmake | 12 +++++------- ports/libvpx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libvpx.json | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 71f2f7b6fb0480..5730cf5880f91c 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -13,18 +13,16 @@ vcpkg_from_github( 0005-fix-arm64-build.patch # Upstream commit: https://github.com/webmproject/libvpx/commit/858a8c611f4c965078485860a6820e2135e6611b ) -vcpkg_find_acquire_program(PERL) - -get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) - if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) + set(ENV{PATH} "${MSYS_ROOT}/usr/bin;$ENV{PATH}") else() + vcpkg_find_acquire_program(PERL) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") endif() -find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE) +find_program(BASH NAME bash HINTS ${MSYS_ROOT}/usr/bin REQUIRED NO_CACHE) vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 9e47d6d4749c11..e1916eb48f9cba 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libvpx", "version": "1.13.1", - "port-version": 1, + "port-version": 2, "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 bbf28d245d568b..9fccdd514a116e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5010,7 +5010,7 @@ }, "libvpx": { "baseline": "1.13.1", - "port-version": 1 + "port-version": 2 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 2597b1bff569db..a1bcc673bca147 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66ea767e9ce55da152694d49a74ad2125ca4d937", + "version": "1.13.1", + "port-version": 2 + }, { "git-tree": "88491a53de6cdc69ec82882d44aab8cf3b315577", "version": "1.13.1", From 52b52b4588b916152ff662f97842e03db83fa5d1 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Wed, 20 Dec 2023 00:31:01 -0800 Subject: [PATCH 0681/1039] [podofo] Update to 0.10.3 (#35788) --- ports/podofo/portfile.cmake | 2 +- ports/podofo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/podofo.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index eaba88764aa3ef..0f9300930a1216 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO podofo/podofo REF "${VERSION}" - SHA512 b5b7d4236a1f15b4eeee9d24210015b983910e88efa4727dd551f58b4d39cf7566314513b99099f54835b90a209cbf8231e04d19b63019223113abe6520fc932 + SHA512 80fa86ff7f256a69b963451ef741e49c56447084b26481e52d1a079940102b5d51d9ff1c43952bba22bae61d95c8c44eacc08f55cd18999aec6c563f615b2cf5 PATCHES fix-interface-include.patch ) diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index 098212375a14e8..e9e31f0c0516c7 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "podofo", - "version": "0.10.2", + "version": "0.10.3", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://github.com/podofo/podofo", "license": "LGPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 9fccdd514a116e..83b8f2608563f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6689,7 +6689,7 @@ "port-version": 0 }, "podofo": { - "baseline": "0.10.2", + "baseline": "0.10.3", "port-version": 0 }, "poissonrecon": { diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 120a22e7fb96a4..4116f09a116742 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d60835f5584606317c7c3ea4fbc5187d5d4b00", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "0323e740780ecead10bd47ca5bfb89ca6140c3b7", "version": "0.10.2", From 29b03c409912e2076c19fddb6f35320da679a4d4 Mon Sep 17 00:00:00 2001 From: JacobBarthelmeh Date: Wed, 20 Dec 2023 13:28:34 -0700 Subject: [PATCH 0682/1039] [wolfssl] update to 5.6.6 (#35802) --- ports/wolfssl/portfile.cmake | 4 ++-- ports/wolfssl/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wolfssl.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 2be75a74fa66ac..807e9aea151f64 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.6.4-stable - SHA512 12d9dd264e005f04854d71ded629b20b9563a42b04bfbfd2879c4e3b121902edf2ac4349de27498cddd75d4d9fd742e8f78b82cd319c240485f69b4828e2c80c + REF v5.6.6-stable + SHA512 d664ab1cd84d7c33d1b34eb934843292b7ffc07b922b4c483b45deeeeda5c425b673640e3049f731bfff364bd7e7c0c14e236afce36622a7d03242d3be0c7382 HEAD_REF master PATCHES ) diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 8a6249e3dd24e6..3b72985a862c48 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wolfssl", - "version": "5.6.4", - "port-version": 1, + "version": "5.6.6", "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 83b8f2608563f2..fc50b4fe873af9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9113,8 +9113,8 @@ "port-version": 0 }, "wolfssl": { - "baseline": "5.6.4", - "port-version": 1 + "baseline": "5.6.6", + "port-version": 0 }, "wolftpm": { "baseline": "2.7.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index 0bb433f0235106..4202269162fe26 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c03fac0a968b9bdba85d3baba48695e82e1e297d", + "version": "5.6.6", + "port-version": 0 + }, { "git-tree": "fb8d59a3965864a1330fa99418eef1df5c354a50", "version": "5.6.4", From 69cc111abccb1af68b5a7f56bab848d5af843920 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 20 Dec 2023 21:29:28 +0100 Subject: [PATCH 0683/1039] [atomic-queue] Update to 1.5 (#35799) --- ports/atomic-queue/portfile.cmake | 22 +++++++++++----------- ports/atomic-queue/vcpkg.json | 5 +++-- versions/a-/atomic-queue.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ports/atomic-queue/portfile.cmake b/ports/atomic-queue/portfile.cmake index 49c5e057695cbf..d1ae955ba29fc9 100644 --- a/ports/atomic-queue/portfile.cmake +++ b/ports/atomic-queue/portfile.cmake @@ -1,20 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO max0x7ba/atomic_queue - REF 7619054490efdbfe377bd528bc09b21f5cd38a02 - SHA512 0d145f461a5c978c4d6f6d8ec1f06f0c61f3d009e65eac12db806c2aa7941461f881b34b9c4dd9aeebd3206a4598e6081f89f983c389b2f5aecefefcbddd94b6 + REF "v${VERSION}" + SHA512 d2b329698412127d23e9ee55472f65869c59b228439e714ebbe6cc66202b654a102f32583e7cc3b5999c22c1dba69a5aa4365870cc4b88b75b1ac0b4d94b979a HEAD_REF master ) file( - COPY - ${SOURCE_PATH}/include/atomic_queue/atomic_queue.h - ${SOURCE_PATH}/include/atomic_queue/atomic_queue_mutex.h - ${SOURCE_PATH}/include/atomic_queue/barrier.h - ${SOURCE_PATH}/include/atomic_queue/defs.h - ${SOURCE_PATH}/include/atomic_queue/spinlock.h - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/atomic_queue + COPY + "${SOURCE_PATH}/include/atomic_queue/atomic_queue.h" + "${SOURCE_PATH}/include/atomic_queue/atomic_queue_mutex.h" + "${SOURCE_PATH}/include/atomic_queue/barrier.h" + "${SOURCE_PATH}/include/atomic_queue/defs.h" + "${SOURCE_PATH}/include/atomic_queue/spinlock.h" + DESTINATION + "${CURRENT_PACKAGES_DIR}/include/atomic_queue" ) -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/atomic-queue/vcpkg.json b/ports/atomic-queue/vcpkg.json index 7e7cbe56fa75f0..255c3ee00be213 100644 --- a/ports/atomic-queue/vcpkg.json +++ b/ports/atomic-queue/vcpkg.json @@ -1,6 +1,7 @@ { "name": "atomic-queue", - "version-date": "2021-05-03", + "version": "1.5", "description": "Minimalistic header-only thread-safe ultra-low-latency multiple-producer-multiple-consumer lockless queues based on circular buffer with std::atomic.", - "homepage": "https://github.com/max0x7ba/atomic_queue" + "homepage": "https://github.com/max0x7ba/atomic_queue", + "license": "MIT" } diff --git a/versions/a-/atomic-queue.json b/versions/a-/atomic-queue.json index 56784d4b3b6de3..328de0fc0afef4 100644 --- a/versions/a-/atomic-queue.json +++ b/versions/a-/atomic-queue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "045962c06085fe2da8633106b2170b29f4febe47", + "version": "1.5", + "port-version": 0 + }, { "git-tree": "a32a426d9c16a0067532134ecb6680ee7928f7f7", "version-date": "2021-05-03", diff --git a/versions/baseline.json b/versions/baseline.json index fc50b4fe873af9..a5130046b30650 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -309,7 +309,7 @@ "port-version": 3 }, "atomic-queue": { - "baseline": "2021-05-03", + "baseline": "1.5", "port-version": 0 }, "attr": { From c6f9a7b205b7c6847513a60a9759e1e600e0646d Mon Sep 17 00:00:00 2001 From: i-curve Date: Thu, 21 Dec 2023 04:30:12 +0800 Subject: [PATCH 0684/1039] [copypp] update to 0.3.0 (#35797) --- ports/copypp/portfile.cmake | 2 +- ports/copypp/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/copypp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/copypp/portfile.cmake b/ports/copypp/portfile.cmake index 5af36233d7bdbf..4e8d06bc9643e0 100644 --- a/ports/copypp/portfile.cmake +++ b/ports/copypp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO i-curve/copypp REF "v${VERSION}" - SHA512 cd96a310544dcd936126162de603c8a79c60e1ab9764e337704c3425096592b8e91e92ba9813f28f4838cd9b5f58e2e50cb7bce9a15d9b35c5c863693c32ae5d + SHA512 1c34cfcc30234d6a0eb3f150dff40299f74be8cc7653dc494a5a6857ad4d42342815a8ef2cb3b06d05555cd9d6d4c9b9941a7a845ab40cc782ce4660fb1e2560 HEAD_REF main ) diff --git a/ports/copypp/vcpkg.json b/ports/copypp/vcpkg.json index 4c93a2c079ca42..06d6566a0280da 100644 --- a/ports/copypp/vcpkg.json +++ b/ports/copypp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "copypp", - "version": "0.2.0", - "description": "support field copy in different c++ struct.", + "version": "0.3.0", + "description": "support field copy in different c++ data type.", "homepage": "https://github.com/i-curve/copypp", "license": "MIT", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a5130046b30650..befe689b04e26d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1789,7 +1789,7 @@ "port-version": 3 }, "copypp": { - "baseline": "0.2.0", + "baseline": "0.3.0", "port-version": 0 }, "coroutine": { diff --git a/versions/c-/copypp.json b/versions/c-/copypp.json index 3e6af81f7577f7..8babb117829cb1 100644 --- a/versions/c-/copypp.json +++ b/versions/c-/copypp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a681be8127821639bed4c4886a351b0640d5c04", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "19d47125ad84c71c928f7ea266a6d7543b65ef23", "version": "0.2.0", From 38bd5902bb9049003e385587ee008ee01cd1445a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 21 Dec 2023 05:24:18 +0100 Subject: [PATCH 0685/1039] [vcpkg-ci-boost] All triplets (#28619) --- scripts/ci.baseline.txt | 7 ++++- scripts/test_ports/vcpkg-ci-boost/vcpkg.json | 30 +++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 65f154b29837ed..bbf6c962993520 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1265,9 +1265,14 @@ 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:arm-neon-android=pass +vcpkg-ci-boost:arm64-android=pass +vcpkg-ci-boost:arm64-uwp=pass vcpkg-ci-boost:arm64-windows=pass +vcpkg-ci-boost:x64-android=pass +vcpkg-ci-boost:x64-linux=pass vcpkg-ci-boost:x64-osx=pass +vcpkg-ci-boost:x64-uwp=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/scripts/test_ports/vcpkg-ci-boost/vcpkg.json b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json index 0721b95e33381e..472288ac0960a0 100644 --- a/scripts/test_ports/vcpkg-ci-boost/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-boost/vcpkg.json @@ -9,7 +9,7 @@ "features": [ "mpi" ], - "platform":"!(arm & windows)" + "platform": "!staticcrt & !(arm & windows) & !uwp" }, { "name": "boost-asio", @@ -24,7 +24,7 @@ "features": [ "numa" ], - "platform":"!uwp & !arm & !emscripten" + "platform": "!uwp & !arm & !emscripten" }, { "name": "boost-locale", @@ -32,7 +32,7 @@ "features": [ "icu" ], - "platform":"!uwp" + "platform": "!uwp" }, { "name": "boost-mpi", @@ -40,11 +40,11 @@ "features": [ "python3" ], - "platform": "!static & !(arm & windows)" + "platform": "!staticcrt & !static & !uwp & !(arm & windows)" }, { - "name":"boost-odeint", - "default-features":false + "name": "boost-odeint", + "default-features": false }, { "name": "boost-odeint", @@ -52,27 +52,23 @@ "features": [ "mpi" ], - "platform": "!(arm & windows)" + "platform": "!staticcrt & !uwp & !(windows & arm)" }, { "name": "boost-python", - "default-features":false, - "features":[ - "python2" + "default-features": false, + "features": [ + "python3" ], - "platform":"!(arm & windows)" + "platform": "!emscripten & !ios & !android & !uwp" }, { "name": "boost-python", "default-features": false, "features": [ - "python3" + "python2" ], - "platform":"!uwp" - }, - { - "name":"boost-regex", - "default-features":false + "platform": "!android & !emscripten & !ios & !(arm & osx) & !(arm & windows) & !uwp" }, { "name": "boost-regex", From 4874bea8eb8db9e6610672cccdd6ccd5d55c6f1a Mon Sep 17 00:00:00 2001 From: Aleksei Shpakovskii Date: Thu, 21 Dec 2023 05:26:48 +0100 Subject: [PATCH 0686/1039] [libdisasm] add license (#35798) --- ports/libdisasm/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libdisasm.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libdisasm/vcpkg.json b/ports/libdisasm/vcpkg.json index 0a51bb37ef0b51..d5a6f418c568b3 100644 --- a/ports/libdisasm/vcpkg.json +++ b/ports/libdisasm/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libdisasm", "version": "0.23", - "port-version": 10, + "port-version": 11, "description": "x86 Disassembler Library.", "homepage": "https://sourceforge.net/projects/bastard", + "license": "ClArtistic", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index befe689b04e26d..71023c2da069b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4206,7 +4206,7 @@ }, "libdisasm": { "baseline": "0.23", - "port-version": 10 + "port-version": 11 }, "libdivide": { "baseline": "5.0", diff --git a/versions/l-/libdisasm.json b/versions/l-/libdisasm.json index e20096468a532c..2aa1cb4499592d 100644 --- a/versions/l-/libdisasm.json +++ b/versions/l-/libdisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d98ead706d535c81198d0b4fd3a1744cd0e0a23e", + "version": "0.23", + "port-version": 11 + }, { "git-tree": "e6870682ac5d76671fbe396235d4667f5edf669b", "version": "0.23", From ec05fe4a59b3e38b0a46aefb1123af37e7cc603d Mon Sep 17 00:00:00 2001 From: Benjamin Just Date: Thu, 21 Dec 2023 20:17:20 +0100 Subject: [PATCH 0687/1039] [openssl] add feature to enable ssl3/weak-ssl-ciphers (#35196) --- ports/openssl/portfile.cmake | 11 +++++++++-- ports/openssl/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 2f9f5be911d705..b1a0772a38a8b3 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -36,8 +36,6 @@ vcpkg_from_github( vcpkg_list(SET CONFIGURE_OPTIONS enable-static-engine enable-capieng - no-ssl3 - no-weak-ssl-ciphers no-tests no-docs ) @@ -58,6 +56,15 @@ if(NOT "tools" IN_LIST FEATURES) vcpkg_list(APPEND CONFIGURE_OPTIONS no-apps) endif() +if("weak-ssl-ciphers" IN_LIST FEATURES) + vcpkg_list(APPEND CONFIGURE_OPTIONS enable-weak-ssl-ciphers) +endif() + +if("ssl3" IN_LIST FEATURES) + vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3) + vcpkg_list(APPEND CONFIGURE_OPTIONS enable-ssl3-method) +endif() + if(DEFINED OPENSSL_USE_NOPINSHARED) vcpkg_list(APPEND CONFIGURE_OPTIONS no-pinshared) endif() diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d5b1417827f2a6..bc067f8bf6d938 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.2.0", + "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", @@ -23,9 +24,15 @@ "description": "Enable fips", "supports": "!static" }, + "ssl3": { + "description": "Enable SSL3" + }, "tools": { "description": "Install openssl executable and scripts", "supports": "!uwp" + }, + "weak-ssl-ciphers": { + "description": "Enable weak-ssl-ciphers" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 71023c2da069b5..bf3309ecd086eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6338,7 +6338,7 @@ }, "openssl": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 721249cf36aabe..7b51fc3d7433a1 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd76b04663283d999c149033c3fac211d08f0324", + "version": "3.2.0", + "port-version": 1 + }, { "git-tree": "b9b4587c2e00e793e735d8ac5094f64dbfcf44e1", "version": "3.2.0", From f30434939d5516ce764c549ab04e3d23d312180a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 22 Dec 2023 08:11:21 +0800 Subject: [PATCH 0688/1039] [treehopper] Fix dependency handling of libusb (#35480) --- ports/treehopper/fix-dependences.patch | 42 ++++++++++++++++++++++++++ ports/treehopper/portfile.cmake | 11 ++++--- ports/treehopper/vcpkg.json | 9 ++++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/t-/treehopper.json | 5 +++ 6 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 ports/treehopper/fix-dependences.patch diff --git a/ports/treehopper/fix-dependences.patch b/ports/treehopper/fix-dependences.patch new file mode 100644 index 00000000000000..7fdd26a4553832 --- /dev/null +++ b/ports/treehopper/fix-dependences.patch @@ -0,0 +1,42 @@ +diff --git a/C++/API/CMakeLists.txt b/C++/API/CMakeLists.txt +index 8537305..db3d29b 100644 +--- a/C++/API/CMakeLists.txt ++++ b/C++/API/CMakeLists.txt +@@ -37,7 +37,10 @@ if(APPLE) + find_library(IOKIT IOKit) + target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT}) + elseif(UNIX) +- target_link_libraries(treehopper usb-1.0 pthread) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(libusb REQUIRED IMPORTED_TARGET libusb-1.0) ++ ++ target_link_libraries(treehopper PRIVATE PkgConfig::libusb pthread) + elseif(WIN32) + target_link_libraries(treehopper winusb setupapi) + endif(APPLE) +diff --git a/C++/API/inc/ConnectionService.h b/C++/API/inc/ConnectionService.h +index 66d338e..12a0192 100644 +--- a/C++/API/inc/ConnectionService.h ++++ b/C++/API/inc/ConnectionService.h +@@ -8,7 +8,7 @@ + #include + #endif + #ifdef __linux__ +-#include "libusb-1.0/libusb.h" ++#include "libusb.h" + #endif + #include + +diff --git a/C++/API/inc/LibUsbConnection.h b/C++/API/inc/LibUsbConnection.h +index b6d5198..e9cd29e 100644 +--- a/C++/API/inc/LibUsbConnection.h ++++ b/C++/API/inc/LibUsbConnection.h +@@ -6,7 +6,7 @@ + + #include "Treehopper.h" + +-#include ++#include + #include "UsbConnection.h" + + namespace Treehopper { diff --git a/ports/treehopper/portfile.cmake b/ports/treehopper/portfile.cmake index 3b6cfa9c196d39..d2b263386875ac 100644 --- a/ports/treehopper/portfile.cmake +++ b/ports/treehopper/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO treehopper-electronics/treehopper-sdk - REF 1.11.3 + REF "${VERSION}" SHA512 65b748375b798787c8b59f9657151f340920c939c3f079105b9b78f4e3b775125598106c6dfa4feba111a64d30f007003a70110ac767802a7dd1127a25c9fb14 - HEAD_REF master) + HEAD_REF master + PATCHES + fix-dependences.patch +) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/C++/API/" @@ -18,6 +21,4 @@ vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/C++/API/inc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/Treehopper/") - -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/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json index 42d19e0f68220b..fdf185fb78a49c 100644 --- a/ports/treehopper/vcpkg.json +++ b/ports/treehopper/vcpkg.json @@ -1,12 +1,15 @@ { "name": "treehopper", "version": "1.11.3", - "port-version": 8, + "port-version": 9, "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", "homepage": "https://treehopper.io", - "supports": "!staticcrt", + "supports": "!staticcrt & !uwp", "dependencies": [ - "libusb", + { + "name": "libusb", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bbf6c962993520..ff121cb1bea4e0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1162,7 +1162,6 @@ torch-th:arm64-uwp=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -treehopper:x64-linux=fail turbobase64:arm-neon-android=fail tvision:arm-neon-android=fail tvision:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index bf3309ecd086eb..d4a5e35e5fdf37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8602,7 +8602,7 @@ }, "treehopper": { "baseline": "1.11.3", - "port-version": 8 + "port-version": 9 }, "triangle": { "baseline": "1.6", diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index 8569bae3611fb5..06616ffa10d147 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "145e9145dba553063f0483909603c6369c5a4e63", + "version": "1.11.3", + "port-version": 9 + }, { "git-tree": "94c478388c393d8b174b2fd9c4ad0f77805583dc", "version": "1.11.3", From e9435ccc15d72d6238b529c1f5d5c5e505ba4f29 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 22 Dec 2023 21:47:59 +0100 Subject: [PATCH 0689/1039] [kealib] Update to 1.5.3 (#35819) --- ports/kealib/kealib-target.diff | 43 --------------------------------- ports/kealib/portfile.cmake | 6 ++--- ports/kealib/usage | 4 +-- ports/kealib/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/k-/kealib.json | 5 ++++ 6 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 ports/kealib/kealib-target.diff diff --git a/ports/kealib/kealib-target.diff b/ports/kealib/kealib-target.diff deleted file mode 100644 index d89095f208dc8f..00000000000000 --- a/ports/kealib/kealib-target.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a9b19fe..3ab09c1 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -54,21 +54,8 @@ set_target_properties(${LIBKEA_LIB_NAME} - ) - - add_library(Kealib INTERFACE) --target_include_directories(Kealib INTERFACE -- $ -- $ -- $ --) --# TODO: a better way?? --if(MSVC) -- target_link_libraries(Kealib INTERFACE -- $ -- $) --else() -- target_link_libraries(Kealib INTERFACE -- $ -- $) --endif(MSVC) -+target_include_directories(Kealib INTERFACE $) -+target_link_libraries(Kealib INTERFACE ${LIBKEA_LIB_NAME}) - ############################################################################### - - ############################################################################### -diff --git a/src/Config.cmake.in b/src/Config.cmake.in -index 7de44f9..8a7bb8c 100644 ---- a/src/Config.cmake.in -+++ b/src/Config.cmake.in -@@ -1,5 +1,10 @@ - @PACKAGE_INIT@ - -+# FindHDF5.cmake may expose exported targets in HDF5_LIBRARIES. -+include(CMakeFindDependencyMacro) -+set(HDF5_USE_STATIC_LIBRARIES "@HDF5_USE_STATIC_LIBRARIES@") -+find_dependency(HDF5) -+ - include("${CMAKE_CURRENT_LIST_DIR}/libkeaTargets.cmake") - - check_required_components(libkea) diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake index 5f2a2a5df05d2e..3367edf923b9bd 100644 --- a/ports/kealib/portfile.cmake +++ b/ports/kealib/portfile.cmake @@ -2,10 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ubarsc/kealib REF "kealib-${VERSION}" - SHA512 82399f1332ff2aeb6342732e9e5c897c813109fd18e77cfc8d866f06adf4faa7f080f1f3c0a3b777fb3a679912dacf4851b7ad09a338d6087dd1d26eb2d1689f + SHA512 ccaaf9d5031eac32bf1a0e6b9e9efb4f5245fc730d33bd9931efb1a6f529990c6da8ddd400ec0d58ee527675057b74c81393d263c9b182ac5f9a8796273b001f HEAD_REF master PATCHES - kealib-target.diff no-kea-config-script.diff ) @@ -18,7 +17,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kealib) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/kealib/usage b/ports/kealib/usage index 9b42e9f066a620..b8a1ab4430d225 100644 --- a/ports/kealib/usage +++ b/ports/kealib/usage @@ -1,4 +1,4 @@ kealib provides CMake targets: - find_package(libkea CONFIG REQUIRED) - target_link_libraries(main PRIVATE libkea::Kealib) + find_package(Kealib CONFIG REQUIRED) + target_link_libraries(main PRIVATE Kealib::Kealib) diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json index 6ca70a322f69c9..7e324a5a2c4226 100644 --- a/ports/kealib/vcpkg.json +++ b/ports/kealib/vcpkg.json @@ -1,9 +1,9 @@ { "name": "kealib", - "version": "1.5.2", - "port-version": 1, + "version": "1.5.3", "description": "KEALib provides an implementation of the GDAL data model using HDF5.", "homepage": "https://github.com/ubarsc/kealib", + "license": "MIT", "dependencies": [ { "name": "hdf5", diff --git a/versions/baseline.json b/versions/baseline.json index d4a5e35e5fdf37..04796799776854 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3745,8 +3745,8 @@ "port-version": 0 }, "kealib": { - "baseline": "1.5.2", - "port-version": 1 + "baseline": "1.5.3", + "port-version": 0 }, "keccak-tiny": { "baseline": "2014-09-08", diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json index 1772d8b07a5c60..76481aac791721 100644 --- a/versions/k-/kealib.json +++ b/versions/k-/kealib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56a7c2f40ce5bb8f1674cf676d80c20a32e32d14", + "version": "1.5.3", + "port-version": 0 + }, { "git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834", "version": "1.5.2", From 4c59249debed9ac4fc786e0d06c247f013767f62 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 23 Dec 2023 04:48:46 +0800 Subject: [PATCH 0690/1039] [realsense2] Add support !arm (#35824) --- ports/realsense2/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index abbc316213961b..54616c1362ae7b 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,11 +1,11 @@ { "name": "realsense2", "version": "2.54.2", - "port-version": 1, + "port-version": 2, "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", - "supports": "!uwp", + "supports": "!uwp & !(windows & arm)", "dependencies": [ { "name": "libusb", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ff121cb1bea4e0..b29297fc542568 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -990,7 +990,6 @@ rbdl-orb:x64-osx=skip rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail -realsense2:arm64-windows=fail replxx:arm-neon-android=fail replxx:arm64-android=fail replxx:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 04796799776854..660663e3102539 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7430,7 +7430,7 @@ }, "realsense2": { "baseline": "2.54.2", - "port-version": 1 + "port-version": 2 }, "recast": { "baseline": "deprecated", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 6a30bca87b1f92..345fb90cd3467d 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b15354f0a205d2288e63564e2789e317442bd999", + "version": "2.54.2", + "port-version": 2 + }, { "git-tree": "17434b2bd3e05364a70afea06d2d7ccb9db544c6", "version": "2.54.2", From 6c937c32233bdf295ab2140dbce97fd00084a5f3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 22 Dec 2023 21:53:15 +0100 Subject: [PATCH 0691/1039] [freerdp] Update to 3.0.0 (#35727) --- ports/freerdp/dependencies.patch | 59 ++++++ ports/freerdp/export-include.patch | 203 -------------------- ports/freerdp/find-dependency.patch | 44 ----- ports/freerdp/fix-include-path.patch | 52 ----- ports/freerdp/fix-install-destination.patch | 127 ------------ ports/freerdp/install-layout.patch | 88 +++++++++ ports/freerdp/keep-dup-libs.patch | 22 +-- ports/freerdp/openssl-3.patch | 15 -- ports/freerdp/portfile.cmake | 72 ++++--- ports/freerdp/pr-7060-jni-onload.patch | 89 --------- ports/freerdp/vcpkg.json | 13 +- ports/freerdp/wfreerdp-server-cli.patch | 8 +- ports/freerdp/windows-linkage.patch | 14 ++ versions/baseline.json | 4 +- versions/f-/freerdp.json | 5 + 15 files changed, 239 insertions(+), 576 deletions(-) create mode 100644 ports/freerdp/dependencies.patch delete mode 100644 ports/freerdp/export-include.patch delete mode 100644 ports/freerdp/find-dependency.patch delete mode 100644 ports/freerdp/fix-include-path.patch delete mode 100644 ports/freerdp/fix-install-destination.patch create mode 100644 ports/freerdp/install-layout.patch delete mode 100644 ports/freerdp/openssl-3.patch delete mode 100644 ports/freerdp/pr-7060-jni-onload.patch create mode 100644 ports/freerdp/windows-linkage.patch diff --git a/ports/freerdp/dependencies.patch b/ports/freerdp/dependencies.patch new file mode 100644 index 00000000000000..bbacce8094d971 --- /dev/null +++ b/ports/freerdp/dependencies.patch @@ -0,0 +1,59 @@ +diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in +index 35b74c1..a4e48c9 100644 +--- a/client/FreeRDP-ClientConfig.cmake.in ++++ b/client/FreeRDP-ClientConfig.cmake.in +@@ -1,6 +1,7 @@ + include(CMakeFindDependencyMacro) + find_dependency(WinPR @FREERDP_VERSION@) + find_dependency(FreeRDP @FREERDP_VERSION@) ++find_dependency(ZLIB) + + @PACKAGE_INIT@ + +diff --git a/cmake/FindFeature.cmake b/cmake/FindFeature.cmake +index bd25fd4..dd180a3 100644 +--- a/cmake/FindFeature.cmake ++++ b/cmake/FindFeature.cmake +@@ -15,7 +15,7 @@ macro(find_feature _feature _type _purpose _description) + set(_feature_default "ON") + message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})") + find_package(${_feature} REQUIRED) +- elseif(${_type} STREQUAL "RECOMMENDED") ++ elseif(0) + if(NOT ${WITH_${_feature_upper}}) + set(_feature_default "OFF") + message(STATUS "Skipping ${_type_lower} feature ${_feature} for ${_purpose} (${_description})") +@@ -29,7 +29,7 @@ macro(find_feature _feature _type _purpose _description) + message(STATUS "Not detected ${_type_lower} feature ${_feature} for ${_purpose} (${_description}), feature disabled") + endif() + endif() +- elseif(${_type} STREQUAL "OPTIONAL") ++ elseif(1) + if(${WITH_${_feature_upper}}) + set(_feature_default "ON") + message(STATUS "Finding ${_type_lower} feature ${_feature} for ${_purpose} (${_description})") +diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in +index 21ecd59..2613a59 100644 +--- a/libfreerdp/FreeRDPConfig.cmake.in ++++ b/libfreerdp/FreeRDPConfig.cmake.in +@@ -1,5 +1,7 @@ + include(CMakeFindDependencyMacro) + find_dependency(WinPR @FREERDP_VERSION@) ++find_dependency(cJSON) ++find_dependency(ZLIB) + + @PACKAGE_INIT@ + +diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in +index 21ea0c7..71b8e18 100644 +--- a/libfreerdp/freerdp.pc.in ++++ b/libfreerdp/freerdp.pc.in +@@ -14,7 +14,7 @@ Description: FreeRDP: A Remote Desktop Protocol Implementation + URL: http://www.freerdp.com/ + Version: @FREERDP_VERSION@ + Requires: +-Requires.private: winpr@FREERDP_API_VERSION@ ++Requires.private: winpr@FREERDP_API_VERSION@ libcjson zlib + Libs: -L${libdir} ${libs} + Libs.private: -ldl -lpthread + Cflags: -I${includedir} diff --git a/ports/freerdp/export-include.patch b/ports/freerdp/export-include.patch deleted file mode 100644 index 7a91ec3215d0be..00000000000000 --- a/ports/freerdp/export-include.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt -index 882fef7..4ae7737 100644 ---- a/channels/CMakeLists.txt -+++ b/channels/CMakeLists.txt -@@ -213,6 +213,7 @@ macro(add_channel_client_library _module_prefix _module_name _channel_name _dyna - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() - endif() -+ target_include_directories(${_module_name} INTERFACE $) - endmacro(add_channel_client_library) - - macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_name _type _dynamic _entry) -@@ -253,6 +254,7 @@ macro(add_channel_client_subsystem_library _module_prefix _module_name _channel_ - client_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() - endif() -+ target_include_directories(${_module_name} INTERFACE $) - endmacro(add_channel_client_subsystem_library) - - macro(add_channel_server_library _module_prefix _module_name _channel_name _dynamic _entry) -@@ -290,6 +292,7 @@ macro(add_channel_server_library _module_prefix _module_name _channel_name _dyna - server_channel_install(${_module_name} ${FREERDP_ADDIN_PATH}) - endif() - endif() -+ target_include_directories(${_module_name} INTERFACE $) - endmacro(add_channel_server_library) - - set(FILENAME "ChannelOptions.cmake") -diff --git a/channels/server/CMakeLists.txt b/channels/server/CMakeLists.txt -index 1f49c3b..67d361f 100644 ---- a/channels/server/CMakeLists.txt -+++ b/channels/server/CMakeLists.txt -@@ -29,6 +29,7 @@ foreach(STATIC_MODULE ${CHANNEL_STATIC_SERVER_MODULES}) - endforeach() - - add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - if (WITH_LIBRARY_VERSIONING) - set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) -diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt -index b3473a9..5537033 100644 ---- a/client/Android/CMakeLists.txt -+++ b/client/Android/CMakeLists.txt -@@ -51,4 +51,5 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} jnigraphics) - #set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION}) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT AndroidTargets) -diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt -index b3eb591..f6f756b 100644 ---- a/client/Mac/CMakeLists.txt -+++ b/client/Mac/CMakeLists.txt -@@ -95,6 +95,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${EXTRA_LIBS} freerdp-client) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - # Set a list of the dependent targets used by the application. There should be a way to get this list automatically - # from cmake, but for now I put it down manually. I got the references by calling "otool -L MacFreeRDP-client" -diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt -index b0a5d27..278b0fc 100644 ---- a/client/Windows/CMakeLists.txt -+++ b/client/Windows/CMakeLists.txt -@@ -80,6 +80,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32) - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - if(WITH_CLIENT_INTERFACE) - install(TARGETS ${MODULE_NAME} COMPONENT libraries) -diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt -index 869652c..d170277 100644 ---- a/client/X11/CMakeLists.txt -+++ b/client/X11/CMakeLists.txt -@@ -238,6 +238,8 @@ if(WITH_IPP) - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${IPP_LIBRARY_LIST}) - endif() - -+target_include_directories(${MODULE_NAME} INTERFACE $) -+ - if(WITH_CLIENT_INTERFACE) - install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) - add_subdirectory(cli) -diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt -index 1de7461..acb6ecf 100644 ---- a/client/common/CMakeLists.txt -+++ b/client/common/CMakeLists.txt -@@ -77,6 +77,7 @@ else() - target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} ${${MODULE_PREFIX}_LIBS}) - endif() - -+target_include_directories(${MODULE_NAME} INTERFACE $) - - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets) - -diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index 7e9a63d..b9b0ab0 100644 ---- a/libfreerdp/CMakeLists.txt -+++ b/libfreerdp/CMakeLists.txt -@@ -395,6 +395,7 @@ endif() - - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) -diff --git a/rdtk/librdtk/CMakeLists.txt b/rdtk/librdtk/CMakeLists.txt -index 000e6d2..a84ce5e 100644 ---- a/rdtk/librdtk/CMakeLists.txt -+++ b/rdtk/librdtk/CMakeLists.txt -@@ -42,6 +42,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr) - list(APPEND ${MODULE_PREFIX}_LIBS freerdp) - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk") - -diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt -index 4086542..976bd86 100644 ---- a/server/Windows/CMakeLists.txt -+++ b/server/Windows/CMakeLists.txt -@@ -96,6 +96,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} dsound) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp) - - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - if(WITH_SERVER_INTERFACE) - install(TARGETS ${MODULE_NAME} COMPONENT libraries) -diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt -index 7c533b7..8503928 100644 ---- a/server/common/CMakeLists.txt -+++ b/server/common/CMakeLists.txt -@@ -62,6 +62,7 @@ endif() - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS}) - target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) -diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt -index 0daa245..583c0a4 100644 ---- a/server/shadow/CMakeLists.txt -+++ b/server/shadow/CMakeLists.txt -@@ -80,6 +80,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS winpr-tools) - list(APPEND ${MODULE_PREFIX}_LIBS rdtk) - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_VERSION_MAJOR}) - if (WITH_LIBRARY_VERSIONING) -@@ -285,6 +286,7 @@ add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) - set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow freerdp winpr) - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${${MODULE_PREFIX}_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${MODULE_NAME}${FREERDP_API_VERSION}) - if (WITH_LIBRARY_VERSIONING) -diff --git a/uwac/libuwac/CMakeLists.txt b/uwac/libuwac/CMakeLists.txt -index f66a8c4..ea08bed 100644 ---- a/uwac/libuwac/CMakeLists.txt -+++ b/uwac/libuwac/CMakeLists.txt -@@ -81,6 +81,7 @@ if (HAVE_PIXMAN_REGION) - else() - target_link_libraries(${MODULE_NAME} PRIVATE freerdp) - endif() -+target_include_directories(${MODULE_NAME} INTERFACE $) - - install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT uwac) - -diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt -index 2616439..1f4688e 100644 ---- a/winpr/libwinpr/CMakeLists.txt -+++ b/winpr/libwinpr/CMakeLists.txt -@@ -144,6 +144,7 @@ endif() - - add_definitions(${WINPR_DEFINITIONS}) - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) -diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index 13f4c13..4a73333 100644 ---- a/winpr/tools/CMakeLists.txt -+++ b/winpr/tools/CMakeLists.txt -@@ -111,6 +111,7 @@ endif() - - add_definitions(${WINPR_DEFINITIONS}) - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS}) -+target_include_directories(${MODULE_NAME} INTERFACE $) - - install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) diff --git a/ports/freerdp/find-dependency.patch b/ports/freerdp/find-dependency.patch deleted file mode 100644 index 1df98f91a5c00d..00000000000000 --- a/ports/freerdp/find-dependency.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/client/FreeRDP-ClientConfig.cmake.in b/client/FreeRDP-ClientConfig.cmake.in -index 779374c..35b74c1 100644 ---- a/client/FreeRDP-ClientConfig.cmake.in -+++ b/client/FreeRDP-ClientConfig.cmake.in -@@ -1,3 +1,6 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(WinPR @FREERDP_VERSION@) -+find_dependency(FreeRDP @FREERDP_VERSION@) - - @PACKAGE_INIT@ - -diff --git a/libfreerdp/FreeRDPConfig.cmake.in b/libfreerdp/FreeRDPConfig.cmake.in -index a2321e7..4c8379e 100644 ---- a/libfreerdp/FreeRDPConfig.cmake.in -+++ b/libfreerdp/FreeRDPConfig.cmake.in -@@ -1,3 +1,5 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(WinPR @FREERDP_VERSION@) - - @PACKAGE_INIT@ - -diff --git a/server/FreeRDP-ServerConfig.cmake.in b/server/FreeRDP-ServerConfig.cmake.in -index b9edb55..db7cb44 100644 ---- a/server/FreeRDP-ServerConfig.cmake.in -+++ b/server/FreeRDP-ServerConfig.cmake.in -@@ -1,3 +1,6 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(WinPR @FREERDP_VERSION@) -+find_dependency(FreeRDP @FREERDP_VERSION@) - - @PACKAGE_INIT@ - -diff --git a/server/shadow/FreeRDP-ShadowConfig.cmake.in b/server/shadow/FreeRDP-ShadowConfig.cmake.in -index 1eb11e0..9b6f24c 100644 ---- a/server/shadow/FreeRDP-ShadowConfig.cmake.in -+++ b/server/shadow/FreeRDP-ShadowConfig.cmake.in -@@ -1,3 +1,7 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(WinPR @FREERDP_VERSION@) -+find_dependency(FreeRDP @FREERDP_VERSION@) -+find_dependency(FreeRDP-Server @FREERDP_VERSION@) - - @PACKAGE_INIT@ - diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch deleted file mode 100644 index f426813a02ae7c..00000000000000 --- a/ports/freerdp/fix-include-path.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54df8cf..5232d46 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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/") - - # Compatibility options - if(DEFINED STATIC_CHANNELS) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index a020dc5..0bc1157 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -19,7 +19,7 @@ - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h) --set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp) -+set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp) - - 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 d8a40da..73ffba4 100644 ---- a/winpr/CMakeLists.txt -+++ b/winpr/CMakeLists.txt -@@ -221,7 +221,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") - - SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") - -- set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") -+ set(WINPR_INCLUDE_DIR "include") - - configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake - INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} -diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt -index 452383d..3faab0c 100644 ---- a/winpr/include/CMakeLists.txt -+++ b/winpr/include/CMakeLists.txt -@@ -17,7 +17,7 @@ - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h) --set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr) -+set(WINPR_INSTALL_INCLUDE_DIR include/winpr) - - file(GLOB WINPR_HEADERS "winpr/*.h") - install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers) diff --git a/ports/freerdp/fix-install-destination.patch b/ports/freerdp/fix-install-destination.patch deleted file mode 100644 index 911bfc349dfb23..00000000000000 --- a/ports/freerdp/fix-install-destination.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8894a58..d2f8b2f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -960,6 +960,9 @@ else() - set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") - set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}") - endif() -+set(FREERDP_DATA_PATH "share/freerdp") -+set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") -+set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}") - set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}") - - # Path to put extensions -diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt -index 6274571..b0a5d27 100644 ---- a/client/Windows/CMakeLists.txt -+++ b/client/Windows/CMakeLists.txt -@@ -82,7 +82,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32) - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - if(WITH_CLIENT_INTERFACE) -- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) -+ install(TARGETS ${MODULE_NAME} COMPONENT libraries) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) - endif() -diff --git a/client/common/CMakeLists.txt b/client/common/CMakeLists.txt -index b465a63..1de7461 100644 ---- a/client/common/CMakeLists.txt -+++ b/client/common/CMakeLists.txt -@@ -78,7 +78,7 @@ else() - endif() - - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ClientTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ClientTargets) - - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) -diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index a259b68..10a0921 100644 ---- a/libfreerdp/CMakeLists.txt -+++ b/libfreerdp/CMakeLists.txt -@@ -396,7 +396,7 @@ endif() - - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${LIBFREERDP_LIBS} winpr) - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDPTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDPTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) -diff --git a/server/Windows/CMakeLists.txt b/server/Windows/CMakeLists.txt -index c7833ad..4086542 100644 ---- a/server/Windows/CMakeLists.txt -+++ b/server/Windows/CMakeLists.txt -@@ -98,7 +98,7 @@ set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-server freerdp) - target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}) - - if(WITH_SERVER_INTERFACE) -- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) -+ install(TARGETS ${MODULE_NAME} COMPONENT libraries) - - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) -diff --git a/server/common/CMakeLists.txt b/server/common/CMakeLists.txt -index c94a209..7c533b7 100644 ---- a/server/common/CMakeLists.txt -+++ b/server/common/CMakeLists.txt -@@ -63,7 +63,7 @@ endif() - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${FREERDP_CHANNELS_SERVER_LIBS}) - target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD} winpr freerdp) - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT FreeRDP-ServerTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT FreeRDP-ServerTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) -diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt -index 3e0df0b..0daa245 100644 ---- a/server/shadow/CMakeLists.txt -+++ b/server/shadow/CMakeLists.txt -@@ -86,7 +86,7 @@ if (WITH_LIBRARY_VERSIONING) - set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) - endif() - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets) - - if (WITH_DEBUG_SYMBOLS AND MSVC) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) -@@ -291,7 +291,7 @@ if (WITH_LIBRARY_VERSIONING) - set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION}) - endif() - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT server EXPORT FreeRDP-ShadowTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT server EXPORT FreeRDP-ShadowTargets) - - if (WITH_DEBUG_SYMBOLS AND MSVC) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) -diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt -index 2df8d89..da23a1b 100644 ---- a/winpr/libwinpr/CMakeLists.txt -+++ b/winpr/libwinpr/CMakeLists.txt -@@ -144,7 +144,7 @@ endif() - - add_definitions(${WINPR_DEFINITIONS}) - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_LIBS_PRIVATE} ${PUBLIC_KEYWORD} ${WINPR_LIBS_PUBLIC}) --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) -diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index 0ddf9fb..b89a954 100644 ---- a/winpr/tools/CMakeLists.txt -+++ b/winpr/tools/CMakeLists.txt -@@ -112,7 +112,7 @@ endif() - add_definitions(${WINPR_DEFINITIONS}) - target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD} ${WINPR_TOOLS_LIBS}) - --install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries EXPORT WinPRTargets) -+install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPRTargets) - if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) - get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME) - install(FILES ${CMAKE_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) diff --git a/ports/freerdp/install-layout.patch b/ports/freerdp/install-layout.patch new file mode 100644 index 00000000000000..803e28eef50397 --- /dev/null +++ b/ports/freerdp/install-layout.patch @@ -0,0 +1,88 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1633656..db346d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ endif() + message(STATUS "Git Revision ${GIT_REVISION}") + + set(FREERDP_MAJOR_DIR "freerdp${FREERDP_VERSION_MAJOR}") +-set(FREERDP_INCLUDE_DIR "include/${FREERDP_MAJOR_DIR}/") ++set(FREERDP_INCLUDE_DIR "include/") + + option(WITH_SMARTCARD_EMULATE "Emulate smartcards instead of redirecting readers" ON) + if (WITH_SMARTCARD_EMULATE) +@@ -711,6 +711,9 @@ else() + set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") + set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/${FREERDP_MAJOR_DIR}") + endif() ++set(FREERDP_DATA_PATH "share/freerdp") ++set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") ++set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp${FREERDP_VERSION_MAJOR}") + set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}") + + # Path to put extensions +diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt +index cc94b99..0423242 100644 +--- a/client/Windows/CMakeLists.txt ++++ b/client/Windows/CMakeLists.txt +@@ -107,7 +107,7 @@ endif() + target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS}) + + if(WITH_CLIENT_INTERFACE) +- install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) ++ install(TARGETS ${MODULE_NAME} COMPONENT libraries) + if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS) + install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols) + endif() +diff --git a/libfreerdp/freerdp.pc.in b/libfreerdp/freerdp.pc.in +index 7555957..21ea0c7 100644 +--- a/libfreerdp/freerdp.pc.in ++++ b/libfreerdp/freerdp.pc.in +@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/@FREERDP_INCLUDE_DIR@ + libs=-lfreerdp@FREERDP_API_VERSION@ + datarootdir=${prefix}/share +-datadir=${datarootdir}/@FREERDP_MAJOR_DIR@ ++datadir=${datarootdir}/freerdp + plugindir=${libdir}/@FREERDP_MAJOR_DIR@ + proxy_plugindir=${plugindir}/proxy + extensiondir=${plugindir}/extensions +diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt +index 4769741..eb3fe11 100644 +--- a/winpr/CMakeLists.txt ++++ b/winpr/CMakeLists.txt +@@ -320,7 +320,7 @@ endif() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) + +-set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") ++set(WINPR_INCLUDE_DIR "include") + + + add_subdirectory(libwinpr) +diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt +index 4be2015..00c64e0 100644 +--- a/winpr/libwinpr/CMakeLists.txt ++++ b/winpr/libwinpr/CMakeLists.txt +@@ -195,7 +195,7 @@ else() + endif() + target_link_options(${MODULE_NAME} ${LINK_OPTS_MODE} ${WINPR_LINK_OPTIONS}) + target_include_directories(${MODULE_NAME} PRIVATE ${WINPR_INCLUDES}) +-target_include_directories(${MODULE_NAME} INTERFACE $) ++target_include_directories(${MODULE_NAME} INTERFACE $) + target_link_directories(${MODULE_NAME} PRIVATE ${WINPR_LINK_DIRS}) + target_compile_options(${MODULE_NAME} PRIVATE ${WINPR_COMPILE_OPTIONS}) + target_compile_definitions(${MODULE_NAME} PRIVATE ${WINPR_DEFINITIONS}) +diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt +index e995172..f612718 100644 +--- a/winpr/tools/CMakeLists.txt ++++ b/winpr/tools/CMakeLists.txt +@@ -110,7 +110,7 @@ if (WITH_LIBRARY_VERSIONING) + endif() + + add_definitions(${WINPR_DEFINITIONS}) +-target_include_directories(${MODULE_NAME} INTERFACE $) ++target_include_directories(${MODULE_NAME} INTERFACE $) + target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_TOOLS_LIBS}) + + install(TARGETS ${MODULE_NAME} COMPONENT libraries EXPORT WinPR-toolsTargets diff --git a/ports/freerdp/keep-dup-libs.patch b/ports/freerdp/keep-dup-libs.patch index af029d1aa58641..7336ad59b3b474 100644 --- a/ports/freerdp/keep-dup-libs.patch +++ b/ports/freerdp/keep-dup-libs.patch @@ -1,30 +1,30 @@ diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt -index 10a0921..7e9a63d 100644 +index 2ce9c42..bbd202a 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt -@@ -363,7 +363,6 @@ endif() - # /primitives +@@ -415,7 +415,6 @@ endif() + list(APPEND LIBFREERDP_PUB_LIBS winpr) list(REMOVE_DUPLICATES LIBFREERDP_DEFINITIONS) -list(REMOVE_DUPLICATES LIBFREERDP_LIBS) + list(REMOVE_DUPLICATES LIBFREERDP_PUB_LIBS) list(REMOVE_DUPLICATES LIBFREERDP_INCLUDES) include_directories(${LIBFREERDP_INCLUDES}) - diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt -index da23a1b..2616439 100644 +index 4be2015..f1266f3 100644 --- a/winpr/libwinpr/CMakeLists.txt +++ b/winpr/libwinpr/CMakeLists.txt -@@ -113,8 +113,6 @@ endforeach() - - set(MODULE_NAME winpr) - list(REMOVE_DUPLICATES WINPR_DEFINITIONS) +@@ -157,8 +157,6 @@ list(REMOVE_DUPLICATES WINPR_DEFINITIONS) + list(REMOVE_DUPLICATES WINPR_COMPILE_OPTIONS) + list(REMOVE_DUPLICATES WINPR_LINK_OPTIONS) + list(REMOVE_DUPLICATES WINPR_LINK_DIRS) -list(REMOVE_DUPLICATES WINPR_LIBS_PRIVATE) -list(REMOVE_DUPLICATES WINPR_LIBS_PUBLIC) list(REMOVE_DUPLICATES WINPR_INCLUDES) - include_directories(${WINPR_INCLUDES}) + # On windows create dll version information. diff --git a/winpr/tools/CMakeLists.txt b/winpr/tools/CMakeLists.txt -index b89a954..13f4c13 100644 +index e995172..90c4e58 100644 --- a/winpr/tools/CMakeLists.txt +++ b/winpr/tools/CMakeLists.txt @@ -82,7 +82,6 @@ add_subdirectory(makecert) diff --git a/ports/freerdp/openssl-3.patch b/ports/freerdp/openssl-3.patch deleted file mode 100644 index 0b7757f4c15cce..00000000000000 --- a/ports/freerdp/openssl-3.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/freerdp/crypto/tls.h b/include/freerdp/crypto/tls.h -index e273ec3..3cc265e 100644 ---- a/include/freerdp/crypto/tls.h -+++ b/include/freerdp/crypto/tls.h -@@ -34,6 +34,10 @@ - - #include - -+#if defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3 -+ #define tls_free freerdp_tls_free -+#endif -+ - #define TLS_ALERT_LEVEL_WARNING 1 - #define TLS_ALERT_LEVEL_FATAL 2 - diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index bca6a14bd249ef..ab8d264a55d396 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -2,20 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP REF "${VERSION}" - SHA512 722d95d7591b5ce6a7e8a3b6ac8999df278dbcfc286a532f56bcbc4a3881e75b02c7e3cd4b296e67bc19d1165020acdcca198bf4bcc92aea5611760037fcc57f + SHA512 6c9061674716ca8c83a3913222db4002d893d751b0072a8af10013e09462a9cc847689dc874e30c499ae0d5be73c464f610057744c771fcd678bc43185d0f923 HEAD_REF master PATCHES + dependencies.patch DontInstallSystemRuntimeLibs.patch - fix-include-path.patch - fix-install-destination.patch + install-layout.patch keep-dup-libs.patch + windows-linkage.patch wfreerdp-server-cli.patch - pr-7060-jni-onload.patch - find-dependency.patch - export-include.patch - openssl-3.patch # Remove in freerdp 3.0.0 ) -file(REMOVE "${SOURCE_PATH}/cmake/FindOpenSSL.cmake") file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg") if("x11" IN_LIST FEATURES) @@ -24,14 +20,14 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - client-mac WITH_CLIENT_MAC - ffmpeg WITH_FFMPEG - ffmpeg WITH_SWSCALE - server WITH_SERVER - urbdrc CHANNEL_URBDRC - wayland WITH_WAYLAND + client-mac WITH_CLIENT_MAC + ffmpeg WITH_FFMPEG + ffmpeg WITH_SWSCALE + server WITH_SERVER + urbdrc CHANNEL_URBDRC + wayland WITH_WAYLAND winpr-tools WITH_WINPR_TOOLS - x11 WITH_X11 + x11 WITH_X11 ) vcpkg_list(SET GENERATOR_OPTION) @@ -47,18 +43,36 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake" + -DCMAKE_REQUIRE_FIND_PACKAGE_cJSON=ON + -DUSE_VERSION_FROM_GIT_TAG=OFF + -DWITH_AAD=ON -DWITH_CCACHE=OFF -DWITH_CLANG_FORMAT=OFF -DWITH_MANPAGES=OFF -DWITH_OPENSSL=ON + -DWITH_SAMPLE=OFF + -DWITH_UNICODE_BUILTIN=ON "-DMSVC_RUNTIME=${VCPKG_CRT_LINKAGE}" "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON - # Uncontrolled dependencies w.r.t. vcpkg ports + # Uncontrolled dependencies w.r.t. vcpkg ports, system libs, or tools # Can be overriden in custom triplet file + -DUSE_UNWIND=OFF -DWITH_ALSA=OFF -DWITH_CAIRO=OFF + -DWITH_CLIENT_SDL=OFF + -DWITH_CUPS=OFF + -DWITH_FUSE=OFF + -DWITH_KRB5=OFF -DWITH_LIBSYSTEMD=OFF + -DWITH_OPUS=OFF + -DWITH_OSS=OFF + -DWITH_PCSC=OFF + -DWITH_PKCS11=OFF + -DWITH_PROXY_MODULES=OFF + -DWITH_PULSE=OFF + -DWITH_URIPARSER=OFF + -DVCPKG_TRACE_FIND_PACKAGE=ON MAYBE_UNUSED_VARIABLES MSVC_RUNTIME ) @@ -95,12 +109,12 @@ if("winpr-tools" IN_LIST FEATURES) endif() if("server" IN_LIST FEATURES) list(APPEND tools freerdp-proxy freerdp-shadow-cli) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server2 PACKAGE_NAME freerdp-server2 DO_NOT_DELETE_PARENT_CONFIG_PATH) - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow2 PACKAGE_NAME freerdp-shadow2 DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Server3 PACKAGE_NAME freerdp-server3 DO_NOT_DELETE_PARENT_CONFIG_PATH) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Shadow3 PACKAGE_NAME freerdp-shadow3 DO_NOT_DELETE_PARENT_CONFIG_PATH) endif() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client2 PACKAGE_NAME freerdp-client2 DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR2 PACKAGE_NAME winpr2 DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP2 PACKAGE_NAME freerdp) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP-Client3 PACKAGE_NAME freerdp-client3 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/WinPR3 PACKAGE_NAME winpr3 DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/FreeRDP3 PACKAGE_NAME freerdp) if(tools) vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) @@ -109,10 +123,24 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" ".") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}/" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/build-config.h" "${CURRENT_PACKAGES_DIR}" "") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # They build static with dllexport, so it must be used with dllexport. Proper fix needs invasive patching. + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freerdp/api.h" "#ifdef FREERDP_EXPORTS" "#if 1") + if(WITH_SERVER) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/rdtk0/rdtk/api.h" "#ifdef RDTK_EXPORTS" "#if 1") + endif() +endif() file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/config" + "${CURRENT_PACKAGES_DIR}/include/CMakeFiles" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB cmakefiles "${CURRENT_PACKAGES_DIR}/include/*/CMakeFiles") +if(cmakefiles) + file(REMOVE_RECURSE ${cmakefiles}) +endif() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freerdp/pr-7060-jni-onload.patch b/ports/freerdp/pr-7060-jni-onload.patch deleted file mode 100644 index 00b4b62465c445..00000000000000 --- a/ports/freerdp/pr-7060-jni-onload.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c -index 0fd987f446e..014c4d4db96 100644 ---- a/client/Android/android_freerdp.c -+++ b/client/Android/android_freerdp.c -@@ -1093,7 +1093,10 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) - (*env)->RegisterNatives(env, activityClass, methods, sizeof(methods) / sizeof(methods[0])); - /* create global reference for class */ - gJavaActivityClass = (*env)->NewGlobalRef(env, activityClass); -+ - g_JavaVm = vm; -+ winpr_set_java_vm((void*)vm); -+ - return init_callback_environment(vm, env); - } - -diff --git a/winpr/include/winpr/sysinfo.h b/winpr/include/winpr/sysinfo.h -index c14e999d970..7af615947bd 100644 ---- a/winpr/include/winpr/sysinfo.h -+++ b/winpr/include/winpr/sysinfo.h -@@ -344,6 +344,20 @@ extern "C" - #define PF_SSE_INSTRUCTIONS_AVAILABLE PF_XMMI_INSTRUCTIONS_AVAILABLE - #define PF_SSE2_INSTRUCTIONS_AVAILABLE PF_XMMI64_INSTRUCTIONS_AVAILABLE - -+#ifdef ANDROID -+ -+ /* -+ * Call winpr_set_java_vm() from JNI_OnLoad in a shared library: -+ * JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) -+ * and then call winpr_get_java_vm to obtain the JavaVM* handle. -+ * The functions use void* to avoid including jni.h in exported headers. -+ */ -+ -+ WINPR_API void winpr_set_java_vm(void* vm); -+ WINPR_API void* winpr_get_java_vm(); -+ -+#endif -+ - #ifdef __cplusplus - } - #endif -diff --git a/winpr/libwinpr/sysinfo/sysinfo.c b/winpr/libwinpr/sysinfo/sysinfo.c -index dd15bb374e2..a4d0ddf90cc 100644 ---- a/winpr/libwinpr/sysinfo/sysinfo.c -+++ b/winpr/libwinpr/sysinfo/sysinfo.c -@@ -988,3 +988,20 @@ BOOL IsProcessorFeaturePresentEx(DWORD ProcessorFeature) - #endif - return ret; - } -+ -+#ifdef ANDROID -+ -+#include -+static JavaVM* g_JavaVM = NULL; -+ -+void winpr_set_java_vm(void* vm) -+{ -+ g_JavaVM = (JavaVM*)vm; -+} -+ -+void* winpr_get_java_vm() -+{ -+ return (void*)g_JavaVM; -+} -+ -+#endif -diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c -index b29ecab33dd..c42928d6738 100644 ---- a/winpr/libwinpr/timezone/timezone.c -+++ b/winpr/libwinpr/timezone/timezone.c -@@ -151,18 +151,12 @@ static char* winpr_get_timezone_from_link(void) - - #if defined(ANDROID) - #include --static JavaVM* jniVm = NULL; -- --JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) --{ -- jniVm = vm; -- return JNI_VERSION_1_6; --} - - static char* winpr_get_android_timezone_identifier(void) - { - char* tzid = NULL; - JNIEnv* jniEnv; -+ JavaVM* jniVm = (JavaVM*)winpr_get_java_vm(); - - /* Preferred: Try to get identifier from java TimeZone class */ - if (jniVm && ((*jniVm)->GetEnv(jniVm, (void**)&jniEnv, JNI_VERSION_1_6) == JNI_OK)) diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 8a2865c3004dc2..6575573f5ca5d6 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,12 +1,12 @@ { "name": "freerdp", - "version": "2.11.2", - "port-version": 2, + "version": "3.0.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", "supports": "!uwp & !(arm & windows)", "dependencies": [ + "cjson", { "name": "glib", "platform": "!windows" @@ -20,10 +20,7 @@ "name": "vcpkg-cmake-config", "host": true }, - { - "name": "zlib", - "platform": "!windows" - } + "zlib" ], "features": { "client-mac": { @@ -66,7 +63,7 @@ }, "wayland": { "description": "Enable wayland support", - "supports": "!windows & !android & !ios & !osx & !openbsd", + "supports": "!android & !ios & !openbsd & !osx & !windows", "dependencies": [ "wayland" ] @@ -77,7 +74,7 @@ }, "x11": { "description": "Enable X11 support", - "supports": "!windows & !android & !ios", + "supports": "!android & !ios & !windows", "dependencies": [ "xcb" ] diff --git a/ports/freerdp/wfreerdp-server-cli.patch b/ports/freerdp/wfreerdp-server-cli.patch index d0eb36f1240b5d..122cfbce40c348 100644 --- a/ports/freerdp/wfreerdp-server-cli.patch +++ b/ports/freerdp/wfreerdp-server-cli.patch @@ -1,11 +1,13 @@ diff --git a/server/Windows/cli/CMakeLists.txt b/server/Windows/cli/CMakeLists.txt -index fcfa811..e4d4360 100644 +index 58d5df0..fdba313 100644 --- a/server/Windows/cli/CMakeLists.txt +++ b/server/Windows/cli/CMakeLists.txt -@@ -41,5 +41,5 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/ +@@ -41,7 +41,7 @@ set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/ + add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) --set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME "wfreerdp-server") +-set_target_properties(${MODULE_NAME} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME}) +set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_NAME wfreerdp-server PDB_NAME wfreerdp-server.exe) set(${MODULE_PREFIX}_LIBS wfreerdp-server) + diff --git a/ports/freerdp/windows-linkage.patch b/ports/freerdp/windows-linkage.patch new file mode 100644 index 00000000000000..0d59c66ea70741 --- /dev/null +++ b/ports/freerdp/windows-linkage.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db346d3..6ad72d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -439,6 +439,9 @@ if(WIN32) + endif() + + add_definitions(-DFREERDP_EXPORTS) ++if(NOT BUILD_SHARED_LIBS) ++ add_definitions(-DRDTK_EXPORTS) ++endif() + + # Mac OS X + if(APPLE) diff --git a/versions/baseline.json b/versions/baseline.json index 660663e3102539..4ec7905eb66536 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2773,8 +2773,8 @@ "port-version": 7 }, "freerdp": { - "baseline": "2.11.2", - "port-version": 2 + "baseline": "3.0.0", + "port-version": 0 }, "freetds": { "baseline": "1.3.10", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 0058f46a85a432..06f56f906b67ad 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfb634ed4a717897d4cb646a34dc9c663dcfceb8", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "00aea4e71fcfa8fa2ea4c294996726290abe3243", "version": "2.11.2", From 1b3128686a014124bfbf84ab07a270d658a545ec Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 23 Dec 2023 09:45:21 +0100 Subject: [PATCH 0692/1039] [gettext] Fix osx (#35810) --- ports/gettext/assume-modern-darwin.patch | 26 +++++++++++++++++++ ports/gettext/config-step-order.patch | 32 ++++++++++++------------ ports/gettext/portfile.cmake | 1 + ports/gettext/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gettext.json | 5 ++++ 6 files changed, 50 insertions(+), 17 deletions(-) create mode 100644 ports/gettext/assume-modern-darwin.patch diff --git a/ports/gettext/assume-modern-darwin.patch b/ports/gettext/assume-modern-darwin.patch new file mode 100644 index 00000000000000..b59f434a6be45a --- /dev/null +++ b/ports/gettext/assume-modern-darwin.patch @@ -0,0 +1,26 @@ +diff --git a/gettext-runtime/configure b/gettext-runtime/configure +index a984774..f436a19 100755 +--- a/gettext-runtime/configure ++++ b/gettext-runtime/configure +@@ -35448,7 +35448,7 @@ fi + haiku*) use_elf_origin_trick=yes ;; + # On Mac OS X 10.4 or newer, use Mac OS X tools. See + # . +- darwin | darwin[1-7].*) ;; ++ darwin[1-7].*) ;; + darwin*) use_macos_tools=yes ;; + esac + if test $is_noop = yes; then +diff --git a/gettext-tools/configure b/gettext-tools/configure +index ee64b69..2dde1f5 100755 +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -48606,7 +48606,7 @@ fi + haiku*) use_elf_origin_trick=yes ;; + # On Mac OS X 10.4 or newer, use Mac OS X tools. See + # . +- darwin | darwin[1-7].*) ;; ++ darwin[1-7].*) ;; + darwin*) use_macos_tools=yes ;; + esac + if test $is_noop = yes; then diff --git a/ports/gettext/config-step-order.patch b/ports/gettext/config-step-order.patch index b2aa8587e1b212..da247c65f20669 100644 --- a/ports/gettext/config-step-order.patch +++ b/ports/gettext/config-step-order.patch @@ -1,5 +1,5 @@ diff --git a/gettext-runtime/configure b/gettext-runtime/configure -index ed6cb37..780cc84 100644 +index 2a376c6..a984774 100755 --- a/gettext-runtime/configure +++ b/gettext-runtime/configure @@ -22346,6 +22346,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } @@ -8,23 +8,23 @@ index ed6cb37..780cc84 100644 +### Configuration step reordering +### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4 -+### Pull iconv lookup before actual GNU gettext lookup. -+for configuration_step in gettext-iconv gettext-main; do ++### Pull (include_next and) iconv lookup before actual GNU gettext lookup. ++for configuration_step in gettext-independent gettext-main ; do +case "$configuration_step" in +gettext-main) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 printf %s "checking for CFPreferencesCopyAppValue... " >&6; } if test ${gt_cv_func_CFPreferencesCopyAppValue+y} -@@ -29535,6 +29541,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +@@ -23288,6 +23294,9 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h +### Configuration step reordering +;; -+gettext-iconv) - use_additional=yes - - acl_save_prefix="$prefix" ++gettext-independent) + # Check whether --enable-cross-guesses was given. + if test ${enable_cross_guesses+y} + then : @@ -30464,6 +30473,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; } gl_next_as_first_directive=$gl_cv_next_iconv_h fi @@ -37,7 +37,7 @@ index ed6cb37..780cc84 100644 diff --git a/gettext-tools/configure b/gettext-tools/configure -index b4a4f93..17b05c8 100644 +index 5ce6cf1..ee64b69 100755 --- a/gettext-tools/configure +++ b/gettext-tools/configure @@ -25735,6 +25735,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; } @@ -46,23 +46,23 @@ index b4a4f93..17b05c8 100644 +### Configuration step reordering +### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4 -+### Pull iconv lookup before actual GNU gettext lookup. -+for configuration_step in gettext-iconv gettext-main; do ++### Pull (include_next and) iconv lookup before actual GNU gettext lookup. ++for configuration_step in gettext-independent gettext-main; do +case "$configuration_step" in +gettext-main) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 printf %s "checking for CFPreferencesCopyAppValue... " >&6; } if test ${gt_cv_func_CFPreferencesCopyAppValue+y} -@@ -37529,6 +37535,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h +@@ -27588,6 +27594,9 @@ fi +### Configuration step reordering +;; -+gettext-iconv) - use_additional=yes - - acl_save_prefix="$prefix" ++gettext-independent) + # Check whether --enable-cross-guesses was given. + if test ${enable_cross_guesses+y} + then : @@ -38458,6 +38467,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; } gl_next_as_first_directive=$gl_cv_next_iconv_h fi diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index c9e513879c15fc..fe4796a8764cf7 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES + assume-modern-darwin.patch uwp.patch rel_path.patch subdirs.patch diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index a96078e3db3ab2..db6883c459e9ff 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gettext", "version": "0.22.4", + "port-version": 1, "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "license": "GPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 4ec7905eb66536..d1ff2861f0c18b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2934,7 +2934,7 @@ }, "gettext": { "baseline": "0.22.4", - "port-version": 0 + "port-version": 1 }, "gettext-libintl": { "baseline": "0.22.4", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 0a07806920581f..a14bdd648672c2 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd31edd407c0889c864c1e8854be92b602a4e29f", + "version": "0.22.4", + "port-version": 1 + }, { "git-tree": "e30ed5daac31351d72a221b74c1b8c4ecd06b694", "version": "0.22.4", From 04f7d34c26defd9a54397dcbbb26b1ce3573614d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 23 Dec 2023 09:52:06 +0100 Subject: [PATCH 0693/1039] [ogre-next] Fixup 2.3.3 (#35344) --- ports/glslang/portfile.cmake | 11 +- ports/glslang/vcpkg.json | 1 + ports/ogre-next/fix-dependencies.patch | 111 ++++------- ports/ogre-next/fix-error-c2039.patch | 79 -------- ports/ogre-next/osx.patch | 13 -- ports/ogre-next/portfile.cmake | 151 ++++++--------- ports/ogre-next/toolchain_fixes.patch | 251 +++++++++++-------------- ports/ogre-next/vcpkg.json | 52 ++++- versions/baseline.json | 4 +- versions/g-/glslang.json | 5 + versions/o-/ogre-next.json | 5 + 11 files changed, 266 insertions(+), 417 deletions(-) delete mode 100644 ports/ogre-next/fix-error-c2039.patch delete mode 100644 ports/ogre-next/osx.patch diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 7ea0aaccdde19f..f2c75fffc242ca 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -40,11 +40,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glslang DO_NOT_DELETE_PARENT_CONFIG_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/glslang-config.cmake" - "${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake" - "${PACKAGE_PREFIX_DIR}/share/${PORT}/glslang-targets.cmake" + [[${PACKAGE_PREFIX_DIR}/lib/cmake/glslang/glslang-targets.cmake]] + [[${CMAKE_CURRENT_LIST_DIR}/glslang-targets.cmake]] ) +file(REMOVE_RECURSE CONFIG_PATH "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Public/ShaderLang.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/glslang/Include/glslang_c_interface.h" "ifdef GLSLANG_IS_SHARED_LIBRARY" "if 1") +endif() vcpkg_copy_pdbs() diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 4e84d5a2716829..7f659a1da00da2 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glslang", "version": "13.1.1", + "port-version": 1, "description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.", "homepage": "https://github.com/KhronosGroup/glslang", "license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later", diff --git a/ports/ogre-next/fix-dependencies.patch b/ports/ogre-next/fix-dependencies.patch index 3ef2fc8d057ba1..06014fef87122f 100644 --- a/ports/ogre-next/fix-dependencies.patch +++ b/ports/ogre-next/fix-dependencies.patch @@ -1,7 +1,37 @@ +diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index cdb097a..967d33b 100644 +--- a/CMake/CMakeLists.txt ++++ b/CMake/CMakeLists.txt +@@ -21,9 +21,7 @@ endif() + set(OGRE_CMAKE_DIR "share/ogre-next") + + set(INST_FILES +- Packages/FindRapidjson.cmake + Packages/FindRemotery.cmake +- Packages/FindSDL2.cmake + Packages/FindOGRE.cmake + Utils/FindPkgMacros.cmake + Utils/MacroLogFeature.cmake +@@ -45,12 +43,8 @@ endif () + + set(STATIC_INST_FILES + Packages/FindDirectX.cmake +- Packages/FindFreeImage.cmake +- Packages/FindFreetype.cmake + Packages/FindOpenGLES.cmake + Packages/FindOpenGLES2.cmake +- Packages/FindZLIB.cmake +- Packages/FindZZip.cmake + Packages/FindSoftimage.cmake + ) + if (WIN32) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index 74cb0f4..2cad26a 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake -@@ -76,17 +76,20 @@ +@@ -74,21 +74,24 @@ set(CMAKE_FRAMEWORK_PATH ${OGRE_DEP_SEARCH_PATH} ${CMAKE_FRAMEWORK_PATH}) + ####################################################################### + # Find zlib -find_package(ZLIB) +find_package(ZLIB REQUIRED) @@ -26,81 +56,14 @@ diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +find_package(FREETYPE NAMES freetype REQUIRED) +set(FREETYPE_LIBRARIES freetype) macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") -@@ -107,3 +111,3 @@ + + find_package(Vulkan) +@@ -105,7 +108,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT EMSCRIPTEN) + endif () + # Find rapidjson -find_package(Rapidjson) +find_package(Rapidjson NAMES RapidJSON CONFIG REQUIRED) macro_log_feature(Rapidjson_FOUND "rapidjson" "C++ JSON parser" "https://rapidjson.org/" FALSE "" "") -@@ -257,3 +261,3 @@ - # ThreadingBuildingBlocks --find_package(TBB) -+find_package(TBB CONFIG REQUIRED) - macro_log_feature(TBB_FOUND "tbb" "Threading Building Blocks" "http://www.threadingbuildingblocks.org/" FALSE "" "") -@@ -279,5 +283,5 @@ - # Find sdl2 --find_package(SDL2) -+find_package(SDL2 CONFIG REQUIRED) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library" "https://www.libsdl.org/" FALSE "" "") - - ####################################################################### -diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt ---- a/CMake/CMakeLists.txt -+++ b/CMake/CMakeLists.txt -@@ -21,9 +21,7 @@ - - set(INST_FILES -- Packages/FindRapidjson.cmake - Packages/FindRemotery.cmake -- Packages/FindSDL2.cmake - Packages/FindOGRE.cmake - Utils/FindPkgMacros.cmake - Utils/MacroLogFeature.cmake - Utils/PreprocessorUtils.cmake -@@ -37,18 +35,12 @@ - if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco") - set(INST_FILES ${INST_FILES} Packages/FindPOCO.cmake) - endif () --if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "tbb") -- set(INST_FILES ${INST_FILES} Packages/FindTBB.cmake) --endif () - -+ - set(STATIC_INST_FILES - Packages/FindDirectX.cmake -- Packages/FindFreeImage.cmake -- Packages/FindFreetype.cmake - Packages/FindOpenGLES.cmake - Packages/FindOpenGLES2.cmake -- Packages/FindZLIB.cmake -- Packages/FindZZip.cmake - Packages/FindSoftimage.cmake - ) -diff --git a/CMake/Packages/FindZLIB.cmake b/CMake/Packages/FindZLIB_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindZLIB.cmake -rename to CMake/Packages/FindZLIB_NOTUSE.cmake -diff --git a/CMake/Packages/FindZZip.cmake b/CMake/Packages/FindZZip_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindZZip.cmake -rename to CMake/Packages/FindZZip_NOTUSE.cmake -diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindFreeImage.cmake -rename to CMake/Packages/FindFreeImage_NOTUSE.cmake -diff --git a/CMake/Packages/FindFreetype.cmake b/CMake/Packages/FindFreetype_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindFreetype.cmake -rename to CMake/Packages/FindFreetype_NOTUSE.cmake -diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindSDL2.cmake -rename to CMake/Packages/FindSDL2_NOTUSE.cmake -diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindTBB.cmake -rename to CMake/Packages/FindTBB_NOTUSE.cmake -diff --git a/CMake/Packages/FindRapidjson.cmake b/CMake/Packages/FindRapidjson_NOTUSE.cmake -similarity index 100% -rename from CMake/Packages/FindRapidjson.cmake -rename to CMake/Packages/FindRapidjson_NOTUSE.cmake + find_package(RenderDoc) diff --git a/ports/ogre-next/fix-error-c2039.patch b/ports/ogre-next/fix-error-c2039.patch deleted file mode 100644 index f6071f8303048f..00000000000000 --- a/ports/ogre-next/fix-error-c2039.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h -index 8693c57..720a243 100644 ---- a/OgreMain/include/OgreString.h -+++ b/OgreMain/include/OgreString.h -@@ -34,44 +34,6 @@ THE SOFTWARE. - - #include "OgreHeaderPrefix.h" - --// If we're using the GCC 3.1 C++ Std lib --#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT) -- --// For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html --# if __cplusplus >= 201103L --# include --# elif OGRE_COMP_VER >= 430 --# include --# else --# include --namespace __gnu_cxx --{ -- template <> struct hash< Ogre::_StringBase > -- { -- size_t operator()( const Ogre::_StringBase _stringBase ) const -- { -- /* This is the PRO-STL way, but it seems to cause problems with VC7.1 -- and in some other cases (although I can't recreate it) -- hash H; -- return H(_stringBase.c_str()); -- */ -- /** This is our custom way */ -- register size_t ret = 0; -- for( Ogre::_StringBase::const_iterator it = _stringBase.begin(); it != _stringBase.end(); ++it ) -- ret = 5 * ret + *it; -- -- return ret; -- } -- }; --} --# endif -- --#endif -- --#if OGRE_COMPILER == OGRE_COMPILER_MSVC -- #include --#endif -- - namespace Ogre { - /** \addtogroup Core - * @{ -@@ -205,28 +167,8 @@ namespace Ogre { - static const String replaceAll(const String& source, const String& replaceWhat, const String& replaceWithWhat); - }; - -+ typedef ::std::hash<_StringBase> _StringHash; - --#if OGRE_COMPILER == OGRE_COMPILER_GNUC && OGRE_COMP_VER >= 310 && !defined(STLPORT) --# if __cplusplus >= 201103L -- typedef std::hash< _StringBase > _StringHash; --# elif OGRE_COMP_VER < 430 -- typedef ::__gnu_cxx::hash< _StringBase > _StringHash; --# else -- typedef ::std::tr1::hash< _StringBase > _StringHash; --# endif --#elif OGRE_COMPILER == OGRE_COMPILER_CLANG --# if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -- typedef ::std::hash< _StringBase > _StringHash; --# else -- typedef ::std::tr1::hash< _StringBase > _StringHash; --# endif --#elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && OGRE_COMP_VER < 1910 && !defined(STLPORT) // VC++ 10.0 -- typedef ::std::tr1::hash< _StringBase > _StringHash; --#elif !defined( _STLP_HASH_FUN_H ) -- typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash; --#else -- typedef std::hash< _StringBase > _StringHash; --#endif - /** @} */ - /** @} */ - diff --git a/ports/ogre-next/osx.patch b/ports/ogre-next/osx.patch deleted file mode 100644 index f0a87eded1860d..00000000000000 --- a/ports/ogre-next/osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,3 +29,3 @@ - endif() -- -+set(CMAKE_CXX_STANDARD 17) - # Use relative paths -@@ -387,3 +387,3 @@ - else() -- set(CMAKE_OSX_SYSROOT macosx) -+ # set(CMAKE_OSX_SYSROOT macosx) - endif() diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 92658b8cb3ae25..9da922912c0dba 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_IOS AND NOT VCPKG_TARGET_IS_OSX AND 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() @@ -11,132 +11,91 @@ vcpkg_from_github( PATCHES toolchain_fixes.patch avoid-name-clashes.patch - fix-error-c2039.patch fix-dependencies.patch - osx.patch ) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(OGRE_STATIC ON) -else() - set(OGRE_STATIC OFF) -endif() +file(REMOVE + "${SOURCE_PATH}/CMake/Packages/FindFreeImage.cmake" + "${SOURCE_PATH}/CMake/Packages/FindFreetype.cmake" + "${SOURCE_PATH}/CMake/Packages/FindRapidjson.cmake" + "${SOURCE_PATH}/CMake/Packages/FindVulkan.cmake" + "${SOURCE_PATH}/CMake/Packages/FindZLIB.cmake" + "${SOURCE_PATH}/CMake/Packages/FindZZip.cmake" +) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + d3d11 OGRE_BUILD_RENDERSYSTEM_DirectX11 + d3d11 CMAKE_REQUIRE_FIND_PACKAGE_DirectX11 + gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS + gl3plus CMAKE_REQUIRE_FIND_PACKAGE_OpenGL + metal OGRE_BUILD_RENDERSYSTEM_METAL planar-reflections OGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS + vulkan OGRE_BUILD_RENDERSYSTEM_VULKAN + vulkan CMAKE_REQUIRE_FIND_PACKAGE_Vulkan ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC) + +vcpkg_find_acquire_program(PKGCONFIG) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_CXX_STANDARD=11 + -DCMAKE_DISABLE_FIND_PACKAGE_AMDAGS=ON + -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GLSLOptimizer=ON + -DCMAKE_DISABLE_FIND_PACKAGE_HLSL2GLSL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenVR=ON + -DCMAKE_DISABLE_FIND_PACKAGE_POCO=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Remotery=ON + -DCMAKE_DISABLE_FIND_PACKAGE_RenderDoc=ON + -DCMAKE_DISABLE_FIND_PACKAGE_SDL2=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Softimage=ON + -DCMAKE_DISABLE_FIND_PACKAGE_TBB=ON + -DCMAKE_POLICY_DEFAULT_CMP0072=NEW # Prefer GLVND + -DOGRE_ARCHIVE_OUTPUT=lib + -DOGRE_LIBRARY_OUTPUT=lib -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF - -DOGRE_COPY_DEPENDENCIES=OFF + -DOGRE_BUILD_MSVC_MP=ON + -DOGRE_BUILD_MSVC_ZM=ON + -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF + -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF -DOGRE_BUILD_SAMPLES2=OFF -DOGRE_BUILD_TESTS=OFF -DOGRE_BUILD_TOOLS=OFF - -DOGRE_BUILD_MSVC_MP=ON - -DOGRE_BUILD_MSVC_ZM=ON + -DOGRE_COPY_DEPENDENCIES=OFF -DOGRE_INSTALL_DEPENDENCIES=OFF -DOGRE_INSTALL_DOCS=OFF -DOGRE_INSTALL_PDB=OFF -DOGRE_INSTALL_SAMPLES=OFF -DOGRE_INSTALL_TOOLS=OFF -DOGRE_INSTALL_VSPROPS=OFF + -DOGRE_SKIP_BOOST_SEARCHING=ON -DOGRE_STATIC=${OGRE_STATIC} - -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 - -DOGRE_CMAKE_DIR=share/ogre-next -DOGRE_USE_NEW_PROJECT_NAME=ON + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_AMDAGS + CMAKE_REQUIRE_FIND_PACKAGE_DirectX11 + OGRE_BUILD_MSVC_MP + OGRE_BUILD_MSVC_ZM + OGRE_BUILD_RENDERSYSTEM_DirectX11 + OGRE_COPY_DEPENDENCIES + OGRE_INSTALL_DEPENDENCIES + OGRE_INSTALL_VSPROPS ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() - -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}) -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() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -#Remove OgreNextMain*.lib from lib/ folder, because autolink would complain, since it defines a main symbol -#manual-link subfolder is here to the rescue! -if(VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMain.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMain.lib") - else() - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/release/OgreNextMainStatic.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/OgreNextMainStatic.lib") - endif() - file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*") - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*") - file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMain_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMain_d.lib") - else() - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/debug/OgreNextMainStatic_d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/OgreNextMainStatic_d.lib") - endif() - file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*") - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*") - file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/") - endif() - - file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/ogre-next/*.cmake") - foreach(SHARE_FILE ${SHARE_FILES}) - file(READ "${SHARE_FILE}" _contents) - string(REPLACE "lib/OgreNextMain" "lib/manual-link/OgreNextMain" _contents "${_contents}") - file(WRITE "${SHARE_FILE}" "${_contents}") - endforeach() +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_fixup_pkgconfig() endif() -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_TARGET_IS_OSX) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Release") - file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/lib/release/*") - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/bin/release/*") - file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/release/" "${CURRENT_PACKAGES_DIR}/bin/release/") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "Debug") - file(GLOB LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/debug/*") - file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/bin/debug/*") - file(COPY ${LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/debug/" "${CURRENT_PACKAGES_DIR}/debug/bin/debug/") - endif() -endif() - -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/ogre-next/toolchain_fixes.patch b/ports/ogre-next/toolchain_fixes.patch index 1a527eec86b4de..6ea38a1e0ec0b3 100644 --- a/ports/ogre-next/toolchain_fixes.patch +++ b/ports/ogre-next/toolchain_fixes.patch @@ -1,165 +1,136 @@ diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt +index 45d5935..cdb097a 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt -@@ -13,8 +13,10 @@ - # 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_NEXT_PREFIX}/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_NEXT_PREFIX}/cmake") -+ endif() +@@ -18,6 +18,7 @@ if(WIN32 OR APPLE) + else() + set(OGRE_CMAKE_DIR "${OGRE_LIB_DIRECTORY}/${OGRE_NEXT_PREFIX}/cmake") endif() -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) ++set(OGRE_CMAKE_DIR "share/ogre-next") + set(INST_FILES + Packages/FindRapidjson.cmake +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +index 9d3b1b2..11fc345 100644 +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -284,6 +284,11 @@ if (UNIX) + # there is no pkgconfig file for freeimage, so we need to add that lib manually + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") + configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY) ++ if(NOT X11_FOUND) ++ file(READ "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" ogre_pc) ++ string(REPLACE ", x11, xt, xaw7, gl" "" ogre_pc "${ogre_pc}") ++ file(WRITE "${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc" "${ogre_pc}") ++ endif() + else () + configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY) + endif () diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake -index 53111e0..8dffbbc 100644 +index 53111e0..e0f6716 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) +@@ -81,6 +81,12 @@ endmacro (use_pkgconfig) 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) + if (${PREFIX}_FWK) + set(${PREFIX} ${${PREFIX}_FWK}) ++ elseif (${PREFIX}_REL OR ${PREFIX}_DBG) ++ include("${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake") ++ set(${PREFIX}_RELEASE "${${PREFIX}_REL}") ++ set(${PREFIX}_DEBUG "${${PREFIX}_DBG}") ++ string(REPLACE "_LIBRARY" "" PREFIX_BASENAME "${PREFIX}") ++ select_library_configurations(${PREFIX_BASENAME}) + elseif (${PREFIX}_REL AND ${PREFIX}_DBG) + set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) + elseif (${PREFIX}_REL) +diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake +index d8e0208..1fdb63c 100644 +--- a/CMake/Utils/OgreConfigTargets.cmake ++++ b/CMake/Utils/OgreConfigTargets.cmake +@@ -41,7 +41,7 @@ if (NOT OGRE_RUNTIME_OUTPUT) + set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin) + endif () - # Generate debug names from given release names +-if (WIN32) ++if (0) + set(OGRE_RELEASE_PATH "/Release") + set(OGRE_RELWDBG_PATH "/RelWithDebInfo") + set(OGRE_MINSIZE_PATH "/MinSizeRel") +@@ -52,7 +52,7 @@ if (WIN32) + set(OGRE_LIB_DEBUG_PATH "/Debug") + set(OGRE_PLUGIN_PATH "/opt") + set(OGRE_SAMPLE_PATH "/opt/samples") +-elseif (UNIX) ++elseif (1) + set(OGRE_RELEASE_PATH "") + set(OGRE_RELWDBG_PATH "") + set(OGRE_MINSIZE_PATH "") diff --git a/CMakeLists.txt b/CMakeLists.txt -index 48af55b..b18ac57 100644 +index 2786e35..7a92a7b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -282,7 +282,7 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) +@@ -299,7 +299,6 @@ if (OGRE_BUILD_PLATFORM_APPLE_IOS) + 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() +- set(CMAKE_OSX_SYSROOT iphoneos) + endif() - # Set build variables - set(XCODE_ATTRIBUTE_SDKROOT iphoneos) -- if(CMAKE_GENERATOR STREQUAL "Unix Makefiles") -+ if(1) + set(CMAKE_EXE_LINKER_FLAGS "-framework Foundation -framework CoreGraphics -framework QuartzCore -framework UIKit") +@@ -364,7 +363,6 @@ elseif (APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS) 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() +- set(CMAKE_OSX_SYSROOT macosx) + endif() + + set( CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES ) diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt +index b698b84..75fef2c 100644 --- a/OgreMain/CMakeLists.txt +++ b/OgreMain/CMakeLists.txt -@@ -438,7 +438,5 @@ if (APPLE) - set_target_properties(${OGRE_NEXT}Main PROPERTIES +@@ -439,7 +439,7 @@ if (APPLE) LINK_FLAGS "-framework IOKit -framework Cocoa -framework Carbon -framework OpenGL -framework CoreVideo" ) -- + - set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)") ++ set(OGRE_OSX_BUILD_CONFIGURATION ".") add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD + COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading +@@ -494,6 +494,9 @@ use_precompiled_header(${OGRE_NEXT}Main + ) + + # install ${OGRE_NEXT}Main ++if(MSVC) ++ set(OGRE_LIB_DIRECTORY lib/manual-link) ++endif() + ogre_config_lib(${OGRE_NEXT}Main TRUE) + foreach(HEADER_FILE ${HEADER_FILES}) + string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE}) +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h +index 6754c4e..6b1879d 100644 +--- a/OgreMain/include/OgrePlatform.h ++++ b/OgreMain/include/OgrePlatform.h +@@ -504,7 +504,7 @@ THE SOFTWARE. + + // Define whether or not Ogre compiled with NEON support. + #if OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_ARM && \ +- ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 ) ++ ( defined(__aarch64__) || defined(__ARM_NEON__) || defined(_M_ARM64) || defined(_WIN32_WINNT_WIN8) && _WIN32_WINNT >= _WIN32_WINNT_WIN8 ) + #define __OGRE_HAVE_NEON 1 + #endif + #endif +diff --git a/OgreMain/include/OgreString.h b/OgreMain/include/OgreString.h +index 8693c57..b4179ea 100644 +--- a/OgreMain/include/OgreString.h ++++ b/OgreMain/include/OgreString.h +@@ -222,7 +222,7 @@ namespace Ogre { + # endif + #elif OGRE_COMPILER == OGRE_COMPILER_MSVC && OGRE_COMP_VER >= 1600 && OGRE_COMP_VER < 1910 && !defined(STLPORT) // VC++ 10.0 + typedef ::std::tr1::hash< _StringBase > _StringHash; +-#elif !defined( _STLP_HASH_FUN_H ) ++#elif 0 + typedef stdext::hash_compare< _StringBase, std::less< _StringBase > > _StringHash; + #else + typedef std::hash< _StringBase > _StringHash; diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 459747c166f91c..2be6e1b182e788 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,23 +1,18 @@ { "name": "ogre-next", "version": "2.3.3", - "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", + "port-version": 1, + "description": "Ogre Next - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", + "supports": "!emscripten & !uwp & !xbox", "dependencies": [ - "boost-date-time", - "boost-thread", "freeimage", - "freetype", { - "name": "openvr", - "platform": "!osx" + "name": "freetype", + "default-features": false }, - "pkgconf", - "poco", "rapidjson", - "sdl2", - "tbb", "tinyxml", { "name": "vcpkg-cmake", @@ -30,9 +25,46 @@ "zlib", "zziplib" ], + "default-features": [ + { + "name": "d3d11", + "platform": "windows" + }, + { + "name": "gl3plus", + "platform": "!android & !ios & !osx & !windows" + }, + { + "name": "metal", + "platform": "ios | osx" + }, + { + "name": "vulkan", + "platform": "android" + } + ], "features": { + "d3d11": { + "description": "Direct3D 11 render system", + "supports": "windows" + }, + "gl3plus": { + "description": "OpenGL 3+ render system", + "supports": "!android & !(arm & windows)" + }, + "metal": { + "description": "Metal render system", + "supports": "osx | ios" + }, "planar-reflections": { "description": "Component to use planar reflections, can be used by both HlmsPbs and HlmsUnlit" + }, + "vulkan": { + "description": "Vulkan render system", + "dependencies": [ + "glslang", + "vulkan" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index d1ff2861f0c18b..d2de4687c4c50e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3030,7 +3030,7 @@ }, "glslang": { "baseline": "13.1.1", - "port-version": 0 + "port-version": 1 }, "glui": { "baseline": "2019-11-30", @@ -6162,7 +6162,7 @@ }, "ogre-next": { "baseline": "2.3.3", - "port-version": 0 + "port-version": 1 }, "ois": { "baseline": "1.5.1", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index e9b97f3ecb584e..d371c9678ef53a 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a5fb278065c7505c6c2814d8dab0bba3642f194", + "version": "13.1.1", + "port-version": 1 + }, { "git-tree": "8296ce09ec51c8495a5bec8d65445b681df27b74", "version": "13.1.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 805e301d795976..f89f01380681f4 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92372bf7078f6e5f955072f35696788f09849b71", + "version": "2.3.3", + "port-version": 1 + }, { "git-tree": "ecf4c650a53fe5d7427f5fcb1e28302d42aad2c7", "version": "2.3.3", From f1c6efee2245009540dde947e0e3d008f3aa7dbb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 24 Dec 2023 09:44:26 +0100 Subject: [PATCH 0694/1039] [gdal] Update to 3.8.2 (#35818) --- ports/gdal/portfile.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- scripts/ci.baseline.txt | 9 ++++ .../test_ports/vcpkg-ci-gdal/portfile.cmake | 1 + scripts/test_ports/vcpkg-ci-gdal/vcpkg.json | 43 +++++++++++++++++++ versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++ 7 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 scripts/test_ports/vcpkg-ci-gdal/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-gdal/vcpkg.json diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 45872faccc683a..7de7fc80554f04 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 1a5ddc6a53f54e1c2f36cfd9af0ec05abc48c14207afaa89f449f3c7395f724ff92a8a5936608703dcc8b862e1762b1c3840445f440ebf9437816362aceef931 + SHA512 65119bf83d8680cb1648dce8997a131a256856aed1ad16fdb60812c6a159e4e1352e8463cb5c6fcf831113df58d2f6f9b814e13119d593c9319abd7cd63048a6 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 350d8327864522..433fceab410c22 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gdal", - "version-semver": "3.8.1", + "version-semver": "3.8.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/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b29297fc542568..66e4f29c9d80ec 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1292,6 +1292,15 @@ vcpkg-ci-freerdp:x64-windows-static-md=pass vcpkg-ci-freerdp:x64-windows-static=pass vcpkg-ci-freerdp:x64-windows=pass vcpkg-ci-freerdp:x86-windows=pass +vcpkg-ci-gdal:arm-neon-android=pass +vcpkg-ci-gdal:arm64-android=pass +vcpkg-ci-gdal:x64-android=pass +vcpkg-ci-gdal:x64-linux=pass +vcpkg-ci-gdal:x64-osx=pass +vcpkg-ci-gdal:x64-windows-static-md=pass +vcpkg-ci-gdal:x64-windows-static=pass +vcpkg-ci-gdal:x64-windows=pass +vcpkg-ci-gdal:x86-windows=pass vcpkg-ci-llvm:x64-linux=pass vcpkg-ci-llvm:x64-osx=pass vcpkg-ci-llvm:x64-windows-static-md=pass diff --git a/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake b/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake new file mode 100644 index 00000000000000..065116c276adcf --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gdal/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json new file mode 100644 index 00000000000000..b514803243c861 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "vcpkg-ci-gdal", + "version-date": "2023-12-21", + "description": "Port to force features of certain ports within CI", + "homepage": "https://github.com/microsoft/vcpkg", + "license": "MIT", + "dependencies": [ + { + "name": "gdal", + "features": [ + "freexl" + ] + }, + { + "name": "gdal", + "features": [ + "postgresql" + ], + "platform": "linux" + }, + { + "name": "gdal", + "features": [ + "cfitsio" + ], + "platform": "native" + }, + { + "name": "gdal", + "features": [ + "mysql-libmariadb" + ], + "platform": "windows & x86" + }, + { + "name": "gdal", + "features": [ + "aws-ec2-windows" + ], + "platform": "windows & !mingw" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d2de4687c4c50e..546640ff9aef2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2881,7 +2881,7 @@ "port-version": 0 }, "gdal": { - "baseline": "3.8.1", + "baseline": "3.8.2", "port-version": 0 }, "gdcm": { diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 1cf843c4b94a2d..f3bf447ee2b096 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c455ae6529676c606b6a031fa62d2c87e72ec86", + "version-semver": "3.8.2", + "port-version": 0 + }, { "git-tree": "33a60f073f77b16b9364659fea34df2cff9ea3ae", "version-semver": "3.8.1", From 5b539db37e274f56a8bf48b1f056640677cb16ea Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 00:39:57 +0100 Subject: [PATCH 0695/1039] [kealib] Cleanup, fix cmake config, [gdal] Add feature 'kea' (#35437) * [gdal] Add feature 'kea' * [gdal] Accept (vcpkg) interface and alias targets --- ports/gdal/cmake-project-include.cmake | 7 +++++++ ports/gdal/portfile.cmake | 3 +++ ports/gdal/target-is-valid.patch | 21 +++++++++++++++++++++ ports/gdal/vcpkg.json | 14 ++++++++++++++ scripts/test_ports/vcpkg-ci-gdal/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 7 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 ports/gdal/target-is-valid.patch diff --git a/ports/gdal/cmake-project-include.cmake b/ports/gdal/cmake-project-include.cmake index 33ce62b9821565..409b7b1a6436fc 100644 --- a/ports/gdal/cmake-project-include.cmake +++ b/ports/gdal/cmake-project-include.cmake @@ -1,3 +1,10 @@ +if(GDAL_USE_KEA) + find_package(Kealib CONFIG REQUIRED) + add_library(KEA::KEA ALIAS Kealib::Kealib) + set(GDAL_CHECK_PACKAGE_KEA_NAMES Kealib CACHE INTERNAL "vcpkg") + set(GDAL_CHECK_PACKAGE_KEA_TARGETS Kealib::Kealib CACHE INTERNAL "vcpkg") +endif() + if(GDAL_USE_WEBP) find_package(WebP CONFIG REQUIRED) add_library(WEBP::WebP ALIAS WebP::webp) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 7de7fc80554f04..edb284fe45d195 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( find-link-libraries.patch fix-gdal-target-interfaces.patch libkml.patch + target-is-valid.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -32,6 +33,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS iconv GDAL_USE_ICONV jpeg GDAL_USE_JPEG core GDAL_USE_JSONC + kea GDAL_USE_KEA lerc GDAL_USE_LERC libkml GDAL_USE_LIBKML lzma GDAL_USE_LIBLZMA @@ -86,6 +88,7 @@ vcpkg_cmake_configure( -DGDAL_USE_EXTERNAL_LIBS=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=ON -DOGR_BUILD_OPTIONAL_DRIVERS=ON + -DFIND_PACKAGE2_KEA_ENABLED=OFF -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb -DMYSQL_LIBRARIES=unofficial::libmariadb diff --git a/ports/gdal/target-is-valid.patch b/ports/gdal/target-is-valid.patch new file mode 100644 index 00000000000000..c7acf739064a63 --- /dev/null +++ b/ports/gdal/target-is-valid.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake +index f5c920a..53494c9 100644 +--- a/cmake/helpers/CheckDependentLibraries.cmake ++++ b/cmake/helpers/CheckDependentLibraries.cmake +@@ -41,6 +41,7 @@ endif() + # https://github.com/OSGeo/gdal/issues/5324 + function (gdal_check_target_is_valid target res_var) + get_target_property(_interface_include_directories ${target} "INTERFACE_INCLUDE_DIRECTORIES") ++ get_target_property(_type ${target} "TYPE") + if(_interface_include_directories) + foreach(_dir IN LISTS _interface_include_directories) + if(NOT EXISTS "${_dir}") +@@ -54,7 +55,7 @@ function (gdal_check_target_is_valid target res_var) + # property, but a GeoTIFF_INCLUDE_DIRS variable. + set_target_properties(${target} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${GeoTIFF_INCLUDE_DIRS}") +- else() ++ elseif(NOT _type STREQUAL "INTERFACE" AND _type STREQUAL "ALIAS") + message(WARNING "Target ${target} has no INTERFACE_INCLUDE_DIRECTORIES property. Ignoring that target.") + set(${res_var} FALSE PARENT_SCOPE) + return() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 433fceab410c22..ad209de355a623 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.8.2", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -150,6 +151,19 @@ "libjpeg-turbo" ] }, + "kea": { + "description": "Enable KEA driver", + "dependencies": [ + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5" + ] + }, + "kealib" + ] + }, "lerc": { "description": "Enable LERC support", "dependencies": [ diff --git a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json index b514803243c861..d72dae1b7039d6 100644 --- a/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-gdal/vcpkg.json @@ -21,7 +21,8 @@ { "name": "gdal", "features": [ - "cfitsio" + "cfitsio", + "kea" ], "platform": "native" }, diff --git a/versions/baseline.json b/versions/baseline.json index 546640ff9aef2b..b432b66bea5e59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2882,7 +2882,7 @@ }, "gdal": { "baseline": "3.8.2", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index f3bf447ee2b096..c3b853b28e96fd 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "833ca497db5bfb3e95b313c6bfbf793d20548326", + "version-semver": "3.8.2", + "port-version": 1 + }, { "git-tree": "8c455ae6529676c606b6a031fa62d2c87e72ec86", "version-semver": "3.8.2", From 155075b4793e22448ca28c7be5b1694396beafbc Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Thu, 28 Dec 2023 07:51:43 +0800 Subject: [PATCH 0696/1039] [proxy] update to 2.0.0 (#35885) * [proxy] update to 2.0.0 * [proxy] update versions --- 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 8c3e5cf7e91557..ee635acf5b6dbd 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.1.1 - SHA512 47fd051cc4b774e02bf390ac6f6319ecf16f8ee063348557a93806e4fd3019229fb0157fb3f12143a90d994675615c05c8a8cf99dde5789f65c43b5ff74a7afa + REF ${VERSION} + SHA512 09399eda8667cb575bcf826903bccbd5efaa989d2e0f4614ef3a112bae9eeb40c1da964587444aeb84d1b9a8c28e37a4262675cae885cc84d6a41c9b6729f7d1 HEAD_REF main ) diff --git a/ports/proxy/vcpkg.json b/ports/proxy/vcpkg.json index da4f4c7f58c1ad..43e90270908630 100644 --- a/ports/proxy/vcpkg.json +++ b/ports/proxy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxy", - "version": "1.1.1", + "version": "2.0.0", "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 b432b66bea5e59..9a812110fa2542 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6809,7 +6809,7 @@ "port-version": 0 }, "proxy": { - "baseline": "1.1.1", + "baseline": "2.0.0", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/proxy.json b/versions/p-/proxy.json index a310c169aeac54..5a2381b36c5993 100644 --- a/versions/p-/proxy.json +++ b/versions/p-/proxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02fdcb0499f6f91a041a8e444f33256f4284e808", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "259a1e2615c5bd167974fcd5d8148434a1040319", "version": "1.1.1", From cb1e4728779e35c4bb60c25114a59c93b3e9be9a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 28 Dec 2023 07:52:58 +0800 Subject: [PATCH 0697/1039] update to 20.54.0 (#35883) --- ports/uwebsockets/portfile.cmake | 2 +- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 7bef5e87dff583..79f11af452979a 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets REF "v${VERSION}" - SHA512 f6324663db534a0c70fbe94f77900ac0dedfd837abe091c7bf41c92865309dea01dc91703ac435a2e4d4f71342beb595fabba9477743c932cd1dfee8b2a7c3e2 + SHA512 0e63808b9f01237b6a4e21d54360565d6f3992cf61fdffd0354680cdf309a0e19666d269d42eec4a05fe5670910f048d6e09c6031468bf4f87072d61f47b113c HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 2758a3b13d3bf1..030bb2f2f98772 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.47.0", + "version-semver": "20.54.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9a812110fa2542..e4eee7846c6de7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8781,7 +8781,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "20.47.0", + "baseline": "20.54.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 706d11581258da..7b92632e55c681 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2d1e526ceac2a64d35063ef42990b83fb43e80e", + "version-semver": "20.54.0", + "port-version": 0 + }, { "git-tree": "accbc9586fca80fd1345c5f2f3cf8449c76dcb24", "version-semver": "20.47.0", From ffb614f8c10681aa0e38fc8776b5a3fee04ba0ee Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Thu, 28 Dec 2023 02:46:07 -0500 Subject: [PATCH 0698/1039] [bshoshany-thread-pool] Updated to v4.0.0 (#35896) * [bshoshany-thread-pool] Updated to v4.0.0 * [bshoshany-thread-pool] Updated to v4.0.0 --- ports/bshoshany-thread-pool/portfile.cmake | 2 +- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index dd8589ea9ffc58..13cda1b1fbe8e5 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool REF "v${VERSION}" - SHA512 43200acf989adbabc0478d847931d2e46c4ce13de9d28f2e603e6b86d38a7370c0e50bacd36bff5a1a200f33ae6394764adc64ce9a54df5e418d85fb525b4b3f + SHA512 a503f6877d8264c79bdffec204551a3bfba50c608dba34bbfb8145dc480715ed3d86d3d70cbe86855d3a739474c4de6e204ab1f95fe9fd3245e93cddd7e345af HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 38abafcd5b819c..5b8aeffad25b56 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.5.0", + "version": "4.0.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 d652925cf28dc0..20c0d93e7d1dda 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dab54b91bf4c70fc898cb14fb2505773f54660b", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "ed9b93bfd6a7031b7d96fa5443873f4c2634a049", "version": "3.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index e4eee7846c6de7..842a17e343a2f9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1337,7 +1337,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.5.0", + "baseline": "4.0.0", "port-version": 0 }, "bsio": { From 6a6ad17d8bd0e201426bcc0c179fa43caebda58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 28 Dec 2023 08:46:50 +0100 Subject: [PATCH 0699/1039] [unordered-dense] Update to 4.4.0 (#35895) * [unordered-dense] Update to 4.4.0 * [unordered-dense] Update version files --- ports/unordered-dense/portfile.cmake | 2 +- ports/unordered-dense/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/unordered-dense.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/unordered-dense/portfile.cmake b/ports/unordered-dense/portfile.cmake index a607dad3edec39..acced3e55e0ba2 100644 --- a/ports/unordered-dense/portfile.cmake +++ b/ports/unordered-dense/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/unordered_dense REF v${VERSION} - SHA512 a3d29c7dc6673a55e4b9c0e33ce9585b1cb4617173fcb5b09480b8ef75a0b4ae77c971f3477699965d4312e721479168ca77aaa9b23bac9795d72c385d334b9c + SHA512 82724dd3651f520a240b131fa7cac209d844b9f3a54ea36c8cbb125cb42fdbf5f38d96935f2999e5bf04c447b2b9fde4ebc740decfd7d3d4b7d45177d4f26b58 HEAD_REF master ) diff --git a/ports/unordered-dense/vcpkg.json b/ports/unordered-dense/vcpkg.json index b15e88bcdb435b..190ebcfaaf07cc 100644 --- a/ports/unordered-dense/vcpkg.json +++ b/ports/unordered-dense/vcpkg.json @@ -1,6 +1,6 @@ { "name": "unordered-dense", - "version": "4.3.1", + "version": "4.4.0", "description": "A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion", "homepage": "https://github.com/martinus/unordered_dense", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 842a17e343a2f9..90af8cffb05108 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8693,7 +8693,7 @@ "port-version": 2 }, "unordered-dense": { - "baseline": "4.3.1", + "baseline": "4.4.0", "port-version": 0 }, "unqlite": { diff --git a/versions/u-/unordered-dense.json b/versions/u-/unordered-dense.json index 830b5c239dbce4..8e444478219c70 100644 --- a/versions/u-/unordered-dense.json +++ b/versions/u-/unordered-dense.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "814c362d3218fc2f06ba7c2555c2aa977965ceb1", + "version": "4.4.0", + "port-version": 0 + }, { "git-tree": "92b6f3cc16f6fe577511e094a9b918b8af8fa360", "version": "4.3.1", From d4d2e611ece379289c4ce2391e6181ebaec22e46 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 08:47:50 +0100 Subject: [PATCH 0700/1039] [libosmium] Fix and cleanup (#35892) --- ports/libosmium/portfile.cmake | 15 ++++++++------- ports/libosmium/usage | 4 ++++ ports/libosmium/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libosmium.json | 5 +++++ 5 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 ports/libosmium/usage diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index 804c84ac6f94da..719d98c994480e 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -1,22 +1,23 @@ -# header-only library +set(VCPKG_BUILD_TYPE release) # header-only + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium REF "v${VERSION}" SHA512 72e881e221dc3e62d7459b5cd84bf65de4fc0149bed66fe0534107d0d4dc30e5d474df685b44af07e6065a690dd7b31b877b5b040b8e0b4b0b971738175c34a3 ) -set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GDAL=ON + # for transitive dependencies via pkgconf + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=1 + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} ) - vcpkg_cmake_install() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libosmium/usage b/ports/libosmium/usage new file mode 100644 index 00000000000000..813a7052217f3e --- /dev/null +++ b/ports/libosmium/usage @@ -0,0 +1,4 @@ +libosmium is header-only and can be used from CMake via: + + find_path(OSMIUM_INCLUDE_DIRS "osmium/version.hpp") + target_include_directories(main PRIVATE ${OSMIUM_INCLUDE_DIRS}) diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index f73188c81ad538..e526a2e40f3716 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libosmium", "version-semver": "2.20.0", + "port-version": 1, "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 90af8cffb05108..4f5cfa8152504a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4646,7 +4646,7 @@ }, "libosmium": { "baseline": "2.20.0", - "port-version": 0 + "port-version": 1 }, "libosmscout": { "baseline": "1.1.1", diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index f3070b6cbf3ed2..702721ca4eb75a 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e43abda3d2ab79b2d813717eef1b330b390557f", + "version-semver": "2.20.0", + "port-version": 1 + }, { "git-tree": "b77d6ee3568b3a3fedb7b00984ae085253e46506", "version-semver": "2.20.0", From 19786b14ecbafb585a5e98b46e70bfe34447e3ea Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 28 Dec 2023 02:51:01 -0500 Subject: [PATCH 0701/1039] Updating the necessary files. (#35886) --- ports/discordcoreapi/portfile.cmake | 2 +- ports/discordcoreapi/vcpkg.json | 2 +- ports/jsonifier/portfile.cmake | 2 +- ports/jsonifier/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/discordcoreapi.json | 5 +++++ versions/j-/jsonifier.json | 5 +++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 3d740bae9a4280..103672aeeeecfd 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI REF "v${VERSION}" - SHA512 4fcffa23be80bd7cf13ded5b8a78d7b94832d1d80996d315c5ee333b7a4006903f4d9f7ec1046f01658887349e5bf29406fe2eb5c979578b6bdad188798f4173 + SHA512 02fbb9e62048d2a98eab9f937d689f25a34eceba01e978cd592d11ed558492ebd4d4fdb74581182cb67e1247d0275e12f794cea296fabe00a3cbde9e66ff12dd HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 0a63f45a675f2b..e09009c2de31a5 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version": "2.0.4", + "version": "2.0.5", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "MIT", diff --git a/ports/jsonifier/portfile.cmake b/ports/jsonifier/portfile.cmake index 2eab200578aeef..cdf84405840d73 100644 --- a/ports/jsonifier/portfile.cmake +++ b/ports/jsonifier/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO realtimechris/jsonifier REF "v${VERSION}" - SHA512 da9a67e6987970462c22ac2174231c4c2d5531bd0ebd329cdaf8147f8777e03fb9a7c9ac2b23297dbe51fdf894720ac101ca11277f8a610a089fe9d06d0dbd38 + SHA512 a6907f01e76af23dde6a22758ff48eea647b24a1b0f39205fdc8d2808c66e691f8e2e682f0296dbab2d3a4b8d7a4ae18a011b4fa411d210108a3b88495e336be HEAD_REF main PATCHES uninstall-head.patch diff --git a/ports/jsonifier/vcpkg.json b/ports/jsonifier/vcpkg.json index e5237dc3bafaef..9a6171736c0741 100644 --- a/ports/jsonifier/vcpkg.json +++ b/ports/jsonifier/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsonifier", - "version": "0.9.93", + "version": "0.9.94", "description": "A few classes for parsing and serializing json - very rapidly.", "homepage": "https://github.com/realtimechris/jsonifier", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4f5cfa8152504a..f87a1fb1a1a809 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2217,7 +2217,7 @@ "port-version": 3 }, "discordcoreapi": { - "baseline": "2.0.4", + "baseline": "2.0.5", "port-version": 0 }, "discount": { @@ -3701,7 +3701,7 @@ "port-version": 2 }, "jsonifier": { - "baseline": "0.9.93", + "baseline": "0.9.94", "port-version": 0 }, "jsonnet": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 9cd30c25ee27e9..cefe0421f3c174 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cfa99c19a8811ae210dc76d37a27dae5c636aca", + "version": "2.0.5", + "port-version": 0 + }, { "git-tree": "9ee6373146d5c81a3e7bd75e4f32da5ec846299d", "version": "2.0.4", diff --git a/versions/j-/jsonifier.json b/versions/j-/jsonifier.json index 1c7ad700aeba46..84d1b5b3d2fc88 100644 --- a/versions/j-/jsonifier.json +++ b/versions/j-/jsonifier.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2a298ce7fae729f6d3e45e1ba669d33a77983d0", + "version": "0.9.94", + "port-version": 0 + }, { "git-tree": "250b98a91d7bf114d5616c193cfb8ed3f8ee7aa7", "version": "0.9.93", From 6734216dc73b5ea0400b34819e068865ecc8313f Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 28 Dec 2023 02:52:26 -0500 Subject: [PATCH 0702/1039] [harfbuzz] Make freetype dependency into feature. (#35877) --- ports/harfbuzz/portfile.cmake | 6 +++++- ports/harfbuzz/vcpkg.json | 18 +++++++++++++----- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 510f40d2e1d8e0..bf84f95bf8479d 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -35,7 +35,11 @@ if("cairo" IN_LIST FEATURES) else() list(APPEND FEATURE_OPTIONS -Dcairo=disabled) endif() -list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +if("freetype" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +else() + list(APPEND FEATURE_OPTIONS -Dfreetype=disabled) +endif() #if(VCPKG_TARGET_IS_WINDOWS) #link errors in qt5-base. probably requires changes to the pc files generated by meson #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 89367789e143b7..a92051f2cd0374 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,16 +1,12 @@ { "name": "harfbuzz", "version": "8.3.0", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", "supports": "!uwp", "dependencies": [ - { - "name": "freetype", - "default-features": false - }, { "name": "gettext", "platform": "osx" @@ -20,6 +16,9 @@ "host": true } ], + "default-features": [ + "freetype" + ], "features": { "cairo": { "description": "Enable Cairo graphics library support", @@ -37,6 +36,15 @@ "description": "Enable CoreText shaper backend on macOS", "supports": "osx" }, + "freetype": { + "description": "Enable FreeType support", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, "glib": { "description": "Glib Unicode callbacks support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f87a1fb1a1a809..626468f3fbff4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3274,7 +3274,7 @@ }, "harfbuzz": { "baseline": "8.3.0", - "port-version": 1 + "port-version": 2 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index b6d5550fefdd8f..9fa3889802bff1 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff776c837e28a47a91cad45946d7ab6b51dc3c67", + "version": "8.3.0", + "port-version": 2 + }, { "git-tree": "6e2d07391d009a33797b19b707bf5bc60cdb17e5", "version": "8.3.0", From 76d9952e00e7d3412b188cd995047b92df0bf802 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:53:45 +0800 Subject: [PATCH 0703/1039] [vxl] Fix missing header files (#35875) * add header file * update version --- ports/vxl/fix_limits.patch | 12 ++++++++++++ ports/vxl/portfile.cmake | 4 ++++ ports/vxl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vxl.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/vxl/fix_limits.patch diff --git a/ports/vxl/fix_limits.patch b/ports/vxl/fix_limits.patch new file mode 100644 index 00000000000000..3299f4f06dbb01 --- /dev/null +++ b/ports/vxl/fix_limits.patch @@ -0,0 +1,12 @@ +diff --git a/core/vnl/vnl_bignum.cxx b/core/vnl/vnl_bignum.cxx +index b615a9b..741bd43 100644 +--- a/core/vnl/vnl_bignum.cxx ++++ b/core/vnl/vnl_bignum.cxx +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include "vnl_bignum.h" + //: + // \file diff --git a/ports/vxl/portfile.cmake b/ports/vxl/portfile.cmake index b566458064360f..c70f94a5bc9551 100644 --- a/ports/vxl/portfile.cmake +++ b/ports/vxl/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( PATCHES fix_dependency.patch testlib.patch + fix_limits.patch ) set(USE_WIN_WCHAR_T OFF) @@ -43,6 +44,9 @@ vcpkg_cmake_configure( -DVXL_USE_DCMTK=OFF # TODO : need fix dcmtk support to turn on -DVXL_USE_GEOTIFF=ON -DVXL_USE_WIN_WCHAR_T=${USE_WIN_WCHAR_T} + MAYBE_UNUSED_VARIABLES + VXL_USE_DCMTK + VXL_USING_NATIVE_BZLIB2 ) vcpkg_cmake_install() diff --git a/ports/vxl/vcpkg.json b/ports/vxl/vcpkg.json index fb87b04d295774..29158b2d79a8f4 100644 --- a/ports/vxl/vcpkg.json +++ b/ports/vxl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vxl", "version": "2.0.2", - "port-version": 4, + "port-version": 5, "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.", "dependencies": [ "bzip2", diff --git a/versions/baseline.json b/versions/baseline.json index 626468f3fbff4e..5e0e35976c00d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9006,7 +9006,7 @@ }, "vxl": { "baseline": "2.0.2", - "port-version": 4 + "port-version": 5 }, "wampcc": { "baseline": "2019-09-04", diff --git a/versions/v-/vxl.json b/versions/v-/vxl.json index 80885d5e90eedb..a102826bde1a4d 100644 --- a/versions/v-/vxl.json +++ b/versions/v-/vxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63c0db04d12a2dbe25a0ec754983ca25415e3b38", + "version": "2.0.2", + "port-version": 5 + }, { "git-tree": "7a84f7e74335e755ba16066fa148e3d30a9d5af5", "version": "2.0.2", From 96b74ddc316b68b5f7700caede920c7c8d6e52bc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Dec 2023 23:55:41 -0800 Subject: [PATCH 0704/1039] [opencv4] Add feature openjpeg dependency (#35874) * Add feature openjpeg dependency * update version * update portfile.cmake * update version --------- Co-authored-by: vzhli17 --- ports/opencv4/portfile.cmake | 3 +++ ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 49772e15e2f8df..9618af5cc9b116 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -537,6 +537,9 @@ find_dependency(Tesseract)") if("openexr" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") endif() + if("openjpeg" IN_LIST FEATURES) + string(APPEND DEPS_STRING "\nfind_dependency(OpenJPEG)") + endif() if(WITH_OPENMP) string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)") endif() diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 1cbf5942a37b69..d2f4907ece398c 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 12, + "port-version": 13, "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 5e0e35976c00d6..f2787a31276018 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6262,7 +6262,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 12 + "port-version": 13 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 29218357596042..df5ae4065da86e 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "757561dc37010d966ad90a8a1f7d2942e9286154", + "version": "4.8.0", + "port-version": 13 + }, { "git-tree": "c3d46b66df37511cf7b49ceffe96f5ff62acf6ea", "version": "4.8.0", From f7a371bbd9945c9059875492ba018ec12cb925c2 Mon Sep 17 00:00:00 2001 From: Vladimir Shaleev Date: Thu, 28 Dec 2023 10:57:02 +0300 Subject: [PATCH 0705/1039] Add imgui support for feature android-binding (#35870) --- ports/imgui/CMakeLists.txt | 8 ++++++++ ports/imgui/portfile.cmake | 1 + ports/imgui/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index d5e22724860799..d76fe9570bb0bb 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -36,6 +36,10 @@ if(IMGUI_BUILD_ALLEGRO5_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.cpp) endif() +if(IMGUI_BUILD_ANDROID_BINDING) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.cpp) +endif() + if(IMGUI_BUILD_DX9_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.cpp) endif() @@ -158,6 +162,10 @@ if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_allegro5.h DESTINATION include) endif() + if (IMGUI_BUILD_ANDROID_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_android.h DESTINATION include) + endif() + if(IMGUI_BUILD_DX9_BINDING) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_dx9.h DESTINATION include) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 190999a711ab1e..25e362b0623b5f 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -24,6 +24,7 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH} vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES allegro5-binding IMGUI_BUILD_ALLEGRO5_BINDING + android-binding IMGUI_BUILD_ANDROID_BINDING dx9-binding IMGUI_BUILD_DX9_BINDING dx10-binding IMGUI_BUILD_DX10_BINDING dx11-binding IMGUI_BUILD_DX11_BINDING diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 484ce1be3c1c22..d1f8194f144f01 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "imgui", "version": "1.90", - "port-version": 2, + "port-version": 3, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -22,6 +22,10 @@ "allegro5" ] }, + "android-binding": { + "description": "Make available Android native app support", + "supports": "android" + }, "docking-experimental": { "description": "Build with docking support" }, diff --git a/versions/baseline.json b/versions/baseline.json index f2787a31276018..337fed9e6e5993 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3510,7 +3510,7 @@ }, "imgui": { "baseline": "1.90", - "port-version": 2 + "port-version": 3 }, "imgui-node-editor": { "baseline": "0.9.3", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 547500fa4c2b16..3632ef9e1b2f1f 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12ab98a00e6c2eda3393c25bda6458194d0cc42c", + "version": "1.90", + "port-version": 3 + }, { "git-tree": "a9fd7997ab3813f71b87171213ea8fbd4e70b863", "version": "1.90", From 2383d331e6c152d2648db19ca4f8ba86f1a3dec4 Mon Sep 17 00:00:00 2001 From: klaus triendl Date: Thu, 28 Dec 2023 09:58:43 +0200 Subject: [PATCH 0706/1039] Ability to enable the SOUNDEX() scalar function (#35867) --- ports/sqlite3/portfile.cmake | 1 + ports/sqlite3/vcpkg.json | 4 ++++ versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 18375f3ee06fa8..d5166f92fb1ecb 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -46,6 +46,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS none # only using the script-mode side- session SQLITE_ENABLE_PREUPDATE_HOOK omit-load-extension SQLITE_OMIT_LOAD_EXTENSION geopoly SQLITE_ENABLE_GEOPOLY + soundex SQLITE_SOUNDEX INVERTED_FEATURES json1 SQLITE_OMIT_JSON ) diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index c1ae47d06d0e5f..7011b3e5531d1d 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite3", "version": "3.43.2", + "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", @@ -57,6 +58,9 @@ "session": { "description": "Enable the SESSION extension" }, + "soundex": { + "description": "Enable the SOUNDEX scalar function" + }, "tool": { "description": "Build sqlite3 executable", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 337fed9e6e5993..2501d8ea51c6b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8150,7 +8150,7 @@ }, "sqlite3": { "baseline": "3.43.2", - "port-version": 0 + "port-version": 1 }, "sqlitecpp": { "baseline": "3.3.1", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 64334b9ce5e8a3..c4b99c07c718d3 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73056e20fb351b2c6978b351c74112223791eb25", + "version": "3.43.2", + "port-version": 1 + }, { "git-tree": "45ea1b638c4911a25f145365f06a11802b12c81e", "version": "3.43.2", From 71e47c9fb8a9aae9dd71091616dbbc1bf31d1912 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Thu, 28 Dec 2023 15:59:16 +0800 Subject: [PATCH 0707/1039] [minifb] Bump to 2023-09-21 (#35857) * [minifb] Bump to 2023-09-21 * Update version database --- ports/minifb/portfile.cmake | 4 ++-- ports/minifb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/minifb.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/minifb/portfile.cmake b/ports/minifb/portfile.cmake index eb299edb147bd0..3389c2a139f165 100644 --- a/ports/minifb/portfile.cmake +++ b/ports/minifb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emoon/minifb - REF 1e087f1e9fe5bd33cdb2210b8e92d513ff7dc339 # 2023-02-03 - SHA512 482bdcdb81d9f163ac7ff1224297331bfee68e53778a9170bfec52c8150c840445cb1338250bfc3e780aef011e3e95e7df3d7134183e59df947f69109a27108a + REF 2ce2449b1bc8d7c6d20c31b86244f1e540f2e788 # 2023-09-21 + SHA512 cbadc06df99f833fedcd9eb9d5afab4572272a9dfd0f4084a2b79a64dc98f19bcddbb6f43992b16f005d26054c454e3cfc34e3e210cdd93ad1adb89e19463a4d HEAD_REF master ) diff --git a/ports/minifb/vcpkg.json b/ports/minifb/vcpkg.json index 7059dca89bf4f5..07ef620853a52b 100644 --- a/ports/minifb/vcpkg.json +++ b/ports/minifb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "minifb", - "version-date": "2023-02-03", + "version-date": "2023-09-21", "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.", "homepage": "https://github.com/emoon/minifb", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2501d8ea51c6b8..3d7199fe382683 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5589,7 +5589,7 @@ "port-version": 0 }, "minifb": { - "baseline": "2023-02-03", + "baseline": "2023-09-21", "port-version": 0 }, "minimp3": { diff --git a/versions/m-/minifb.json b/versions/m-/minifb.json index fdf852f283f895..e40af52e69b0eb 100644 --- a/versions/m-/minifb.json +++ b/versions/m-/minifb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "745289bcc43c14f1f4c5b1f9f2d319d42fe1d299", + "version-date": "2023-09-21", + "port-version": 0 + }, { "git-tree": "071e8c4877c43b767d0afce0ad085255b6f68622", "version-date": "2023-02-03", From 9299bf302af09e4412efd792cd27ae5f1fe540fc Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Thu, 28 Dec 2023 15:59:51 +0800 Subject: [PATCH 0708/1039] [imageinfo] Bump to 2023-12-25 (#35856) * [imageinfo] Bump to 2023-12-25 * Update version database --- ports/imageinfo/portfile.cmake | 8 ++++---- ports/imageinfo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imageinfo.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/imageinfo/portfile.cmake b/ports/imageinfo/portfile.cmake index e7d0bdc39790ff..413b87481d2065 100644 --- a/ports/imageinfo/portfile.cmake +++ b/ports/imageinfo/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaozhuai/imageinfo - REF 724301f7ef5e29410e78cd900ae25f9fa2e3080a # committed on 2023-01-31 - SHA512 b9ba5d2ec5698b9eee4eb07e0dbb50d0f361e730b6d468ac6e4c90b29375f6468f45214573673de5f9388d532794f922a556153d34cba5d6ccec854c20d34506 + REF eb2f4a0727d425ecfe2debd3475bea1f570b1a8d # committed on 2023-12-25 + SHA512 1f03ff2dbe49d27e757b66c57c28e8a53ddbe372b20bb3f5891d1644dd885a851f55fb40c42637ca3528023b37e1b980b11cbe64fa5484f12a2c462052ae247a HEAD_REF master ) @@ -16,9 +16,9 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/imageinfo) +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/imageinfo/vcpkg.json b/ports/imageinfo/vcpkg.json index ff5b516ccf5180..143a93342023b8 100644 --- a/ports/imageinfo/vcpkg.json +++ b/ports/imageinfo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imageinfo", - "version-date": "2023-01-31", + "version-date": "2023-12-25", "description": "Cross platform super fast single header c++ library to get image size and format without loading/decoding. Support avif, bmp, cur, dds, gif, hdr (pic), heic (heif), icns, ico, jp2, jpeg (jpg), jpx, ktx, png, psd, qoi, tga, tiff (tif), webp ...", "homepage": "https://github.com/xiaozhuai/imageinfo", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3d7199fe382683..3398b418651ecf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3501,7 +3501,7 @@ "port-version": 0 }, "imageinfo": { - "baseline": "2023-01-31", + "baseline": "2023-12-25", "port-version": 0 }, "imath": { diff --git a/versions/i-/imageinfo.json b/versions/i-/imageinfo.json index c70ad20e500d72..99948cd834c412 100644 --- a/versions/i-/imageinfo.json +++ b/versions/i-/imageinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0061c49ae5be9cb32e197fd56a0a71e793d49f42", + "version-date": "2023-12-25", + "port-version": 0 + }, { "git-tree": "66f45650934f8561d3779ca4a29d808b8d1cea98", "version-date": "2023-01-31", From 5d0108992f85cb93b86208944ffc2669e027ef09 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 28 Dec 2023 16:01:19 +0800 Subject: [PATCH 0709/1039] Make detail mesh edge detection more robust (#35855) --- .../fix-detail-mesh-edge-detection.patch | 103 ++++++++++++++++++ ports/recastnavigation/portfile.cmake | 4 +- ports/recastnavigation/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/recastnavigation.json | 5 + 5 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 ports/recastnavigation/fix-detail-mesh-edge-detection.patch diff --git a/ports/recastnavigation/fix-detail-mesh-edge-detection.patch b/ports/recastnavigation/fix-detail-mesh-edge-detection.patch new file mode 100644 index 00000000000000..a4a8257a7f1073 --- /dev/null +++ b/ports/recastnavigation/fix-detail-mesh-edge-detection.patch @@ -0,0 +1,103 @@ +diff --git a/Recast/Source/RecastMeshDetail.cpp b/Recast/Source/RecastMeshDetail.cpp +index 40f5b8c..d83bf1c 100644 +--- a/Recast/Source/RecastMeshDetail.cpp ++++ b/Recast/Source/RecastMeshDetail.cpp +@@ -634,6 +634,40 @@ inline float getJitterY(const int i) + return (((i * 0xd8163841) & 0xffff) / 65535.0f * 2.0f) - 1.0f; + } + ++static bool onHull(int a, int b, int nhull, int* hull) ++{ ++ // All internal sampled points come after the hull so we can early out for those. ++ if (a >= nhull || b >= nhull) ++ return false; ++ ++ for (int j = nhull - 1, i = 0; i < nhull; j = i++) ++ { ++ if (a == hull[j] && b == hull[i]) ++ return true; ++ } ++ ++ return false; ++} ++ ++// Find edges that lie on hull and mark them as such. ++static void setTriFlags(rcIntArray& tris, int nhull, int* hull) ++{ ++ // Matches DT_DETAIL_EDGE_BOUNDARY ++ const int DETAIL_EDGE_BOUNDARY = 0x1; ++ ++ for (int i = 0; i < tris.size(); i += 4) ++ { ++ int a = tris[i + 0]; ++ int b = tris[i + 1]; ++ int c = tris[i + 2]; ++ unsigned short flags = 0; ++ flags |= (onHull(a, b, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 0; ++ flags |= (onHull(b, c, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 2; ++ flags |= (onHull(c, a, nhull, hull) ? DETAIL_EDGE_BOUNDARY : 0) << 4; ++ tris[i + 3] = (int)flags; ++ } ++} ++ + static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin, + const float sampleDist, const float sampleMaxError, + const int heightSearchRadius, const rcCompactHeightfield& chf, +@@ -771,6 +805,7 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin, + if (minExtent < sampleDist*2) + { + triangulateHull(nverts, verts, nhull, hull, nin, tris); ++ setTriFlags(tris, nhull, hull); + return true; + } + +@@ -875,7 +910,8 @@ static bool buildPolyDetail(rcContext* ctx, const float* in, const int nin, + tris.resize(MAX_TRIS*4); + ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Shrinking triangle count from %d to max %d.", ntris, MAX_TRIS); + } +- ++ ++ setTriFlags(tris, nhull, hull); + return true; + } + +@@ -1137,30 +1173,6 @@ static void getHeightData(rcContext* ctx, const rcCompactHeightfield& chf, + } + } + +-static unsigned char getEdgeFlags(const float* va, const float* vb, +- const float* vpoly, const int npoly) +-{ +- // The flag returned by this function matches dtDetailTriEdgeFlags in Detour. +- // Figure out if edge (va,vb) is part of the polygon boundary. +- static const float thrSqr = rcSqr(0.001f); +- for (int i = 0, j = npoly-1; i < npoly; j=i++) +- { +- if (distancePtSeg2d(va, &vpoly[j*3], &vpoly[i*3]) < thrSqr && +- distancePtSeg2d(vb, &vpoly[j*3], &vpoly[i*3]) < thrSqr) +- return 1; +- } +- return 0; +-} +- +-static unsigned char getTriFlags(const float* va, const float* vb, const float* vc, +- const float* vpoly, const int npoly) +-{ +- unsigned char flags = 0; +- flags |= getEdgeFlags(va,vb,vpoly,npoly) << 0; +- flags |= getEdgeFlags(vb,vc,vpoly,npoly) << 2; +- flags |= getEdgeFlags(vc,va,vpoly,npoly) << 4; +- return flags; +-} + + /// @par + /// +@@ -1377,7 +1389,7 @@ bool rcBuildPolyMeshDetail(rcContext* ctx, const rcPolyMesh& mesh, const rcCompa + dmesh.tris[dmesh.ntris*4+0] = (unsigned char)t[0]; + dmesh.tris[dmesh.ntris*4+1] = (unsigned char)t[1]; + dmesh.tris[dmesh.ntris*4+2] = (unsigned char)t[2]; +- dmesh.tris[dmesh.ntris*4+3] = getTriFlags(&verts[t[0]*3], &verts[t[1]*3], &verts[t[2]*3], poly, npoly); ++ dmesh.tris[dmesh.ntris*4+3] = (unsigned char)t[3]; + dmesh.ntris++; + } + } diff --git a/ports/recastnavigation/portfile.cmake b/ports/recastnavigation/portfile.cmake index 69dcac3626ef37..e6f4a0d418a5f8 100644 --- a/ports/recastnavigation/portfile.cmake +++ b/ports/recastnavigation/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v${VERSION} SHA512 7567aaa78219cc490a6f76210fba1f130f0c17aeaa06432ab1207e0fd03404abe31042e8b03971aa0d04ad65d39469f13575fe0072fb920c38581d39568b70fb HEAD_REF master + PATCHES + fix-detail-mesh-edge-detection.patch #Upstream fix https://github.com/recastnavigation/recastnavigation/pull/657 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -25,4 +27,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/License.txt") diff --git a/ports/recastnavigation/vcpkg.json b/ports/recastnavigation/vcpkg.json index 08a5e13e306096..839670623bb4f6 100644 --- a/ports/recastnavigation/vcpkg.json +++ b/ports/recastnavigation/vcpkg.json @@ -1,6 +1,7 @@ { "name": "recastnavigation", "version": "1.6.0", + "port-version": 1, "description": "Navigation-mesh Toolset for Games", "homepage": "https://github.com/recastnavigation/recastnavigation", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 3398b418651ecf..1460965b3de88e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7438,7 +7438,7 @@ }, "recastnavigation": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "recycle": { "baseline": "6.0.0", diff --git a/versions/r-/recastnavigation.json b/versions/r-/recastnavigation.json index a4b5216dc24622..38cf40fa95ae8c 100644 --- a/versions/r-/recastnavigation.json +++ b/versions/r-/recastnavigation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "806d9850ce88d7190649eb90863455084516d519", + "version": "1.6.0", + "port-version": 1 + }, { "git-tree": "d08244dcfe4974f58b9dd481f1e3e34414a46207", "version": "1.6.0", From cfd0a5a75a5680c67bc39113524482aabe384cc9 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 28 Dec 2023 00:01:47 -0800 Subject: [PATCH 0710/1039] [fast-float] update to 6.0.0 (#35852) * [fast-float] update to 6.0.0 * update version --------- Co-authored-by: vzhli17 --- ports/fast-float/portfile.cmake | 2 +- ports/fast-float/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fast-float.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake index ba15cd260763b7..5590e82e356e10 100644 --- a/ports/fast-float/portfile.cmake +++ b/ports/fast-float/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float REF "v${VERSION}" - SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81 + SHA512 37280efebea7aa33cc25c8d8375b6c9456a8025d29d618abb5aac580c025097a6110ec3a913d1504fd9af1df43e434bc5411e07e38dd66c12491f3edc7374fff HEAD_REF master ) diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json index d4654dc7c9b1d9..fb875042433ec5 100644 --- a/ports/fast-float/vcpkg.json +++ b/ports/fast-float/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fast-float", - "version": "5.2.0", + "version": "6.0.0", "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", "homepage": "https://github.com/fastfloat/fast_float", "license": "Apache-2.0 OR BSL-1.0 OR MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1460965b3de88e..0eb10ca913cc35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2545,7 +2545,7 @@ "port-version": 2 }, "fast-float": { - "baseline": "5.2.0", + "baseline": "6.0.0", "port-version": 0 }, "fastcdr": { diff --git a/versions/f-/fast-float.json b/versions/f-/fast-float.json index e768766cb1df06..f5ebcfa449426d 100644 --- a/versions/f-/fast-float.json +++ b/versions/f-/fast-float.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f36d745c12126b63e7f6b1dc5f41f6c644e1367", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "b78d9590504b99e64f96cdddac42bf67fed57feb", "version": "5.2.0", From 1f74e2c58a47e5d7be7f09bf76c006eb653f07f9 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 28 Dec 2023 09:02:21 +0100 Subject: [PATCH 0711/1039] asio-grpc: Update to 2.9.0 (#35849) --- ports/asio-grpc/portfile.cmake | 2 +- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index 9f90f6ff5c4553..e54779a375f020 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc REF "v${VERSION}" - SHA512 e41d2cf4098af9921fc8911634baa7b2c283d6afa31dbb6ff371c385ed5f6518eb870672a5c0b0fcc42b5cb767cdd82b077e85afbf0b132b74bd2c80118907b8 + SHA512 1dfd6254967dc24185cc17770fb18460289b4d1ff0952b8b3bad5d4222ee1fd640ef56ef437589d88b789ca9e374362f1a780b3fbf7d46dbd1ed6628b6b6ceca HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 8dec481bf534aa..c3c8f3b489150c 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "2.8.0", + "version": "2.9.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 5695c100d05396..29e9b3abe53529 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f03cf73ec5ddb5be5e21f4ce6c7f442ac53a769", + "version": "2.9.0", + "port-version": 0 + }, { "git-tree": "ab210d20b701caf5c71159529c8b4f163df0c5cc", "version": "2.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0eb10ca913cc35..318b604934d1d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -253,7 +253,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "2.8.0", + "baseline": "2.9.0", "port-version": 0 }, "asiosdk": { From 77df385ff64d70bea9a86152fa0307d9381cefe9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 09:06:40 +0100 Subject: [PATCH 0712/1039] [shapelib] Update to 1.6.0 (#35840) --- ports/shapelib/fix-usage.patch | 34 ----------- ports/shapelib/option-build-test.patch | 13 ---- ports/shapelib/portfile.cmake | 84 +++++++++++++++++--------- ports/shapelib/vcpkg.json | 12 +++- versions/baseline.json | 4 +- versions/s-/shapelib.json | 5 ++ 6 files changed, 70 insertions(+), 82 deletions(-) delete mode 100644 ports/shapelib/fix-usage.patch delete mode 100644 ports/shapelib/option-build-test.patch diff --git a/ports/shapelib/fix-usage.patch b/ports/shapelib/fix-usage.patch deleted file mode 100644 index 8b22423fa2e6d5..00000000000000 --- a/ports/shapelib/fix-usage.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b3b3b51..ea3f129 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,8 +73,8 @@ set( - - # Export build information to help other projects link installed - # shapelib software. Only one of these signatures is required --# for the export_shp name. --install(EXPORT export_shp DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) -+# for the shpConfig name. -+install(EXPORT shpConfig DESTINATION ${CMAKE_INSTALL_SHP_DATADIR}) - - # Initial boilerplate done, now build library and executables. - -@@ -127,12 +127,17 @@ if(USE_RPATH) - endif(USE_RPATH) - - install(TARGETS shp -- EXPORT export_shp -+ EXPORT shpConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) - -+INSTALL(EXPORT shpConfig -+ DESTINATION share/shp -+) -+ -+ - # executables to be built and installed. - set(executables - shpcreate diff --git a/ports/shapelib/option-build-test.patch b/ports/shapelib/option-build-test.patch deleted file mode 100644 index c91410f386c948..00000000000000 --- a/ports/shapelib/option-build-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c3ef935..845ec06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,7 +148,7 @@ set(executables - find_program(BASH_EXECUTABLE bash) - find_program(SED_EXECUTABLE sed) - if(BASH_EXECUTABLE AND SED_EXECUTABLE) -- set(BUILD_TEST ON) -+ option(BUILD_TEST "" ON) - else(BASH_EXECUTABLE AND SED_EXECUTABLE) - message(STATUS "WARNING: sed or bash not available so disabling testing") - endif(BASH_EXECUTABLE AND SED_EXECUTABLE) diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake index 89c00b2e133592..146b05b91f8df5 100644 --- a/ports/shapelib/portfile.cmake +++ b/ports/shapelib/portfile.cmake @@ -1,50 +1,74 @@ -set(SHAPELIB_VERSION 1.5.0) -set(SHAPELIB_HASH 230939afb33aee042808a32b38ee9dfc7ec1f39432e5a4ebe3fda99c2f87bfbebc91830d4e21691c51aae3f4bb65d7e71e7061472bb08124dcd3402c46800d6c) - vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/shapelib/shapelib-${SHAPELIB_VERSION}.zip" - FILENAME "shapelib-${SHAPELIB_VERSION}.zip" - SHA512 ${SHAPELIB_HASH} + URLS "http://download.osgeo.org/shapelib/shapelib-${VERSION}.zip" + FILENAME "shapelib-${VERSION}.zip" + SHA512 f3f43f2028fe442e020558de2559b24eae9c7a1d0c84cc242f23ea985cf1fb5ff39fbfef7738f9b8ef5df9a5d0b9f3e891a61b3d5fbbe5b224f41a46589723a3 ) vcpkg_extract_source_archive( SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - option-build-test.patch + ARCHIVE "${ARCHIVE}" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS options + FEATURES + contrib BUILD_SHAPELIB_CONTRIB ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TEST=OFF + ${options} + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME shp) +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") -if(EXES) - file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib") - file(REMOVE ${EXES}) -endif() - -file(GLOB DEBUG_EXES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") -if(DEBUG_EXES) - file(REMOVE ${DEBUG_EXES}) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +vcpkg_copy_tools( + TOOL_NAMES + dbfadd + dbfcreate + dbfdump + shpadd + shpcreate + shpdump + shprewind + shptreedump + AUTO_CLEAN +) +if(BUILD_SHAPELIB_CONTRIB) + vcpkg_copy_tools( + TOOL_NAMES + csv2shp + dbfcat + dbfinfo + Shape_PointInPoly + shpcat + shpcentrd + shpdata + shpdxf + shpfix + shpinfo + shpsort + shpwkb + AUTO_CLEAN + ) endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib") +vcpkg_install_copyright( + FILE_LIST "${SOURCE_PATH}/LICENSE-LGPL" "${SOURCE_PATH}/LICENSE-MIT" + # Cf. web/license.html + COMMENT [[ +The core portions of the library are made available under two +possible licenses. The licensee can choose to use the code under +either the Library GNU Public License described in LICENSE-LGPL +or under the MIT license described in LICENSE-MIT. -vcpkg_copy_pdbs() +Some auxiliary portions of Shapelib, notably some of the components +in the contrib directory come under slightly different license restrictions. +Check the source files that you are actually using for conditions. +]]) diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json index 099b5147eecb17..99eaaff0585d7d 100644 --- a/ports/shapelib/vcpkg.json +++ b/ports/shapelib/vcpkg.json @@ -1,9 +1,9 @@ { "name": "shapelib", - "version": "1.5.0", - "port-version": 4, + "version": "1.6.0", "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", "homepage": "https://download.osgeo.org/shapelib", + "license": "MIT OR LGPL-2.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", @@ -13,5 +13,11 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "contrib": { + "description": "Build utilities (from contrib)", + "license": null + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 318b604934d1d7..5b7d100d696984 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7849,8 +7849,8 @@ "port-version": 0 }, "shapelib": { - "baseline": "1.5.0", - "port-version": 4 + "baseline": "1.6.0", + "port-version": 0 }, "shiftmedia-libgcrypt": { "baseline": "1.10.1-1", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index 2cd29737ecd5dc..7c575b57d22392 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b89a941de4bb79399a81b9199cf15e66a882956", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "07bc870ae6b0fd620c817bd35c8ec499ecbf4f22", "version": "1.5.0", From c415be64bdfa98aeca07d6f498ff16195c8d7d5b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Dec 2023 09:11:17 +0100 Subject: [PATCH 0713/1039] [skia] Fix and test vulkan (#35828) * [vcpkg-ci-skia] Use vulkan * [skia] Fix vulkan on windows * Require vcpkg-ci-skia pass * Fixup --- ports/skia/portfile.cmake | 3 ++- ports/skia/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 12 ++++++++++++ scripts/test_ports/vcpkg-ci-skia/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/s-/skia.json | 5 +++++ 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index d9d593ddcf07c8..77e22253c60312 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -194,7 +194,8 @@ if("vulkan" IN_LIST FEATURES) vulkan-tools ) string(APPEND OPTIONS " skia_use_vulkan=true") - file(COPY "${CURRENT_INSTALLED_DIR}/include/vk_mem_alloc.h" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include") + find_file(vk_mem_alloc_h "vk_mem_alloc.h" PATHS "${CURRENT_INSTALLED_DIR}/include" PATH_SUFFIXES "vma" REQUIRED) + file(COPY "${vk_mem_alloc_h}" DESTINATION "${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include") # Cf. third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h:25 vcpkg_replace_string("${SOURCE_PATH}/third_party/externals/vulkanmemoryallocator/include/vk_mem_alloc.h" "#include " diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 4053b6100317f5..928c840da9c20f 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.38.2", - "port-version": 1, + "port-version": 2, "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.", @@ -57,7 +57,7 @@ }, { "name": "gl", - "platform": "!uwp" + "platform": "!(windows & arm) & !uwp" }, { "name": "harfbuzz", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 66e4f29c9d80ec..1b4aacf30818e5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1333,6 +1333,18 @@ vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-skia:arm-neon-android=pass +vcpkg-ci-skia:arm64-android=pass +vcpkg-ci-skia:arm64-uwp=pass +vcpkg-ci-skia:arm64-windows=pass +vcpkg-ci-skia:x64-android=pass +vcpkg-ci-skia:x64-linux=pass +vcpkg-ci-skia:x64-osx=pass +vcpkg-ci-skia:x64-uwp=pass +vcpkg-ci-skia:x64-windows-static-md=pass +vcpkg-ci-skia:x64-windows-static=pass +vcpkg-ci-skia:x64-windows=pass +vcpkg-ci-skia:x86-windows=pass vcpkg-ci-soci:x64-linux=pass vcpkg-ci-soci:x64-osx=pass vcpkg-ci-soci:x64-windows=pass diff --git a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json index 586b3a3a5315cb..54a5c2c64dae69 100644 --- a/scripts/test_ports/vcpkg-ci-skia/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-skia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-ci-skia", - "version-date": "2023-11-12", + "version-date": "2023-12-22", "description": "Builds an app in order to validate the skia port.", "license": "BSD-3-Clause", "dependencies": [ @@ -8,6 +8,14 @@ "name": "skia", "default-features": false }, + { + "name": "skia", + "default-features": false, + "features": [ + "vulkan" + ], + "platform": "linux | osx | (windows & !uwp)" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 5b7d100d696984..17ea6a91164e5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7938,7 +7938,7 @@ }, "skia": { "baseline": "0.38.2", - "port-version": 1 + "port-version": 2 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index d8f3ddbfbc0842..951d085a0981e0 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce919437fcbcbfe2c364757efdc117a286f44fa2", + "version": "0.38.2", + "port-version": 2 + }, { "git-tree": "7363d84372c8a2a6e3c06a7fcc6c1ef1d1b7b97a", "version": "0.38.2", From eaee229786166092c0c5437e81b61a6e47c2b32a Mon Sep 17 00:00:00 2001 From: endingly Date: Thu, 28 Dec 2023 16:25:44 +0800 Subject: [PATCH 0714/1039] [backward-cpp]Update version (#35583) * update backward-cpp version * update vcpkg versions json file * delete `include-dir.diff` * update vcpkg versions file * remove PACKAGE_NAME item * fix version file * version format changes * add new version to vcpkg * add usage * chage main version in vcpkg * Add blank line * update version --------- Co-authored-by: vzhli17 --- ports/backward-cpp/include-dir.diff | 16 ---------------- ports/backward-cpp/portfile.cmake | 13 +++++-------- ports/backward-cpp/usage | 7 +++++++ ports/backward-cpp/vcpkg.json | 3 +-- versions/b-/backward-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 ports/backward-cpp/include-dir.diff create mode 100644 ports/backward-cpp/usage diff --git a/ports/backward-cpp/include-dir.diff b/ports/backward-cpp/include-dir.diff deleted file mode 100644 index 9a502744b2b0d4..00000000000000 --- a/ports/backward-cpp/include-dir.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/BackwardConfig.cmake b/BackwardConfig.cmake -index a982adc..0c549f3 100644 ---- a/BackwardConfig.cmake -+++ b/BackwardConfig.cmake -@@ -198,6 +198,11 @@ if(WIN32) - endif() - - set(BACKWARD_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}") -+if(NOT PROJECT_NAME STREQUAL "backward") -+ get_filename_component(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}" DIRECTORY) -+ get_filename_component(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}" DIRECTORY) -+ set(BACKWARD_INCLUDE_DIR "${BACKWARD_INCLUDE_DIR}/include") -+endif() - - set(BACKWARD_HAS_EXTERNAL_LIBRARIES FALSE) - set(FIND_PACKAGE_REQUIRED_VARS BACKWARD_INCLUDE_DIR) diff --git a/ports/backward-cpp/portfile.cmake b/ports/backward-cpp/portfile.cmake index 65725bea26397e..a81ef1fdc5bdda 100644 --- a/ports/backward-cpp/portfile.cmake +++ b/ports/backward-cpp/portfile.cmake @@ -1,21 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bombela/backward-cpp - REF "v${VERSION}" - SHA512 db0256a54819952ff1d92e05d6ab81fe979d4826ebb6651b6b08c30e7a0091879dfeff33d81f9599462152ce68e61e2c8c42bf039129bc6b28d1e68b1eab039b + REF 51f0700452cf71c57d43c2d028277b24cde32502 # 2023-11-24 + SHA512 8831be0a1c0a2f2d2625c5e2065202445520e0f7591cdbf998c60f2c892880d1527f304f9361b057c831f84621be636e12fea018297c9a17d858ecc6c36c9ffb HEAD_REF master - PATCHES - include-dir.diff ) -set(VCPKG_BUILD_TYPE release) # header-only - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME backward CONFIG_PATH lib/backward) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/backward) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/backward-cpp/usage b/ports/backward-cpp/usage new file mode 100644 index 00000000000000..a4bc592a7156db --- /dev/null +++ b/ports/backward-cpp/usage @@ -0,0 +1,7 @@ +backward-cpp provides CMake targets: + + find_package(Backward CONFIG REQUIRED) + # To use the header library + target_link_libraries(main PRIVATE Backward::Interface) + # To use the prebuilt library + target_link_libraries(main PRIVATE Backward::Backward) diff --git a/ports/backward-cpp/vcpkg.json b/ports/backward-cpp/vcpkg.json index f1b7db835c83b6..8499af6b165550 100644 --- a/ports/backward-cpp/vcpkg.json +++ b/ports/backward-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "backward-cpp", - "version": "1.6", - "port-version": 1, + "version-date": "2023-11-24", "description": "A beautiful stack trace pretty printer for C++", "homepage": "https://github.com/bombela/backward-cpp", "supports": "!uwp & !(windows & arm)", diff --git a/versions/b-/backward-cpp.json b/versions/b-/backward-cpp.json index 56900b9b5dfdf7..79ddd53858ffaf 100644 --- a/versions/b-/backward-cpp.json +++ b/versions/b-/backward-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b8009fe2173eac9490fd50428585a19cd85b043", + "version-date": "2023-11-24", + "port-version": 0 + }, { "git-tree": "748c91a2ed90cad10b92d4c527dc855ec8f15db0", "version": "1.6", diff --git a/versions/baseline.json b/versions/baseline.json index 17ea6a91164e5a..999305105c4809 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -513,8 +513,8 @@ "port-version": 2 }, "backward-cpp": { - "baseline": "1.6", - "port-version": 1 + "baseline": "2023-11-24", + "port-version": 0 }, "baresip-libre": { "baseline": "3.7.0", From e64dd3356f7fe38e1e547cd94cee92bae831d41f Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 28 Dec 2023 17:30:51 +0900 Subject: [PATCH 0715/1039] [hwinfo] create a new port (#35465) * [hwinfo] create a new port * [hwinfo] update baseline * [hwinfo] can't use WbemIdl in UWP * [hwinfo] suppress NO_OCL unused * it's just not accessed in CMakeLists.txt * [hwinfo] fix NO_OCL expression --- ports/hwinfo/portfile.cmake | 21 +++++++++++++++++++++ ports/hwinfo/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++++ versions/h-/hwinfo.json | 9 +++++++++ 4 files changed, 48 insertions(+) create mode 100644 ports/hwinfo/portfile.cmake create mode 100644 ports/hwinfo/vcpkg.json create mode 100644 versions/h-/hwinfo.json diff --git a/ports/hwinfo/portfile.cmake b/ports/hwinfo/portfile.cmake new file mode 100644 index 00000000000000..bd8dad6c9c6e16 --- /dev/null +++ b/ports/hwinfo/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lfreist/hwinfo + REF 5cb31dbdb2c40413a837ce52ffadee23578c9069 + SHA512 7c431528d5bf2f91843a3f6f8de908f6bc5b1427f85961bb885ab95e7765a875cb0358638e0e1e1f9a9336476ba74dc22819c97189251391fd8459c334c1092a +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNO_OCL=TRUE # disable OpenCL usage + MAYBE_UNUSED_VARIABLES + NO_OCL +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/hwinfo/vcpkg.json b/ports/hwinfo/vcpkg.json new file mode 100644 index 00000000000000..cb5ac1373cbcc9 --- /dev/null +++ b/ports/hwinfo/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "hwinfo", + "version-date": "2023-12-02", + "description": "cross platform C++ library for hardware information (CPU, RAM, GPU, ...)", + "homepage": "https://github.com/lfreist/hwinfo", + "license": "MIT", + "supports": "(windows | linux) & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 999305105c4809..8842d2a37c7cb6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3364,6 +3364,10 @@ "baseline": "1.7.2", "port-version": 0 }, + "hwinfo": { + "baseline": "2023-12-02", + "port-version": 0 + }, "hwloc": { "baseline": "2.9.3", "port-version": 0 diff --git a/versions/h-/hwinfo.json b/versions/h-/hwinfo.json new file mode 100644 index 00000000000000..9dca1884ff7e73 --- /dev/null +++ b/versions/h-/hwinfo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "75e06682da06c2b28e10f57d72dc30618b833848", + "version-date": "2023-12-02", + "port-version": 0 + } + ] +} From 9fd83fa98b5f2ae6188a6ba59a49837061db0a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Thu, 28 Dec 2023 08:31:48 +0000 Subject: [PATCH 0716/1039] [bext-sml] Update to v1.1.9 (#35894) * bext-sml update v1.1.9 * vcpkg update database * Windows style line endings for existing lines * vcpkg database update --- ports/bext-sml/portfile.cmake | 4 ++-- ports/bext-sml/vcpkg.json | 2 +- versions/b-/bext-sml.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bext-sml/portfile.cmake b/ports/bext-sml/portfile.cmake index 3701e1616f1cd3..d8d662745029b6 100644 --- a/ports/bext-sml/portfile.cmake +++ b/ports/bext-sml/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boost-ext/sml - REF v1.1.5 - SHA512 6babee6da2db93912afa2eb932591674a73f43609b7c2b0523e84ba682c09f6d4f67d1c7f6ea48f73f1f09de8df2eaf2ae30b3399c1602189ea08d42689758d7 + REF v${VERSION} + SHA512 7612f301ed3e4edd4171214d85c6b746af19079622aef80c0965536782e4f50635332e7435966b072e1cb415c3a680260211740313d52d1927ab5af78ecdd30e HEAD_REF master ) diff --git a/ports/bext-sml/vcpkg.json b/ports/bext-sml/vcpkg.json index 5b04bc3fc66e9c..c41a932b535892 100644 --- a/ports/bext-sml/vcpkg.json +++ b/ports/bext-sml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bext-sml", - "version": "1.1.5", + "version": "1.1.9", "description": "Your scalable C++14 one header only State Machine Library with no dependencies", "homepage": "https://github.com/boost-ext/sml", "license": "BSL-1.0" diff --git a/versions/b-/bext-sml.json b/versions/b-/bext-sml.json index 0f6fd7284671e9..f956810b45c12c 100644 --- a/versions/b-/bext-sml.json +++ b/versions/b-/bext-sml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a92a1e011efcac69647356c0806c794d4d8ceac", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "607e0e94d37ca023fd393c42e8acb43881ea8025", "version": "1.1.5", diff --git a/versions/baseline.json b/versions/baseline.json index 8842d2a37c7cb6..6ea48e5283ba80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -573,7 +573,7 @@ "port-version": 0 }, "bext-sml": { - "baseline": "1.1.5", + "baseline": "1.1.9", "port-version": 0 }, "bext-sml2": { From 9d3db6b7e4f496878ed17d8edc4d5bcf66c532a1 Mon Sep 17 00:00:00 2001 From: "Dr.-Ing. Carsten Grimm" <16454511+carsten-grimm@users.noreply.github.com> Date: Fri, 29 Dec 2023 08:59:20 +0100 Subject: [PATCH 0717/1039] [qt5] update to 5.15.12, patch CVE-2023-51714 (#35912) * [qt5] update version number and hashes * [qt5-base] add official patch for CVE-2023-51714 * [qt5] regenerate version info --- ports/qt5-3d/vcpkg.json | 2 +- ports/qt5-activeqt/vcpkg.json | 2 +- ports/qt5-androidextras/vcpkg.json | 2 +- ports/qt5-base/cmake/qt_port_hashes.cmake | 82 +++++++++--------- .../0001-CVE-2023-51714-qtbase-5.15.diff | 38 ++++++++ .../0002-CVE-2023-51714-qtbase-5.15.diff | 59 +++++++++++++ ports/qt5-base/portfile.cmake | 2 + 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 | 2 +- ports/qt5-location/vcpkg.json | 2 +- ports/qt5-macextras/vcpkg.json | 2 +- ports/qt5-mqtt/vcpkg.json | 2 +- ports/qt5-multimedia/vcpkg.json | 3 +- 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/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 | 86 +++++++++---------- 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 ++ 87 files changed, 429 insertions(+), 127 deletions(-) create mode 100644 ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff create mode 100644 ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 398b30b5e59f73..b0eb2c5c71575f 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.11", + "version": "5.15.12", "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 da99d74106e4fd..02ac498068585a 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.11", + "version": "5.15.12", "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 5c5ff65cf0a3b2..aaf5307b06cc34 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.11", + "version": "5.15.12", "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 a4aeef035f79c9..fe5e8565f49aa8 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 11) +set(QT_PATCH_VER 12) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-3d 34362aafbff5352786e87d98362e8961d4e2d9ad4ddd0c76ec7771375eb3f9c6f23b681c2697752ee9dad228f04e377e0a934859f70e6020dd9613b6ee760f1c) -set(QT_HASH_qt5-activeqt 33e441e56e0d59215c2884f75fbea104c2089e2b7571025f045cd03a8f5db1cf318f7f0bd7107ff2e414ddd0de13e16fbd49ad6c75ae1cef4cc4049429d3fba0) -set(QT_HASH_qt5-androidextras 6524e13c255f8350c0ac4abe8ea6a424daed60b3dc05c2aa66ecdcceace47fe4733a386dd4faf883c1014791e11f7f34633c6189907fbf8da31e81b027ef4003) -set(QT_HASH_qt5-base 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f) -set(QT_HASH_qt5-charts fe6f32b9d42a6fb6c26d4f860489be18643b1f5b32d5be348f7529fa029cfaea79af0c8493d8d26b0a9d91ebdbdc8ac0d80a3912ee40b36bed863cc5356370bf) -set(QT_HASH_qt5-connectivity f1bddff89b45352c9f98c7f94be9c5226588219036474d3be1e35b6f0c9327dcb1e8ca4e52e342863ff2e3052014eb7abbed1f9d4381174e326e3c70eebc1306) -set(QT_HASH_qt5-datavis3d 43ca0e5aa9af59d80a05166bb6cf29ab0d1a7421474d7dc974cb960dd3100d417456a2614208ccfca900e2203fd9becea12af6c15dd93107c196ebe17ad47559) -set(QT_HASH_qt5-declarative 08f76c5a1253d6014e48ef8d8c53f65d3087efea0f614f36aa03f37882c6947109b17398ac491157c4fbd0c954762e819c2f074fa5a71e6990f16a54ec7224ae) -set(QT_HASH_qt5-doc 8c7777446ca83fc7a4f2ef33b0f7e032268f67284855fd97900e07e1f7e0b7173bfb980cba206d010c489630719a5f8f08c42b222784a426b0800c4c34f097da) -set(QT_HASH_qt5-gamepad 4aa21aa51d854edd365e21e6f8f195c70998223c2a70603518b00a0efbeddf5ed9c60c33e665c1bb2dbed73e3d9b113b7fbf47287789ea54ba2a1d5c65b72c33) -set(QT_HASH_qt5-graphicaleffects 9e46eb1d985fdde3571f0327229a973b9ba4e3da360c3a890aa9c658a4cd82c20485a46ffbdbfd10c7fe4d6e3c45476682ee561ce3345f1eddebbf97eee162b0) -set(QT_HASH_qt5-imageformats a41f2adec9470433914a634e3dc79a70e2eda5713be5884029f8ef5eae3c5b2cea4c6de795907ddc69268635aef194325b047cddf84c8be4cf59668d172a89fa) -set(QT_HASH_qt5-location d439d03ff9044fc70165d1ceb5def9ec3290beec56b3e893409a24cd355651a4317e0eadff0266d38203ff84429a5fb8659a200f094669716579b6791a1a0f6d) -set(QT_HASH_qt5-macextras 5a9427c5dc21ecaac45097c731fcb3cb5c8397f0391e3da52f8aee30a6ba919b4697e6a20008b358c0086e98cb47fec678a2ed421a44c5107425432b5bc59e9a) -set(QT_HASH_qt5-mqtt 7bc1c4f3fa0097c057ffa72fd7ac68a3f7df35b1c0b93a54d53568c4743041887f3e2739c0281fcfad49909c926e9353c0a6523fd2bac62f539e4390044151fe) -set(QT_HASH_qt5-multimedia 1d72f79fe83cc955037ec6c5348058369697889a9a40b9fbaee9f3ad0cb74fe5f97062e026254e3512f0861e67cca8a36eaa19c1b3ffbea32d6b3cde2163b484) -set(QT_HASH_qt5-networkauth a7e4fcb5d5d5f80640444ae42896920c3e713df887244fbb42ce8de920270204fde1be12664ae24c075cdeea5d98da8f13aa4114524516cd9e3e5f2c68bd016f) -set(QT_HASH_qt5-purchasing 89b2d03528c4902ce2011817246f691902314383e0401638dc06c3bef4664a3d5a37edfe6f290fd7117168fa7862217b67b9a2340353b883b6e2b3741af658a8) -set(QT_HASH_qt5-quickcontrols 0779f9eb1b7b78a9f7662f5c2f7754882c0b85efbfff6e922d044757d1bc47f4c8ba0adb14b1a1347c32abd8086b6031d77c50cf534206f1988c4ce616e4953c) -set(QT_HASH_qt5-quickcontrols2 2621ae1d0c8ebb38ec2c9a0ff28b9bdb3a7aebfd2b6477d145a9772002abdae832aa7daeb8843a8372b32ebe476262650ba23cc977257fd5932499cde796eb32) -set(QT_HASH_qt5-remoteobjects ae5910c4b4da95cb927389137c2def0e75030024f5139a7634d009f9ebcc81c3f7171e6d0b3a5f3e0201a93eb8fad4d346b70fcc0aefbb1c6c69afc13c6d4848) -set(QT_HASH_qt5-script 116dc95c804fcd78082100d67c51c68c045a17754c8591cb885925c3b3541439317ae79ba7eefc1102ce12d2f544dc502fd67c4d8724f4d7f1347099cda3f744) -set(QT_HASH_qt5-scxml 7b6b9a13e8a142cbb3d10b879877dcffdcf99a815db8149f7ff869c1b967a39620b8fd0bbb5e07832b9aeb91b6152ea5b8413b25020d73531e560041525a7842) -set(QT_HASH_qt5-sensors 94c3ae48a8423fd6af5c984ae99a51cba49d396a6d7032ba29008aa9bea461199986d52449f838278285a98aa3c0a95bb62868368bdc5879ca696273608a74d6) -set(QT_HASH_qt5-serialbus 2f51b449242a05a50cdf761f639dc9fa178eca5531cc520fdd22a1a18e3bac7244acc5a4b596f1ca11dbf7bff38181b451f6cb8de6fcee63165316a5b09956d8) -set(QT_HASH_qt5-serialport ff863b20283f36f865dbcf363faff5555234438ac29f475f98f2a351bbcac320fb1764ecc42f0cdcc729b6b6a64792ca86f35cfa2567d9ade5ef72ff2e493e2f) -set(QT_HASH_qt5-speech 658eb9d24ea2f2bf39c6f4cd6dc75677067c8058cae694b53e665e28a273d2f730ab0dd4744ca8f8db224e52bb014fd145af1abd1667e3cd37f74c51bf96ebf4) -set(QT_HASH_qt5-svg ac04197aa69342aa403f476e41a8ea7b1895187812577afe32536130d5605fb1dc7f99c0aef368ccbacb673f8b41efe44a200643b905e4674379aa951a48cf59) -set(QT_HASH_qt5-tools 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884) -set(QT_HASH_qt5-translations bb1d5c353932566b3daccc8b4d9ad957d3c4ea130e67eb933c0a7e49b99d2f9cac2860201a12e37ea51e46ae772a75a4be80d71e3a8afa59f5e14d3e02dd1ce2) -set(QT_HASH_qt5-virtualkeyboard 771088a6f847c901f59c14e32225410a4b174d2e9eb026928acba41e7dc2f658ad09d054846a06efb262fe198c1ddfbaf1014a61257856014c6ca2498747cc0e) -set(QT_HASH_qt5-wayland b47a3358bc37f52dde0839940431e8049abfaa827722e6d57362b07547c35fe9fb422d28fd28c69a13f5773c24efc3eeea1e584372737a0151ed94bf4c5b9980) -set(QT_HASH_qt5-webchannel 499e67d83d08476ee4b9da6c331a459b595ace3c6a7cbc7e1d8660b551cc0a87ef50e5d9d69a7783614c67db46df7802fdb4a2e79edb76012f6d26ceb3417eeb) -set(QT_HASH_qt5-webengine cebda17b9023348c85e9397fce5ad0f8ee16cfe821b8e79cea7ce92f7bb00e7fe59594107ac9f9411df1bb2e675eb6ecbfe3366df67a05b45fe12ead97cdc76c) -set(QT_HASH_qt5-webglplugin cbbab9ac54b38dfaa3f492ded0796ea942c24534d001980f71f5d1f35786c7c455de8a187608caa9ec4d9d1a0ed7dba19dc03de00414ac69efec48ff8c69f2ed) -set(QT_HASH_qt5-websockets 644182da57f0b3b77a434abcfe67731178cb0e62bc8743c85bda24e137f2fe686728b10a73f5030d8f357cc616c2e681de15598bedf4d01d4cb705482235bbcd) -set(QT_HASH_qt5-webview 7a741b3bb79b9aeaca05130ad8346a2dc704a203654754c73953d37a88d4c923375c3db44ddc22ea0b9856abedb7daf99e89d4f387014dfe8fbb31aaea6a7e38) -set(QT_HASH_qt5-winextras a387da6da092267545c78caff54dd95958be1840913f8ebe66320d35d8328ced2bb2b0cc85f0e2f7138f937fd828141e573d45c805e2da47c7b050bf961f2fb5) -set(QT_HASH_qt5-x11extras e1135ed8d1800d59f039e82ce33f3c84ac87df29ad61a60b2a0d25d78e4e38e2e1800406513d45abd3af79a2821698ca5d71161d6ad1f3b05deb3fad7599f654) -set(QT_HASH_qt5-xmlpatterns 73326aaa7fef65e00e3a585952d06841bba0905c1cb9a753b6c636e01fd7bf8cc66dadbe962ed962523f234c7461463ed893b045a7e3c2f0fbfb5e9aecf7a802) +set(QT_HASH_qt5-3d fe66aebdfda50c75f588d5dfc1c48c4d39c1e7aa29ee342178016a10ca24dfa00284f89839810121d15aac40d47fcd471f7a3573892210a0abf14e247102a66d) +set(QT_HASH_qt5-activeqt 4afd89ccfb142dd72841d0d5129ef2175106c31b7a710ebd6f630cca18da2009b1fcd3b094e769f2ea24d4f67e9302441b8fdd80174823328fa3d22ad5957e7c) +set(QT_HASH_qt5-androidextras b181b8e42c19ca2946245cbcdbe19ba8c1fd1f9ab6988a6d1b920bb1895019372b529626789953722ccf28805f9171146d3bc38c3f0c72ed5511a1753ec38e00) +set(QT_HASH_qt5-base 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888) +set(QT_HASH_qt5-charts 543c9fe0dfd04f19407d3c11c2a1ed93da34b493cfb758b4b2a9e86a7325476e1f754de3281e366eff52e96d8f12fb44c9ff8f3e047069c409cb171687d11df4) +set(QT_HASH_qt5-connectivity 36cbdaf63e7f478a5bb1b51d14b8671a24251614fc99d07cab195a596a9b60f28dd013c5f2a3af914f655a12725b1e6e2318324393ee0f0586c746a1a670f224) +set(QT_HASH_qt5-datavis3d 6a734bd1e3296aaae94358e2315a7c4b033b113b27b9e1e75f0d888231c11c2fdf1caa17c40c4ed545ad8e4a735766368c1bf04e6b36e53ba3164f0f8d66a1c6) +set(QT_HASH_qt5-declarative 3ebe195dac22efa2e71a4520e4816592204431bc724d94a38d9f426424624990199f7e99b72c7d96f6ae324bb18b7eec89ea2b5db63ff2f1d24a997be25a0589) +set(QT_HASH_qt5-doc 46133676da2584c533bbe78d8eef12f2b1baa95e91168f7fa3400e58046c36a31064f6198f40e1679224da8824e642c6f610fba125b71e91399069019eaf68e6) +set(QT_HASH_qt5-gamepad 8a5f6c8fac4e7977b1c93efda698e27c6bc1e66b844f86642ae05ba104d8f14f30e6cb95ba4b3923e2e43d117af52354cfb5a6d35ffd159e29a336710fc63f93) +set(QT_HASH_qt5-graphicaleffects c0993082e96c5d8e26cc4e2e45320542d21fb7c716dfb6b087b385a985fff358cdff7e3d5d4ca3fc8fc9813e7c110165aa034d5e8d32e8082ad007b7bf929531) +set(QT_HASH_qt5-imageformats c56e70e17ed29ff126257ce41e2b9fd03807f0325ac60bd307779406dcea39ff929e49d2ea99ab17f07f19a6dda5f5103d4def6bb70a52f761141fc4b2c46e7c) +set(QT_HASH_qt5-location c480762cea2cd1a00e6061bab05c402d5aab2d12e7decebcd606c930d2029a93f2a46f8edbb188b73c7cdcad473b03c15037ea10e0b3538de0a99b1d7d7fb333) +set(QT_HASH_qt5-macextras 205fc0747dff5a7e8b199ccf82675484064e71c4267741fb1ae7ab4961436d8e645126dd548b9236f27f29379a297a1efce82a1f8589f081aadd752a9875034e) +set(QT_HASH_qt5-mqtt eaad1a8b8ad3f18181e5840dca725a9ac445ef0cdacb3eaffc682e145f6db2f4ffd1742329b2ea57653ba3d1a7168c3e9e531b9f48784ca2fef726197b4b50a4) +set(QT_HASH_qt5-multimedia 2cef917df20da1381ea64834e4110e25ea0d5e12249176ddbe2e0314c25490926ccbf2f7cc3f89b2969d113a645ec88244fabe691aff851ffb4b2be9766bcf76) +set(QT_HASH_qt5-networkauth f0c48453e21ad14a4fbac25d35e6257c4d8bbb5f2ac87dad0deee44ca86aec8def618f102cd1d9af05e1611f37ea722e1630165f15a238d3d8c38d161771bc3d) +set(QT_HASH_qt5-purchasing 5a5e8ca1de6155b20164e5f3e28daaed424afa05b1ddae3c07207e056183fb6dfce71a9de9c9c8ca1bb1e10ecb02139db79b0e5e701e8c11c6514274e21e5069) +set(QT_HASH_qt5-quickcontrols 980b233f83991d12029bac90b0875b3a001399d4358c58185a21bbb30911f0d6fec5dfc5f157e9c3c4d17e82c3ff5302e55c62b4cd63731f23a655bd55d300bb) +set(QT_HASH_qt5-quickcontrols2 725fb03907973fdca4479017b8f792110a4620a6e4d39f97c81c3be16280b81135394f6ce5be507fd734926307d33a249e790234139e01f387d2362cd7027128) +set(QT_HASH_qt5-remoteobjects fef775ccbc187064ef3e2cb73f9bc784c002bf74d89032a33767cb234ff40ea07eb5294eb919a50cede2afbf539e32c6c78df52817bc22a10617585e417c3690) +set(QT_HASH_qt5-script 48a00763686a5455d0429d1ecd6b32e3e96a13f05faa6625361c49b91275b8a8b3a1de3627cc3db5c69d346686c07b9466022cf37abf394a6f097933b9dbed4a) +set(QT_HASH_qt5-scxml c451fa8fc5999aa7e3b3a336503bcf1ccc8992ef27645d003c938166384508d2cc9b35fbd21e9da641ea98a2aaa58834ac85e8713bce25b96e4aef79c3cda976) +set(QT_HASH_qt5-sensors 25d4eb1ea43c5d7819a7b9cee22604b774007f84bdc86433f673766b1943134c5880be14ab06fac7f05fb2708491cb8b7e03f8656aae0d74538d732e31ffd917) +set(QT_HASH_qt5-serialbus d6571b6d54fe91ff945c0bd51bcecb97ae3d001ee3e1f30deb042a52bab17ad7e059ae943c0a3f2a4d6e7a952cb3f68b71275cef0fda1875fd233c8dc17d0d3c) +set(QT_HASH_qt5-serialport f27adbc07a3c3e946761e033105377ae26ac48d2c796f281947e950de1b7b9fb5a25627fd1a2c30cccd2de19181867cfd7d4a740a3318348e57885b5d96c7192) +set(QT_HASH_qt5-speech 960eb661cfeb8a4fc01337ac998bc8ce101da73782155e75a7b128987d9809fa1e4cc6fee30cfa3cbd39f7fff9bbe7e49e55430681ac6582e7c8110242d7183a) +set(QT_HASH_qt5-svg c68fa1bc8e3dc782a70049aeddca62731b48ff7de972d6e1a245b06d23c0795fd6a3e3538aa39a92016d5c15a068f7b8ae1d3b6bd950fb7857a7aa2ed556f857) +set(QT_HASH_qt5-tools d830129777c481e1a66e32911af82a09e2858b678fdd2b802433fc1009856d9f0b8ea39b6ed1d7e93b6e9db1dda848c3a4077f6d804400f1427f33a3c7ccb40e) +set(QT_HASH_qt5-translations 675e0902bbd6a1f910ffc0473e1e865239cf820886fff9ccc3c5cf69f6a9af862fa1e44d86538f2884f1a34ab433dc2615707487b426d56742bd26f8f0d9924a) +set(QT_HASH_qt5-virtualkeyboard 17c63ea6287f7dbc84c82762ea43da9fbb4d1c7281a4e81971c10eacfbfe7293a855dde35a37ed9c8cf5ccc289a0e1d0a0c970e6908cea5cae15f149b9f5e3c4) +set(QT_HASH_qt5-wayland acd78018665db3d0d77a84bb80ce7dbb65a33e0e813c3308e09a27195df204029b5e580f353eae2536e6fdde249aa34411e37f4f1663f7645448d96c9df67a66) +set(QT_HASH_qt5-webchannel 8b4f3c787e88a68a9b850c7c700e37b491ff17435871223fd70373a532e4d8c6d809d4b8ca0036b68f99852dbd80e21e45aa2ee2d89efffab1182fdf792d0d59) +set(QT_HASH_qt5-webengine 84ebdab10ea3138671c0612cc558dd3257264410d2776719c34d41b8f846424183742abc7185fa61c7bb3d35d471ab2341d064eec57b92c34e30325dbc3eff63) +set(QT_HASH_qt5-webglplugin 97670f47e582ec921c409b346f08bc70040a982811d9df967635900e4654b7069ca22ba5a6504b0f8a6b0022c317ffa71a3b60043212078d2b29cb1d2daf69ae) +set(QT_HASH_qt5-websockets 01195f4b2f11baa66e1b3d08148c234ac979d1a80be28d72b2bb8cd57f053102f432f59b7b89daa66d0e27c6e5ee792da12772d70c76aa88fa1bbe114b6f675a) +set(QT_HASH_qt5-webview eaabc534a116617dee0394afdb4d35525aa367d01d974c4759c02781a7e4af2fa2d096c638109b421d2b061df4476348d8471a9a02f6f05b97170366c973ef61) +set(QT_HASH_qt5-winextras da230ee9c9afccad83573a678c641f22f85ab45d7063406ef1b1922097b4b41fca9f1ca81256bba835e71a3f59f6280601f9fad3f7d5be74e436a242e3ef45eb) +set(QT_HASH_qt5-x11extras f346f399a79aece2635e3871d86302042834d17be143adbfa130ea91a6cd692211804c50e74cecb072a5d7c388f3fbf774b2b40b0fc86498b84552da7b213fe7) +set(QT_HASH_qt5-xmlpatterns 762c1c64e8ab269bf74de86f08afd50822859716024f3b13a70b719aeedfd35fd705fa03e32220f5cfab579361e754823d8bd584b30bde5965b026aa54b97142) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff b/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff new file mode 100644 index 00000000000000..89f467aad0fd19 --- /dev/null +++ b/ports/qt5-base/patches/0001-CVE-2023-51714-qtbase-5.15.diff @@ -0,0 +1,38 @@ +From ea63c28efc1d2ecb467b83a34923d12462efa96f Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Tue, 12 Dec 2023 20:51:56 +0100 +Subject: [PATCH] HPack: fix a Yoda Condition + +Putting the variable on the LHS of a relational operation makes the +expression easier to read. In this case, we find that the whole +expression is nonsensical as an overflow protection, because if +name.size() + value.size() overflows, the result will exactly _not_ +be > max() - 32, because UB will have happened. + +To be fixed in a follow-up commit. + +As a drive-by, add parentheses around the RHS. + +Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09 +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9) +Reviewed-by: Qt Cherry-pick Bot +(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867) +(cherry picked from commit 13c16b756900fe524f6d9534e8a07aa003c05e0c) +(cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92) +(cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db) +--- + +diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp +index 834214f..ab166a6 100644 +--- a/src/network/access/http2/hpacktable.cpp ++++ b/src/network/access/http2/hpacktable.cpp +@@ -63,7 +63,7 @@ + // 32 octets of overhead." + + const unsigned sum = unsigned(name.size() + value.size()); +- if (std::numeric_limits::max() - 32 < sum) ++ if (sum > (std::numeric_limits::max() - 32)) + return HeaderSize(); + return HeaderSize(true, quint32(sum + 32)); + } diff --git a/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff b/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff new file mode 100644 index 00000000000000..00f04c1ea914da --- /dev/null +++ b/ports/qt5-base/patches/0002-CVE-2023-51714-qtbase-5.15.diff @@ -0,0 +1,59 @@ +From 23c3fc483e8b6e21012a61f0bea884446f727776 Mon Sep 17 00:00:00 2001 +From: Marc Mutz +Date: Tue, 12 Dec 2023 22:08:07 +0100 +Subject: [PATCH] HPack: fix incorrect integer overflow check + +This code never worked: + +For the comparison with max() - 32 to trigger, on 32-bit platforms (or +Qt 5) signed interger overflow would have had to happen in the +addition of the two sizes. The compiler can therefore remove the +overflow check as dead code. + +On Qt 6 and 64-bit platforms, the signed integer addition would be +very unlikely to overflow, but the following truncation to uint32 +would yield the correct result only in a narrow 32-value window just +below UINT_MAX, if even that. + +Fix by using the proper tool, qAddOverflow. + +Manual conflict resolutions: + - qAddOverflow doesn't exist in Qt 5, use private add_overflow + predecessor API instead + +Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c +Reviewed-by: Allan Sandfeld Jensen +(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3) +Reviewed-by: Qt Cherry-pick Bot +(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860) +Reviewed-by: Thiago Macieira +Reviewed-by: Marc Mutz +(cherry picked from commit 811b9eef6d08d929af8708adbf2a5effb0eb62d7) +(cherry picked from commit f931facd077ce945f1e42eaa3bead208822d3e00) +(cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5) +Reviewed-by: MÃ¥rten Nordheim +--- + +diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp +index ab166a6..de91fc0 100644 +--- a/src/network/access/http2/hpacktable.cpp ++++ b/src/network/access/http2/hpacktable.cpp +@@ -40,6 +40,7 @@ + #include "hpacktable_p.h" + + #include ++#include + + #include + #include +@@ -62,7 +63,9 @@ + // for counting the number of references to the name and value would have + // 32 octets of overhead." + +- const unsigned sum = unsigned(name.size() + value.size()); ++ size_t sum; ++ if (add_overflow(size_t(name.size()), size_t(value.size()), &sum)) ++ return HeaderSize(); + if (sum > (std::numeric_limits::max() - 32)) + return HeaderSize(); + return HeaderSize(true, quint32(sum + 32)); diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 9969b7f7bcad3e..06bb7b5ae4b8bf 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -55,6 +55,8 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/CVE-2023-37369-qtbase-5.15.diff patches/CVE-2023-38197-qtbase-5.15.diff patches/CVE-2023-43114-5.15.patch + patches/0001-CVE-2023-51714-qtbase-5.15.diff + patches/0002-CVE-2023-51714-qtbase-5.15.diff patches/winmain_pro.patch #Moves qtmain to manual-link patches/windows_prf.patch #fixes the qtmain dependency due to the above move diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index c01e316ea2e57f..4bda0303c7d8e7 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.11", - "port-version": 1, + "version": "5.15.12", "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 4776a533e44a1f..733dd137af5918 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.11", + "version": "5.15.12", "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 eab2b2e3720d90..fc08513d936c9c 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.11", + "version": "5.15.12", "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 e9dae7a52427b2..1787da57280f07 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.11", + "version": "5.15.12", "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 2ffb5acee7950e..ef715e434f03b3 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.11", + "version": "5.15.12", "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 403099132eae3b..f6cc833dfc6583 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index a5cbb927303e91..9f9a9a12b76335 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.11", + "version": "5.15.12", "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 01b6f6d9e6f4d0..0a0b12764a7a6c 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index 38c70b1b609635..d807aa59462014 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.11", + "version": "5.15.12", "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 ee68e67e202042..cc0c2c92f61aa7 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.11", + "version": "5.15.12", "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 b2d03191a8beb5..e05a718a9de1ec 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.11", + "version": "5.15.12", "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 16f7f52c6b9ba2..c4d6d55d63118a 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index 68638dca3b400e..4769d9e5518391 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.11", - "port-version": 1, + "version": "5.15.12", "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 24814527eb7934..f9f502ad0b3205 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index ce0126d6f184f0..926b5070773d4c 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.11", + "version": "5.15.12", "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 26741f8f5dcac0..672d9483f0808b 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 9d7f132a918982..93278eff288923 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 675197200ee357..bad0a8db876106 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.11", + "version": "5.15.12", "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 0d1609a26c1f30..5933c8cd8e3e61 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 522e87d415c6d1..1b093d9b6c2c51 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.11", + "version": "5.15.12", "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 1c714da77f8f46..07bdd7e98b4c64 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.11", + "version": "5.15.12", "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 c55bf6c7aa71d2..7755413a65969d 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 7644e67fc22ce2..57a3c9cb988cb0 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.11", + "version": "5.15.12", "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 15a50ac979cccb..e6f3b1169b6149 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 63f9b59fa54e93..d60d4f785a4b29 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 31a9e69653a73e..346de22577be0b 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.11", + "version": "5.15.12", "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 83f1f385d31b6c..10ed2e40166e87 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index 3a6eb89f7d70d2..f81f6763b1d466 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.11", + "version": "5.15.12", "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 224d47f9c10fe1..71d68f307db8b6 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index d16e484d35006e..62a203c151e169 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.11", + "version": "5.15.12", "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 296aa471eb58b3..60bbb671ccd14e 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 99ab24ed5e0059..db3efdcc5f4157 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Webglplugin Module", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 45209f405fe4fa..c89163a3886123 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.11", + "version": "5.15.12", "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 2d6ad37008d217..cbf066486dcfb5 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.11", + "version": "5.15.12", "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 b1b519b0dc8724..bd482ad71441fe 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.11", + "version": "5.15.12", "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 76ca6eb92b5ec7..317a7310a726f0 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 x11extras Module;", "license": null, "supports": "!windows", diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index c44f47a8c4db81..5cec3adcdf1839 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.11", + "version": "5.15.12", "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 4fced41162bc4f..0e0fd82dc382a4 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5", - "version": "5.15.11", + "version": "5.15.12", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6ea48e5283ba80..9782de7a0f0e07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6929,67 +6929,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.11", - "port-version": 1 + "baseline": "5.15.12", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 2 }, "qt5-charts": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-location": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-modularscripts": { @@ -6997,107 +6997,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.11", - "port-version": 1 + "baseline": "5.15.12", + "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.11", + "baseline": "5.15.12", "port-version": 0 }, "qt5compat": { diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 856cd3966c6516..a232297811bef2 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0f73e9f36b58bb194c21d495bb0a4e8fc9a4d41", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "fd3a019873d77d8951d137f3f5a4bd3ae8fc147a", "version": "5.15.11", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index 6fede3be3dacbe..5fa77c024619f9 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5105fba54b83485f15754fe858dd8b8318a88eb", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "45de7184a24f527bbccf33013f1c6667d5e6f668", "version": "5.15.11", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index 7a173015f515dd..1d295ac37ee5a1 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb3e1de9127ad2c1bda4ebf21f441adfa5facf63", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "382ab13532eab56c75a3a4150a8bdb2cf9464200", "version": "5.15.11", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index a509edccd1820e..162dd91a624e82 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2a320e35b03c115bc674b6006f7a8a9907835b0", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "c09b409166a1cb3e4881ee5b0081069227a7ae45", "version": "5.15.11", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 0e2d14123f0108..bf38bfaf018261 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a21040c82b8746bd1feb8d7830defa42f9cff7a", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "917d2b5a9ee716031be8a168076d174ec6712788", "version": "5.15.11", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 48bd66c53dd9e4..c693ddb7d34c1a 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4de0c9f255cb601469ad4e7d42e55f14e27dba11", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "b623eee1a6ff0e483580654a60d9e6eb4787be92", "version": "5.15.11", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 3c8db1d4cacbd6..54af97fd735330 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4af2cbfb2191d9525a25bfcf9b7633cfa62890b", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "80f8d82fe81bf098c225ca52b7ea49478512be67", "version": "5.15.11", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index f969d3fa8533b4..53ea5449e258bd 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "859e5b2f20ce9e1d782b9a2190b273249f5fb44e", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "880d2e0ae6f6042a0cb4baae85bc7bc7c950b746", "version": "5.15.11", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 3c9a0a16c4dc0e..c92997cf8e511f 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b67cd829b2cdff91e51d2da5651a98d4d02cc6e2", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "8e2640c2eff33d0d16d7a3168aeb75bccb8fbc37", "version": "5.15.11", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 122e59f0742f42..7a82f9ebb3b37b 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aa1ca558402bd1cedda0c2c466a51bc1272f8ff", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "9a02c1cd4d355720fc3b2af9d0ddad446279a731", "version": "5.15.11", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 1ac424030bacc8..a6a25be3784812 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27e65ecf7fdd5ff87e1409d76edbfcec7da55415", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "209e1c20fbc69e0bd69bf50aad1a5b049f7cf5fd", "version": "5.15.11", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 913cb0cfa4015f..4148a5e1385004 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22923758113a31c2d0570b192358fecb3e3a4c2f", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "ea581d5a2583209a4b276fd9a20f8c04194e29c0", "version": "5.15.11", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 2440816d684969..567740194ff128 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c27c0c3d8bf68ec89a3b0a7e75192d2b5a6eb970", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "55991602e3deb4103599fc04c287a4959c847016", "version": "5.15.11", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 0982c9698795b1..2864342993bde6 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "480132dc9a67d2dfcbb94be62c8d35f31a901a86", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "a50e9a0fc524758440c3715855627b8b8bd531f0", "version": "5.15.11", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index 91adb1ac41e0d6..e8d0ab06513d69 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "380e4063bfa14b26f098b4ae1244c1a09f1ca5f8", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "e0fc4bdfce63f3f7410762189b98448182f9b3ab", "version": "5.15.11", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index 9510c155ba8c77..7e973235ca0207 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9b0f60b7c990d5f202833234f553ba4424c471d", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "e4c6f73398cdab1711339020a1dfe0630e0f89c4", "version": "5.15.11", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 9462015627700b..4a2ba69f220300 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ebb64c3ef7457b6050874adc7fa69e1797613c1", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "2245d4d7c2e1064fd19a893f34ee247bdb07322b", "version": "5.15.11", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 301ad95bca54d4..d361f1b870e36e 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ede9ad9a147c9f953d0b1ea54f7a6ed1f3c37cbe", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "714b9adc89ab6a09174e73be5497e982e4e830fa", "version": "5.15.11", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 5c0081dcb554c4..2281b072b89e56 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbb429884146fe7493bf515aa1762c495de51c9b", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "9e63a158c8c9551554c2986dab6d771efabd38c7", "version": "5.15.11", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index 26bc37f30d8c48..eb665385e99684 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ed4347c3fe7f8e2d57a5aa06b03d5b6a1c37e93", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "e1d335409f6c5c9af37eb6721b5d68d78a8dbdb1", "version": "5.15.11", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index 37efcaa9d1c41f..342a87889739ab 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c46f7b7f674a1ac79a7c8edc63c1e4e16c23c6d6", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "83e7e782900b0f016a0f7b659e6cb235f7677cf7", "version": "5.15.11", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index be9f8fb2e74595..1eda08e405fe48 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac33071fd5ddde84d056539669c67071e85f3691", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "d4c21b90523ce92847d4b1f675a84ba4f34a9710", "version": "5.15.11", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 392a3f1371b500..c476f83c32f6d2 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc9e39cd307b641892aec0e5a2972c781ac68f20", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "6eb406a4e80cd474efe6f42e896438b7b90ee96c", "version": "5.15.11", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index 8696e62d28f103..0d191b59019053 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b437048a241025e9baaf71a07587958d11e7dfd2", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "5883a76574d6f2b6077898a5fd3ca52d1788dd88", "version": "5.15.11", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 6aae9ca9212069..3300fe67759a4a 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c22dac467d42914d078721e71c047eba6738518", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "a1259ec9f3eea78cad8e057fbc7d765a47929154", "version": "5.15.11", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 4ed83e36d86e34..9d9d2878d307df 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8339392414afac8b6d179b19ad01db6460d77318", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "081a6b53bdb5d7dd70f8e8315deaa8e71a160714", "version": "5.15.11", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 4b12030f96351c..c45866ba807f83 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "213220011e61695380694601622b75e4bd781a8f", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "bf9d4d8eab1658f34274dcdf5e83c2624e7727bb", "version": "5.15.11", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index f86df19be40431..34a397a199de5d 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f47fe4971f6a0d3fc7991fc6dfa76f4dab3ef6c3", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "c938a0870f30cebe24c31abefa8ac8a8dc60722a", "version": "5.15.11", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 66ada1a2178a5c..3420a04ae9d2cc 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "350c9197bc751e17c5e0ea532322f1483a6bf1e4", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "5b41d2e4f17b9cbcb85f1fe67b9e1adfaa70a0cb", "version": "5.15.11", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index ea43d1be6d6d9f..c8eac9ddf8a278 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87a765320bb699ab1b716b5a4bcc1cc70efc8239", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "0d49653566c4a0eae04e6b56cb9b3904b7c826af", "version": "5.15.11", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 69b7314fe1ac53..857676808df8b4 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0a93247e4efaad743aa47711f947efa6a4424ea", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "144f57127630eec25443579a16d72fd4eb2c0378", "version": "5.15.11", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 46518ab9cce87e..0b221a16ef7d06 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44d19f3afd9be463c0cce1fa189dcb08d7ad9c82", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "1fe250be41e03ec6404fb5b38d8db2d52e68ef78", "version": "5.15.11", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 676f1bcab04c00..1a16957cceeb46 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c21a5e697bcf761c902064dec1325d34e016e9fc", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "834b6ab045a2739e6fa6d85f3687423e66417d7a", "version": "5.15.11", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 28a436dae28074..726e580aaede87 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bebbe2367c700cb1c309eb1d1f0b22b1463c61a", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "f4609e43287d1db55e04e0553d85039adebffacd", "version": "5.15.11", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index d1e22f69d04da2..a689267451b208 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a7a0fbea2f47aa24e61928cbe4836164d66a8f9", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "0b2a0472f4b91117a702ed605c443c71d3393862", "version": "5.15.11", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 8db9fd64e267b7..78337ed41ab80e 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "478c0eea8a9b638f8e79083d16c3ad3ba378f60f", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "b8589b41f61533965537f8a6701d2f8ea015f1f2", "version": "5.15.11", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 7a492fc5fdb56e..8232469429165c 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "359fb6a2340821f4e375568af9f3736c9f8d5989", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "bf926864a58a4777c63c25c856ea5f4c544b1fd2", "version": "5.15.11", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 897abe00eb9519..cc5c9f76d0d572 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3094cfb44b2edc3284f22378ac0a9d2f847d9d85", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "913946992a50661e33d59f4452c3d322d5341400", "version": "5.15.11", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index e961435bd32c4f..478172c3c84b31 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "467b63b17863b78a47afe3675bf35de910c09871", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "08d312b3a2e6e0016aa0b6d2bdac1d3d3d864d23", "version": "5.15.11", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 1934dfffd8d805..efc30948454e65 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d7d728be5f21d29d82251a43f4600bde5b5c404", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "8d366bc9e9536eb8db2be796afdd35eb0ad05c8b", "version": "5.15.11", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 3c90fbf95b2427..ab28c8db54cf6a 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1af37c43da6f3720cf0d805fb13333a42a07fce9", + "version": "5.15.12", + "port-version": 0 + }, { "git-tree": "83c7937d7b60d45f3f9e5006fa6cbcdead8b62e0", "version": "5.15.11", From d53829ec75384159a143d47ffa79bbee7b85408e Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Fri, 29 Dec 2023 03:00:00 -0500 Subject: [PATCH 0718/1039] [bshoshany-thread-pool] Updated to v4.0.1 (#35910) * [bshoshany-thread-pool] Updated to v4.0.1 * [bshoshany-thread-pool] Updated to v4.0.1 --- ports/bshoshany-thread-pool/portfile.cmake | 2 +- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index 13cda1b1fbe8e5..02b2a5051437c2 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool REF "v${VERSION}" - SHA512 a503f6877d8264c79bdffec204551a3bfba50c608dba34bbfb8145dc480715ed3d86d3d70cbe86855d3a739474c4de6e204ab1f95fe9fd3245e93cddd7e345af + SHA512 37ebde68a9dc74204fc3df90a8f69cf17be241224eb2176d0841be0d412f8882ecf9abcc7eb61a19874b542988c22a88b4f7087efa86d0f435f996fa438eef5a HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 5b8aeffad25b56..9001e25978365c 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "4.0.0", + "version": "4.0.1", "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 20c0d93e7d1dda..9cc090985906b9 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eedda7057a9359ec30cec22194f7a5da5320ac16", + "version": "4.0.1", + "port-version": 0 + }, { "git-tree": "0dab54b91bf4c70fc898cb14fb2505773f54660b", "version": "4.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9782de7a0f0e07..710084a203b020 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1337,7 +1337,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "4.0.0", + "baseline": "4.0.1", "port-version": 0 }, "bsio": { From 31f2c1d528e96db52fd9ce13c87e7e3888c77780 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 29 Dec 2023 03:00:39 -0500 Subject: [PATCH 0719/1039] [harfbuzz] Add `directwrite` feature on Windows. (#35908) --- ports/harfbuzz/portfile.cmake | 5 +++++ ports/harfbuzz/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index bf84f95bf8479d..1fecbf681d730f 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -23,6 +23,11 @@ if("coretext" IN_LIST FEATURES) else() list(APPEND FEATURE_OPTIONS -Dcoretext=disabled) endif() +if("directwrite" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Ddirectwrite=enabled) # Enable DirectWrite support on Windows +else() + list(APPEND FEATURE_OPTIONS -Ddirectwrite=disabled) +endif() if("glib" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -Dglib=enabled) # Enable GLib unicode functions list(APPEND FEATURE_OPTIONS -Dgobject=enabled) #Enable GObject bindings diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index a92051f2cd0374..575e7e89d44255 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "8.3.0", - "port-version": 2, + "port-version": 3, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", @@ -36,6 +36,10 @@ "description": "Enable CoreText shaper backend on macOS", "supports": "osx" }, + "directwrite": { + "description": "Enable DirectWrite support on Windows", + "supports": "windows" + }, "freetype": { "description": "Enable FreeType support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 710084a203b020..693889aa0c135b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3274,7 +3274,7 @@ }, "harfbuzz": { "baseline": "8.3.0", - "port-version": 2 + "port-version": 3 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 9fa3889802bff1..7701af112cf656 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f22f35a345a42b356292d5c480208c6c395ed5a0", + "version": "8.3.0", + "port-version": 3 + }, { "git-tree": "ff776c837e28a47a91cad45946d7ab6b51dc3c67", "version": "8.3.0", From 8e8743cbe6036b36ee9ce0eb7cc6595de914b01c Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 29 Dec 2023 00:01:40 -0800 Subject: [PATCH 0720/1039] [qtopcua] Feature ns0idgenerator doesn't support cross-building (#35903) * [qtopcua] Feature ns0idgenerator doesn't support cross-building * update version * add supports * update version --- ports/qtopcua/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/q-/qtopcua.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 6f4366a050db10..040afb1c91f870 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtopcua", "version": "6.6.1", + "port-version": 1, "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, @@ -27,7 +28,8 @@ "description": "Support for global discovery server" }, "ns0idgenerator": { - "description": "Namespace 0 NodeIds generator from the NodeIds.csv file." + "description": "Namespace 0 NodeIds generator from the NodeIds.csv file.", + "supports": "native" }, "ns0idnames": { "description": "Support for namespace 0 NodeId names" diff --git a/versions/baseline.json b/versions/baseline.json index 693889aa0c135b..2df812765b8f3b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7198,7 +7198,7 @@ }, "qtopcua": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtpositioning": { "baseline": "6.6.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 914f732020e5c2..89e2d60274bfdf 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "158f8110a6d3d504c64bf24e2ec68552b8e34097", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "bbd569723a9e84b190ba938c4f040d0cc83af21d", "version": "6.6.1", From e25c595cbdaaa5a97d913be9a3c4b6af0203493b Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 29 Dec 2023 00:02:26 -0800 Subject: [PATCH 0721/1039] [kddockwidgets] Update to 2.0.0 (#35882) * update g2o * update version * update kddockwidgets * update version * undo g2o --------- Co-authored-by: Monica --- ports/kddockwidgets/fix_find_package.patch | 15 --------------- ports/kddockwidgets/portfile.cmake | 9 +++------ ports/kddockwidgets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kddockwidgets.json | 5 +++++ 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 ports/kddockwidgets/fix_find_package.patch diff --git a/ports/kddockwidgets/fix_find_package.patch b/ports/kddockwidgets/fix_find_package.patch deleted file mode 100644 index 01363a3413837f..00000000000000 --- a/ports/kddockwidgets/fix_find_package.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c174b89a..b83bace53 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -127,8 +127,8 @@ endif() - if(${PROJECT_NAME}_QT6) - set(Qt_VERSION_MAJOR 6) - set(QT_MIN_VERSION "6.0.0") -- find_package(Qt6Widgets ${QT_MIN_VERSION} REQUIRED) -- find_package(Qt6Test ${QT_MIN_VERSION} REQUIRED) -+ find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets REQUIRED) -+ find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Test) - set(${PROJECT_NAME}_LIBRARY_QTID "-qt6") - else() - set(Qt_VERSION_MAJOR 5) diff --git a/ports/kddockwidgets/portfile.cmake b/ports/kddockwidgets/portfile.cmake index 594f5fbce55874..878d028145a51f 100644 --- a/ports/kddockwidgets/portfile.cmake +++ b/ports/kddockwidgets/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDAB/KDDockWidgets - REF 9990300006854afa4b4fa796912da067e770046a - SHA512 2207b3c021957d9be8652cad24c0b5e37b07fa02ffeeeb7dab57feaeade7973b580b853d6b69db15015b62cc1397459e27d032131292baaeb17a0633e287fa3c + REF "v${VERSION}" + SHA512 4dccf24e901ab58d645478bc62ff9e72224dc11c3f39c53f5be5b188ece1bf8c682d50a42ece7a38400adfeb6147336795fcb86e903fd0957949c83f852c9b53 HEAD_REF master - PATCHES - fix_find_package.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KD_STATIC) @@ -24,7 +22,6 @@ vcpkg_cmake_configure( ${_qarg_OPTIONS} -DKDDockWidgets_QT6=ON -DKDDockWidgets_STATIC=${KD_STATIC} - -DKDDockWidgets_QTQUICK=OFF -DKDDockWidgets_PYTHON_BINDINGS=OFF -DKDDockWidgets_EXAMPLES=OFF ) @@ -39,4 +36,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/kddockwidgets/vcpkg.json b/ports/kddockwidgets/vcpkg.json index 86b0771b6d534c..3b688eb3468ec3 100644 --- a/ports/kddockwidgets/vcpkg.json +++ b/ports/kddockwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kddockwidgets", - "version": "1.5.0", + "version": "2.0.0", "description": "KDAB's Dock Widget Framework for Qt", "homepage": "https://www.kdab.com/development-resources/qt-tools/kddockwidgets/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2df812765b8f3b..c340cf48e13a33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3745,7 +3745,7 @@ "port-version": 0 }, "kddockwidgets": { - "baseline": "1.5.0", + "baseline": "2.0.0", "port-version": 0 }, "kealib": { diff --git a/versions/k-/kddockwidgets.json b/versions/k-/kddockwidgets.json index 7f30424266e26d..fc4bfc8bf1c584 100644 --- a/versions/k-/kddockwidgets.json +++ b/versions/k-/kddockwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dcce3389ff415798302c843980052dd03314ddc", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "5b5e511f49b28d447aafde193422e3b7961a4e62", "version": "1.5.0", From ceca66bec0618ef026388c864f4f7874b82be10b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 29 Dec 2023 09:03:07 +0100 Subject: [PATCH 0722/1039] [libexif] Fix feature nls (#35864) This package has own gettext autoconf hacks, so providing gettext[core] m4 files and autopoint for autoreconf cannot be avoided. --- ports/libexif/portfile.cmake | 2 -- ports/libexif/vcpkg.json | 10 ++++++---- versions/baseline.json | 2 +- versions/l-/libexif.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/libexif/portfile.cmake b/ports/libexif/portfile.cmake index 30a0355acb40b3..320c1ac05f336e 100644 --- a/ports/libexif/portfile.cmake +++ b/ports/libexif/portfile.cmake @@ -1,4 +1,3 @@ - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexif/libexif @@ -13,7 +12,6 @@ vcpkg_list(SET options) 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() diff --git a/ports/libexif/vcpkg.json b/ports/libexif/vcpkg.json index 80aa5fba2ef0fc..41d4eb3d099b1c 100644 --- a/ports/libexif/vcpkg.json +++ b/ports/libexif/vcpkg.json @@ -1,20 +1,22 @@ { "name": "libexif", "version": "0.6.24", - "port-version": 1, + "port-version": 2, "description": "a library for parsing, editing, and saving EXIF data", "homepage": "https://libexif.github.io/", "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ + { + "$comment": "Needs gettext m4 files and autopoint during autoreconf. No runtime dependency.", + "name": "gettext", + "host": true + }, { "name": "vcpkg-cmake", "host": true } ], - "default-features": [ - "nls" - ], "features": { "nls": { "description": "Enable native language support.", diff --git a/versions/baseline.json b/versions/baseline.json index c340cf48e13a33..a9540dbde98e1e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,7 +4274,7 @@ }, "libexif": { "baseline": "0.6.24", - "port-version": 1 + "port-version": 2 }, "libfabric": { "baseline": "1.13.2", diff --git a/versions/l-/libexif.json b/versions/l-/libexif.json index 9b612d7bfb3565..58ea732ad9e8ff 100644 --- a/versions/l-/libexif.json +++ b/versions/l-/libexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de3b3a5ade33ccafbeb4a00cde07954717240eee", + "version": "0.6.24", + "port-version": 2 + }, { "git-tree": "40f7058e18a937bab35b7213595fc4eef5de7dec", "version": "0.6.24", From 695a69661950212be7e87788ad42f33a27531162 Mon Sep 17 00:00:00 2001 From: eao197 Date: Fri, 29 Dec 2023 11:07:23 +0300 Subject: [PATCH 0723/1039] [restinio] Update to 0.7.1 (#35777) * RESTinio updated to v.0.7.1. * Fix format for manifest file. * x-add-version for RESTinio-0.7.1. * Fix port for RESTinio v.0.7.1. * x-add-version for fixed RESTinio port. --- ports/restinio/portfile.cmake | 2 +- ports/restinio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/restinio.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index ce40357e656da6..587e7b2e5127a0 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio REF "v.${VERSION}" - SHA512 de9929d9ed6acf9574482ffa3f865a550e319716c9cfc5a9e2e9f604169206df022d55e0e55174c66f0edc04a4491c028755272067e55ae646ecfccc1573f78f + SHA512 b5932a08687ef2d3ae02d0b0b1384b3462706ce207f16126efa8cd3dcea130d823863169dd5088b12b8c69761ccd044b447c2fe04f31ee10d26ff33d088606ee ) set(VCPKG_BUILD_TYPE release) # header-only diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index 35de5e84786385..b88d2189068c1d 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version": "0.7.0", + "version": "0.7.1", "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 a9540dbde98e1e..f16e80e6c0a06b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7489,7 +7489,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.7.0", + "baseline": "0.7.1", "port-version": 0 }, "rexo": { diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index bfae60f4f1b9af..cb880017fecf70 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b59b3fc1e00b5abdfbbedaeb495e2816aeee1b44", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "06ab98765576c8b3d11f5a9a1d4125e0176c482a", "version": "0.7.0", From dc1982367038cf09bfa455c239d7ebc2e687a056 Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Fri, 29 Dec 2023 16:15:51 +0800 Subject: [PATCH 0724/1039] [pulsar-client-cpp] New port (#35579) * [pulsar-client-cpp] New port * Remove unnecessary link options * Address review comments - Use find_dependency instead of find_package - Specify BUILD_DYNAMIC_LIB explicitly * Fix the Windows build and linkage * Fix dynamic library not built when VCPKG_LIBRARY_LINKAGE is dynamic on Windows * Fix Linux and OSX failures * Remove PULSAR_FORCE_DYNAMIC_LIBRARY and upgrade version to 3.4.2 * Reduce the changes to the upstream CMakeLists.txt * Remove unused version * Optimize finding and linking dependency and patch the header for static library * Support multi-config generators * Fix path for release libraries --- .../0001-use-find-package.patch | 82 +++++++++++++++++++ ports/pulsar-client-cpp/portfile.cmake | 41 ++++++++++ .../unofficial-pulsar-config.cmake | 81 ++++++++++++++++++ ports/pulsar-client-cpp/usage | 4 + ports/pulsar-client-cpp/vcpkg.json | 48 +++++++++++ versions/baseline.json | 4 + versions/p-/pulsar-client-cpp.json | 9 ++ 7 files changed, 269 insertions(+) create mode 100644 ports/pulsar-client-cpp/0001-use-find-package.patch create mode 100644 ports/pulsar-client-cpp/portfile.cmake create mode 100644 ports/pulsar-client-cpp/unofficial-pulsar-config.cmake create mode 100644 ports/pulsar-client-cpp/usage create mode 100644 ports/pulsar-client-cpp/vcpkg.json create mode 100644 versions/p-/pulsar-client-cpp.json diff --git a/ports/pulsar-client-cpp/0001-use-find-package.patch b/ports/pulsar-client-cpp/0001-use-find-package.patch new file mode 100644 index 00000000000000..3138706a3ee6f6 --- /dev/null +++ b/ports/pulsar-client-cpp/0001-use-find-package.patch @@ -0,0 +1,82 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb4f1b1..1bcfd47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -96,6 +96,7 @@ if (APPLE AND NOT LINK_STATIC) + else () + set(LATEST_PROTOBUF FALSE) + endif () ++set(LATEST_PROTOBUF FALSE) + + if (NOT CMAKE_CXX_STANDARD) + if (LATEST_PROTOBUF) +@@ -157,14 +158,15 @@ if (LATEST_PROTOBUF) + # Use Config mode to avoid FindProtobuf.cmake does not find the Abseil library + find_package(Protobuf REQUIRED CONFIG) + else () +- find_package(Protobuf REQUIRED) ++ find_package(protobuf CONFIG REQUIRED) ++ set(Protobuf_LIBRARIES protobuf::libprotobuf) + endif () + message("Protobuf_INCLUDE_DIRS: " ${Protobuf_INCLUDE_DIRS}) + message("Protobuf_LIBRARIES: " ${Protobuf_LIBRARIES}) + + # NOTE: CMake might not find curl and zlib on some platforms like Ubuntu, in this case, find them manually + set(CURL_NO_CURL_CMAKE ON) +-find_package(curl QUIET) ++find_package(CURL REQUIRED) + if (NOT CURL_FOUND) + find_path(CURL_INCLUDE_DIRS NAMES curl/curl.h) + find_library(CURL_LIBRARIES NAMES curl curllib libcurl_imp curllib_static libcurl) +@@ -175,7 +177,7 @@ if (NOT CURL_INCLUDE_DIRS OR NOT CURL_LIBRARIES) + message(FATAL_ERROR "Could not find libcurl") + endif () + +-find_package(zlib QUIET) ++find_package(ZLIB REQUIRED) + if (NOT ZLIB_FOUND) + find_path(ZLIB_INCLUDE_DIRS NAMES zlib.h) + find_library(ZLIB_LIBRARIES NAMES z zlib zdll zlib1 zlibstatic) +@@ -226,6 +228,17 @@ elseif (LINK_STATIC AND VCPKG_TRIPLET) + if (LIB_SNAPPY) + message(STATUS "Found Snappy library: ${LIB_SNAPPY}") + endif () ++elseif (1) ++ find_package(zstd CONFIG REQUIRED) ++ set(HAS_ZSTD 1) ++ set(LIB_ZSTD ++ $,zstd::libzstd_shared,zstd::libzstd_static>) ++ find_package(Snappy CONFIG REQUIRED) ++ set(HAS_SNAPPY 1) ++ set(LIB_SNAPPY Snappy::snappy) ++ if (MSVC) ++ find_package(dlfcn-win32 CONFIG REQUIRED) ++ endif () + else() + if (MSVC AND (${CMAKE_BUILD_TYPE} STREQUAL Debug)) + find_library(LIB_ZSTD zstdd HINTS "${VCPKG_DEBUG_ROOT}/lib") +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 8bd9749..551ac0c 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -31,12 +31,14 @@ include_directories(${LIB_AUTOGEN_DIR}) + # Using custom command for now + set(PROTO_SOURCES ${LIB_AUTOGEN_DIR}/PulsarApi.pb.cc ${LIB_AUTOGEN_DIR}/PulsarApi.pb.h) + set(PULSAR_SOURCES ${PULSAR_SOURCES} ${PROTO_SOURCES}) +-ADD_CUSTOM_COMMAND( +- OUTPUT ${PROTO_SOURCES} +- COMMAND ${PROTOC_PATH} -I ../proto ../proto/PulsarApi.proto --cpp_out=${LIB_AUTOGEN_DIR} +- DEPENDS +- ../proto/PulsarApi.proto +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ ++add_library(proto-objects OBJECT "${CMAKE_SOURCE_DIR}/proto/PulsarApi.proto") ++target_link_libraries(proto-objects PUBLIC protobuf::libprotobuf) ++target_include_directories(proto-objects PUBLIC "${LIB_AUTOGEN_DIR}") ++protobuf_generate( ++ TARGET proto-objects ++ IMPORT_DIRS "${CMAKE_SOURCE_DIR}/proto" ++ PROTOC_OUT_DIR "${LIB_AUTOGEN_DIR}") + + set(LIBRARY_VERSION $ENV{PULSAR_LIBRARY_VERSION}) + if (NOT LIBRARY_VERSION) diff --git a/ports/pulsar-client-cpp/portfile.cmake b/ports/pulsar-client-cpp/portfile.cmake new file mode 100644 index 00000000000000..595d73e3a7b7e2 --- /dev/null +++ b/ports/pulsar-client-cpp/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/pulsar-client-cpp + REF "v${VERSION}" + SHA512 b1f56ca8d5edb7faaba68eb4e04fcb4e458ccf2c7a5b0fb6d66868c6507081344fb3f0ebb29afe9aef567295a249b09cdeb3fb00285746767bbccef65a0f6e70 + HEAD_REF main + PATCHES + 0001-use-find-package.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_PERF_TOOLS=OFF + -DBUILD_DYNAMIC_LIB=${BUILD_DYNAMIC_LIB} + -DBUILD_STATIC_LIB=${BUILD_STATIC_LIB} +) + +vcpkg_cmake_install() + +if (BUILD_STATIC_LIB) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pulsar/defines.h" + "#ifdef PULSAR_STATIC" + "#if 1") +endif () + +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_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-pulsar-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-pulsar/unofficial-pulsar-config.cmake" @ONLY) + +vcpkg_copy_pdbs() diff --git a/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake b/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake new file mode 100644 index 00000000000000..d8406a7060040f --- /dev/null +++ b/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake @@ -0,0 +1,81 @@ +if (NOT TARGET unofficial::pulsar::pulsar) + get_filename_component(VCPKG_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH) + get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH) + + find_path(_pulsar_include_dir NAMES "pulsar/Client.h" PATH "${VCPKG_IMPORT_PREFIX}/include") + set(_temp_cmake_ignore_path ${CMAKE_IGNORE_PATH}) + # Without setting CMAKE_IGNORE_PATH, the library under debug/lib/ directory could be found + set(CMAKE_IGNORE_PATH "${VCPKG_IMPORT_PREFIX}/debug/lib") + find_library(_pulsar_library_release NAMES pulsar pulsar-static PATH "${VCPKG_IMPORT_PREFIX}/lib") + set(CMAKE_IGNORE_PATH ${_temp_cmake_ignore_path}) + unset(_temp_cmake_ignore_path) + find_library(_pulsar_library_debug NAMES pulsar pulsar-static PATH "${VCPKG_IMPORT_PREFIX}/debug/lib") + message(STATUS "Found _pulsar_library_release: ${_pulsar_library_release}") + message(STATUS "Found _pulsar_library_debug: ${_pulsar_library_debug}") + if (NOT _pulsar_include_dir OR NOT _pulsar_library_release) + message(FATAL_ERROR "Broken installation of vcpkg port pulsar-client-cpp") + endif () + + if (MSVC AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") + find_file(_pulsar_release_dll NAMES "pulsar.dll" PATHS "${VCPKG_IMPORT_PREFIX}/bin" NO_DEFAULT_PATH) + find_file(_pulsar_debug_dll NAMES "pulsar.dll" PATHS "${VCPKG_IMPORT_PREFIX}/debug/bin" NO_DEFAULT_PATH) + if (NOT _pulsar_release_dll) + message(FATAL_ERROR "No pulsar.dll found") + endif () + message(STATUS "Found _pulsar_release_dll: ${_pulsar_release_dll}") + message(STATUS "Found _pulsar_debug_dll: ${_pulsar_debug_dll}") + endif () + + include(CMakeFindDependencyMacro) + find_dependency(OpenSSL) + find_dependency(ZLIB) + find_dependency(protobuf CONFIG) + find_dependency(CURL CONFIG) + find_dependency(zstd CONFIG) + find_dependency(snappy CONFIG) + if (MSVC) + find_dependency(dlfcn-win32 CONFIG) + endif () + + if (_pulsar_release_dll) + add_library(unofficial::pulsar::pulsar SHARED IMPORTED) + set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_CONFIGURATIONS "Release" + IMPORTED_IMPLIB_RELEASE "${_pulsar_library_release}" + IMPORTED_LOCATION_RELEASE "${_pulsar_release_dll}") + if (_pulsar_debug_dll) + set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_CONFIGURATIONS "Release;DEBUG" + IMPORTED_IMPLIB_DEBUG "${_pulsar_library_debug}" + IMPORTED_LOCATION_DEBUG "${_pulsar_debug_dll}") + unset(_pulsar_debug_dll CACHE) + endif () + unset(_pulsar_release_dll CACHE) + else () + add_library(unofficial::pulsar::pulsar UNKNOWN IMPORTED) + set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_LOCATION_RELEASE "${_pulsar_library_release}") + if (_pulsar_library_debug) + set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_LOCATION_DEBUG "${_pulsar_library_debug}") + unset(_pulsar_library_debug CACHE) + endif () + endif () + set_target_properties(unofficial::pulsar::pulsar PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_pulsar_include_dir}") + target_link_libraries(unofficial::pulsar::pulsar INTERFACE + OpenSSL::SSL + OpenSSL::Crypto + ZLIB::ZLIB + protobuf::libprotobuf + CURL::libcurl + $,zstd::libzstd_shared,zstd::libzstd_static> + Snappy::snappy + ) + if (MSVC) + target_link_libraries(unofficial::pulsar::pulsar INTERFACE dlfcn-win32::dl) + endif () + unset(_pulsar_library_release CACHE) + unset(_pulsar_include_dir CACHE) +endif () diff --git a/ports/pulsar-client-cpp/usage b/ports/pulsar-client-cpp/usage new file mode 100644 index 00000000000000..474d73f16f63f1 --- /dev/null +++ b/ports/pulsar-client-cpp/usage @@ -0,0 +1,4 @@ +pulsar-client-cpp provides CMake targets: + + find_package(unofficial-pulsar CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::pulsar::pulsar) diff --git a/ports/pulsar-client-cpp/vcpkg.json b/ports/pulsar-client-cpp/vcpkg.json new file mode 100644 index 00000000000000..c746bb53120433 --- /dev/null +++ b/ports/pulsar-client-cpp/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "pulsar-client-cpp", + "version": "3.4.2", + "description": "The Apache Pulsar C++ library", + "homepage": "https://github.com/apache/pulsar-client-cpp", + "license": "Apache-2.0", + "supports": "!(arm & windows) & !android", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-any", + "boost-asio", + "boost-circular-buffer", + "boost-date-time", + "boost-predef", + "boost-property-tree", + "boost-random", + "boost-serialization", + "boost-xpressive", + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + }, + { + "name": "dlfcn-win32", + "platform": "windows" + }, + "openssl", + { + "name": "protobuf", + "version>=": "3.21.12" + }, + "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f16e80e6c0a06b..7a160653c62ef0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6856,6 +6856,10 @@ "baseline": "1.14", "port-version": 0 }, + "pulsar-client-cpp": { + "baseline": "3.4.2", + "port-version": 0 + }, "pulzed-mini": { "baseline": "0.9.14", "port-version": 0 diff --git a/versions/p-/pulsar-client-cpp.json b/versions/p-/pulsar-client-cpp.json new file mode 100644 index 00000000000000..1611cc33230a78 --- /dev/null +++ b/versions/p-/pulsar-client-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f022e5dacbf10b0a6cead0f065ce6ab885b4c9af", + "version": "3.4.2", + "port-version": 0 + } + ] +} From 83972272512ce4ede5fc3b2ba98f6468b179f192 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 29 Dec 2023 09:21:45 +0100 Subject: [PATCH 0725/1039] [vulkan-sdk-components] Use separate port for the SDK (#35742) * [vulkan-sdk] Separate port * Update ci.baseline.txt * [hikogui] Using glslc from shaderc * [vulkan] Drop LICENSE.txt * [vulkan-sdk-components] Avoid vulkan-sdk name * [vulkan] Fixup copyright text --- ports/hikogui/vcpkg.json | 3 +- .../LICENSE.txt | 0 ports/vulkan-sdk-components/portfile.cmake | 26 ++++++++++ ports/vulkan-sdk-components/usage | 12 +++++ ports/vulkan-sdk-components/vcpkg.json | 47 +++++++++++++++++++ ports/vulkan-utility-libraries/vcpkg.json | 2 +- ports/vulkan/CMakeLists.txt | 8 ++-- ports/vulkan/portfile.cmake | 26 +++++----- ports/vulkan/usage | 3 -- ports/vulkan/vcpkg.json | 45 ++++-------------- ports/vulkan/vulkan-result.cmake.in | 1 + scripts/ci.baseline.txt | 8 ++++ versions/baseline.json | 10 ++-- versions/h-/hikogui.json | 5 ++ versions/v-/vulkan-sdk-components.json | 9 ++++ versions/v-/vulkan-utility-libraries.json | 5 ++ versions/v-/vulkan.json | 5 ++ 17 files changed, 155 insertions(+), 60 deletions(-) rename ports/{vulkan => vulkan-sdk-components}/LICENSE.txt (100%) create mode 100644 ports/vulkan-sdk-components/portfile.cmake create mode 100644 ports/vulkan-sdk-components/usage create mode 100644 ports/vulkan-sdk-components/vcpkg.json create mode 100644 versions/v-/vulkan-sdk-components.json diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json index 31679e93171636..cff97ce1282a4d 100644 --- a/ports/hikogui/vcpkg.json +++ b/ports/hikogui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hikogui", "version": "0.8.1", - "port-version": 1, + "port-version": 2, "maintainers": "@takev", "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/hikogui/hikogui", @@ -14,6 +14,7 @@ "tools" ] }, + "shaderc", { "name": "vcpkg-cmake", "host": true diff --git a/ports/vulkan/LICENSE.txt b/ports/vulkan-sdk-components/LICENSE.txt similarity index 100% rename from ports/vulkan/LICENSE.txt rename to ports/vulkan-sdk-components/LICENSE.txt diff --git a/ports/vulkan-sdk-components/portfile.cmake b/ports/vulkan-sdk-components/portfile.cmake new file mode 100644 index 00000000000000..58168e2538f542 --- /dev/null +++ b/ports/vulkan-sdk-components/portfile.cmake @@ -0,0 +1,26 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(components COMPONENTS glslang) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND components dxc) +endif() + +set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log") +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/vulkan/detect-vulkan" + OPTIONS + "-DVCPKG_VULKAN_VERSION=${VERSION}" + "-DVCPKG_VULKAN_COMPONENTS=${components}" + OPTIONS_RELEASE + "-DOUTFILE=${vulkan_result_file}" +) + +include("${vulkan_result_file}") +if(NOT DETECTED_Vulkan_FOUND) + message(FATAL_ERROR "The Vulkan SDK wasn't found.") +endif() + +find_file(vulkan_license NAMES LICENSE.txt PATHS ${DETECTED_Vulkan_INCLUDE_DIRS} "${CURRENT_PORT_DIR}" PATH_SUFFIXES "..") +vcpkg_install_copyright(FILE_LIST "${vulkan_license}") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vulkan-sdk-components/usage b/ports/vulkan-sdk-components/usage new file mode 100644 index 00000000000000..436a83136fac9d --- /dev/null +++ b/ports/vulkan-sdk-components/usage @@ -0,0 +1,12 @@ +vulkan-sdk-components is compatible with built-in CMake targets: + + # https://cmake.org/cmake/help/latest/module/FindVulkan.html + find_package(Vulkan REQUIRED) + # SPIR-V generator library + target_link_libraries(main PRIVATE Vulkan::glslang) + # DirectX Shader Compiler + target_link_libraries(main PRIVATE Vulkan::dxc) + +The vulkan-sdk-components package does not provide direct Visual Studio +integration. For manual integration, add $(VULKAN_SDK)/include to your +include path. diff --git a/ports/vulkan-sdk-components/vcpkg.json b/ports/vulkan-sdk-components/vcpkg.json new file mode 100644 index 00000000000000..29d7462d68b249 --- /dev/null +++ b/ports/vulkan-sdk-components/vcpkg.json @@ -0,0 +1,47 @@ +{ + "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.268.0/windows/config.json", + "name": "vulkan-sdk-components", + "version": "1.3.268.0", + "description": "Installs packages which are part of the Vulkan SDK.", + "license": null, + "supports": "!uwp & !xbox", + "dependencies": [ + { + "name": "directx-dxc", + "platform": "windows" + }, + "glm", + "glslang", + "jsoncpp", + { + "name": "mimalloc", + "platform": "windows" + }, + "robin-hood-hashing", + "sdl2", + "shaderc", + "spirv-cross", + "spirv-headers", + "valijson", + { + "name": "vcpkg-cmake", + "host": true + }, + "volk", + "vulkan", + "vulkan-memory-allocator", + "vulkan-utility-libraries", + "vulkan-validationlayers" + ], + "features": { + "tools": { + "description": "Build Vulkan related tools", + "dependencies": [ + "lunarg-vulkantools", + "spirv-reflect", + "spirv-tools", + "vulkan-tools" + ] + } + } +} diff --git a/ports/vulkan-utility-libraries/vcpkg.json b/ports/vulkan-utility-libraries/vcpkg.json index 70c054eef61cbe..bd9f18607efe29 100644 --- a/ports/vulkan-utility-libraries/vcpkg.json +++ b/ports/vulkan-utility-libraries/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vulkan-utility-libraries", "version": "1.3.268.0", + "port-version": 1, "description": "Utility libraries for Vulkan developers", "homepage": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries", "license": null, - "supports": "!android", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vulkan/CMakeLists.txt b/ports/vulkan/CMakeLists.txt index faf48f7423f666..3370eb11f676e5 100644 --- a/ports/vulkan/CMakeLists.txt +++ b/ports/vulkan/CMakeLists.txt @@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.25) project(FIND_VULKAN LANGUAGES C) -set(CMAKE_FIND_DEBUG_MODE ON) - -find_package(Vulkan ${VCPKG_VULKAN_VERSION}) +find_package(Vulkan ${VCPKG_VULKAN_VERSION} ${VCPKG_VULKAN_COMPONENTS}) +if(NOT Vulkan_FOUND) + set(CMAKE_FIND_DEBUG_MODE ON) + find_package(Vulkan ${VCPKG_VULKAN_VERSION} ${VCPKG_VULKAN_COMPONENTS}) +endif() set(OUTFILE "${CMAKE_CURRENT_BINARY_DIR}/vulkan-result.cmake" CACHE FILEPATH "") configure_file("vulkan-result.cmake.in" "${OUTFILE}" @ONLY ESCAPE_QUOTES) diff --git a/ports/vulkan/portfile.cmake b/ports/vulkan/portfile.cmake index d48d9d0f8f23ec..cd198112a2e1f2 100644 --- a/ports/vulkan/portfile.cmake +++ b/ports/vulkan/portfile.cmake @@ -1,31 +1,31 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - set(vulkan_result_file "${CURRENT_BUILDTREES_DIR}/vulkan-${TARGET_TRIPLET}.cmake.log") vcpkg_cmake_configure( SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" - OPTIONS - "-DVCPKG_VULKAN_VERSION=${VERSION}" OPTIONS_RELEASE "-DOUTFILE=${vulkan_result_file}" ) include("${vulkan_result_file}") if(DETECTED_Vulkan_FOUND) - message(STATUS "Found Vulkan SDK ${DETECTED_Vulkan_VERSION} (${DETECTED_Vulkan_LIBRARIES})") + message(STATUS "Found Vulkan ${DETECTED_Vulkan_VERSION} (${DETECTED_Vulkan_LIBRARIES})") else() - set(message "The Vulkan SDK wasn't found. ") - if(VCPKG_TARGET_IS_WINDOWS) - string(APPEND message "Refer to Getting Started with the Windows Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/windows/getting_started.html") - elseif(VCPKG_TARGET_IS_OSX) - string(APPEND message "Refer to Getting Started with the MacOS Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/mac/getting_started.html") - elseif(VCPKG_TARGET_IS_LINUX) - string(APPEND message "Refer to Getting Started with the Linux Vulkan SDK: https://vulkan.lunarg.com/doc/sdk/latest/linux/getting_started.html") + set(message "Vulkan wasn't found.") + if(VCPKG_TARGET_IS_ANDROID AND DETECTED_ANDROID_NATIVE_API_LEVEL AND DETECTED_ANDROID_NATIVE_API_LEVEL LESS "24") + string(APPEND message " Vulkan support from the Android NDK requires API level 24 (found: ${DETECTED_ANDROID_NATIVE_API_LEVEL})") endif() message(FATAL_ERROR "${message}") endif() -find_file(vulkan_license NAMES LICENSE.txt PATHS ${DETECTED_Vulkan_INCLUDE_DIRS} "${CURRENT_PORT_DIR}" PATH_SUFFIXES "..") -vcpkg_install_copyright(FILE_LIST "${vulkan_license}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/vulkan-result.cmake.in" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/detect-vulkan" +) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" [[ +This is a stub package. Copyright and license information +is provided with Vulkan headers and loader. +For Android, the loader is provided by the NDK. +]]) diff --git a/ports/vulkan/usage b/ports/vulkan/usage index e2df7fcf0a9ca5..e742892f1c2b3c 100644 --- a/ports/vulkan/usage +++ b/ports/vulkan/usage @@ -3,6 +3,3 @@ vulkan is compatible with built-in CMake targets: # https://cmake.org/cmake/help/latest/module/FindVulkan.html find_package(Vulkan REQUIRED) target_link_libraries(main PRIVATE Vulkan::Vulkan) - -The vulkan package does not provide direct Visual Studio integration. -For manual integration, add $(VULKAN_SDK)/include to your include path. diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index a8cb3174e0d1b4..cff6df67e458f9 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -1,48 +1,21 @@ { - "$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.268.0/windows/config.json", "name": "vulkan", - "version": "1.3.268.0", - "description": "A stub package that ensures that the Vulkan SDK is installed.", + "version-date": "2023-12-17", + "description": [ + "A stub package that ensures that Vulkan headers and a loader are available.", + "On Android, the NDK provides a loader at API level 24 or higher." + ], "license": null, "supports": "!uwp & !xbox", "dependencies": [ - { - "name": "directx-dxc", - "platform": "windows" - }, - "glm", - "glslang", - "jsoncpp", - { - "name": "mimalloc", - "platform": "windows" - }, - "robin-hood-hashing", - "sdl2", - "shaderc", - "spirv-cross", - "spirv-headers", - "valijson", { "name": "vcpkg-cmake", "host": true }, - "volk", "vulkan-headers", - "vulkan-loader", - "vulkan-memory-allocator", - "vulkan-utility-libraries", - "vulkan-validationlayers" - ], - "features": { - "tools": { - "description": "Build Vulkan related tools", - "dependencies": [ - "lunarg-vulkantools", - "spirv-reflect", - "spirv-tools", - "vulkan-tools" - ] + { + "name": "vulkan-loader", + "platform": "!android" } - } + ] } diff --git a/ports/vulkan/vulkan-result.cmake.in b/ports/vulkan/vulkan-result.cmake.in index daed34203677a2..877df8d34db376 100644 --- a/ports/vulkan/vulkan-result.cmake.in +++ b/ports/vulkan/vulkan-result.cmake.in @@ -2,3 +2,4 @@ set(DETECTED_Vulkan_FOUND "@Vulkan_FOUND@") set(DETECTED_Vulkan_VERSION "@Vulkan_VERSION@") set(DETECTED_Vulkan_INCLUDE_DIRS "@Vulkan_INCLUDE_DIRS@") set(DETECTED_Vulkan_LIBRARIES "@Vulkan_LIBRARIES@") +set(DETECTED_ANDROID_NATIVE_API_LEVEL "@ANDROID_NATIVE_API_LEVEL@") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1b4aacf30818e5..b99ac0575d8502 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1188,6 +1188,14 @@ vowpal-wabbit:x64-android=fail vtk-m:arm-neon-android=fail vtk-m:arm64-android=fail vtk-m:x64-android=fail +# Needs android-24 to supply a vulkan loader library +vulkan:arm-neon-android=fail +vulkan:arm64-android=fail +vulkan:x64-android=fail +# Needs android-26 +vulkan-utility-libraries:arm-neon-android=fail +vulkan-utility-libraries:arm64-android=fail +vulkan-utility-libraries:x64-android=fail # Conflicts with latest openjpeg port (vxl ships with an old version of openjpeg) # conflicts with qt5-location vxl:arm-neon-android=skip diff --git a/versions/baseline.json b/versions/baseline.json index 7a160653c62ef0..d20ea4f53b468d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3334,7 +3334,7 @@ }, "hikogui": { "baseline": "0.8.1", - "port-version": 1 + "port-version": 2 }, "hiredis": { "baseline": "1.2.0", @@ -8973,7 +8973,7 @@ "port-version": 2 }, "vulkan": { - "baseline": "1.3.268.0", + "baseline": "2023-12-17", "port-version": 0 }, "vulkan-headers": { @@ -8996,13 +8996,17 @@ "baseline": "3.0.1.1", "port-version": 0 }, + "vulkan-sdk-components": { + "baseline": "1.3.268.0", + "port-version": 0 + }, "vulkan-tools": { "baseline": "1.3.268.0", "port-version": 0 }, "vulkan-utility-libraries": { "baseline": "1.3.268.0", - "port-version": 0 + "port-version": 1 }, "vulkan-validationlayers": { "baseline": "1.3.268.0", diff --git a/versions/h-/hikogui.json b/versions/h-/hikogui.json index bcf1b2c4921dea..6607857d1da5cd 100644 --- a/versions/h-/hikogui.json +++ b/versions/h-/hikogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d007fc919e0734e139f89d285000d2d166315f73", + "version": "0.8.1", + "port-version": 2 + }, { "git-tree": "89a94b29c6cf63fb3e99c979281751279f02031e", "version": "0.8.1", diff --git a/versions/v-/vulkan-sdk-components.json b/versions/v-/vulkan-sdk-components.json new file mode 100644 index 00000000000000..41fadf2a350af9 --- /dev/null +++ b/versions/v-/vulkan-sdk-components.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "efe1324e0d30a235687686111be4daa4605083e6", + "version": "1.3.268.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vulkan-utility-libraries.json b/versions/v-/vulkan-utility-libraries.json index 0f9febe89fe3cb..45cd4b53c6da6f 100644 --- a/versions/v-/vulkan-utility-libraries.json +++ b/versions/v-/vulkan-utility-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d90089cebfde86dcb2c554b9e45271889503fc36", + "version": "1.3.268.0", + "port-version": 1 + }, { "git-tree": "0849291de2e14ef941d30aef9a17e45547329e44", "version": "1.3.268.0", diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index 6f41769dcb2308..db9b05d552637e 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e8d64ec799440b97c7151f97dd00a53e8e1b5ea", + "version-date": "2023-12-17", + "port-version": 0 + }, { "git-tree": "27c107c7bd16ff68d2c9da45b0020713d4b2ea03", "version": "1.3.268.0", From 8de7ffa491af3ecd31094b96eea0f61691f31ef5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 2 Jan 2024 23:23:31 +0100 Subject: [PATCH 0726/1039] Revert "[hwinfo] create a new port (#35465)" (#35993) This reverts commit e64dd3356f7fe38e1e547cd94cee92bae831d41f. --- ports/hwinfo/portfile.cmake | 21 --------------------- ports/hwinfo/vcpkg.json | 14 -------------- versions/baseline.json | 4 ---- versions/h-/hwinfo.json | 9 --------- 4 files changed, 48 deletions(-) delete mode 100644 ports/hwinfo/portfile.cmake delete mode 100644 ports/hwinfo/vcpkg.json delete mode 100644 versions/h-/hwinfo.json diff --git a/ports/hwinfo/portfile.cmake b/ports/hwinfo/portfile.cmake deleted file mode 100644 index bd8dad6c9c6e16..00000000000000 --- a/ports/hwinfo/portfile.cmake +++ /dev/null @@ -1,21 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO lfreist/hwinfo - REF 5cb31dbdb2c40413a837ce52ffadee23578c9069 - SHA512 7c431528d5bf2f91843a3f6f8de908f6bc5b1427f85961bb885ab95e7765a875cb0358638e0e1e1f9a9336476ba74dc22819c97189251391fd8459c334c1092a -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DNO_OCL=TRUE # disable OpenCL usage - MAYBE_UNUSED_VARIABLES - NO_OCL -) -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/hwinfo/vcpkg.json b/ports/hwinfo/vcpkg.json deleted file mode 100644 index cb5ac1373cbcc9..00000000000000 --- a/ports/hwinfo/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "hwinfo", - "version-date": "2023-12-02", - "description": "cross platform C++ library for hardware information (CPU, RAM, GPU, ...)", - "homepage": "https://github.com/lfreist/hwinfo", - "license": "MIT", - "supports": "(windows | linux) & !uwp", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index d20ea4f53b468d..1789c49c5c3d2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3364,10 +3364,6 @@ "baseline": "1.7.2", "port-version": 0 }, - "hwinfo": { - "baseline": "2023-12-02", - "port-version": 0 - }, "hwloc": { "baseline": "2.9.3", "port-version": 0 diff --git a/versions/h-/hwinfo.json b/versions/h-/hwinfo.json deleted file mode 100644 index 9dca1884ff7e73..00000000000000 --- a/versions/h-/hwinfo.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "75e06682da06c2b28e10f57d72dc30618b833848", - "version-date": "2023-12-02", - "port-version": 0 - } - ] -} From 194896fcb1db10e7c4ea02651790fb97c85066a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Tue, 2 Jan 2024 22:26:56 +0000 Subject: [PATCH 0727/1039] [libtorch] build failure (#35708) --- ports/libtorch/missing_include.patch | 57 ++++++++++++++++++++++++++++ ports/libtorch/portfile.cmake | 1 + ports/libtorch/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorch.json | 5 +++ 5 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 ports/libtorch/missing_include.patch diff --git a/ports/libtorch/missing_include.patch b/ports/libtorch/missing_include.patch new file mode 100644 index 00000000000000..d8d1b0597544ab --- /dev/null +++ b/ports/libtorch/missing_include.patch @@ -0,0 +1,57 @@ +diff --git a/aten/src/ATen/core/dynamic_type.h b/aten/src/ATen/core/dynamic_type.h +index a84644ddde0..b1b6b2c9ecc 100644 +--- a/aten/src/ATen/core/dynamic_type.h ++++ b/aten/src/ATen/core/dynamic_type.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + #include + +diff --git a/c10/util/BFloat16.h b/c10/util/BFloat16.h +index 1ada02bba1c..f6f9fc65e0e 100644 +--- a/c10/util/BFloat16.h ++++ b/c10/util/BFloat16.h +@@ -3,6 +3,7 @@ + // Defines the bloat16 type (brain floating-point). This representation uses + // 1 bit for the sign, 8 bits for the exponent and 7 bits for the mantissa. + ++#include + #include + #include + #include +diff --git a/torch/csrc/jit/passes/quantization/quantization_type.h b/torch/csrc/jit/passes/quantization/quantization_type.h +index ea5ca10b15a..c704f9c3037 100644 +--- a/torch/csrc/jit/passes/quantization/quantization_type.h ++++ b/torch/csrc/jit/passes/quantization/quantization_type.h +@@ -1,5 +1,6 @@ + #pragma once + #include ++#include + + namespace torch { + namespace jit { +diff --git a/torch/csrc/jit/runtime/logging.cpp b/torch/csrc/jit/runtime/logging.cpp +index 66712990368..b326f587bc8 100644 +--- a/torch/csrc/jit/runtime/logging.cpp ++++ b/torch/csrc/jit/runtime/logging.cpp +@@ -1,6 +1,7 @@ + #include + + #include ++#include + #include + #include + +diff --git a/torch/csrc/lazy/core/multi_wait.cpp b/torch/csrc/lazy/core/multi_wait.cpp +index 6b9933518e0..db0742b32a3 100644 +--- a/torch/csrc/lazy/core/multi_wait.cpp ++++ b/torch/csrc/lazy/core/multi_wait.cpp +@@ -1,5 +1,6 @@ + #include + ++#include + #include + #include + diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index 16804028394b77..7ca5885423e11a 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca HEAD_REF master PATCHES + missing_include.patch pytorch-pr-85958.patch # https://github.com/pytorch/pytorch/pull/85958 fix-cmake.patch fix-fbgemm-include.patch diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index 1b27ee499e321a..efd6ea9d4e4af2 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "1.12.1", - "port-version": 4, + "port-version": 5, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 1789c49c5c3d2e..157519504e4819 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4918,7 +4918,7 @@ }, "libtorch": { "baseline": "1.12.1", - "port-version": 4 + "port-version": 5 }, "libtorrent": { "baseline": "2.0.9", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 4fa4e5ed68c84c..cdb452b0aaa6f2 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20a2f323fb33dab29315fd18217e263ade2a9bd6", + "version": "1.12.1", + "port-version": 5 + }, { "git-tree": "de2d4bfd4a26268b29c3be02790c16d23ecd3d5e", "version": "1.12.1", From 7f5282b7d665893bfc37eaba674d208323a61b21 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 3 Jan 2024 06:31:28 +0800 Subject: [PATCH 0728/1039] [mongo-c-driver] update to 1.25.2 (#35524) --- ports/libbson/portfile.cmake | 2 +- ports/libbson/vcpkg.json | 3 +-- ports/mongo-c-driver/portfile.cmake | 2 +- ports/mongo-c-driver/vcpkg.json | 3 +-- versions/baseline.json | 8 ++++---- versions/l-/libbson.json | 5 +++++ versions/m-/mongo-c-driver.json | 5 +++++ 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 442999bbdc1449..790e95cd40a65e 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 e0f15a8a45ff156136251f1a0e5d0cc2b0253ba9dbf062a6eaef73e02c3b7999d3af31a9eb2ebf2c141e5b2367e356b3ea56b8eb083a5097d88f81bbc4f0be23 + SHA512 77569b9816eb9bfcc6fe2f3cfab69845410aa2e7c6a5db987957eef74cff5cfd51006373bbc8539ecf385adf8c9c067df5a151bdf9b5f7ee71cdf5c9c64040a8 HEAD_REF master PATCHES fix-include-directory.patch # vcpkg legacy decision diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index 923b9b9666d3e1..e202657e386ea1 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libbson", - "version": "1.25.1", - "port-version": 2, + "version": "1.25.2", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index bb488176fa239b..71232e8ec07078 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 e0f15a8a45ff156136251f1a0e5d0cc2b0253ba9dbf062a6eaef73e02c3b7999d3af31a9eb2ebf2c141e5b2367e356b3ea56b8eb083a5097d88f81bbc4f0be23 + SHA512 77569b9816eb9bfcc6fe2f3cfab69845410aa2e7c6a5db987957eef74cff5cfd51006373bbc8539ecf385adf8c9c067df5a151bdf9b5f7ee71cdf5c9c64040a8 HEAD_REF master PATCHES disable-dynamic-when-static.patch diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index c9c721ae301bac..e2015df97496e1 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.25.1", - "port-version": 1, + "version": "1.25.2", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 157519504e4819..a7e7e2ea757ad5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4113,8 +4113,8 @@ "port-version": 4 }, "libbson": { - "baseline": "1.25.1", - "port-version": 2 + "baseline": "1.25.2", + "port-version": 0 }, "libcaer": { "baseline": "3.3.15", @@ -5661,8 +5661,8 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.25.1", - "port-version": 1 + "baseline": "1.25.2", + "port-version": 0 }, "mongo-cxx-driver": { "baseline": "3.9.0", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index df7f0eee42a727..dcb2293ce8d97f 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c4c352f8b6c44b8cb678e906b8f8431b54d2d27", + "version": "1.25.2", + "port-version": 0 + }, { "git-tree": "cefffe3ffeb41cff3720044ea92a8734c42dc31c", "version": "1.25.1", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 39d834f6d0f6aa..cdfe3002c31889 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654476156359ba012d49880fbf0acf549c6eaa35", + "version": "1.25.2", + "port-version": 0 + }, { "git-tree": "988570f6f3cad6a77c519990851d9d2208d5970d", "version": "1.25.1", From 8b8ba993a684248a69eb2dae326eaec54d72a44a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 3 Jan 2024 06:32:00 +0800 Subject: [PATCH 0729/1039] [curl] update to 8.5.0 (#35806) --- ports/curl/0012-fix-dependency-idn2.patch | 10 ++++-- ports/curl/0020-fix-pc-file.patch | 24 +++++++-------- ports/curl/0022-deduplicate-libs.patch | 18 +++++------ ports/curl/cmake-config.patch | 11 +++---- ports/curl/export-components.patch | 37 ++++++++++++----------- ports/curl/portfile.cmake | 4 +-- ports/curl/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/c-/curl.json | 5 +++ 9 files changed, 62 insertions(+), 54 deletions(-) diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index c0efbba3a208c7..551e7fcba6a3f4 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -1,12 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b19c68..bb5fba9 100644 +index a54c2ff..3b83a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -839,7 +839,8 @@ endif() +@@ -852,11 +852,8 @@ endif() # Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) if(USE_LIBIDN2) -- check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) +- check_library_exists("idn2" "idn2_lookup_ul" "" HAVE_LIBIDN2) +- if(HAVE_LIBIDN2) +- set(CURL_LIBS "idn2;${CURL_LIBS}") +- check_include_file_concat("idn2.h" HAVE_IDN2_H) +- endif() + set(HAVE_LIBIDN2 TRUE) + list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) else() diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index aad6ed9c2a0492..8031121c6a3469 100644 --- a/ports/curl/0020-fix-pc-file.patch +++ b/ports/curl/0020-fix-pc-file.patch @@ -1,15 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bb5fba9..9919fd3 100644 +index 3b83a7f..0ceaf5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1624,7 +1624,9 @@ set(includedir "\${prefix}/include") - set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") - set(LIBCURL_LIBS "") - set(libdir "${CMAKE_INSTALL_PREFIX}/lib") --foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) -+set(CURL_LIBS_FLAT "") -+vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) -+foreach(_lib ${CURL_LIBS_FLAT}) - if(TARGET "${_lib}") - set(_libname "${_lib}") - get_target_property(_imported "${_libname}" IMPORTED) +@@ -1652,7 +1652,9 @@ if(NOT CURL_DISABLE_INSTALL) + set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + set(LIBCURL_LIBS "") + set(libdir "${CMAKE_INSTALL_PREFIX}/lib") +- foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) ++ set(CURL_LIBS_FLAT "") ++ vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) ++ foreach(_lib ${CURL_LIBS_FLAT}) + if(TARGET "${_lib}") + set(_libname "${_lib}") + get_target_property(_imported "${_libname}" IMPORTED) diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch index aa47329589d352..dac3b6788b6504 100644 --- a/ports/curl/0022-deduplicate-libs.patch +++ b/ports/curl/0022-deduplicate-libs.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9919fd3..7e513f6 100644 +index 0ceaf5b..ec714a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1654,6 +1654,7 @@ if(BUILD_SHARED_LIBS) - else() - set(ENABLE_SHARED "no") - set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") -+ set(LIBCURL_LIBS "") - set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB") - endif() - if(BUILD_STATIC_LIBS) +@@ -1682,6 +1682,7 @@ if(NOT CURL_DISABLE_INSTALL) + else() + set(ENABLE_SHARED "no") + set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") ++ set(LIBCURL_LIBS "") + set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB") + endif() + if(BUILD_STATIC_LIBS) diff --git a/ports/curl/cmake-config.patch b/ports/curl/cmake-config.patch index 39b7d28316f6b0..1e980cdf311c74 100644 --- a/ports/curl/cmake-config.patch +++ b/ports/curl/cmake-config.patch @@ -1,13 +1,12 @@ diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in -index c89c686..2f39949 100644 +index a013adf..2f39949 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in -@@ -45,4 +45,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") - check_required_components("@PROJECT_NAME@") +@@ -46,5 +46,6 @@ check_required_components("@PROJECT_NAME@") # Alias for either shared or static library --add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@) -+if(NOT TARGET @PROJECT_NAME@::libcurl) + if(NOT TARGET @PROJECT_NAME@::libcurl) +- add_library(@PROJECT_NAME@::libcurl ALIAS @PROJECT_NAME@::@LIB_SELECTED@) + add_library(@PROJECT_NAME@::libcurl INTERFACE IMPORTED) + set_target_properties(@PROJECT_NAME@::libcurl PROPERTIES INTERFACE_LINK_LIBRARIES @PROJECT_NAME@::@LIB_SELECTED@) -+endif() + endif() diff --git a/ports/curl/export-components.patch b/ports/curl/export-components.patch index e116f31e96e0c3..03039aaddf3e90 100644 --- a/ports/curl/export-components.patch +++ b/ports/curl/export-components.patch @@ -1,23 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e513f6..049ac34 100644 +index ec714a5..478527e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1727,8 +1727,17 @@ if(CURL_ENABLE_EXPORT_TARGET) - ) - endif() +@@ -1754,9 +1754,18 @@ if(NOT CURL_DISABLE_INSTALL) + DESTINATION ${CURL_INSTALL_CMAKE_DIR} + ) + endif() ++ ++ set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake") ++ file(CONFIGURE OUTPUT "${components_file}" CONTENT [[ ++ foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@) ++ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$") ++ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE) ++ endif() ++ endforeach() ++ ]] @ONLY) -+set(components_file "${CMAKE_CURRENT_BINARY_DIR}/CURLConfigComponents.cmake") -+file(CONFIGURE OUTPUT "${components_file}" CONTENT [[ -+foreach(z_vcpkg_curl_component IN ITEMS @SUPPORT_FEATURES@ @SUPPORT_PROTOCOLS@) -+ if(z_vcpkg_curl_component MATCHES "^[-_a-zA-Z0-9]*$") -+ set(CURL_${z_vcpkg_curl_component}_FOUND TRUE) -+ endif() -+endforeach() -+]] @ONLY) -+ - install( -- FILES ${version_config} ${project_config} -+ FILES ${version_config} ${project_config} ${components_file} - DESTINATION ${CURL_INSTALL_CMAKE_DIR} - ) + install( +- FILES ${version_config} ${project_config} ++ FILES ${version_config} ${project_config} ${components_file} + DESTINATION ${CURL_INSTALL_CMAKE_DIR} + ) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index c3ac95e2a31e2e..f6b9bd57a362e6 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl REF "${curl_version}" - SHA512 c8550fef49e2f1571f7392a351e10bbdb23821069db1e988094fe27fe0a881a265ba69a2cd34462e630563d153462a975ef70472ba39adaad1c5e5ab45cf7f4f + SHA512 0d431b894aeaff9e63cb9208830a074a3499dee2e9479ec64387f264e06b9544a09a63b262bb3fb85c39420610c2b43b4b4b87ecba5c7b4a08e89cefd2a9b17d HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -14,7 +14,7 @@ vcpkg_from_github( mbedtls-ws2_32.patch export-components.patch dependencies.patch - cmake-config.patch # https://github.com/curl/curl/pull/11913 + cmake-config.patch cmake-config-ios.patch ) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index a63858e34207e5..e80232b80b894c 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "curl", - "version": "8.4.0", - "port-version": 1, + "version": "8.5.0", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a7e7e2ea757ad5..3658a387b807a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2037,8 +2037,8 @@ "port-version": 8 }, "curl": { - "baseline": "8.4.0", - "port-version": 1 + "baseline": "8.5.0", + "port-version": 0 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 2324cd7644cab6..99635e65b7068b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b30c6697e314cdba601dee9bdef0ed01e1d09c8f", + "version": "8.5.0", + "port-version": 0 + }, { "git-tree": "8ad22809b9ba0e1e140a8ef45c4502bb2d669e1f", "version": "8.4.0", From 346d327f6472ab474fcd1622d08e6a61af8cac1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93mar=20H=C3=B6gni=20Gu=C3=B0marsson?= Date: Tue, 2 Jan 2024 22:32:16 +0000 Subject: [PATCH 0730/1039] [Glaze] Update to v1.9.9 (#35922) --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index cdb6ecc511d641..ab757b69933eac 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 ffc2c2d007e736c4ef44407c639c89ba82e2e90d9e6ec9d3d507bdf20e197659e6963439d83e0b311efddb1f089552fa36edfc5af6c6b620f9dd3fdc06e5a52d + SHA512 ed1f1cccbba3eb46edb3899ac351d4d0f6f838ef96de958f90e6acea655c626d94c14d7b4e78ed379ea8710d99e43e84b166ccbbf5f3015599b88dae254a764a ) vcpkg_cmake_configure( diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 89d53e6f4a49b8..33c475edc01f3d 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "1.9.6", + "version": "1.9.9", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3658a387b807a7..3c1a8ba8172444 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,7 +2981,7 @@ "port-version": 0 }, "glaze": { - "baseline": "1.9.6", + "baseline": "1.9.9", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index d639f9b83ca481..bc4139e3d963cc 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "292cb129d7afdb63c4cd1881b863581725fa1f29", + "version": "1.9.9", + "port-version": 0 + }, { "git-tree": "90e9524cec84329ef65d58ce265d64567ff861f5", "version": "1.9.6", From b5246fa43e2e0b31fcdfeba9c22a795368a7756c Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 3 Jan 2024 05:32:38 +0700 Subject: [PATCH 0731/1039] [exiv2] fix target in usage description (#35923) --- ports/exiv2/usage | 2 +- ports/exiv2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/exiv2.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/exiv2/usage b/ports/exiv2/usage index 6d31c60264be26..1baff4d10a5e8c 100644 --- a/ports/exiv2/usage +++ b/ports/exiv2/usage @@ -1,4 +1,4 @@ exiv2 provides CMake targets: find_package(exiv2 CONFIG REQUIRED) - target_link_libraries(main PRIVATE exiv2lib) \ No newline at end of file + target_link_libraries(main PRIVATE Exiv2::exiv2lib) diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index fc0040c24db600..6af148c59d08a1 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "exiv2", "version": "0.28.1", + "port-version": 1, "description": "Image metadata library and tools", "homepage": "https://exiv2.org", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3c1a8ba8172444..1d7d3331694f85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2490,7 +2490,7 @@ }, "exiv2": { "baseline": "0.28.1", - "port-version": 0 + "port-version": 1 }, "expat": { "baseline": "2.5.0", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 8d77826bab7889..4df48d3c4a094b 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c718e83fc18023db2be57de6fb8873555aabdccb", + "version": "0.28.1", + "port-version": 1 + }, { "git-tree": "0c1020def33eb27e28b1cb0bd2cfd53dfe5fbae5", "version": "0.28.1", From 441105e451de25752726f51ca5d36d1d0a0bd071 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 2 Jan 2024 17:34:38 -0500 Subject: [PATCH 0732/1039] [meshoptimizer] Update to 0.20 (#35953) --- ports/meshoptimizer/portfile.cmake | 4 ++-- ports/meshoptimizer/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/m-/meshoptimizer.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/meshoptimizer/portfile.cmake b/ports/meshoptimizer/portfile.cmake index 2feb437a45a178..4a34d18fef003e 100644 --- a/ports/meshoptimizer/portfile.cmake +++ b/ports/meshoptimizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/meshoptimizer - REF v0.19 - SHA512 4de938cb8fbbbe42305511a18e1cba64d6774751604d64f06a6e581fa739c656528b443fdda492459138b9a42c898af8d1d0752777b48a8832e3bef08eb4a522 + REF v${VERSION} + SHA512 29f9987325b1e00e2b4bf5cb7745323456f5f766f6bdc189aeb192c802e7c73d6ec4484cd7c91d070ee940b423a680bee31c79e4db4a49da99346d21f70c58d6 HEAD_REF master ) diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json index d6cff3b0534700..5873046852cab0 100644 --- a/ports/meshoptimizer/vcpkg.json +++ b/ports/meshoptimizer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "meshoptimizer", - "version": "0.19", - "port-version": 1, + "version": "0.20", "description": "Mesh optimization library that makes meshes smaller and faster to render", "homepage": "https://github.com/zeux/meshoptimizer", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1d7d3331694f85..a6c93e398dc6b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5533,8 +5533,8 @@ "port-version": 6 }, "meshoptimizer": { - "baseline": "0.19", - "port-version": 1 + "baseline": "0.20", + "port-version": 0 }, "metis": { "baseline": "2022-07-27", diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json index a84cf84462eb19..39b7d1beec8f0f 100644 --- a/versions/m-/meshoptimizer.json +++ b/versions/m-/meshoptimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ed757afdbfbbe133e9c4ae31e8288ea80f66860", + "version": "0.20", + "port-version": 0 + }, { "git-tree": "4443e075e83187322a4323485d302fb52746a9e4", "version": "0.19", From 87a90594fdb764c9ac2bc921e9d88ddff84c2003 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 2 Jan 2024 14:37:52 -0800 Subject: [PATCH 0733/1039] [directxmath, directxmesh, directxtex, directxtk, uvatlas] Update for Dec2023 (#35965) --- ports/directxmath/portfile.cmake | 11 ++++++++--- ports/directxmath/usage | 4 ++++ ports/directxmath/vcpkg.json | 2 +- ports/directxmesh/portfile.cmake | 13 ++++++++----- ports/directxmesh/usage | 2 +- ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 17 +++++++++-------- ports/directxtex/usage | 2 +- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 11 ++++++----- ports/directxtk/usage | 2 +- ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 11 ++++++----- ports/directxtk12/usage | 2 +- ports/directxtk12/vcpkg.json | 2 +- ports/openexr/portfile.cmake | 4 +++- ports/openexr/vcpkg.json | 1 + ports/uvatlas/portfile.cmake | 11 +++++++---- ports/uvatlas/usage | 2 +- ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 14 +++++++------- versions/d-/directxmath.json | 5 +++++ versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/o-/openexr.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 28 files changed, 105 insertions(+), 49 deletions(-) create mode 100644 ports/directxmath/usage diff --git a/ports/directxmath/portfile.cmake b/ports/directxmath/portfile.cmake index 0bd63bdc32ecd4..088d3bccefa94d 100644 --- a/ports/directxmath/portfile.cmake +++ b/ports/directxmath/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMath - REF dec2022 - SHA512 61da5464e4a6b0e405307496b0b925fc52e3f7acd3841527c5f8e86d5188865767dd44d4277f034c46b0088d1ee52da72f747c5965cd37411600418b605d4702 + REF dec2023 + SHA512 ddb5fdb4ef2d524990b0eba254e8395e0c3278a49c37889eef97c977b9d72c4983305c7e2a5b732e05ee54819e0d4aea134a1419f713dda4da386d1bad2d3580 HEAD_REF main ) @@ -11,6 +11,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() + +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/DirectXMath.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmath) if(NOT VCPKG_TARGET_IS_WINDOWS) @@ -28,4 +32,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/directxmath/usage b/ports/directxmath/usage new file mode 100644 index 00000000000000..6e179fe37c3d03 --- /dev/null +++ b/ports/directxmath/usage @@ -0,0 +1,4 @@ +The DirectXMath package provides CMake targets: + + find_package(directxmath CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft::DirectXMath) diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json index 2c894e15e5d82d..3292bb6de581e7 100644 --- a/ports/directxmath/vcpkg.json +++ b/ports/directxmath/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmath", - "version-date": "2022-12-12", + "version-date": "2023-12-31", "description": "DirectXMath SIMD C++ math library", "homepage": "https://github.com/Microsoft/DirectXMath", "documentation": "https://docs.microsoft.com/windows/win32/dxmath/directxmath-portal", diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 34e1059ea23e61..d3c2efe4df1723 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXMESH_TAG oct2023) +set(DIRECTXMESH_TAG dec2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh REF ${DIRECTXMESH_TAG} - SHA512 e02471cc0d3a1f2f5c6effe23cea0909a6096b97011885af4b6436e070a11d5f5d5033f0df2c9103cef182b9666c7d17274c519e4f35099cb602a317a9e3bed5 + SHA512 25442ec60040f2f232079b4a62a4460c8de11a881e36f5bdaeadbe98678d360141e8eca8162169941c03884cc2a05c3e20cf7fd2aef6518f6a647b7382d6d271 HEAD_REF main ) @@ -18,16 +18,19 @@ vcpkg_check_features( tools BUILD_TOOLS ) +set(EXTRA_OPTIONS -DBUILD_TESTING=OFF) + if (VCPKG_HOST_IS_LINUX) message(WARNING "Build ${PORT} requires GCC version 9 or later") endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh) if("tools" IN_LIST FEATURES) @@ -40,7 +43,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}.exe" - SHA512 24385c74fa4b32c41bb2d6713ffe2fc78ef899d4f9f55bdb1a9d0a362858c019e6f59b932c03a7c66298362aed09b845f409dcd659dc79c05cb6e00c04db52ae + SHA512 db2d32ec44993547881e2f14ee3403aa6133758d250ffc54b7cec9c1f15be46e5a5d847eb1cff60081bdfeaaa1e6be129475f40502c0a8c5ba2d58e5baa71691 ) file(INSTALL @@ -55,7 +58,7 @@ if("tools" IN_LIST FEATURES) MESHCONVERT_EXE URLS "https://github.com/Microsoft/DirectXMesh/releases/download/${DIRECTXMESH_TAG}/meshconvert_arm64.exe" FILENAME "meshconvert-${DIRECTXMESH_TAG}-arm64.exe" - SHA512 32b64534f7dc7bbf41c5d7ad154d401dbfec2442ebb62969b2acef94595fe4f07e092e1e201aebb7596b47216904ee9e7647911c2a52efdc588d9abc1d691785 + SHA512 deaa61a1f24bf1ffff817a7b72b125d2402b97ca15713411eb3a5b0af0b5f2b25407be87d2fd60fb4670744656230d221183510167a1696685d2def9fa9c1532 ) file(INSTALL diff --git a/ports/directxmesh/usage b/ports/directxmesh/usage index ff81c281801b11..73b783e1537c21 100644 --- a/ports/directxmesh/usage +++ b/ports/directxmesh/usage @@ -1,4 +1,4 @@ -The package DirectXMesh is compatible with built-in CMake targets: +The DirectXMesh package provides CMake targets: find_package(directxmesh CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::DirectXMesh) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 87f47889479550..c06d8e195aed42 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2023-10-28", + "version-date": "2023-12-31", "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 b7ed4c0f7bca11..1302a9e196a76e 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTEX_TAG oct2023) +set(DIRECTXTEX_TAG dec2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex REF ${DIRECTXTEX_TAG} - SHA512 4521d716bc903e9373c8d2929ff4fec04b3ae276a3005a06a744d5ee7044520faec6aa06e166b9c3bcc18f68c8e7553f23b21c227154eb3ef994a1c68b57da1a + SHA512 c4d9c5f0ce275bb612ee5055c7fcbe4dbfdfd8a1a6eda78e25761f1e70b9883bf620812de2f27b5ac950ca5416f5dcdd08c364d0d2afe13150746bba4c36e3dd HEAD_REF main ) @@ -40,6 +40,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex) if("tools" IN_LIST FEATURES) @@ -52,21 +53,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}.exe" - SHA512 e53548f8715f9ecfe7bd9904eec5fd2fe77d09e8fae78fa95a056a882d8856fe9311d01a703da47ef530e3878fdee8bc4a288617a81ffb61043d6b48acef5df0 + SHA512 ce1e136eb68a3c5f8da6c99e95a066a567c9127346bdafa7218886a766d747ea1407c62d1c8630c76b315e1b17ffd6cd5e3b3a04badb390d468abb56d595360d ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv.exe" FILENAME "texconv-${DIRECTXTEX_TAG}.exe" - SHA512 ca1772650f7368917ea719d853eade2040ed189c45acb8cbaa1dec57e61ca429e041b411271a53e9ca9a11f7a5fc84df1e25c0d019886647b8208bdde93ff258 + SHA512 0da10ad66c6ac71127c1f8b14b9c3410dc3c87b27c0788a0cebf54618211978740a27d9664d9314998f8c4d7ecfc8aa621860fd8eef05844bd7257c9fabbdc5e ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}.exe" - SHA512 baea51318adec86e7d0808c99c5ed8d529d9196073ce31c7df79fc12c7ff085169ab72d8876a47bc462d4eb6ec02e103af3f8b1ee0fdd762c2662c0453388e74 + SHA512 0b66e919847c299aa7e6078dea1616e1a69ea94660bd37c1476c4d37b2247589f33fa830cb7dddb3ef2daf7eea13e4c12d1975c442eef5e72e7b1436359d7dfe ) file(INSTALL @@ -85,21 +86,21 @@ if("tools" IN_LIST FEATURES) TEXASSEMBLE_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texassemble_arm64.exe" FILENAME "texassemble-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 d11152bf4193ab83ab8cabae58ef517b05babec049f2fb1317a51b708d14ba4a93806ff4ebeb1004391c0692fc76b9bedd7a43dbea3d74a4d7548fb69c809f8b + SHA512 b85b6632027e329c90504e1e5923587301fc8fca2e5600d9b01eceaeb62579004dda410a625c6c9d9d39a6877ffb3df892ca60a8fe54d17825f51fe6baa032cb ) vcpkg_download_distfile( TEXCONV_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texconv_arm64.exe" FILENAME "texconv-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 09f3bc8aebac8804644f6673d0f21d4ee21155f13383c5a0da8afcaef6df6a1186c9254679334247b638ec11b9f1080abed285e174716a1e7662fc46c103278d + SHA512 82d22d6aca167d2e8a6ef8a92c6b43e38584d773c9ccac3c8746ec4b59cbc795aa41ffeac4b865bda5a8c5350547f25e3aef32529ec5ff06f78dabf398a16b21 ) vcpkg_download_distfile( TEXDIAG_EXE URLS "https://github.com/Microsoft/DirectXTex/releases/download/${DIRECTXTEX_TAG}/texdiag_arm64.exe" FILENAME "texdiag-${DIRECTXTEX_TAG}-arm64.exe" - SHA512 d1ec122e9647d243349678b8d1d267d9b26a84a6a845728c0408f94a486fe6c43488b2f507a96035063fc245bcb670367c0f219626c627ddc31d1713a782a1fd + SHA512 5b015b85ff60bd393c7844223575c0dd16b527c9bd65e1c57d2b07892293dae049df175d1f4ef28d32cf536e51aed9925fd79e520f72c892a6979e198fd9fa1f ) file(INSTALL diff --git a/ports/directxtex/usage b/ports/directxtex/usage index c054f2648541b3..525d1f0c3d9560 100644 --- a/ports/directxtex/usage +++ b/ports/directxtex/usage @@ -1,4 +1,4 @@ -The package DirectXTex is compatible with built-in CMake targets: +The DirectXTex package provides CMake targets: find_package(directxtex CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::DirectXTex) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index f13e462b4bb027..8970becba1540c 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2023-10-28", + "version-date": "2023-12-31", "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 c4f2abc97eaa94..23db25e8cd0207 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG oct2023) +set(DIRECTXTK_TAG dec2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK REF ${DIRECTXTK_TAG} - SHA512 3df7f26df2edfbfd8ba8ab2ff8b7f653c1df194145e89fd2bbe7c3f0581d4a11de2845091a6c7d27c2b7800d2b1e8770728fb357e6ab0ce57e714d8fcc0c3453 + SHA512 952f1455fd91c858b0debb10e0dea17f229a26eee0c3316341de4d2b7101c9023eb20d7b9c5a09eb5a21f3f8ca1d97ecae9e29b7ce5f0eb2a0797db6ff9ae8b9 HEAD_REF main ) @@ -32,6 +32,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk) if("tools" IN_LIST FEATURES) @@ -40,7 +41,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 00a4c94d3f9b6607f652edfbe1ce0cc9c09437f3084e2b252462458e652ff2735bf94f028091739ec66edbf29c1ebeb813af5c9b68644ac02cebf8ab6833d8fa + SHA512 f5872c479e537ae02d32039dce9ed4820c834de37795365b02cb5ae0d9241fb2ece58c1555335c57394a7cfbca95202a91ddda4e77d6bdd484c6cf6e7b9d6e0e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -55,7 +56,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 2b60b1dedfe8803914d16c760b546aad82a05404eedff9740f56a1ca8e15d9b77bba3743a3b39adb2092d04afc90106c8a3c2dffc87392cf5dfe6686752c4d3d + SHA512 e30f786e72e0a9ec84b359e768d3ea024c7e5611ea274b01189ee30faa2ce976579b42307edd4979fa39bdae7f0bc6041463723db3e97399e98575985b15d5da ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -68,7 +69,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 d0ff53fefedeba588ad583f99ab2c2420fe0b30a1efb88e4ce556436f1d5d8d76c69f28be7ca7209660212d017a1a404bcdb43349743a4142a7c3e88937ce1d3 + SHA512 8b01d120954e29e532ded2a38bd3ba883310e48655eab6af884ddcb9c4516640b59ed0d970d01eec189c7b4d04593b51a79739895761f2514c1e8f0df8504d99 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") diff --git a/ports/directxtk/usage b/ports/directxtk/usage index c36358606dece4..e1f79f6e7256da 100644 --- a/ports/directxtk/usage +++ b/ports/directxtk/usage @@ -1,4 +1,4 @@ -The DirectX Tool Kit for DX11 package is compatible with built-in CMake targets: +The DirectX Tool Kit for DX11 package provides CMake targets: find_package(directxtk CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::DirectXTK) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 98067de8a1ce58..4167a440ca2139 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2023-10-28", + "version-date": "2023-12-31", "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 76c507e143d488..70cc14e83a10ed 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -1,4 +1,4 @@ -set(DIRECTXTK_TAG oct2023) +set(DIRECTXTK_TAG dec2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 REF ${DIRECTXTK_TAG} - SHA512 3a162ce9101ee8585470bb76f7ac13397f215e4c70fca5a9e0ec419ba114bd4d07da9922cf7022b00cfb3cff0e7016df082658fd3f1e32d230fa2fd0140a338f + SHA512 7946ccd4ea9199ac981079462d1ff4621a3b10e70359948a9209a1d192ec936f0ea336bd8b6c2adaa63ace04a94950f933b1013242cadb9f7a22cd191c73699e HEAD_REF main ) @@ -31,6 +31,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12) if("tools" IN_LIST FEATURES) @@ -39,7 +40,7 @@ if("tools" IN_LIST FEATURES) MAKESPRITEFONT_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/MakeSpriteFont.exe" FILENAME "makespritefont-${DIRECTXTK_TAG}.exe" - SHA512 00a4c94d3f9b6607f652edfbe1ce0cc9c09437f3084e2b252462458e652ff2735bf94f028091739ec66edbf29c1ebeb813af5c9b68644ac02cebf8ab6833d8fa + SHA512 f5872c479e537ae02d32039dce9ed4820c834de37795365b02cb5ae0d9241fb2ece58c1555335c57394a7cfbca95202a91ddda4e77d6bdd484c6cf6e7b9d6e0e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -54,7 +55,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}.exe" - SHA512 2b60b1dedfe8803914d16c760b546aad82a05404eedff9740f56a1ca8e15d9b77bba3743a3b39adb2092d04afc90106c8a3c2dffc87392cf5dfe6686752c4d3d + SHA512 e30f786e72e0a9ec84b359e768d3ea024c7e5611ea274b01189ee30faa2ce976579b42307edd4979fa39bdae7f0bc6041463723db3e97399e98575985b15d5da ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -67,7 +68,7 @@ if("tools" IN_LIST FEATURES) XWBTOOL_EXE URLS "https://github.com/Microsoft/DirectXTK12/releases/download/${DIRECTXTK_TAG}/XWBTool_arm64.exe" FILENAME "xwbtool-${DIRECTXTK_TAG}-arm64.exe" - SHA512 d0ff53fefedeba588ad583f99ab2c2420fe0b30a1efb88e4ce556436f1d5d8d76c69f28be7ca7209660212d017a1a404bcdb43349743a4142a7c3e88937ce1d3 + SHA512 8b01d120954e29e532ded2a38bd3ba883310e48655eab6af884ddcb9c4516640b59ed0d970d01eec189c7b4d04593b51a79739895761f2514c1e8f0df8504d99 ) file(INSTALL "${XWBTOOL_EXE}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") diff --git a/ports/directxtk12/usage b/ports/directxtk12/usage index b9b9c8c6075f6d..5a2893111ab14f 100644 --- a/ports/directxtk12/usage +++ b/ports/directxtk12/usage @@ -1,4 +1,4 @@ -The DirectX Tool Kit for DX12 package is compatible with built-in CMake targets: +The DirectX Tool Kit for DX12 package provides CMake targets find_package(directxtk12 CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::DirectXTK12) diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 90c37b34ef05a7..844b9aff73bb55 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2023-10-28", + "version-date": "2023-12-31", "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/openexr/portfile.cmake b/ports/openexr/portfile.cmake index 8ffa6c76bb898f..0861fc0933910c 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF -DBUILD_DOCS=OFF + -DOPENEXR_INSTALL_PKG_CONFIG=ON OPTIONS_DEBUG -DOPENEXR_BUILD_TOOLS=OFF -DOPENEXR_INSTALL_TOOLS=OFF @@ -28,6 +29,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenEXR) + vcpkg_fixup_pkgconfig() if(OPENEXR_INSTALL_TOOLS) @@ -43,4 +45,4 @@ file(REMOVE_RECURSE ) 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 7f35bfac6911f1..f5536a0c4a0021 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openexr", "version": "3.1.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/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index d87c6b2d639e27..f8dd8ca582e0cd 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -1,4 +1,4 @@ -set(UVATLAS_TAG oct2023) +set(UVATLAS_TAG dec2023) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas REF ${UVATLAS_TAG} - SHA512 2ad831663a0db907c21cc13af766704ff9b037a55032bed0e99e71aae496df367e00a7ee146b4f2223fa1390c4ad3f050a79dd6ffdbc0f16982dbb3592da8912 + SHA512 44caebdb6c4c2fc42c8dbbe4acbaf7046996dfcd08e36d622c50a024c1ea3968e1174bd4bf35356068d163c76ac88b697bebb4904dcd2c2bdb6e3e2daf9781d3 HEAD_REF main PATCHES openexr.patch ) @@ -19,16 +19,19 @@ vcpkg_check_features( tools BUILD_TOOLS ) +set(EXTRA_OPTIONS -DBUILD_TESTING=OFF) + if (VCPKG_HOST_IS_LINUX) message(WARNING "Build ${PORT} requires GCC version 9 or later") endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF + OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas) if("tools" IN_LIST FEATURES) @@ -41,7 +44,7 @@ if("tools" IN_LIST FEATURES) UVATLASTOOL_EXE URLS "https://github.com/Microsoft/UVAtlas/releases/download/${UVATLAS_TAG}/uvatlastool.exe" FILENAME "uvatlastool-${UVATLAS_TAG}.exe" - SHA512 66b773c97dc591785c7472557da7f9df0f682dd8b20a4751aa4e3ad97c3a0edc6080ce563ac49d21e3781a12ca0c748e1aa032b20839bcf06f6d21133e5cc8e1 + SHA512 d8c76c4745e120f45e99330be09498e53d013d64342c7df836a9d3bc6746cfc1d0d351b9d7d8ae76c24206f3032d98a4402a04b8a6450d2ced68594675f9be08 ) file(INSTALL diff --git a/ports/uvatlas/usage b/ports/uvatlas/usage index 274e13b76bef6c..a5fb208b410a9e 100644 --- a/ports/uvatlas/usage +++ b/ports/uvatlas/usage @@ -1,4 +1,4 @@ -The package UVAtlas is compatible with built-in CMake targets: +The UVAtlas package provides CMake targets: find_package(uvatlas CONFIG REQUIRED) target_link_libraries(main PRIVATE Microsoft::UVAtlas) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index e1309e5765bdfb..ccaacdc799b972 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2023-10-31", + "version-date": "2023-12-31", "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 a6c93e398dc6b7..5947560412ea4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2181,11 +2181,11 @@ "port-version": 0 }, "directxmath": { - "baseline": "2022-12-12", + "baseline": "2023-12-31", "port-version": 0 }, "directxmesh": { - "baseline": "2023-10-28", + "baseline": "2023-12-31", "port-version": 0 }, "directxsdk": { @@ -2193,15 +2193,15 @@ "port-version": 7 }, "directxtex": { - "baseline": "2023-10-28", + "baseline": "2023-12-31", "port-version": 0 }, "directxtk": { - "baseline": "2023-10-28", + "baseline": "2023-12-31", "port-version": 0 }, "directxtk12": { - "baseline": "2023-10-28", + "baseline": "2023-12-31", "port-version": 0 }, "dirent": { @@ -6270,7 +6270,7 @@ }, "openexr": { "baseline": "3.1.8", - "port-version": 0 + "port-version": 1 }, "openfbx": { "baseline": "2022-07-18", @@ -8777,7 +8777,7 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2023-10-31", + "baseline": "2023-12-31", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json index d31db6cdd3f86b..c51264486c3f3e 100644 --- a/versions/d-/directxmath.json +++ b/versions/d-/directxmath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7b031efa3bb41535fde116ad3cec2674a2764cd", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "ecd21e108091a293a27869c9c093ad558ffcdc42", "version-date": "2022-12-12", diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index 368244dbb909e7..3489013279656b 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e63a47ffc37c894672b093434b97137d86e599f", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "174e5777bf0c14a32b9182a55f29a4f6c23c2226", "version-date": "2023-10-28", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 6cacdf4b18e0cb..23b2e0cd2d948a 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "badb59a9a275010d4edfa78e2f63d35a91341126", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "7721548fe4f3648dae608b765e757f69db31fe02", "version-date": "2023-10-28", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 881328b3d45ad6..0e63a430cb6bcd 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c817d9e4e03e8e1b848d90681b3ae042dbf3f50", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "8f18ff4afb77acfd3b6383375fd2016746b192d2", "version-date": "2023-10-28", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index b11b88517435cf..d8317980dd0df5 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "812ae3f8a37d56767d5bf058d1c02320a5b10183", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "753353fa24f0d2c86cb75b0c6a881b621835a572", "version-date": "2023-10-28", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index a96caff4d670d2..05859ca34bf2c4 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3823a9121b31308e654b79c1be1dd2d3f195f4c", + "version": "3.1.8", + "port-version": 1 + }, { "git-tree": "36064f5fe46f2399a9a532fdb6d7542dae7faede", "version": "3.1.8", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index ded0661e08b70d..4a5e30a1682343 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e9c34981bb0811581e42a967e3168cf4caae0b1", + "version-date": "2023-12-31", + "port-version": 0 + }, { "git-tree": "b19700b61aeb3ea159f83d6f2184708142ebae73", "version-date": "2023-10-31", From c5c8f07fc5cdf9e236a6e095fec9ef3b3c7814fa Mon Sep 17 00:00:00 2001 From: klaus triendl Date: Wed, 3 Jan 2024 00:38:09 +0200 Subject: [PATCH 0734/1039] [krabsetw] Updated to 4.3.2 (#35967) --- ports/krabsetw/portfile.cmake | 4 ++-- ports/krabsetw/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/krabsetw.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/krabsetw/portfile.cmake b/ports/krabsetw/portfile.cmake index d90e50b8278f10..f99dc5b73471a7 100644 --- a/ports/krabsetw/portfile.cmake +++ b/ports/krabsetw/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/krabsetw - REF 3bc145fb55212aaf121be88c3a2f25afa2e07b42 - SHA512 e25e6525a61df367ba782701cb5f22d8262b6451368dbead2ea901f59eb1479a1364d58da20e47e2413db3cb45c6b46a992a1aeb9bff60ad137ffdb91b4aba60 + REF 550f5edfdb6464567d7a618702316183d31746e5 + SHA512 0e02e04b79d4f856962c135023b87057898cb9a05f8056e0dc2bca7c4bb6227a660097f5251134086d1334f2a8e1541b4e963667ccd4f5c5ed6d60aa32c2c968 HEAD_REF master ) diff --git a/ports/krabsetw/vcpkg.json b/ports/krabsetw/vcpkg.json index 6428581a1949d9..b5808373aa37c3 100644 --- a/ports/krabsetw/vcpkg.json +++ b/ports/krabsetw/vcpkg.json @@ -1,6 +1,6 @@ { "name": "krabsetw", - "version": "4.3.1", + "version": "4.3.2", "description": "krabsetw is a header-only C++ library that simplifies interacting with ETW.", "homepage": "https://github.com/microsoft/krabsetw", "supports": "windows & !uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 5947560412ea4d..6ee3e4b2712f13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3945,7 +3945,7 @@ "port-version": 1 }, "krabsetw": { - "baseline": "4.3.1", + "baseline": "4.3.2", "port-version": 0 }, "ktx": { diff --git a/versions/k-/krabsetw.json b/versions/k-/krabsetw.json index eeced5017d3fc5..ebf9881b3cb7d6 100644 --- a/versions/k-/krabsetw.json +++ b/versions/k-/krabsetw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be73b46ea3a3a59a80d5c45870b495d6081a4ba5", + "version": "4.3.2", + "port-version": 0 + }, { "git-tree": "131b7ae7482a9c9eedcd0c819265d3ab39b0d4c5", "version": "4.3.1", From a344996f1d9c80a73c5d9b9b0426886d26b29da5 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 2 Jan 2024 17:39:37 -0500 Subject: [PATCH 0735/1039] [fmt] Update to 10.2.0 (#35971) --- ports/fmt/fix-format-conflict.patch | 15 --------------- ports/fmt/portfile.cmake | 5 ++--- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 5 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 ports/fmt/fix-format-conflict.patch diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch deleted file mode 100644 index 0a2ac6a57a24da..00000000000000 --- a/ports/fmt/fix-format-conflict.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h -index f44df01c..59cc4559 100644 ---- a/include/fmt/format-inl.h -+++ b/include/fmt/format-inl.h -@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, - error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); - auto it = buffer_appender(out); - if (message.size() <= inline_buffer_size - error_code_size) -- format_to(it, FMT_STRING("{}{}"), message, SEP); -- format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); -+ fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); -+ fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); - FMT_ASSERT(out.size() <= inline_buffer_size, ""); - } - diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index db7a08bd14ad2e..2675715cce36d6 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 288c349baac5f96f527d5b1bed0fa5f031aa509b4526560c684281388e91909a280c3262a2474d963b5d1bf7064b1c9930c6677fe54a0d8f86982d063296a54c + SHA512 b90f8ab1692fcae9146f8cad5c5c26a2b5ceb6a0460003e01cabe8a75c0aa2fea1c3760dc3214eddaf08984a1695747ea8b1f3124c40c54cbadfd45458fa4b2d HEAD_REF master PATCHES fix-write-batch.patch - fix-format-conflict.patch ) vcpkg_cmake_configure( @@ -35,4 +34,4 @@ file(REMOVE_RECURSE ) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.rst") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index acf9fd0885e22c..34d29aa44f3a0e 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "10.1.1", + "version": "10.2.0", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6ee3e4b2712f13..e70b38cc34589a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2713,7 +2713,7 @@ "port-version": 2 }, "fmt": { - "baseline": "10.1.1", + "baseline": "10.2.0", "port-version": 0 }, "folly": { diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 009a8810507334..f7bf20d6779cbd 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f91bb86075f45f6fad0c35ab9e87d8ea43c9d389", + "version": "10.2.0", + "port-version": 0 + }, { "git-tree": "dfe9aa860f5a8317f341a21d317be1cf44e89f18", "version": "10.1.1", From 742c086636a9cfb57eb77a6cc5f2d6832666d169 Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Wed, 3 Jan 2024 05:42:40 +0700 Subject: [PATCH 0736/1039] [qtmultimedia] Fix build for Android by disabling pulseaudio (#35982) --- ports/qtmultimedia/portfile.cmake | 4 ++-- ports/qtmultimedia/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtmultimedia.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 90062d6c696963..4717d040d4d257 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -61,7 +61,7 @@ endif() if("ffmpeg" IN_LIST FEATURES) # Note: Requires pulsadio on linux and wmfsdk on windows list(APPEND FEATURE_OPTIONS "-DINPUT_ffmpeg='yes'") - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_ANDROID) list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='no'") else() list(APPEND FEATURE_OPTIONS "-DINPUT_pulseaudio='yes'") @@ -83,4 +83,4 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6Multimedia/Qt6QGstreamerMediaPluginDependencies.cmake" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl" "GStreamer\;FALSE\;\;\;;GStreamer\;FALSE\;\;App\;;GStreamer\;FALSE\;\;\;Gl;EGL\;FALSE\;\;\;" ) -endif() \ No newline at end of file +endif() diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index b44d81ae872062..ccf1a2e11c4be1 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtmultimedia", "version": "6.6.1", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e70b38cc34589a..69e4fff21098ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7190,7 +7190,7 @@ }, "qtmultimedia": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.6.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 22421481353791..6db5e28c77c200 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52e73bfd242a271f6147df96f811412a325e2bb7", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "04543c19ec8a0f02404b1d58fc84396c3ff50357", "version": "6.6.1", From 64e15f6669480b2d2bff1e5e815c571a8213421e Mon Sep 17 00:00:00 2001 From: commonbreed <145810482+commonbreed@users.noreply.github.com> Date: Wed, 3 Jan 2024 09:00:03 +0000 Subject: [PATCH 0737/1039] [directxsdk] Add missing d3d9 header and lib (#35997) --- ports/directxsdk/portfile.cmake | 3 +++ ports/directxsdk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directxsdk.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/directxsdk/portfile.cmake b/ports/directxsdk/portfile.cmake index b6c8afe6a5e3d5..ac2c22b67286c8 100644 --- a/ports/directxsdk/portfile.cmake +++ b/ports/directxsdk/portfile.cmake @@ -33,6 +33,8 @@ set(HEADERS ${INC_DIR}/D3DX11async.h ${INC_DIR}/D3DX11core.h ${INC_DIR}/D3DX11tex.h + ${INC_DIR}/d3d9.h + ${INC_DIR}/d3d9types.h ${INC_DIR}/d3dx9.h ${INC_DIR}/d3dx9anim.h ${INC_DIR}/d3dx9core.h @@ -70,6 +72,7 @@ set(RELEASE_LIBS ${LIB_DIR}/d3dx9.lib ) set(OTHER_LIBS + ${LIB_DIR}/d3d9.lib ${LIB_DIR}/d3dxof.lib ${LIB_DIR}/DxErr.lib ) diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index d92de898dfeb04..4591dc653b2690 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 7, + "port-version": 8, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 69e4fff21098ee..305f2328f0f781 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2190,7 +2190,7 @@ }, "directxsdk": { "baseline": "jun10", - "port-version": 7 + "port-version": 8 }, "directxtex": { "baseline": "2023-12-31", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index 3d48f8c15ed9fc..5504311c40808c 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c82a75b02160ef435f13eb2fda1f2079013bca68", + "version-string": "jun10", + "port-version": 8 + }, { "git-tree": "10f6ac11c6480f52d70ff2725cf34fd39b942376", "version-string": "jun10", From 88105586165bfe1515eaff607e076af04caa0ac1 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 4 Jan 2024 08:56:55 +0800 Subject: [PATCH 0738/1039] [libdatachannel] Fix dependency not found (#35618) --- ports/libdatachannel/fix_dependency.patch | 40 +++++++++++++++++++++++ ports/libdatachannel/portfile.cmake | 6 +++- ports/libdatachannel/vcpkg.json | 1 + ports/usrsctp/fix_export.patch | 28 ++++++++++++++++ ports/usrsctp/portfile.cmake | 5 ++- ports/usrsctp/vcpkg.json | 6 +++- versions/baseline.json | 4 +-- versions/l-/libdatachannel.json | 5 +++ versions/u-/usrsctp.json | 5 +++ 9 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 ports/libdatachannel/fix_dependency.patch create mode 100644 ports/usrsctp/fix_export.patch diff --git a/ports/libdatachannel/fix_dependency.patch b/ports/libdatachannel/fix_dependency.patch new file mode 100644 index 00000000000000..88e44dcd988f71 --- /dev/null +++ b/ports/libdatachannel/fix_dependency.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f604628..1610166 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -239,7 +239,7 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) + + if(USE_SYSTEM_PLOG) +- find_package(plog REQUIRED) ++ find_package(plog CONFIG REQUIRED) + else() + set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) + add_subdirectory(deps/plog EXCLUDE_FROM_ALL) +@@ -250,7 +250,7 @@ if(SCTP_DEBUG) + endif() + + if(USE_SYSTEM_USRSCTP) +- find_package(Usrsctp REQUIRED) ++ find_package(unofficial-usrsctp CONFIG REQUIRED) + else() + option(sctp_build_shared_lib OFF) + option(sctp_build_programs OFF) +@@ -294,7 +294,7 @@ target_include_directories(datachannel PUBLIC + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_link_libraries(datachannel PRIVATE Threads::Threads) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel PRIVATE unofficial::usrsctp::usrsctp plog::plog) + + target_include_directories(datachannel-static PUBLIC + $ +@@ -302,7 +302,7 @@ target_include_directories(datachannel-static PUBLIC + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_link_libraries(datachannel-static PRIVATE Threads::Threads) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel-static PRIVATE unofficial::usrsctp::usrsctp plog::plog) + + if(WIN32) + target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index c46f2a5cdd21b8..a91db51253527c 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 2c8da820ebf6751d696645092ea5e562f7cb303d4f5cec9a8ca8e69b65321e79cc8a645095a4ecea710f5afd54499e71f4cdf261a0a2e32e28aef96a50ace28c HEAD_REF master - PATCHES ${PATCHES} + PATCHES + ${PATCHES} + fix_dependency.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DATACHANNEL_STATIC_LINKAGE) @@ -44,6 +46,8 @@ include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(OpenSSL) find_dependency(LibJuice) +find_dependency(plog CONFIG) +find_dependency(libSRTP CONFIG) ${DATACHANNEL_CONFIG}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 0abf18fd08c315..275a755a0517b6 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.19.4", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/ports/usrsctp/fix_export.patch b/ports/usrsctp/fix_export.patch new file mode 100644 index 00000000000000..2198094ebf6257 --- /dev/null +++ b/ports/usrsctp/fix_export.patch @@ -0,0 +1,28 @@ +diff --git a/usrsctplib/CMakeLists.txt b/usrsctplib/CMakeLists.txt +index aa99cf2..c60b393 100644 +--- a/usrsctplib/CMakeLists.txt ++++ b/usrsctplib/CMakeLists.txt +@@ -174,7 +174,8 @@ list(APPEND usrsctp_sources + + add_library(usrsctp ${usrsctp_sources} ${usrsctp_headers}) + +-target_include_directories(usrsctp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) ++target_include_directories(usrsctp PUBLIC $ ++ $) + + if (WIN32) + message(STATUS "link library: ws2_32") +@@ -188,8 +189,12 @@ set_target_properties(usrsctp PROPERTIES SOVERSION ${SOVERSION_SHORT} VERSION ${ + # INSTALL LIBRARY AND HEADER + ################################################# + +-install(TARGETS usrsctp DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS usrsctp EXPORT unofficial-usrsctp-config ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin) + install(FILES usrsctp.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(EXPORT unofficial-usrsctp-config NAMESPACE unofficial::usrsctp:: DESTINATION share/unofficial-usrsctp) + + ################################################# + # GENERATE AND INSTALL PKG-CONFIG FILE diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake index 55ea67667acf41..4dba4cc159fe1c 100644 --- a/ports/usrsctp/portfile.cmake +++ b/ports/usrsctp/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 0.9.5.0 SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3 HEAD_REF master + PATCHES + fix_export.patch ) vcpkg_cmake_configure( @@ -23,4 +25,5 @@ configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsct vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json index f7ab9991dbe4da..a8a506196f4511 100644 --- a/ports/usrsctp/vcpkg.json +++ b/ports/usrsctp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usrsctp", "version": "0.9.5.0", - "port-version": 2, + "port-version": 3, "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.", "homepage": "https://github.com/sctplab/usrsctp", "license": "BSD-3-Clause", @@ -9,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 305f2328f0f781..f3382b155d11f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4186,7 +4186,7 @@ }, "libdatachannel": { "baseline": "0.19.4", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.13", @@ -8746,7 +8746,7 @@ }, "usrsctp": { "baseline": "0.9.5.0", - "port-version": 2 + "port-version": 3 }, "utf8-range": { "baseline": "2023-11-09", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 7ba284b21d6ab0..922eda14d6c51e 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3364c6dfb715277d483a8e0410a98fe84a65345", + "version-semver": "0.19.4", + "port-version": 1 + }, { "git-tree": "3e45715d7c64f9b22c87aff96594979f11e872a7", "version-semver": "0.19.4", diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json index 9866648ceead3b..2060e07dd7eacb 100644 --- a/versions/u-/usrsctp.json +++ b/versions/u-/usrsctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c30cd146c1f7b69d5a8f43fbb615e3bbb42b6ee", + "version": "0.9.5.0", + "port-version": 3 + }, { "git-tree": "8ac1cb14a09660bf33bd8f3dc7727bcf8080ae02", "version": "0.9.5.0", From d044846ca131a6839059edf4bd0bb06ab391db24 Mon Sep 17 00:00:00 2001 From: Clemens Wasser Date: Thu, 4 Jan 2024 02:17:02 +0100 Subject: [PATCH 0739/1039] [skia] Fix Debug INTERFACE_COMPILE_COMMANDS (#35800) --- ports/skia/unofficial-skia-targets-details.cmake | 2 +- ports/skia/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/skia.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/skia/unofficial-skia-targets-details.cmake b/ports/skia/unofficial-skia-targets-details.cmake index 8246b36081f794..9d74800ed7feaa 100644 --- a/ports/skia/unofficial-skia-targets-details.cmake +++ b/ports/skia/unofficial-skia-targets-details.cmake @@ -6,8 +6,8 @@ if("@has_location@") set_property(TARGET @cmake_target@ APPEND PROPERTY IMPORTED_CONFIGURATIONS "@cmake_build_type@") set_target_properties(@cmake_target@ PROPERTIES IMPORTED_LOCATION_@cmake_build_type@ "@imported_location@") if("@not_executable@") + set_property(TARGET @cmake_target@ APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "\$<@cmake_config_genex@:@interface_compile_definitions@>") set_target_properties(@cmake_target@ PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "\$<@cmake_config_genex@:@interface_compile_definitions@>" INTERFACE_INCLUDE_DIRECTORIES "@CURRENT_PACKAGES_DIR@/include/@PORT@" IMPORTED_LINK_INTERFACE_LANGUAGES_@cmake_build_type@ "@link_language@" ) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 928c840da9c20f..5fef98a364ef26 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.38.2", - "port-version": 2, + "port-version": 3, "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 f3382b155d11f2..064a54ccf65771 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7942,7 +7942,7 @@ }, "skia": { "baseline": "0.38.2", - "port-version": 2 + "port-version": 3 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 951d085a0981e0..4733a4c6ce27a3 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35eec017ed472e7061cc38768bb4aa9168464332", + "version": "0.38.2", + "port-version": 3 + }, { "git-tree": "ce919437fcbcbfe2c364757efdc117a286f44fa2", "version": "0.38.2", From 98d825aa8339c9ce10b240c0a956a5653ee16d03 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:31:13 +0800 Subject: [PATCH 0740/1039] [vcpkg][workflows] Bold warning output information (#35902) --- .github/workflows/untrustedPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 723a499589820c..f350977690749a 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -96,7 +96,7 @@ jobs: if (deprecated_function.length > 0) { var deprecated_output = ''; - deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n" + deprecated_output += "**You have modified or added at least one portfile where deprecated functions are used**\n" deprecated_output += "If you feel able to do so, please consider migrating them to the new functions.\n"; core.warning(deprecated_output); From 4a938d424065c712de6189488085b7008f71d3e7 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 3 Jan 2024 17:32:13 -0800 Subject: [PATCH 0741/1039] [libxdiff] fix the imported target error (#35905) Co-authored-by: vzhli17 --- ports/libxdiff/fix-usage-error.patch | 15 +++++++++++++++ ports/libxdiff/portfile.cmake | 4 +++- ports/libxdiff/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxdiff.json | 5 +++++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 ports/libxdiff/fix-usage-error.patch diff --git a/ports/libxdiff/fix-usage-error.patch b/ports/libxdiff/fix-usage-error.patch new file mode 100644 index 00000000000000..e7f28e30b30d82 --- /dev/null +++ b/ports/libxdiff/fix-usage-error.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33c34c2..1d93cde 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,8 +87,9 @@ INSTALL ( + EXPORT XDiffTargets + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib ++ RUNTIME DESTINATION bin + ) ++target_include_directories(xdiff INTERFACE "$" "$") + + WRITE_BASIC_PACKAGE_VERSION_FILE ( + "${CMAKE_CURRENT_BINARY_DIR}/XDiff/XDiffConfigVersion.cmake" diff --git a/ports/libxdiff/portfile.cmake b/ports/libxdiff/portfile.cmake index eb2bc82771c8c9..74dbc2d30a3983 100644 --- a/ports/libxdiff/portfile.cmake +++ b/ports/libxdiff/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_from_github( REF ${LIBXDIFF_REF} SHA512 ${LIBXDIFF_SHA512} HEAD_REF master + PATCHES + fix-usage-error.patch ) vcpkg_cmake_configure( @@ -35,7 +37,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) endif() endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") vcpkg_copy_pdbs() diff --git a/ports/libxdiff/vcpkg.json b/ports/libxdiff/vcpkg.json index 73a404c921d8ed..5c54cdf44e0de1 100644 --- a/ports/libxdiff/vcpkg.json +++ b/ports/libxdiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxdiff", "version": "0.23", - "port-version": 3, + "port-version": 4, "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", "homepage": "https://github.com/Drako/libxdiff", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 064a54ccf65771..612b77ab822cfb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5062,7 +5062,7 @@ }, "libxdiff": { "baseline": "0.23", - "port-version": 3 + "port-version": 4 }, "libxdmcp": { "baseline": "1.1.3", diff --git a/versions/l-/libxdiff.json b/versions/l-/libxdiff.json index 09e24cee016443..2d640a34ae0b1d 100644 --- a/versions/l-/libxdiff.json +++ b/versions/l-/libxdiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c416f4eaabd3ca0697fcf4e004e99975d23bd00", + "version": "0.23", + "port-version": 4 + }, { "git-tree": "ce9f54a13c2317e8249e154d852fa5d7ee0940c3", "version": "0.23", From baad52570ff20539eb5cb11945ebffbc041b879a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Jan 2024 02:33:26 +0100 Subject: [PATCH 0742/1039] [kenlm] Fixes and cleanup (#35907) --- ports/kenlm/cmake-config.patch | 29 ++++++++++++++ ports/kenlm/devendor.patch | 42 ++++++++++++++++++++ ports/kenlm/fix-boost-imported-targets.patch | 33 --------------- ports/kenlm/fix-boost.patch | 17 +++++++- ports/kenlm/portfile.cmake | 27 ++++++++----- ports/kenlm/vcpkg.json | 9 ++--- versions/baseline.json | 2 +- versions/k-/kenlm.json | 5 +++ 8 files changed, 112 insertions(+), 52 deletions(-) create mode 100644 ports/kenlm/cmake-config.patch create mode 100644 ports/kenlm/devendor.patch delete mode 100644 ports/kenlm/fix-boost-imported-targets.patch diff --git a/ports/kenlm/cmake-config.patch b/ports/kenlm/cmake-config.patch new file mode 100644 index 00000000000000..5e87e68893d653 --- /dev/null +++ b/ports/kenlm/cmake-config.patch @@ -0,0 +1,29 @@ +diff --git a/cmake/kenlmConfig.cmake.in b/cmake/kenlmConfig.cmake.in +index 592407d..86abd36 100644 +--- a/cmake/kenlmConfig.cmake.in ++++ b/cmake/kenlmConfig.cmake.in +@@ -5,6 +5,12 @@ include(CMakeFindDependencyMacro) + find_dependency(Boost) + find_dependency(Threads) + find_dependency(double-conversion CONFIG) ++if("@ENABLE_INTERPOLATE@") ++ find_dependency(Eigen3) ++ if("@OPENMP_CXX_FOUND@") ++ find_dependency(OpenMP) ++ endif() ++endif() + + # Compression libs + if (@ZLIB_FOUND@) +diff --git a/lm/interpolate/CMakeLists.txt b/lm/interpolate/CMakeLists.txt +index d23e959..26b6092 100644 +--- a/lm/interpolate/CMakeLists.txt ++++ b/lm/interpolate/CMakeLists.txt +@@ -24,6 +24,7 @@ if(ENABLE_INTERPOLATE) + + + find_package(OpenMP) ++ set(OPENMP_CXX_FOUND "${OPENMP_CXX_FOUND}" CACHE INTERNAL "For exported config") + if (OPENMP_CXX_FOUND) + target_link_libraries(kenlm_interpolate PUBLIC OpenMP::OpenMP_CXX) + endif() diff --git a/ports/kenlm/devendor.patch b/ports/kenlm/devendor.patch new file mode 100644 index 00000000000000..891620b769ec52 --- /dev/null +++ b/ports/kenlm/devendor.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd08a48..7439ebf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,7 +128,7 @@ install(EXPORT kenlmTargets + DESTINATION share/kenlm/cmake + ) + +-foreach(SUBDIR IN ITEMS util util/double-conversion util/stream lm lm/builder lm/common lm/filter lm/interpolate) ++foreach(SUBDIR IN ITEMS util util/stream lm lm/builder lm/common lm/filter lm/interpolate) + file(GLOB HEADERS ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.h ${CMAKE_CURRENT_LIST_DIR}/${SUBDIR}/*.hh) + install(FILES ${HEADERS} DESTINATION include/kenlm/${SUBDIR} COMPONENT headers) + endforeach(SUBDIR) +diff --git a/cmake/kenlmConfig.cmake.in b/cmake/kenlmConfig.cmake.in +index 0fbf0c6..592407d 100644 +--- a/cmake/kenlmConfig.cmake.in ++++ b/cmake/kenlmConfig.cmake.in +@@ -4,6 +4,7 @@ include(CMakeFindDependencyMacro) + + find_dependency(Boost) + find_dependency(Threads) ++find_dependency(double-conversion CONFIG) + + # Compression libs + if (@ZLIB_FOUND@) +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 7a96ef5..3318d73 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -32,10 +32,11 @@ if (WIN32) + endif() + + # This directory has children that need to be processed +-add_subdirectory(double-conversion) ++find_package(double-conversion CONFIG REQUIRED) + add_subdirectory(stream) + + add_library(kenlm_util ${KENLM_UTIL_DOUBLECONVERSION_SOURCE} ${KENLM_UTIL_STREAM_SOURCE} ${KENLM_UTIL_SOURCE}) ++target_link_libraries(kenlm_util PRIVATE double-conversion::double-conversion) + # Since headers are relative to `include/kenlm` at install time, not just `include` + target_include_directories(kenlm_util PUBLIC $) + diff --git a/ports/kenlm/fix-boost-imported-targets.patch b/ports/kenlm/fix-boost-imported-targets.patch deleted file mode 100644 index f1987ca4362109..00000000000000 --- a/ports/kenlm/fix-boost-imported-targets.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt -index 7a96ef5..0708d8a 100644 ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -85,7 +85,10 @@ set_target_properties(kenlm_util PROPERTIES POSITION_INDEPENDENT_CODE ON) - target_link_libraries(kenlm_util - PUBLIC - # Boost is required for building binaries and tests -- "$" -+ $ -+ $ -+ $ -+ $ - PRIVATE - Threads::Threads - ${RT}) -diff --git a/util/stream/CMakeLists.txt b/util/stream/CMakeLists.txt -index be2fe00..a7e7df5 100644 ---- a/util/stream/CMakeLists.txt -+++ b/util/stream/CMakeLists.txt -@@ -35,5 +35,11 @@ if(BUILD_TESTING) - ) - - AddTests(TESTS ${KENLM_BOOST_TESTS_LIST} -- LIBRARIES kenlm_util ${Boost_LIBRARIES} Threads::Threads) -+ LIBRARIES -+ kenlm_util -+ Boost::program_options -+ Boost::system -+ Boost::thread -+ Boost::unit_test_framework -+ Threads::Threads) - endif() diff --git a/ports/kenlm/fix-boost.patch b/ports/kenlm/fix-boost.patch index 3eded1c69c6e08..77d23d817204da 100644 --- a/ports/kenlm/fix-boost.patch +++ b/ports/kenlm/fix-boost.patch @@ -1,12 +1,25 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bec81d4..44fd48a 100644 +index 3c6c863..fd08a48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -if (WIN32) -+if (WIN32 AND BUILD_SHARED_LIBS) ++if (0) set(Boost_USE_STATIC_LIBS OFF) # The auto-linking feature has problems with USE_STATIC_LIBS off, so we use # BOOST_ALL_NO_LIB to turn it off. +@@ -100,6 +100,12 @@ find_package(Boost 1.41.0 REQUIRED COMPONENTS + thread + unit_test_framework + ) ++set(Boost_LIBRARIES ++ Boost::program_options ++ Boost::system ++ Boost::thread ++ Boost::unit_test_framework ++) + + # Define where include files live + include_directories(${Boost_INCLUDE_DIRS}) diff --git a/ports/kenlm/portfile.cmake b/ports/kenlm/portfile.cmake index 15917d9253459d..bc57af00e8666b 100644 --- a/ports/kenlm/portfile.cmake +++ b/ports/kenlm/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -7,11 +9,14 @@ vcpkg_from_github( SHA512 04b645d09e60b65cb1e5065a1623ad01737f0dd9415cf620288ace0db10b1c424d72f304b34c52fa08684f3fecdaad9db91088134f34ed374cb1eb9d58c635b5 HEAD_REF master PATCHES + devendor.patch + cmake-config.patch fix-boost.patch - fix-boost-imported-targets.patch ) - -file(REMOVE "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake") +file(REMOVE_RECURSE + "${SOURCE_PATH}/cmake/modules/FindEigen3.cmake" + "${SOURCE_PATH}/util/double-conversion" +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -22,19 +27,20 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DFORCE_STATIC=OFF #already handled by vcpkg + -DCMAKE_CXX_STANDARD=11 # 17 removes std::binary_function + -DFORCE_STATIC=OFF # handled by vcpkg -DENABLE_PYTHON=OFF # kenlm.lib(bhiksha.cc.obj) : fatal error LNK1000: Internal error during IMAGE::Pass2 -DCOMPILE_TESTS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/kenlm/cmake) set(KENLM_TOOLS count_ngrams filter fragment kenlm_benchmark lmplz phrase_table_vocab query build_binary) if (NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND KENLM_TOOLS probing_hash_table_benchmark) - if ("interpolate" IN_LIST FEATURES) - list(APPEND KENLM_TOOLS interpolate) - endif() +endif() +if ("interpolate" IN_LIST FEATURES) + list(APPEND KENLM_TOOLS interpolate) endif() vcpkg_copy_tools(TOOL_NAMES ${KENLM_TOOLS} AUTO_CLEAN) @@ -43,5 +49,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Copyright and License -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE" "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") diff --git a/ports/kenlm/vcpkg.json b/ports/kenlm/vcpkg.json index 4eaffd89e6077a..09dd862010df0e 100644 --- a/ports/kenlm/vcpkg.json +++ b/ports/kenlm/vcpkg.json @@ -1,8 +1,9 @@ { "name": "kenlm", "version": "20230531", + "port-version": 1, "description": "KenLM: Faster and Smaller Language Model Queries", - "license": "LGPL-2.1", + "license": null, "supports": "!(arm64 & windows)", "dependencies": [ "boost-interprocess", @@ -12,6 +13,7 @@ "boost-test", "boost-thread", "bzip2", + "double-conversion", "liblzma", { "name": "vcpkg-cmake", @@ -28,10 +30,7 @@ "description": "Build interpolation program", "supports": "!windows", "dependencies": [ - { - "name": "eigen3", - "platform": "!windows" - } + "eigen3" ] } } diff --git a/versions/baseline.json b/versions/baseline.json index 612b77ab822cfb..cb23f21305a882 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "kenlm": { "baseline": "20230531", - "port-version": 0 + "port-version": 1 }, "kerbal": { "baseline": "2023.12.1", diff --git a/versions/k-/kenlm.json b/versions/k-/kenlm.json index b0d7dbb03de4aa..33d960b7b30680 100644 --- a/versions/k-/kenlm.json +++ b/versions/k-/kenlm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3473d89b5d9e5bfc847a3b3575a5843b729b71ee", + "version": "20230531", + "port-version": 1 + }, { "git-tree": "bb9e0ae36b74ecd5bfb6a8855e761138eeda9185", "version": "20230531", From 8f4ba99ace9e591e1303da61e2f995a52588a54b Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:33:46 +0800 Subject: [PATCH 0743/1039] [daw-header-libraries] Update to 2.97.0 (#36001) --- ports/daw-header-libraries/portfile.cmake | 2 +- ports/daw-header-libraries/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/daw-header-libraries.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 8bd515fa59389c..527fd84eccb728 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries REF "v${VERSION}" - SHA512 98b8a8171998a1e00b99a9fc2f3ec868758ae6f9ae081b60574f0be525e17c1f0db37a87571367dfbda66feb76ef9b8024849987c00a0e92502090c25b821ec3 + SHA512 8e41be509fc62f1421ec987b409203b48e2041b225a468a8d9bc79e1ac0f8261e4b60009c7f6b205c7a5a0ded4b385fe8b38bb1d3d2b1abc1e5399b26d0aced9 HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 05300831c3af3f..2e6737d293bc4d 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.96.1", + "version": "2.97.0", "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 cb23f21305a882..7600cf5049aa08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2109,7 +2109,7 @@ "port-version": 1 }, "daw-header-libraries": { - "baseline": "2.96.1", + "baseline": "2.97.0", "port-version": 0 }, "daw-json-link": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index ab5df0e004366a..2a0292067d02f9 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3646a7d51cdffec8d94d24bd71ea60ffeab50cbd", + "version": "2.97.0", + "port-version": 0 + }, { "git-tree": "6d22d6790c0b6ef8ae4ab570ff55882b410e52b4", "version": "2.96.1", From 00d7b89c77976cada23973f49c0bdd184f09072f Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:35:11 +0800 Subject: [PATCH 0744/1039] [fltk] update to 1.3.9 (#35981) --- ports/fltk/dependencies.patch | 96 +++++++++++++++----------------- ports/fltk/fix-narrow.patch | 13 ----- ports/fltk/fix-system-link.patch | 12 ++-- ports/fltk/include.patch | 10 ++-- ports/fltk/portfile.cmake | 11 +++- ports/fltk/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/f-/fltk.json | 5 ++ 8 files changed, 73 insertions(+), 81 deletions(-) delete mode 100644 ports/fltk/fix-narrow.patch diff --git a/ports/fltk/dependencies.patch b/ports/fltk/dependencies.patch index bd4507c34d06c5..848399824ab898 100644 --- a/ports/fltk/dependencies.patch +++ b/ports/fltk/dependencies.patch @@ -1,26 +1,53 @@ diff --git a/CMake/options.cmake b/CMake/options.cmake -index ddd650f..69bcc2e 100644 +index d1e299f..d20e9c8 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake -@@ -63,7 +63,7 @@ endif (APPLE) +@@ -101,11 +101,14 @@ endif () + ####################################################################### + + if (OPTION_USE_SYSTEM_ZLIB) +- find_package (ZLIB) ++ find_package(ZLIB REQUIRED) ++ set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "") + endif () + + if (OPTION_USE_SYSTEM_LIBPNG) +- find_package (PNG) ++ find_package(PNG REQUIRED) ++ set(HAVE_PNG_H "${PNG_FOUND}") ++ set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "") + endif () + + # If we use the system zlib, we must also use the system png zlib and vice versa +@@ -148,7 +151,8 @@ set (HAVE_LIBZ 1) + ####################################################################### + + if (OPTION_USE_SYSTEM_LIBJPEG) +- find_package (JPEG) ++ find_package(JPEG REQUIRED) ++ set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "") + endif () + + if (OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND) +@@ -228,7 +232,7 @@ endif (APPLE) # find X11 libraries and headers set (PATH_TO_XLIBS) - if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32) + if (NOT APPLE AND NOT WIN32) - include (FindX11) + find_package(X11) if (X11_FOUND) set (USE_X11 1) list (APPEND FLTK_LDLIBS -lX11) -@@ -214,7 +214,7 @@ if (OPTION_USE_GL) - unset(HAVE_GL_GLU_H CACHE) - find_file (HAVE_GL_GLU_H GL/glu.h PATHS ${X11_INCLUDE_DIR}) - else() -- include (FindOpenGL) -+ find_package(OpenGL REQUIRED) - if (APPLE) - set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H}) - endif (APPLE) -@@ -285,7 +285,7 @@ set (FLTK_PTHREADS_FOUND FALSE) +@@ -351,7 +355,7 @@ if (HAVE_GL) + endif (HAVE_GL) + + if (OPTION_USE_GL) +- include (FindOpenGL) ++ find_package(OpenGL REQUIRED) + if (APPLE) + set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H}) + endif (APPLE) +@@ -421,7 +425,7 @@ set (FLTK_PTHREADS_FOUND FALSE) if (OPTION_USE_THREADS) @@ -29,39 +56,8 @@ index ddd650f..69bcc2e 100644 if (CMAKE_HAVE_THREADS_LIBRARY) add_definitions ("-D_THREAD_SAFE -D_REENTRANT") -@@ -330,7 +330,8 @@ unset (debug_threads) - option (OPTION_USE_SYSTEM_ZLIB "use system zlib" ON) - - if (OPTION_USE_SYSTEM_ZLIB) -- include (FindZLIB) -+ find_package(ZLIB REQUIRED) -+ set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "") - endif (OPTION_USE_SYSTEM_ZLIB) - - if (ZLIB_FOUND) -@@ -359,7 +360,8 @@ else () - endif (APPLE) - - if (OPTION_USE_SYSTEM_LIBJPEG) -- include (FindJPEG) -+ find_package(JPEG REQUIRED) -+ set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "") - endif (OPTION_USE_SYSTEM_LIBJPEG) - - if (JPEG_FOUND) -@@ -387,7 +389,9 @@ else () - endif (APPLE) - - if (OPTION_USE_SYSTEM_LIBPNG) -- include (FindPNG) -+ find_package(PNG REQUIRED) -+ set(HAVE_PNG_H "${PNG_FOUND}") -+ set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "") - endif (OPTION_USE_SYSTEM_LIBPNG) - - if (PNG_FOUND) diff --git a/CMake/resources.cmake b/CMake/resources.cmake -index 57173f2..734a528 100644 +index a763fb6..5fdb3d5 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -39,7 +39,7 @@ endmacro (fl_find_header) @@ -73,7 +69,7 @@ index 57173f2..734a528 100644 # fl_debug_var (PKG_CONFIG_FOUND) # fl_debug_var (PKG_CONFIG_EXECUTABLE) -@@ -151,8 +151,7 @@ mark_as_advanced (HAVE_X11_XREGION_H) +@@ -131,8 +131,7 @@ mark_as_advanced (HAVE_X11_XREGION_H) # where to find freetype headers @@ -83,19 +79,19 @@ index 57173f2..734a528 100644 if (FREETYPE_PATH) include_directories (${FREETYPE_PATH}) -@@ -162,11 +161,12 @@ mark_as_advanced (FREETYPE_PATH) +@@ -142,11 +141,12 @@ mark_as_advanced (FREETYPE_PATH) ####################################################################### # libraries -find_library (LIB_dl dl) +set(LIB_dl "${CMAKE_DL_LIBS}" CACHE STRING "") - if ((NOT APPLE) OR OPTION_APPLE_X11) + if (NOT APPLE) - find_library (LIB_fontconfig fontconfig) + find_package(Fontconfig REQUIRED) + set(LIB_fontconfig "${Fontconfig_LIBRARIES}" CACHE INTERNAL "") - endif ((NOT APPLE) OR OPTION_APPLE_X11) + endif (NOT APPLE) -find_library (LIB_freetype freetype) +set(LIB_freetype "" CACHE INTERNAL "Obsolete") find_library (LIB_GL GL) find_library (LIB_MesaGL MesaGL) - find_library (LIB_GLEW GLEW) + find_library (LIB_GLEW NAMES GLEW glew32) diff --git a/ports/fltk/fix-narrow.patch b/ports/fltk/fix-narrow.patch deleted file mode 100644 index 1af2eb89dac192..00000000000000 --- a/ports/fltk/fix-narrow.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx -index 4646fe5..3b7f693 100644 ---- a/fluid/ExternalCodeEditor_WIN32.cxx -+++ b/fluid/ExternalCodeEditor_WIN32.cxx -@@ -474,7 +474,7 @@ void ExternalCodeEditor::reap_cleanup() { - int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) { - if ( pid_reaped ) *pid_reaped = 0; - if ( !is_editing() ) return -2; -- int err; -+ DWORD err; - DWORD msecs_wait = 50; // .05 sec - switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) { - case WAIT_TIMEOUT: { // process didn't reap, still running diff --git a/ports/fltk/fix-system-link.patch b/ports/fltk/fix-system-link.patch index 45a4c3521f8a3d..e4c324093b085a 100644 --- a/ports/fltk/fix-system-link.patch +++ b/ports/fltk/fix-system-link.patch @@ -1,16 +1,16 @@ diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake -index 6fa2fc5..e5ba493 100644 +index 7e3490b..682a000 100644 --- a/CMake/fl_add_library.cmake +++ b/CMake/fl_add_library.cmake -@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES}) - +@@ -39,6 +39,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) + target_include_directories(${TARGET_NAME} PUBLIC $) -+ + + if (APPLE) + find_library(Cocoa Cocoa) + target_link_libraries(${TARGET_NAME} $<$:${Cocoa}>) + endif() - ++ # target properties for all libraries + set_target_properties(${TARGET_NAME} diff --git a/ports/fltk/include.patch b/ports/fltk/include.patch index d460134dc156aa..993c717d6e14ba 100644 --- a/ports/fltk/include.patch +++ b/ports/fltk/include.patch @@ -1,13 +1,13 @@ diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake -index 29baa95..6fa2fc5 100644 +index 29baa95..7e3490b 100644 --- a/CMake/fl_add_library.cmake +++ b/CMake/fl_add_library.cmake -@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - endif (MSVC) +@@ -37,6 +37,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES}) -+ -+ target_include_directories(${TARGET_NAME} PUBLIC $) ++ target_include_directories(${TARGET_NAME} PUBLIC $) ++ # target properties for all libraries + set_target_properties(${TARGET_NAME} diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index ccfdb91d112276..036d3abc20a29f 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -4,15 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fltk/fltk - REF release-1.3.8 - SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3 + REF "release-${VERSION}" + SHA512 2dfeeed9fdc6db62a6620e7c846dbe0bf97dacce3077832e314a35bf16ba6a45803373188a7b3954eada5829385b9914241270b71f12aaf3e9e3df45eb2b1b95 PATCHES dependencies.patch config-path.patch include.patch fix-system-link.patch math-h-polyfill.patch - fix-narrow.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/jpeg" @@ -31,6 +30,11 @@ if(VCPKG_CROSSCOMPILING) set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() +set(runtime_dll "ON") +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(runtime_dll "OFF") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -45,6 +49,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 "-DCocoa:STRING=-framework Cocoa" # avoid absolute path ${fluid_path_param} + -DFLTK_MSVC_RUNTIME_DLL=${runtime_dll} MAYBE_UNUSED_VARIABLES Cocoa ) diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index 7fd2392dd6c64c..8d5443bef25fa3 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fltk", - "version": "1.3.8", - "port-version": 5, + "version": "1.3.9", "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 7600cf5049aa08..76c64767a37596 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2685,8 +2685,8 @@ "port-version": 0 }, "fltk": { - "baseline": "1.3.8", - "port-version": 5 + "baseline": "1.3.9", + "port-version": 0 }, "fluidlite": { "baseline": "2023-04-18", diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index 6d08fa04b4b1cf..f5286b43605863 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "171647047716e78f2a85309b6d3b8cb7ca1309c9", + "version": "1.3.9", + "port-version": 0 + }, { "git-tree": "bb00fc235046a91ebcdb47e9bcb4474b82cb81d8", "version": "1.3.8", From 70fd6a94099a9602b0129ccb7a026be0c4aa0491 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Jan 2024 02:37:29 +0100 Subject: [PATCH 0745/1039] [vcpkg-tool-meson] Fix installation (#35957) --- ports/vcpkg-tool-meson/install.cmake | 5 +++++ ports/vcpkg-tool-meson/portfile.cmake | 12 ++++++++---- ports/vcpkg-tool-meson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 ports/vcpkg-tool-meson/install.cmake diff --git a/ports/vcpkg-tool-meson/install.cmake b/ports/vcpkg-tool-meson/install.cmake new file mode 100644 index 00000000000000..84201aa1aae5e5 --- /dev/null +++ b/ports/vcpkg-tool-meson/install.cmake @@ -0,0 +1,5 @@ +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/meson") +file(INSTALL "${SOURCE_PATH}/meson.py" + "${SOURCE_PATH}/mesonbuild" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/meson" +) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index 08bf2f8384c2db..27dfdf9a0e2317 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -38,12 +38,16 @@ vcpkg_from_github( remove-freebsd-pcfile-specialization.patch ) -file(INSTALL "${SOURCE_PATH}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools" - RENAME "meson" +vcpkg_execute_required_process( + COMMAND "${CMAKE_COMMAND}" + "-DSOURCE_PATH=${SOURCE_PATH}" + "-DCURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}" + -P "${CURRENT_PORT_DIR}/install.cmake" + WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" + LOGNAME install ) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") z_vcpkg_find_acquire_program_find_internal("${program}" INTERPRETER "${interpreter}" diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index bb24ed66b4f8a9..a4c9b9a2507721 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-tool-meson", "version": "0.63", - "port-version": 1, + "port-version": 2, "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 76c64767a37596..7a3670470975cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8874,7 +8874,7 @@ }, "vcpkg-tool-meson": { "baseline": "0.63", - "port-version": 1 + "port-version": 2 }, "vcpkg-tool-mozbuild": { "baseline": "4.0.2", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 8ab8416f1e9e4e..f2e9f80dd33623 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f6f5419cfc743a85e4f1fb1b582d4728b79c1e2", + "version": "0.63", + "port-version": 2 + }, { "git-tree": "d4234634624fc778e5d80db63cf53bac8587ebb9", "version": "0.63", From 5a48f2eb0f2ecba30cdf83dd4cf76d65eb259c3f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Jan 2024 02:38:33 +0100 Subject: [PATCH 0746/1039] [libpng] Search libm in implicit link dirs (#35924) --- ports/libpng/libm.patch | 17 +++++++++++++++++ ports/libpng/portfile.cmake | 1 + ports/libpng/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libpng.json | 5 +++++ 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ports/libpng/libm.patch diff --git a/ports/libpng/libm.patch b/ports/libpng/libm.patch new file mode 100644 index 00000000000000..a60e65cd1c411b --- /dev/null +++ b/ports/libpng/libm.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 958b1d6..21c8941 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,6 +84,12 @@ endif() + + if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN) + find_library(M_LIBRARY m) ++ if(NOT M_LIBRARY) ++ find_library(M_LIBRARY m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} NO_DEFAULT_PATH) ++ if(M_LIBRARY) ++ set(M_LIBRARY m) ++ endif() ++ endif() + if(NOT M_LIBRARY) + set(M_LIBRARY "") + endif() diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index dc7ea22cd85b1b..1f091456681fa6 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -38,6 +38,7 @@ vcpkg_from_github( "${LIBPNG_APNG_PATCH_PATH}" cmake.patch fix-export-targets.patch + libm.patch pkgconfig.patch fix-msa-support-for-mips.patch ) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index 46bb5bca966f5c..7661399e25c64e 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpng", "version": "1.6.40", + "port-version": 1, "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 7a3670470975cb..f9196b835dcfec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4682,7 +4682,7 @@ }, "libpng": { "baseline": "1.6.40", - "port-version": 0 + "port-version": 1 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index 22ee644dc214b3..b3dbf52a548a85 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b6d2c1150541a94c0ca5b2f060eb21eed4a40b2", + "version": "1.6.40", + "port-version": 1 + }, { "git-tree": "1a2a7f489e57c9e55e049b7c5f0a28c8ff4464ed", "version": "1.6.40", From fb9cd249f442dcc6d023e41ec7cb7f85622dd8b6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Jan 2024 02:39:26 +0100 Subject: [PATCH 0747/1039] [tiff] Add libdeflate support, add usage (#35925) --- ports/tiff/portfile.cmake | 6 ++++- ports/tiff/usage | 9 ++++++++ ports/tiff/vcpkg-cmake-wrapper.cmake.in | 29 +++++++++++++++++++++--- ports/tiff/vcpkg.json | 15 +++++++++++- scripts/test_ports/cmake-user/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/t-/tiff.json | 5 ++++ 7 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 ports/tiff/usage diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 6307aae0e162b8..426d8af72a662a 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -14,6 +14,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS cxx cxx jpeg jpeg jpeg CMAKE_REQUIRE_FIND_PACKAGE_JPEG + libdeflate libdeflate + libdeflate CMAKE_REQUIRE_FIND_PACKAGE_Deflate lzma lzma lzma CMAKE_REQUIRE_FIND_PACKAGE_liblzma tools tiff-tools @@ -33,7 +35,6 @@ vcpkg_cmake_configure( -Dtiff-docs=OFF -Dtiff-contrib=OFF -Dtiff-tests=OFF - -Dlibdeflate=OFF -Djbig=OFF # This is disabled by default due to GPL/Proprietary licensing. -Djpeg12=OFF -Dlerc=OFF @@ -44,6 +45,8 @@ vcpkg_cmake_configure( OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d # tiff sets "d" for MSVC only. MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GLUT + CMAKE_DISABLE_FIND_PACKAGE_OpenGL ZSTD_HAVE_DECOMPRESS_STREAM ) @@ -79,4 +82,5 @@ if ("tools" IN_LIST FEATURES) endif() vcpkg_copy_pdbs() +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/tiff/usage b/ports/tiff/usage new file mode 100644 index 00000000000000..d47265b18f71df --- /dev/null +++ b/ports/tiff/usage @@ -0,0 +1,9 @@ +tiff is compatible with built-in CMake targets: + + find_package(TIFF REQUIRED) + target_link_libraries(main PRIVATE TIFF::TIFF) + +tiff provides pkg-config modules: + + # Tag Image File Format (TIFF) library. + libtiff-4 diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 31fef16af8b480..1d04ec7a0ac3a1 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -11,9 +11,8 @@ endif() _find_package(${ARGS}) -include(SelectLibraryConfigurations) - if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + include(SelectLibraryConfigurations) set(z_vcpkg_tiff_link_libraries "") set(z_vcpkg_tiff_libraries "") if("@webp@") @@ -53,13 +52,37 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") add_library(ZSTD::ZSTD INTERFACE IMPORTED) set_property(TARGET ZSTD::ZSTD APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_zstd}) endif() - list(APPEND z_vcpkg_tiff_libraries ${ZSTD_LIBRARIES}) list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd}) + list(APPEND z_vcpkg_tiff_libraries ${ZSTD_LIBRARIES}) unset(z_vcpkg_tiff_zstd) unset(z_vcpkg_tiff_zstd_configs) unset(z_vcpkg_config) unset(z_vcpkg_tiff_zstd_target) endif() + if("@libdeflate@") + find_package(libdeflate ${z_vcpkg_tiff_find_options}) + set(z_vcpkg_property "IMPORTED_LOCATION_") + if(TARGET libdeflate::libdeflate_shared) + set(z_vcpkg_libdeflate_target libdeflate::libdeflate_shared) + if(WIN32) + set(z_vcpkg_property "IMPORTED_IMPLIB_") + endif() + else() + set(z_vcpkg_libdeflate_target libdeflate::libdeflate_static) + endif() + get_target_property(z_vcpkg_libdeflate_configs "${z_vcpkg_libdeflate_target}" IMPORTED_CONFIGURATIONS) + foreach(z_vcpkg_config IN LISTS z_vcpkg_libdeflate_configs) + get_target_property(Z_VCPKG_DEFLATE_LIBRARY_${z_vcpkg_config} "${z_vcpkg_libdeflate_target}" "${z_vcpkg_property}${z_vcpkg_config}") + endforeach() + select_library_configurations(Z_VCPKG_DEFLATE) + list(APPEND z_vcpkg_tiff_link_libraries "\$") + list(APPEND z_vcpkg_tiff_libraries ${Z_VCPKG_DEFLATE_LIBRARIES}) + unset(z_vcpkg_config) + unset(z_vcpkg_libdeflate_configs) + unset(z_vcpkg_libdeflate_target) + unset(z_vcpkg_property) + unset(Z_VCPKG_DEFLATE_FOUND) + endif() if("@zlib@") find_package(ZLIB ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries "\$") diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 18a1950d5bdbab..eea6684aa7472d 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.6.0", - "port-version": 1, + "port-version": 2, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "license": "libtiff", @@ -30,6 +30,19 @@ "libjpeg-turbo" ] }, + "libdeflate": { + "description": "Use libdeflate for faster ZIP support", + "dependencies": [ + "libdeflate", + { + "name": "tiff", + "default-features": false, + "features": [ + "zip" + ] + } + ] + }, "lzma": { "description": "Support LZMA compression in TIFF image files", "dependencies": [ diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index ed1718e0936e9e..1e727be0e541d7 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -40,7 +40,7 @@ "dependencies": [ { "$package": "Boost", - "name":"boost", + "name": "boost", "platform": "!uwp" }, { @@ -158,6 +158,7 @@ "name": "tiff", "default-features": false, "features": [ + "libdeflate", "zstd" ] }, diff --git a/versions/baseline.json b/versions/baseline.json index f9196b835dcfec..d0272f0a76ba83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8426,7 +8426,7 @@ }, "tiff": { "baseline": "4.6.0", - "port-version": 1 + "port-version": 2 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 954fad63654809..7596064aa9243d 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eee46c160d2fcf26a0013e7159adc2e6c03039d5", + "version": "4.6.0", + "port-version": 2 + }, { "git-tree": "1c0fc716f916833234f0fb5e7061d52e9063e7c6", "version": "4.6.0", From d8d41e04039c667416e115179b850e8411885cf4 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Thu, 4 Jan 2024 02:39:45 +0100 Subject: [PATCH 0748/1039] [baresip-libre] update to 3.8.0 (#35927) --- .../fix-static-library-build.patch | 41 ++++++++++--------- ports/baresip-libre/portfile.cmake | 2 +- ports/baresip-libre/vcpkg.json | 2 +- versions/b-/baresip-libre.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ports/baresip-libre/fix-static-library-build.patch b/ports/baresip-libre/fix-static-library-build.patch index 9a5ec2088491df..6dd8b8aaf3b7c4 100644 --- a/ports/baresip-libre/fix-static-library-build.patch +++ b/ports/baresip-libre/fix-static-library-build.patch @@ -1,7 +1,8 @@ -diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.txt ---- re-3.4.0-orig/CMakeLists.txt 2023-08-09 09:53:10.000000000 +0200 -+++ re-3.4.0/CMakeLists.txt 2023-10-04 08:48:23.000000000 +0200 -@@ -93,7 +93,7 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 03c82fb..cce8694 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,7 +99,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() set(re_DIR ${CMAKE_CURRENT_LIST_DIR}/cmake) @@ -10,16 +11,16 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx list(APPEND RE_DEFINITIONS -DRE_VERSION="${PROJECT_VERSION_FULL}" -@@ -694,7 +694,7 @@ +@@ -648,7 +648,7 @@ endif() if(LIBRE_BUILD_STATIC) list(APPEND RE_INSTALL_TARGETS re) add_library(re STATIC $) -- target_link_libraries(re PUBLIC ${LINKLIBS}) -+ target_link_libraries(re PRIVATE ${LINKLIBS}) +- target_link_libraries(re PUBLIC ${RE_LIBS}) ++ target_link_libraries(re PRIVATE ${RE_LIBS}) target_include_directories(re PUBLIC $ ) -@@ -702,6 +702,9 @@ +@@ -656,6 +656,9 @@ if(LIBRE_BUILD_STATIC) if(MSVC) set_target_properties(re PROPERTIES OUTPUT_NAME "re-static") @@ -29,7 +30,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx endif() endif() -@@ -714,6 +717,28 @@ +@@ -668,6 +671,28 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) add_subdirectory(packaging) endif() @@ -58,7 +59,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx configure_file(packaging/libre.pc.in libre.pc @ONLY) -@@ -725,6 +750,9 @@ +@@ -679,6 +704,9 @@ configure_file(packaging/libre.pc.in libre.pc @ONLY) install(TARGETS ${RE_INSTALL_TARGETS} EXPORT libre @@ -68,7 +69,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -@@ -743,7 +771,9 @@ +@@ -697,7 +725,9 @@ install(FILES ${HEADERS} install(EXPORT libre DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre @@ -78,7 +79,7 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx ) if(LIBRE_BUILD_SHARED) -@@ -755,12 +785,8 @@ +@@ -709,12 +739,8 @@ if(LIBRE_BUILD_SHARED) ) endif() @@ -93,9 +94,10 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/CMakeLists.txt re-3.4.0/CMakeLists.tx DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libre COMPONENT Development ) -diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cmake/libre-config.cmake ---- re-3.4.0-orig/cmake/libre-config.cmake 2023-08-09 09:53:10.000000000 +0200 -+++ re-3.4.0/cmake/libre-config.cmake 2023-10-03 10:01:11.000000000 +0200 +diff --git a/cmake/libre-config.cmake b/cmake/libre-config.cmake +index 0965b84..e8548a0 100644 +--- a/cmake/libre-config.cmake ++++ b/cmake/libre-config.cmake @@ -1 +1,23 @@ -include("${CMAKE_CURRENT_LIST_DIR}/libre.cmake") +if("@LIBRE_BUILD_STATIC@") @@ -121,10 +123,11 @@ diff -Naur --exclude='*.rej' re-3.4.0-orig/cmake/libre-config.cmake re-3.4.0/cma + set_target_properties(libre::libre PROPERTIES INTERFACE_LINK_LIBRARIES libre::re) + endif() +endif() -diff -Naur --exclude='*.rej' re-3.4.0-orig/packaging/libre.pc.in re-3.4.0/packaging/libre.pc.in ---- re-3.4.0-orig/packaging/libre.pc.in 2023-08-09 09:53:10.000000000 +0200 -+++ re-3.4.0/packaging/libre.pc.in 2023-10-03 10:01:11.000000000 +0200 -@@ -7,6 +7,7 @@ +diff --git a/packaging/libre.pc.in b/packaging/libre.pc.in +index 5817066..2df8f6c 100644 +--- a/packaging/libre.pc.in ++++ b/packaging/libre.pc.in +@@ -7,6 +7,7 @@ Name: libre Description: @CMAKE_PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@ diff --git a/ports/baresip-libre/portfile.cmake b/ports/baresip-libre/portfile.cmake index 092fd14656e727..904a54a8875140 100644 --- a/ports/baresip-libre/portfile.cmake +++ b/ports/baresip-libre/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baresip/re REF "v${VERSION}" - SHA512 95bfc11d73e8eda76ece51b0e91550e3cb45fc91927d01d024318e74bb0c3893b5bb0716582672490e0131be0314abd1bf2dfd815960b00741e78a55b2a0bbd4 + SHA512 7c03502aae0424bb05e03320c2497de0ec534d872334fe16ec0a688efbc1cc493ad1774e9802e0dc58bb396b4b8a065f3e338deeff4dd1ddd87cb76793e82306 HEAD_REF main PATCHES fix-static-library-build.patch diff --git a/ports/baresip-libre/vcpkg.json b/ports/baresip-libre/vcpkg.json index 5840b18f5c7b32..c32cb4768d0aac 100644 --- a/ports/baresip-libre/vcpkg.json +++ b/ports/baresip-libre/vcpkg.json @@ -1,6 +1,6 @@ { "name": "baresip-libre", - "version": "3.7.0", + "version": "3.8.0", "description": "Generic library for real-time communications with async IO support", "homepage": "https://github.com/baresip/re", "license": "BSD-3-Clause", diff --git a/versions/b-/baresip-libre.json b/versions/b-/baresip-libre.json index 839e14ff75e105..c8a4397e1b76c9 100644 --- a/versions/b-/baresip-libre.json +++ b/versions/b-/baresip-libre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eac42649337bc140a827e4ae83eb7ec1ccac3917", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "e34b5bc2855e62826520ee68fb21d063d42b53d4", "version": "3.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index d0272f0a76ba83..2fe65880e9a6c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -517,7 +517,7 @@ "port-version": 0 }, "baresip-libre": { - "baseline": "3.7.0", + "baseline": "3.8.0", "port-version": 0 }, "basisu": { From 6a0137291e1daca467fe69fb6ec67092d6bcb6cb Mon Sep 17 00:00:00 2001 From: Mathieu Pellerin Date: Thu, 4 Jan 2024 08:40:43 +0700 Subject: [PATCH 0749/1039] [ffmpeg] Enable JNI and MediaCodec backends on Android (#35985) --- 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 9852edd0c6ff96..0a58f388169c6c 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -57,7 +57,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_OSX) string(APPEND OPTIONS " --target-os=darwin --enable-appkit --enable-avfoundation --enable-coreimage --enable-audiotoolbox --enable-videotoolbox") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") - string(APPEND OPTIONS " --target-os=android") + string(APPEND OPTIONS " --target-os=android --enable-jni --enable-mediacodec") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "QNX") string(APPEND OPTIONS " --target-os=qnx") endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index f94124b8ffbccc..80601de1c05450 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "6.1", - "port-version": 1, + "port-version": 2, "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 2fe65880e9a6c2..551fdb663dacb7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2606,7 +2606,7 @@ }, "ffmpeg": { "baseline": "6.1", - "port-version": 1 + "port-version": 2 }, "ffnvcodec": { "baseline": "11.1.5.3", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 2b881a9e9aa249..95f7e1cd548bab 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e749968704c8ad09bb7d2d9cfda93777fe94b563", + "version": "6.1", + "port-version": 2 + }, { "git-tree": "aa26e2742d2c653f1f74843dce3120c753376f50", "version": "6.1", From 6fcc9cc9a2c924698e9082ef129754706b9f7447 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Jan 2024 02:41:17 +0100 Subject: [PATCH 0750/1039] [freerdp] remove deprecated client-mac (#35969) --- ports/freerdp/portfile.cmake | 15 +-------------- ports/freerdp/vcpkg.json | 7 ++----- versions/baseline.json | 2 +- versions/f-/freerdp.json | 5 +++++ 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index ab8d264a55d396..4e963305a06682 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -20,7 +20,6 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - client-mac WITH_CLIENT_MAC ffmpeg WITH_FFMPEG ffmpeg WITH_SWSCALE server WITH_SERVER @@ -52,6 +51,7 @@ vcpkg_cmake_configure( -DWITH_OPENSSL=ON -DWITH_SAMPLE=OFF -DWITH_UNICODE_BUILTIN=ON + -DWITH_CLIENT=OFF "-DMSVC_RUNTIME=${VCPKG_CRT_LINKAGE}" "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON @@ -83,27 +83,14 @@ vcpkg_fixup_pkgconfig() vcpkg_list(SET tools) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND tools wfreerdp) if("server" IN_LIST FEATURES) list(APPEND tools wfreerdp-server) endif() elseif(VCPKG_TARGET_IS_OSX) - if("client-mac" IN_LIST FEATURES) - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/client/Mac/cli/MacFreeRDP.app" - DESTINATION "${CURRENT_PACKAGES_DIR}/bin" - ) - list(APPEND tools MacFreeRDP) - endif() if("server" IN_LIST FEATURES) list(APPEND tools mfreerdp-server) endif() endif() -if("wayland" IN_LIST FEATURES) - list(APPEND tools wlfreerdp) -endif() -if("x11" IN_LIST FEATURES) - list(APPEND tools xfreerdp) -endif() if("winpr-tools" IN_LIST FEATURES) list(APPEND tools winpr-hash winpr-makecert) endif() diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 6575573f5ca5d6..88e35f18fbf7d3 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freerdp", "version": "3.0.0", + "port-version": 1, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", @@ -23,10 +24,6 @@ "zlib" ], "features": { - "client-mac": { - "description": "Build native mac client. Requires XCode.", - "supports": "osx" - }, "ffmpeg": { "description": "Enable image scaling, video and audio with ffmpeg", "supports": "!windows", @@ -74,7 +71,7 @@ }, "x11": { "description": "Enable X11 support", - "supports": "!android & !ios & !windows", + "supports": "!android & !ios & !windows & !osx", "dependencies": [ "xcb" ] diff --git a/versions/baseline.json b/versions/baseline.json index 551fdb663dacb7..3b7dcfecfcd90c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2774,7 +2774,7 @@ }, "freerdp": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "freetds": { "baseline": "1.3.10", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 06f56f906b67ad..9a6b614dd0e91e 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d88811f61ec9063eb70b837f23c6ceeceb0198", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "dfb634ed4a717897d4cb646a34dc9c663dcfceb8", "version": "3.0.0", From 5ffb6e19cfd4ff40bcb93f2f74903887ac594728 Mon Sep 17 00:00:00 2001 From: Koby Kahane Date: Thu, 4 Jan 2024 03:41:56 +0200 Subject: [PATCH 0751/1039] [capstone] Add missing arch features (#35988) --- ports/capstone/portfile.cmake | 6 ++++++ ports/capstone/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 2 +- versions/c-/capstone.json | 5 +++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index 585f79b83f8063..f5da71674a8bdd 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -24,12 +24,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tms320c64x" CAPSTONE_TMS320C64X_SUPPORT "x86" CAPSTONE_X86_SUPPORT "xcore" CAPSTONE_XCORE_SUPPORT + "mos65xx" CAPSTONE_MOS65XX_SUPPORT + "tricore" CAPSTONE_TRICORE_SUPPORT + "wasm" CAPSTONE_WASM_SUPPORT + "bpf" CAPSTONE_BPF_SUPPORT + "riscv" CAPSTONE_RISCV_SUPPORT "diet" CAPSTONE_BUILD_DIET ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCAPSTONE_ARCHITECTURE_DEFAULT=OFF -DCAPSTONE_BUILD_TESTS=OFF -DCAPSTONE_BUILD_CSTOOL=OFF -DCAPSTONE_BUILD_STATIC_RUNTIME=${STATIC_CRT} diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json index 4b9f2a88f09c64..094e22b5537704 100644 --- a/ports/capstone/vcpkg.json +++ b/ports/capstone/vcpkg.json @@ -1,6 +1,7 @@ { "name": "capstone", "version": "5.0.1", + "port-version": 1, "description": "Multi-architecture disassembly framework", "homepage": "https://github.com/capstone-engine/capstone", "dependencies": [ @@ -20,6 +21,9 @@ "arm64": { "description": "Capstone disassembly support for ARM64" }, + "bpf": { + "description": "Capstone disassembly support for BPF" + }, "diet": { "description": "Build Capstone in diet mode (reduced features for smaller size)" }, @@ -35,9 +39,15 @@ "mips": { "description": "Capstone disassembly support for MIPS" }, + "mos65xx": { + "description": "Capstone disassembly support for MOS65XX" + }, "ppc": { "description": "Capstone disassembly support for PowerPC" }, + "riscv": { + "description": "Capstone disassembly support for RISC-V" + }, "sparc": { "description": "Capstone disassembly support for SPARC" }, @@ -47,6 +57,12 @@ "tms320c64x": { "description": "Capstone disassembly support for TMS320C64X" }, + "tricore": { + "description": "Capstone disassembly support for TriCore" + }, + "wasm": { + "description": "Capstone disassembly support for WebAssembly" + }, "x86": { "description": "Capstone disassembly support for x86" }, diff --git a/versions/baseline.json b/versions/baseline.json index 3b7dcfecfcd90c..94e84c6730078f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1438,7 +1438,7 @@ }, "capstone": { "baseline": "5.0.1", - "port-version": 0 + "port-version": 1 }, "cargs": { "baseline": "1.0.3", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index 13ecc08a47878a..4690994da202a1 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2879a914b5c261ad9fb1b48b921a4d53a486eb0", + "version": "5.0.1", + "port-version": 1 + }, { "git-tree": "4c89ad8669fdc6aa946d13cfe053a64fa50f75a7", "version": "5.0.1", From 80649f6539e0be84535cde2be1264390143dcd61 Mon Sep 17 00:00:00 2001 From: sethome <39254204+sethome2@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:45:16 +0800 Subject: [PATCH 0752/1039] [openCV] add vulkan support for openCV dnn (#35933) --- ports/opencv/vcpkg.json | 13 +++++++++++++ ports/opencv4/portfile.cmake | 7 +++++++ ports/opencv4/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 4 ++-- versions/o-/opencv.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 6 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 068f1e3df33497..6f7f217ae3401c 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv", "version": "4.8.0", + "port-version": 1, "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -411,6 +412,18 @@ } ] }, + "vulkan": { + "description": "Vulkan support for opencv dnn", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "vulkan" + ] + } + ] + }, "webp": { "description": "WebP support for opencv", "dependencies": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 9618af5cc9b116..ac8c28f1c99972 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -85,6 +85,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "webp" WITH_WEBP "world" BUILD_opencv_world "dc1394" WITH_1394 + "vulkan" WITH_VULKAN ) # Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" @@ -138,6 +139,11 @@ if("tbb" IN_LIST FEATURES) set(WITH_TBB ON) endif() +set(WITH_VULKAN OFF) +if("vulkan" IN_LIST FEATURES) + set(WITH_VULKAN ON) +endif() + set(WITH_PYTHON OFF) set(BUILD_opencv_python3 OFF) if("python" IN_LIST FEATURES) @@ -445,6 +451,7 @@ vcpkg_cmake_configure( -DWITH_GTK=${WITH_GTK} -DWITH_QT=${WITH_QT} -DWITH_IPP=${WITH_IPP} + -DWITH_VULKAN=${WITH_VULKAN} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENMP=${WITH_OPENMP} diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index d2f4907ece398c..939fc1602ba8e8 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 13, + "port-version": 14, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -372,6 +372,18 @@ "vtk" ] }, + "vulkan": { + "description": "Vulkan support for opencv dnn", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "dnn" + ] + } + ] + }, "webp": { "description": "WebP support for opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 94e84c6730078f..5148990f998cd9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6250,7 +6250,7 @@ }, "opencv": { "baseline": "4.8.0", - "port-version": 0 + "port-version": 1 }, "opencv2": { "baseline": "2.4.13.7", @@ -6262,7 +6262,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 13 + "port-version": 14 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 442620ffed56bd..492a0b94b39dae 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc3a2d25b8cca6c318cdd710381ca152b18ae3cd", + "version": "4.8.0", + "port-version": 1 + }, { "git-tree": "50df5c317df5af01b65a405e31a86e9a7ceead1c", "version": "4.8.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index df5ae4065da86e..6d8efa13a3860d 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "852583d8f7a5bb15998efad9c0305a8ce686e59b", + "version": "4.8.0", + "port-version": 14 + }, { "git-tree": "757561dc37010d966ad90a8a1f7d2942e9286154", "version": "4.8.0", From 0ad615378fc4f8c23a14363a344cc80c3a7619d7 Mon Sep 17 00:00:00 2001 From: David Reidsma Date: Wed, 3 Jan 2024 20:53:08 -0500 Subject: [PATCH 0753/1039] [libusb] Replaced incorrect apt package name "autoreconf" with "autoconf" (#36020) --- ports/libusb/portfile.cmake | 2 +- ports/libusb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 9f9da9dbb3c926..2322872234de5c 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -1,5 +1,5 @@ if(VCPKG_TARGET_IS_LINUX) - message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoreconf libudev-dev") + message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoconf libudev-dev") endif() set(VERSION 1.0.26) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 8e2ebd1033ef1f..25ccdd7ea8a119 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", - "port-version": 6, + "port-version": 7, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 5148990f998cd9..1b0a710ff70e70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4974,7 +4974,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 6 + "port-version": 7 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index e9e3dad4cc12b7..4f838418ef9783 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae02e3ed7014fe0c328b2c3ec6ed60cff9c0b956", + "version": "1.0.26.11791", + "port-version": 7 + }, { "git-tree": "53ad48778a3278668b2ede66ac49fa20a9d03414", "version": "1.0.26.11791", From 1bbba4e6fbba89258855188fc508e9b394ded018 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:54:57 +0800 Subject: [PATCH 0754/1039] [aws-c-io] update to 0.14.0 (#36018) --- ports/aws-c-io/portfile.cmake | 2 +- ports/aws-c-io/vcpkg.json | 2 +- versions/a-/aws-c-io.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index bf331bfbaa20ce..c9b58b03c53d65 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io REF "v${VERSION}" - SHA512 cb76ddf7d43c440443c6e5fb33a022f540d8ca95572f36b263836fe6bebfd0790370c84fec37b45475645167ab71bb14de320b9988803ac01f6bbb0d7436949a + SHA512 393cd388429507da0f1a159b4b70371efe42b47a58437230354378bd588b12eed173f5ff62e50bd57e4c9fb2129f541e6de01995acbb15aff2e6df7e0fdb32ba HEAD_REF master ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index e6fc427362c283..31ecf3a22b578c 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-io", - "version": "0.13.36", + "version": "0.14.0", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index f02800006881c9..f9732c282b9f62 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "346cdc018fbb4d19764457fe205fd0e8db0d8088", + "version": "0.14.0", + "port-version": 0 + }, { "git-tree": "586cb06ad50ef2627c4dd30ab97b88d79e559fd5", "version": "0.13.36", diff --git a/versions/baseline.json b/versions/baseline.json index 1b0a710ff70e70..c2c648c0af5989 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -377,7 +377,7 @@ "port-version": 0 }, "aws-c-io": { - "baseline": "0.13.36", + "baseline": "0.14.0", "port-version": 0 }, "aws-c-mqtt": { From d30cdff6588256ec400c4dbb504c3eedc64bd6a9 Mon Sep 17 00:00:00 2001 From: friendlyanon <1736896+friendlyanon@users.noreply.github.com> Date: Thu, 4 Jan 2024 03:04:42 +0100 Subject: [PATCH 0755/1039] Add port `ms-ifc-sdk` (#35972) Co-authored-by: friendlyanon --- ports/ms-ifc-sdk/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/ms-ifc-sdk/usage | 8 ++++++++ ports/ms-ifc-sdk/vcpkg.json | 18 ++++++++++++++++++ scripts/ci.baseline.txt | 6 +++++- versions/baseline.json | 4 ++++ versions/m-/ms-ifc-sdk.json | 9 +++++++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 ports/ms-ifc-sdk/portfile.cmake create mode 100644 ports/ms-ifc-sdk/usage create mode 100644 ports/ms-ifc-sdk/vcpkg.json create mode 100644 versions/m-/ms-ifc-sdk.json diff --git a/ports/ms-ifc-sdk/portfile.cmake b/ports/ms-ifc-sdk/portfile.cmake new file mode 100644 index 00000000000000..682345cd7125d2 --- /dev/null +++ b/ports/ms-ifc-sdk/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/ifc + REF 0.43.1 + SHA512 c7ce8570d776f875c1a1fed929734ebc73b2cf25106e2a5e80625269f4f91d8106d19da34525cc4d7a694d750788d124e8e1ef082c54a13c9b34fe3da7f9e82d + HEAD_REF main +) + +set(config_path share/cmake/Microsoft.IFC) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DIFC_INSTALL_CMAKEDIR:PATH=${config_path}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME Microsoft.IFC + CONFIG_PATH "${config_path}" +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ms-ifc-sdk/usage b/ports/ms-ifc-sdk/usage new file mode 100644 index 00000000000000..f49a254b11a7bf --- /dev/null +++ b/ports/ms-ifc-sdk/usage @@ -0,0 +1,8 @@ +The package Microsoft.IFC provides CMake targets: + + find_package(Microsoft.IFC CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft.IFC::SDK) + + # Or use the individual components of Microsoft.IFC::SDK for advanced use + find_package(Microsoft.IFC CONFIG REQUIRED) + target_link_libraries(main PRIVATE Microsoft.IFC::Core Microsoft.IFC::DOM) diff --git a/ports/ms-ifc-sdk/vcpkg.json b/ports/ms-ifc-sdk/vcpkg.json new file mode 100644 index 00000000000000..c738f26c4b30a7 --- /dev/null +++ b/ports/ms-ifc-sdk/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ms-ifc-sdk", + "version": "0.43.1", + "description": "SDK for the IFC specification at https://github.com/microsoft/ifc-spec", + "homepage": "https://github.com/microsoft/ifc", + "license": "Apache-2.0 WITH LLVM-exception", + "dependencies": [ + "ms-gsl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b99ac0575d8502..1c34876165db94 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -728,13 +728,17 @@ mp3lame:arm-neon-android=fail mp3lame:arm64-android=fail mp3lame:x64-android=fail mpir:x64-android=fail -# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines +# ms-gltf and ms-quic require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines ms-gdkx:x64-windows=fail ms-gdkx:x64-windows-static=fail ms-gdkx:x64-windows-static-md=fail ms-gltf:arm-neon-android=fail ms-gltf:arm64-android=fail ms-gltf:x64-android=fail +# ms-ifc-sdk requires a very recent compiler (C++23) +ms-ifc-sdk:arm-neon-android=fail +ms-ifc-sdk:arm64-android=fail +ms-ifc-sdk:x64-android=fail ms-quic:arm64-uwp=fail ms-quic:arm64-windows=fail ms-quic:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index c2c648c0af5989..6f5c280b9a7ab2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5760,6 +5760,10 @@ "baseline": "4.0.0", "port-version": 1 }, + "ms-ifc-sdk": { + "baseline": "0.43.1", + "port-version": 0 + }, "ms-quic": { "baseline": "1.2.0", "port-version": 0 diff --git a/versions/m-/ms-ifc-sdk.json b/versions/m-/ms-ifc-sdk.json new file mode 100644 index 00000000000000..1d6b0c7761b956 --- /dev/null +++ b/versions/m-/ms-ifc-sdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c24ff4ae05b7f1b10e071e516d4fb07cedfee16", + "version": "0.43.1", + "port-version": 0 + } + ] +} From 0403626792652a58a9b790ca3cabc601c2d158a8 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 4 Jan 2024 09:26:47 +0700 Subject: [PATCH 0756/1039] [qt*] ios fixes (#36003) --- ports/qtbase/vcpkg.json | 12 +++++++++--- ports/qtpositioning/vcpkg.json | 4 +++- ports/qtserialport/vcpkg.json | 2 ++ versions/baseline.json | 6 +++--- versions/q-/qtbase.json | 5 +++++ versions/q-/qtpositioning.json | 5 +++++ versions/q-/qtserialport.json | 5 +++++ 7 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index fb4ea151fb92d4..2c48a2e2731e31 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 3, + "port-version": 4, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -62,7 +62,10 @@ "icu", "jpeg", "network", - "opengl", + { + "name": "opengl", + "platform": "!ios" + }, "openssl", "pcre2", "png", @@ -224,7 +227,10 @@ "gui": { "description": "Qt Gui", "dependencies": [ - "opengl", + { + "name": "opengl", + "platform": "!ios" + }, { "name": "qtbase", "default-features": false, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 46628170226685..dd7d61b290dbce 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtpositioning", "version": "6.6.1", + "port-version": 1, "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, @@ -12,7 +13,8 @@ }, { "name": "qtserialport", - "default-features": false + "default-features": false, + "platform": "!ios" } ], "features": { diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index 6ec17e3228f193..248f08783ed1b4 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,9 +1,11 @@ { "name": "qtserialport", "version": "6.6.1", + "port-version": 1, "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, + "supports": "!ios", "dependencies": [ { "name": "qtbase", diff --git a/versions/baseline.json b/versions/baseline.json index 6f5c280b9a7ab2..35d3ab30072685 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7118,7 +7118,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 3 + "port-version": 4 }, "qtcharts": { "baseline": "6.6.1", @@ -7206,7 +7206,7 @@ }, "qtpositioning": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtquick3d": { "baseline": "6.6.1", @@ -7246,7 +7246,7 @@ }, "qtserialport": { "baseline": "6.6.1", - "port-version": 0 + "port-version": 1 }, "qtshadertools": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 2e26c906730eb2..e0d7e91254f8fb 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e1dba7994d7d228fee34f8f5b646e7d9aff62ac", + "version": "6.6.1", + "port-version": 4 + }, { "git-tree": "b85d2c16c027edb173f51037d9c5a3e05746efa0", "version": "6.6.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 9ae78c59572ffb..52f87ac20b93c0 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61988bd841be21af4ae3bf2748ac8f6ec071e56c", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "8c0c21c983c3f010540a7b11c3896af2388a0531", "version": "6.6.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index a7717a452a9fff..4c3e9664aae8db 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bfa96397e62f539b329016ceeb31a4c7fa1b9ed", + "version": "6.6.1", + "port-version": 1 + }, { "git-tree": "b0fe6127a189519fdb6c51b00d1fd14759459f96", "version": "6.6.1", From 45c8b198b7647b6a68235353a00839082c910914 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Jan 2024 03:27:03 +0100 Subject: [PATCH 0757/1039] [ogre-next] vulkan no osx (#35968) --- ports/ogre-next/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/ogre-next.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 2be6e1b182e788..07cd697c7be77b 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre-next", "version": "2.3.3", - "port-version": 1, + "port-version": 2, "description": "Ogre Next - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", @@ -61,6 +61,7 @@ }, "vulkan": { "description": "Vulkan render system", + "supports": "!osx", "dependencies": [ "glslang", "vulkan" diff --git a/versions/baseline.json b/versions/baseline.json index 35d3ab30072685..f2932131fc2ba1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6166,7 +6166,7 @@ }, "ogre-next": { "baseline": "2.3.3", - "port-version": 1 + "port-version": 2 }, "ois": { "baseline": "1.5.1", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index f89f01380681f4..9cc87644b90da1 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1563ee76136a49e438bd5229b68635ce8fdc347a", + "version": "2.3.3", + "port-version": 2 + }, { "git-tree": "92372bf7078f6e5f955072f35696788f09849b71", "version": "2.3.3", From d8c0c7da8bb0afb3342048ef4e4225c14fd099e3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Jan 2024 20:58:41 +0100 Subject: [PATCH 0758/1039] [libcoro] Update to 0.10 (#35814) --- .../libcoro/0003-fix-pkgconfig-includedir.patch | 10 ++++++++++ .../libcoro/0004-fix-pkgconfig-on-windows.patch | 16 ++++++++++++++++ ports/libcoro/portfile.cmake | 10 ++++++++-- ports/libcoro/vcpkg.json | 14 ++++++-------- versions/baseline.json | 2 +- versions/l-/libcoro.json | 5 +++++ 6 files changed, 46 insertions(+), 11 deletions(-) create mode 100644 ports/libcoro/0003-fix-pkgconfig-includedir.patch create mode 100644 ports/libcoro/0004-fix-pkgconfig-on-windows.patch diff --git a/ports/libcoro/0003-fix-pkgconfig-includedir.patch b/ports/libcoro/0003-fix-pkgconfig-includedir.patch new file mode 100644 index 00000000000000..ed4cf30769e7bf --- /dev/null +++ b/ports/libcoro/0003-fix-pkgconfig-includedir.patch @@ -0,0 +1,10 @@ +diff --git a/libcoro.pc.in b/libcoro.pc.in +--- a/libcoro.pc.in ++++ b/libcoro.pc.in +@@ -1,5 +1,5 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + libdir="${prefix}/lib" +-includedir="@CMAKE_INSTALL_INCLUDEDIR@" ++includedir="${prefix}/include" + + Name: @PROJECT_NAME@ diff --git a/ports/libcoro/0004-fix-pkgconfig-on-windows.patch b/ports/libcoro/0004-fix-pkgconfig-on-windows.patch new file mode 100644 index 00000000000000..4adbad98144714 --- /dev/null +++ b/ports/libcoro/0004-fix-pkgconfig-on-windows.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -186,7 +186,11 @@ + + + # generate pc file for pkg-config +-string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) ++if(MSVC) ++ set(target1 ${PROJECT_NAME}) ++else() ++ string(REGEX REPLACE "^lib" "" target1 ${PROJECT_NAME}) ++endif() + configure_file(libcoro.pc.in libcoro.pc @ONLY) + + install(TARGETS libcoro) diff --git a/ports/libcoro/portfile.cmake b/ports/libcoro/portfile.cmake index e48f240e97b6b0..c4a16fb68c8b69 100644 --- a/ports/libcoro/portfile.cmake +++ b/ports/libcoro/portfile.cmake @@ -1,19 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbaldwin/libcoro REF "v${VERSION}" - SHA512 9554fcaf721188e2475933fb8fe6b35f879479af9acb8b011545d66e588a98811f69100a4392e62c3c8bf05e8177760778c44ed4357d40d0a6349833a93fb8e8 + SHA512 88d5954591493ad2942fa68ead65b67fa9ac26bcc260b3156844244968dd8477d62a3559a9d3b7b1175bf813e5f23ca2d288a72baeb3ebd774e756d3c06bfee8 HEAD_REF master PATCHES 0001-allow-shared-lib.patch 0002-disable-git-config.patch + 0003-fix-pkgconfig-includedir.patch + 0004-fix-pkgconfig-on-windows.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES networking LIBCORO_FEATURE_NETWORKING + platform LIBCORO_FEATURE_PLATFORM ssl LIBCORO_FEATURE_SSL - threading LIBCORO_FEATURE_THREADING ) vcpkg_cmake_configure( diff --git a/ports/libcoro/vcpkg.json b/ports/libcoro/vcpkg.json index e6a9891b064e4d..0746f37088182e 100644 --- a/ports/libcoro/vcpkg.json +++ b/ports/libcoro/vcpkg.json @@ -1,12 +1,10 @@ { "name": "libcoro", - "version": "0.9", + "version": "0.10", "description": "C++20 coroutine library", "homepage": "https://github.com/jbaldwin/libcoro", "license": "Apache-2.0", - "supports": "!windows", "dependencies": [ - "tl-expected", { "name": "vcpkg-cmake", "host": true @@ -14,8 +12,7 @@ ], "default-features": [ "networking", - "ssl", - "threading" + "ssl" ], "features": { "networking": { @@ -24,6 +21,10 @@ "c-ares" ] }, + "platform": { + "description": "Include linux platform features.", + "supports": "linux" + }, "ssl": { "description": "Include SSL features.", "dependencies": [ @@ -36,9 +37,6 @@ }, "openssl" ] - }, - "threading": { - "description": "Include multithreading features." } } } diff --git a/versions/baseline.json b/versions/baseline.json index f2932131fc2ba1..703344380317e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4153,7 +4153,7 @@ "port-version": 0 }, "libcoro": { - "baseline": "0.9", + "baseline": "0.10", "port-version": 0 }, "libcorrect": { diff --git a/versions/l-/libcoro.json b/versions/l-/libcoro.json index 12ad22eb9c352a..197233ad9db086 100644 --- a/versions/l-/libcoro.json +++ b/versions/l-/libcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da37665bbdb4cdb391d48037308acb4db271aacf", + "version": "0.10", + "port-version": 0 + }, { "git-tree": "36f9c61aa64e8be9670199b9efad6cec4e83b805", "version": "0.9", From baa9580d7d225cdd105d8dccac7563a5fb1feea9 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 4 Jan 2024 22:59:47 +0300 Subject: [PATCH 0759/1039] [openssl] Disable building quicserver utility. (#35838) Thix fixes #35792. Signed-off-by: Vitalii Koshura Co-authored-by: vzhli17 --- ports/openssl/portfile.cmake | 1 + ports/openssl/unix/disable-quicserver.patch | 17 +++++++++++++++++ ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ports/openssl/unix/disable-quicserver.patch diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index b1a0772a38a8b3..1de3d05aa543ad 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_from_github( unix/move-openssldir.patch unix/no-empty-dirs.patch unix/no-static-libs-for-shared.patch + unix/disable-quicserver.patch ) vcpkg_list(SET CONFIGURE_OPTIONS diff --git a/ports/openssl/unix/disable-quicserver.patch b/ports/openssl/unix/disable-quicserver.patch new file mode 100644 index 00000000000000..5db8364d568e8c --- /dev/null +++ b/ports/openssl/unix/disable-quicserver.patch @@ -0,0 +1,17 @@ +diff --git a/util/build.info b/util/build.info +index cf06f15ae4f0e..e4aab44b38038 100644 +--- a/util/build.info ++++ b/util/build.info +@@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl + SOURCE[wrap.pl]=wrap.pl.in + DEPEND[wrap.pl]=../configdata.pm + +-IF[{- !$disabled{quic} && !$disabled{stdio} -}] ++IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{apps} -}] + PROGRAMS{noinst}=quicserver + SOURCE[quicserver]=quicserver.c +-INCLUDE[quicserver]=../include ../apps/include +-DEPEND[quicserver]=../libcrypto.a ../libssl.a ++ INCLUDE[quicserver]=../include ../apps/include ++ DEPEND[quicserver]=../libcrypto.a ../libssl.a + ENDIF diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index bc067f8bf6d938..72694559e5315f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.2.0", - "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 703344380317e8..94219cf4d2f7de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6342,7 +6342,7 @@ }, "openssl": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "deprecated", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 7b51fc3d7433a1..e3c5587df34fe1 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8865e51e2cd2c891df13f80e1a2585d8b69eab9c", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "dd76b04663283d999c149033c3fac211d08f0324", "version": "3.2.0", From b88e4cdec52bd755702d293312650cdf5649026f Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 5 Jan 2024 04:04:24 +0800 Subject: [PATCH 0760/1039] [launch-darkly-server] Fix dependence clib symbol Duplicate with openssl (#35901) --- .../fix-confilct-with-openssl.patch | 26 +++++++++++++++++++ .../fix-depend-clib.patch | 13 ++++++++++ ports/launch-darkly-server/portfile.cmake | 3 +++ ports/launch-darkly-server/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/launch-darkly-server.json | 5 ++++ 6 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 ports/launch-darkly-server/fix-confilct-with-openssl.patch create mode 100644 ports/launch-darkly-server/fix-depend-clib.patch diff --git a/ports/launch-darkly-server/fix-confilct-with-openssl.patch b/ports/launch-darkly-server/fix-confilct-with-openssl.patch new file mode 100644 index 00000000000000..871a1540b122c2 --- /dev/null +++ b/ports/launch-darkly-server/fix-confilct-with-openssl.patch @@ -0,0 +1,26 @@ +diff --git a/sha1.c b/sha1.c +index fe8da83..53ad2c4 100644 +--- a/sha1.c ++++ b/sha1.c +@@ -279,7 +279,7 @@ void SHA1Final( + memset(&finalcount, '\0', sizeof(finalcount)); + } + +-void SHA1( ++void SHA1_CLIBS( + char *hash_out, + const char *str, + int len) +diff --git a/sha1.h b/sha1.h +index 96bb008..53c4b01 100644 +--- a/sha1.h ++++ b/sha1.h +@@ -36,7 +36,7 @@ void SHA1Final( + SHA1_CTX * context + ); + +-void SHA1( ++void SHA1_CLIBS( + char *hash_out, + const char *str, + int len); diff --git a/ports/launch-darkly-server/fix-depend-clib.patch b/ports/launch-darkly-server/fix-depend-clib.patch new file mode 100644 index 00000000000000..297343b00eea10 --- /dev/null +++ b/ports/launch-darkly-server/fix-depend-clib.patch @@ -0,0 +1,13 @@ +diff --git a/src/evaluate.c b/src/evaluate.c +index f702419..e80fa6c 100644 +--- a/src/evaluate.c ++++ b/src/evaluate.c +@@ -1246,7 +1246,7 @@ LDi_bucketUser( + char digest[21], encoded[17]; + const float longScale = 1152921504606846975.0; + +- SHA1(digest, raw, strlen(raw)); ++ SHA1_CLIBS(digest, raw, strlen(raw)); + + /* encodes to hex, and shortens, 16 characters in hex 8 bytes */ + status = hexify( diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake index e0cf49badb7c40..f05a7889bf6fa5 100644 --- a/ports/launch-darkly-server/portfile.cmake +++ b/ports/launch-darkly-server/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( findPCRE.patch FixStrictPrototypes.patch # required with clang-15 removeWarningAsError.patch + fix-depend-clib.patch ) @@ -37,6 +38,8 @@ vcpkg_from_github( REF fa1d96ec293d2968791603548125e3274bd6b472 SHA512 fd7dfbed4ac10e2c482da1cd460dabf0a53965e6fa17fab97156becb8214e435ee3605b2748705141380e254de7c32ab42da5e42cd6e4494f7ecaafb3b9e19f0 HEAD_REF master + PATCHES + fix-confilct-with-openssl.patch ) vcpkg_from_github( diff --git a/ports/launch-darkly-server/vcpkg.json b/ports/launch-darkly-server/vcpkg.json index fa420d6c3d2577..3bb4be09eb7eb2 100644 --- a/ports/launch-darkly-server/vcpkg.json +++ b/ports/launch-darkly-server/vcpkg.json @@ -1,7 +1,7 @@ { "name": "launch-darkly-server", "version": "2.8.6", - "port-version": 1, + "port-version": 2, "description": "LaunchDarkly server-side SDK for C/C++", "homepage": "https://github.com/launchdarkly/c-server-sdk", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 94219cf4d2f7de..dacfe5a9dcf845 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3994,7 +3994,7 @@ }, "launch-darkly-server": { "baseline": "2.8.6", - "port-version": 1 + "port-version": 2 }, "lazy-importer": { "baseline": "2023-08-03", diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json index 5db0081827d2ab..ea76effe1ed7cf 100644 --- a/versions/l-/launch-darkly-server.json +++ b/versions/l-/launch-darkly-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf4d27e890d7becddd87f89a3a0622199892ebd2", + "version": "2.8.6", + "port-version": 2 + }, { "git-tree": "d2e41e5748cc5b77167205b83be64003e979e637", "version": "2.8.6", From ae8680945564fba80856383ab9ba6a873f4d7940 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 5 Jan 2024 04:04:39 +0800 Subject: [PATCH 0761/1039] [lapack-reference] Disable Test program (#35920) --- ports/lapack-reference/portfile.cmake | 1 + ports/lapack-reference/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 2f569f8035cdc7..1eb3401e9d1ac5 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -69,6 +69,7 @@ vcpkg_cmake_configure( "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" "-DCMAKE_REQUIRE_FIND_PACKAGE_BLAS=${USE_OPTIMIZED_BLAS}" "-DCBLAS=${CBLAS}" + "-DTEST_FORTRAN_COMPILER=OFF" ${FORTRAN_CMAKE} MAYBE_UNUSED_VARIABLES CMAKE_REQUIRE_FIND_PACKAGE_BLAS diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json index e073cf664dac5a..6f30ae7a6a5b01 100644 --- a/ports/lapack-reference/vcpkg.json +++ b/ports/lapack-reference/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lapack-reference", "version": "3.11.0", - "port-version": 1, + "port-version": 2, "description": "LAPACK - Linear Algebra PACKage", "homepage": "http://www.netlib.org/lapack/", "license": "BSD-3-Clause-Open-MPI", diff --git a/versions/baseline.json b/versions/baseline.json index dacfe5a9dcf845..abe6415ff22448 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3982,7 +3982,7 @@ }, "lapack-reference": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "lastools": { "baseline": "2.0.2+20230206", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 0b841e18297fe0..1cd14ec48e6144 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34ccaaa835e90fc739829db6ea9b72c58151960e", + "version": "3.11.0", + "port-version": 2 + }, { "git-tree": "d71a74d50d88f3cf337d7cefccadcb192e7d12ab", "version": "3.11.0", From 87e969a6d9b388f246f801720bc97d54a7059160 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 5 Jan 2024 04:05:56 +0800 Subject: [PATCH 0762/1039] [qt5-base] Fix undefined XKB_KEY_dead_lowline under linux (#36005) --- .../patches/XKB_KEY_dead_lowline.patch | 18 ++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + ports/qt5-base/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ports/qt5-base/patches/XKB_KEY_dead_lowline.patch diff --git a/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch b/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch new file mode 100644 index 00000000000000..9bbe3efb1f0a11 --- /dev/null +++ b/ports/qt5-base/patches/XKB_KEY_dead_lowline.patch @@ -0,0 +1,18 @@ +diff --git a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +index 7bfacf4..ded358a 100644 +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -273,11 +273,13 @@ static constexpr const auto KeyTbl = qMakeArray( + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, ++#ifdef XKB_KEY_dead_lowline + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, + Xkb2Qt, + ++#endif + // Special keys from X.org - This include multimedia keys, + // wireless/bluetooth/uwb keys, special launcher keys, etc. + Xkb2Qt, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 06bb7b5ae4b8bf..37d3150ea921c9 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -80,6 +80,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt patches/fix_angle.patch # Failed to create OpenGL context for format QSurfaceFormat ... patches/mingw9.patch # Fix compile with MinGW-W64 9.0.0: Redefinition of 'struct _FILE_ID_INFO' + patches/XKB_KEY_dead_lowline.patch # https://bugreports.qt.io/browse/QTBUG-117950 ) # Remove vendored dependencies to ensure they are not picked up by the build diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 4bda0303c7d8e7..f81e8b0edf05be 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-base", "version": "5.15.12", + "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, diff --git a/versions/baseline.json b/versions/baseline.json index abe6415ff22448..61c6627bc0b99e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6950,7 +6950,7 @@ }, "qt5-base": { "baseline": "5.15.12", - "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 162dd91a624e82..359d37620c592a 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2932bd39b46da13edde2cf5715b0308c53b1d426", + "version": "5.15.12", + "port-version": 1 + }, { "git-tree": "e2a320e35b03c115bc674b6006f7a8a9907835b0", "version": "5.15.12", From b8ec6abf5d85d54940d638888afc7cf2770f56b2 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Thu, 4 Jan 2024 20:00:31 -0500 Subject: [PATCH 0763/1039] [fmt] Update to 10.2.1 (#36033) --- ports/fmt/portfile.cmake | 2 +- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 2675715cce36d6..511912bf260b01 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt REF "${VERSION}" - SHA512 b90f8ab1692fcae9146f8cad5c5c26a2b5ceb6a0460003e01cabe8a75c0aa2fea1c3760dc3214eddaf08984a1695747ea8b1f3124c40c54cbadfd45458fa4b2d + SHA512 27df90c681ec37e55625062a79e3b83589b6d7e94eff37a3b412bb8c1473f757a8adb727603acc9185c3490628269216843b7d7bd5a3cb37f0029da5d1495ffa HEAD_REF master PATCHES fix-write-batch.patch diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 34d29aa44f3a0e..a6b09f45da5c57 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "10.2.0", + "version": "10.2.1", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 61c6627bc0b99e..85b74a1243123c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2713,7 +2713,7 @@ "port-version": 2 }, "fmt": { - "baseline": "10.2.0", + "baseline": "10.2.1", "port-version": 0 }, "folly": { diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index f7bf20d6779cbd..b3ad55cf217a68 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "405156a2b01c91258bf66768ceb3ae75c1caba7f", + "version": "10.2.1", + "port-version": 0 + }, { "git-tree": "f91bb86075f45f6fad0c35ab9e87d8ea43c9d389", "version": "10.2.0", From 3434b0a1b49629fda62cdee0a17cf0332d3b0255 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 5 Jan 2024 02:02:27 +0100 Subject: [PATCH 0764/1039] [Freetype] burn in linkage (#35999) --- ports/freetype/portfile.cmake | 8 ++++++++ ports/freetype/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freetype.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 0639955c01368d..22ebaa934c257f 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -74,6 +74,14 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_TARGET_IS_WINDOWS) + set(dll_linkage 1) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(dll_linkage 0) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/freetype/config/public-macros.h" "#elif defined( DLL_IMPORT )" "#elif ${dll_linkage}") +endif() + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 13e069c0bb3466..f42b050328d052 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype", "version": "2.12.1", - "port-version": 4, + "port-version": 5, "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 85b74a1243123c..24f7fda4298f61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2782,7 +2782,7 @@ }, "freetype": { "baseline": "2.12.1", - "port-version": 4 + "port-version": 5 }, "freetype-gl": { "baseline": "2022-01-17", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index e93f019c42fd1a..de4d7b5c0825e4 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5480587e6a2faf047bc6d8520e48c12fc57604a", + "version": "2.12.1", + "port-version": 5 + }, { "git-tree": "4e52babe5d382c3f9cdb1b8037874d78eceb3512", "version": "2.12.1", From fc3f61366102c1f0d4547c06d03c523bb18c13a7 Mon Sep 17 00:00:00 2001 From: "Thea Camille-Maxime (MaxRev)" Date: Fri, 5 Jan 2024 03:41:17 +0200 Subject: [PATCH 0765/1039] [libmysql] Fix port on arm64-osx (compiler checks) (#35930) --- ports/libmysql/cross-build.patch | 33 ++++++++++++++++++++++++++------ ports/libmysql/portfile.cmake | 5 ++++- ports/libmysql/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 +++++ 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/ports/libmysql/cross-build.patch b/ports/libmysql/cross-build.patch index 000d7aebdf8afa..a91118b4f851e8 100644 --- a/ports/libmysql/cross-build.patch +++ b/ports/libmysql/cross-build.patch @@ -1,5 +1,26 @@ +diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake +index 725b9bd..289bb3d 100644 +--- a/cmake/os/Darwin.cmake ++++ b/cmake/os/Darwin.cmake +@@ -31,13 +31,9 @@ ENDIF() + # We require at least XCode 10.0 + IF(NOT FORCE_UNSUPPORTED_COMPILER) + IF(MY_COMPILER_IS_CLANG) +- CHECK_C_SOURCE_RUNS(" +- int main() +- { +- return (__clang_major__ < 10); +- }" HAVE_SUPPORTED_CLANG_VERSION) +- IF(NOT HAVE_SUPPORTED_CLANG_VERSION) +- MESSAGE(FATAL_ERROR "XCode 10.0 or newer is required!") ++ IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10) ++ MESSAGE(FATAL_ERROR ++ "XCode 10.0 or newer is required! Compiler version was ${CMAKE_CXX_COMPILER_VERSION}") + ENDIF() + ELSE() + MESSAGE(FATAL_ERROR "Unsupported compiler!") diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt -index 8e224532..2b63413b 100644 +index 8e22453..2b63413 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -259,6 +259,7 @@ ELSEIF(FREEBSD) @@ -27,7 +48,7 @@ index 8e224532..2b63413b 100644 DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out ) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 8e933877..d971acbf 100644 +index 8e93387..d971acb 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -69,7 +69,6 @@ ADD_CUSTOM_COMMAND( @@ -39,7 +60,7 @@ index 8e933877..d971acbf 100644 ) diff --git a/scripts/sys_schema/CMakeLists.txt b/scripts/sys_schema/CMakeLists.txt -index aaba3575..a0e52652 100644 +index aaba357..a0e5265 100644 --- a/scripts/sys_schema/CMakeLists.txt +++ b/scripts/sys_schema/CMakeLists.txt @@ -221,7 +221,6 @@ MY_ADD_CUSTOM_TARGET(sql_commands @@ -51,7 +72,7 @@ index aaba3575..a0e52652 100644 COMMENT "Generating Sys Schema C code" ) diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt -index 28cde40e..be916cbc 100644 +index 28cde40..be916cb 100644 --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -47,8 +47,12 @@ SET(dirs @@ -70,7 +91,7 @@ index 28cde40e..be916cbc 100644 COMPONENT Server ) diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt -index 665b35da..88f0743b 100644 +index 665b35d..88f0743 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -69,6 +69,13 @@ SET(ZH_HANS_SRC_FILE ${CMAKE_SOURCE_DIR}/strings/lang_data/zh_hans.txt) @@ -97,7 +118,7 @@ index 665b35da..88f0743b 100644 SET_SOURCE_FILES_PROPERTIES( ${JA_HANS_DST_FILE} ${ZH_HANS_DST_FILE} diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt -index da34524c..dc397dae 100644 +index da34524..dc397da 100644 --- a/utilities/CMakeLists.txt +++ b/utilities/CMakeLists.txt @@ -39,6 +39,21 @@ MYSQL_ADD_EXECUTABLE(comp_client_err diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index a9ba39d3b60a9e..9a9c8c49e9987f 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -14,9 +14,12 @@ vcpkg_from_github( fix_dup_symbols.patch cross-build.patch ) + file(GLOB third_party "${SOURCE_PATH}/extra/*" "${SOURCE_PATH}/include/boost_1_70_0") list(REMOVE_ITEM third_party "${SOURCE_PATH}/extra/libedit") -file(REMOVE_RECURSE ${third_party}) +if (third_party) + file(REMOVE_RECURSE ${third_party}) +endif() #Skip the version check for Visual Studio set(FORCE_UNSUPPORTED_COMPILER "") diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 7ce4a307458a50..611d79d05e5d02 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmysql", "version": "8.0.34", + "port-version": 1, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 24f7fda4298f61..04e03925683e18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4574,7 +4574,7 @@ }, "libmysql": { "baseline": "8.0.34", - "port-version": 0 + "port-version": 1 }, "libnice": { "baseline": "0.1.21", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 3e5a53b264da20..b8147475c42711 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fa6006119f50a9baff9cdf0966b065097113fd7", + "version": "8.0.34", + "port-version": 1 + }, { "git-tree": "91349aeb1e56c0b95d609361ae974a08abace26c", "version": "8.0.34", From 2f8fe8d3e9c66be1476d595c8092cdc93c816377 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Fri, 5 Jan 2024 13:16:24 -0800 Subject: [PATCH 0766/1039] [wxwidgets] Update to 3.2.4 (#35983) Co-authored-by: Monica --- ports/wxwidgets/fix-glegl.patch | 36 +++++++++++++++++++++++++++++++++ ports/wxwidgets/portfile.cmake | 3 ++- ports/wxwidgets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 ports/wxwidgets/fix-glegl.patch diff --git a/ports/wxwidgets/fix-glegl.patch b/ports/wxwidgets/fix-glegl.patch new file mode 100644 index 00000000000000..59c6ef5c3e17e5 --- /dev/null +++ b/ports/wxwidgets/fix-glegl.patch @@ -0,0 +1,36 @@ +diff --git a/src/unix/glegl.cpp b/src/unix/glegl.cpp +index 9e1b6b7..7407a9f 100644 +--- a/src/unix/glegl.cpp ++++ b/src/unix/glegl.cpp +@@ -43,8 +43,9 @@ + + static const char* TRACE_EGL = "glegl"; + +-#ifdef GDK_WINDOWING_WAYLAND +- ++// We can't add a member variable to wxGLCanvasEGL in 3.2 branch, so emulate it ++// by encoding the corresponding boolean value via the presence of "this" ++// pointer in the given hash set. + #include "wx/hashset.h" + + namespace +@@ -58,8 +59,6 @@ wxGLCanvasSet gs_alreadySetSwapInterval; + + } // anonymous namespace + +-#endif // GDK_WINDOWING_WAYLAND +- + // ---------------------------------------------------------------------------- + // wxGLContextAttrs: OpenGL rendering context attributes + // ---------------------------------------------------------------------------- +@@ -633,9 +632,9 @@ wxGLCanvasEGL::~wxGLCanvasEGL() + DestroyWaylandSubsurface(); + g_clear_pointer(&m_wlEGLWindow, wl_egl_window_destroy); + g_clear_pointer(&m_wlSurface, wl_surface_destroy); ++#endif + + gs_alreadySetSwapInterval.erase(this); +-#endif + } + + void wxGLCanvasEGL::CreateWaylandSubsurface() diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 10e6e93ac0d815..7ae03e194efac1 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets REF "v${VERSION}" - SHA512 d9cfad429c5c160944cd9c23c3a32ca72740e2d25d7392a06c22374bcbdd099affee5f541d59ac4a9983fb3d82f90bda7eaf92a93a1e8b5ace2c5bf29962ed53 + SHA512 f1ba875e6dfa3970e6f03741573f96ac224a8d0bace5a4c44dcf95dd4e861031fe086e2dc4429c1c6bcb22d40656fc2c6c287abe0b4678eb9af9698691eda3d9 HEAD_REF master PATCHES install-layout.patch @@ -12,6 +12,7 @@ vcpkg_from_github( fix-pcre2.patch gtk3-link-libraries.patch sdl2.patch + fix-glegl.patch ) vcpkg_check_features( diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 14f297ebd4952b..a160545909ebbe 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxwidgets", - "version": "3.2.3", + "version": "3.2.4", "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 04e03925683e18..13f48931ea9184 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9165,7 +9165,7 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.2.3", + "baseline": "3.2.4", "port-version": 0 }, "wyhash": { diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index cf88dc82830459..314acc4b7d0535 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b76c48ce396ff7c6e49ec508b7c5bd749fb94fbb", + "version": "3.2.4", + "port-version": 0 + }, { "git-tree": "8dfaace5786af8de744ecf9e02622b7b3e39087a", "version": "3.2.3", From 91e7e6c2735f71085065ad2af0984d847350afa4 Mon Sep 17 00:00:00 2001 From: Leger Charlie <54318446+legerch@users.noreply.github.com> Date: Fri, 5 Jan 2024 22:20:20 +0100 Subject: [PATCH 0767/1039] [qtbase] Add missing "egl1" related system package for linux target (#36023) Allow to fix issue explained at https://github.com/microsoft/vcpkg/issues/35815 --- ports/qtbase/portfile.cmake | 2 +- ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 96a39760f57532..5e7fa8f1c46a5b 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -39,7 +39,7 @@ if(VCPKG_TARGET_IS_LINUX) message(WARNING "qtbase currently requires packages from the system package manager. " "They can be installed on Ubuntu systems via sudo apt-get install " "'^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev " - "libxkbcommon-x11-dev.") + "libxkbcommon-x11-dev libegl1-mesa-dev.") endif() # Features can be found via searching for qt_feature in all configure.cmake files in the source: diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 2c48a2e2731e31..baf7e62dfa2e64 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 4, + "port-version": 5, "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 13f48931ea9184..a78bfc77a5f791 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7118,7 +7118,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 4 + "port-version": 5 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index e0d7e91254f8fb..b9812897474354 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b947014e92b75d7bf37427fc4a9ce3fd463af2c", + "version": "6.6.1", + "port-version": 5 + }, { "git-tree": "7e1dba7994d7d228fee34f8f5b646e7d9aff62ac", "version": "6.6.1", From 9cdf33f37d1cf51b8f3a3e3a69fedfdcb142ac49 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 6 Jan 2024 05:24:54 +0800 Subject: [PATCH 0768/1039] [folly,fizz,wangle,mvfst,proxygen,fbthrift] update to 2024.01.01.00 (#36027) --- ports/fbthrift/portfile.cmake | 2 +- ports/fbthrift/vcpkg.json | 2 +- ports/fizz/portfile.cmake | 2 +- ports/fizz/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 3 +-- ports/mvfst/portfile.cmake | 2 +- ports/mvfst/vcpkg.json | 2 +- ports/proxygen/portfile.cmake | 2 +- ports/proxygen/vcpkg.json | 2 +- ports/rsocket/fix-rsockserver-build-error.patch | 16 ++++++++-------- ports/rsocket/vcpkg.json | 2 +- ports/wangle/portfile.cmake | 2 +- ports/wangle/vcpkg.json | 2 +- versions/baseline.json | 16 ++++++++-------- versions/f-/fbthrift.json | 5 +++++ versions/f-/fizz.json | 5 +++++ versions/f-/folly.json | 5 +++++ versions/m-/mvfst.json | 5 +++++ versions/p-/proxygen.json | 5 +++++ versions/r-/rsocket.json | 5 +++++ versions/w-/wangle.json | 5 +++++ 22 files changed, 64 insertions(+), 30 deletions(-) diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 2230f64525621e..88f1285e0cb2cb 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift REF "v${VERSION}" - SHA512 8730c2ecfeccf221e746df9f8e449d31934fd7e6f7861631d4c38e891cfc7b5ab07ffb48b56048031820f771966d6435bee2996738934bca9324548aeba5b30d + SHA512 9138917c622eb1254043520708d49391196412ef5a4c309e82c25eacfcc680a41b3a0b81cde9c777a1893015da5751bac1a627633ef917f9e94b39771a981a07 HEAD_REF master PATCHES fix-glog.patch diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json index 7103b58369bdca..9fe106754356f7 100644 --- a/ports/fbthrift/vcpkg.json +++ b/ports/fbthrift/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fbthrift", - "version-string": "2023.10.02.00", + "version-string": "2024.01.01.00", "description": "Facebook's branch of Apache Thrift, including a new C++ server.", "homepage": "https://github.com/facebook/fbthrift", "license": "Apache-2.0", diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index c92ae9c728e4cd..a6140ed2727c6f 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz REF "v${VERSION}" - SHA512 ff0dfe95640a24568a2950442576fbf4acd9a1dd354b7f7687cb1946cc2f896664e6e54b29ec051eccddb765bab276cb94c9920c724c4b4a5b1fc5f29c26e649 + SHA512 e940aacb6dd08163f292a6e3e07e5782ccaa7658c638791a75604ba4a05da6a827a383d1727e56c85823da99a678a60ae67207f64b64c274786ad85793fd04bb HEAD_REF master PATCHES 0001-fix-libsodium.patch diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json index f5f49a7c059a19..07a95d87d97ffc 100644 --- a/ports/fizz/vcpkg.json +++ b/ports/fizz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fizz", - "version-string": "2023.10.02.00", + "version-string": "2024.01.01.00", "description": "a TLS 1.3 implementation by Facebook", "homepage": "https://github.com/facebookincubator/fizz", "license": "BSD-3-Clause", diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index aea538cdd39f7b..71f60438cffc5f 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly REF "v${VERSION}" - SHA512 406dbbd5a61a5b0713e7e6c7677be76392c21a5d702b051e72158513436ea9605afe616c5bc1405cb9455be1d1993990c9f2608284204210f41ffc2055e7831b + SHA512 c563aa64efa3098235db5f6354cdbc96d829f8bfc24e24464e0cae65279d00f1bba722c7060c2e76c89723ef66ef94225a02d6fb65e24fa6125adb619fc1d74b HEAD_REF main PATCHES reorder-glog-gflags.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 2501067d20c937..834ceb73449a6f 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2023.10.02.00", - "port-version": 1, + "version-string": "2024.01.01.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/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake index 66186a536cdb52..13baf30fcf0dda 100644 --- a/ports/mvfst/portfile.cmake +++ b/ports/mvfst/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/mvfst REF "v${VERSION}" - SHA512 074ad8201e2c35b51bde0f8eaeb22bfe87af80fd9f3dc6c3de343b19d4b3d7738780a208d4719ee4fbd9d3f2f8a1a95b4858e8dc3fad16c26e4a859ecab75eca + SHA512 6bcc4df79b42bafb06ee69f253733dd5136ef329b8009fc5677f62c3476d205f5f0cdcca242d0bde15914bf487a37aeeab1adb4ad555d2edd5e6b3935e84dd37 HEAD_REF main ) diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json index e4df0143ae1666..e83ac843af8db1 100644 --- a/ports/mvfst/vcpkg.json +++ b/ports/mvfst/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mvfst", - "version-string": "2023.10.02.00", + "version-string": "2024.01.01.00", "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.", "homepage": "https://github.com/facebook/mvfst", "license": "MIT", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index 148d75cf595f89..e3f3231f5508f0 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen REF "v${VERSION}" - SHA512 83b294895878c556b855688a78da524d7034a6dc4f1ed9c2b0e73a1bad55df2c4aae94921eb45e173ac0b53ed3ee885194caf37f0dff442f5a343701e4c0ccd8 + SHA512 9a7081e0dafc93f1610a20ad2026111667711336efa46b9208873b539251f5b00d95597acde53818664aa6ea1fcda0dbd3417222af2fa23dc2f6b4c2bb079124 HEAD_REF master PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index c74d79ae8c8c8a..bb222cfb5aadad 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxygen", - "version-string": "2023.10.02.00", + "version-string": "2024.01.01.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", "license": "BSD-3-Clause", diff --git a/ports/rsocket/fix-rsockserver-build-error.patch b/ports/rsocket/fix-rsockserver-build-error.patch index 080f8a3fcf8b81..b7dd6726068ca0 100644 --- a/ports/rsocket/fix-rsockserver-build-error.patch +++ b/ports/rsocket/fix-rsockserver-build-error.patch @@ -64,7 +64,7 @@ index 72d212c..79a09f1 100644 } } catch (const std::exception& ex) { - value.emplaceException(std::current_exception(), ex); -+ value.emplaceException(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex); ++ value.emplaceException(std::current_exception()); } catch (...) { value.emplaceException(std::current_exception()); } @@ -77,7 +77,7 @@ index 9dff78b..bccd70d 100644 } catch (const std::exception& ex) { subscriber.onError( - folly::exception_wrapper(std::current_exception(), ex)); -+ folly::exception_wrapper(folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), ex)); ++ folly::exception_wrapper(std::current_exception())); } catch (...) { subscriber.onError(std::runtime_error( "Flowable::fromGenerator() threw from Subscriber:onNext()")); @@ -90,7 +90,7 @@ index 314ba7f..fe63504 100644 } } catch (const std::exception& exn) { - folly::exception_wrapper ew{std::current_exception(), exn}; -+ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; ++ folly::exception_wrapper ew{std::current_exception()}; this->terminateErr(std::move(ew)); } } @@ -99,7 +99,7 @@ index 314ba7f..fe63504 100644 } catch (const std::exception& exn) { this->terminateErr( - folly::exception_wrapper{std::current_exception(), exn}); -+ folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}); ++ folly::exception_wrapper{std::current_exception()}); } } @@ -108,7 +108,7 @@ index 314ba7f..fe63504 100644 mappedStream = flowable_->function_(std::move(value)); } catch (const std::exception& exn) { - folly::exception_wrapper ew{std::current_exception(), exn}; -+ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; ++ folly::exception_wrapper ew{std::current_exception()}; { std::lock_guard g(onErrorExGuard_); onErrorEx_ = ew; @@ -121,7 +121,7 @@ index d1dc3b5..582f9c4 100644 } catch (const std::exception& exn) { this->cancel(); - auto ew = folly::exception_wrapper{std::current_exception(), exn}; -+ auto ew = folly::exception_wrapper{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; ++ auto ew = folly::exception_wrapper{std::current_exception()}; LOG(ERROR) << "'next' method should not throw: " << ew.what(); onErrorImpl(ew); return; @@ -134,7 +134,7 @@ index 451c6bd..0e60b48 100644 this->observerOnNext(observable_->function_(std::move(value))); } catch (const std::exception& exn) { - folly::exception_wrapper ew{std::current_exception(), exn}; -+ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; ++ folly::exception_wrapper ew{std::current_exception()}; this->terminateErr(std::move(ew)); } } @@ -147,7 +147,7 @@ index 0b3e739..4defd64 100644 this->observerOnSuccess(map_operator->function_(std::move(value))); } catch (const std::exception& exn) { - folly::exception_wrapper ew{std::current_exception(), exn}; -+ folly::exception_wrapper ew{folly::exception_wrapper::from_catch_ref_t{}, std::current_exception(), exn}; ++ folly::exception_wrapper ew{std::current_exception()}; this->observerOnError(std::move(ew)); } } diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json index 190c786aec3d32..5872579eebfa8d 100644 --- a/ports/rsocket/vcpkg.json +++ b/ports/rsocket/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rsocket", "version-string": "2021.08.30.00", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of RSocket http://rsocket.io", "homepage": "https://github.com/rsocket/rsocket-cpp", "dependencies": [ diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index 535de506abb187..392875a40db1f7 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle REF "v${VERSION}" - SHA512 d5e44265e9e609d6fa42e7d3b71598e23460b4157eb45adeb1552077d30390775e6523d58d7d52446ea59509cbfdd7906f295220b70994df0c4f24128932cff4 + SHA512 a3c671b19cb4f4875fa894b3374a4c24e6d4715fbb025c21434d7ca89f10f0affb8c25f392acc15793b4a92b48998d95c51b5120457e1b47ea15890221d0dd6c HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index a1e9dfbb43b047..1ba4a67e159903 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wangle", - "version-string": "2023.10.02.00", + "version-string": "2024.01.01.00", "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a78bfc77a5f791..7ab60b29cd2c14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2589,7 +2589,7 @@ "port-version": 0 }, "fbthrift": { - "baseline": "2023.10.02.00", + "baseline": "2024.01.01.00", "port-version": 0 }, "fcl": { @@ -2633,7 +2633,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2023.10.02.00", + "baseline": "2024.01.01.00", "port-version": 0 }, "flagpp": { @@ -2717,8 +2717,8 @@ "port-version": 0 }, "folly": { - "baseline": "2023.10.02.00", - "port-version": 1 + "baseline": "2024.01.01.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -5825,7 +5825,7 @@ "port-version": 7 }, "mvfst": { - "baseline": "2023.10.02.00", + "baseline": "2024.01.01.00", "port-version": 0 }, "mygui": { @@ -6817,7 +6817,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2023.10.02.00", + "baseline": "2024.01.01.00", "port-version": 0 }, "psimd": { @@ -7582,7 +7582,7 @@ }, "rsocket": { "baseline": "2021.08.30.00", - "port-version": 2 + "port-version": 3 }, "rtabmap": { "baseline": "0.21.0", @@ -9025,7 +9025,7 @@ "port-version": 5 }, "wangle": { - "baseline": "2023.10.02.00", + "baseline": "2024.01.01.00", "port-version": 0 }, "wasmedge": { diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index 37e3d561a0a231..92cabbf06f9cc5 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "824b246c1bf15c6d96a4ca1126d3e9a279663585", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "80891c5a004015fd7a5c4334de145c92474f2cec", "version-string": "2023.10.02.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 556d768a45a5a3..abaced4d02fc40 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a03c5a987e674153efbc6e8a9ab1ed9655b0b0", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "1d8026070e16e8f91275e5f97699bfd5452166d4", "version-string": "2023.10.02.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index a4d67dd333eaa5..e6820fe7e50cdd 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14d0ea48901f854308ce005f8de818b0a0bb06b2", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "5d4dff9c56b8324d2e6b7ca2ba6ad0b60845de56", "version-string": "2023.10.02.00", diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json index e7bd19a9b3dda6..01e782f980af15 100644 --- a/versions/m-/mvfst.json +++ b/versions/m-/mvfst.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0b5b25444aee23d293543cb07f671e422d131a1", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "082167d3253fd7af5973a5e970a407c117702841", "version-string": "2023.10.02.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 0850da2868cf07..55e58c9d4fd9b2 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd720dffa16fc78103cb6e6fc9aae13e94d33fb3", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "193a933153e2cfab49dd265a48ebeb650a9107e4", "version-string": "2023.10.02.00", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index eb7a6e82adbe97..672439d8f43240 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52b82b815b431e296ffea53c1ce955c7df267d82", + "version-string": "2021.08.30.00", + "port-version": 3 + }, { "git-tree": "b1d02b39aaa70e97e3ec2551d1cfc6ae1a163199", "version-string": "2021.08.30.00", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 1f87d08d0da64e..a1df8e0a4737ab 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efa950ad690a3f10060fe5c09cfea6a55201736a", + "version-string": "2024.01.01.00", + "port-version": 0 + }, { "git-tree": "ff239f5d33f181256ff31bbb5cfc0bdc7329937c", "version-string": "2023.10.02.00", From c4e9b765d94bd419a7779255c9ee815b92f2f3c0 Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Fri, 5 Jan 2024 16:25:15 -0500 Subject: [PATCH 0769/1039] [google-cloud-cpp] update to the latest release (v2.20.0) (#36034) --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index b0aa0ee2496005..3d5cf10a4a8c99 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp REF "v${VERSION}" - SHA512 a392da19ac353409ecbf30e390803b2e34670552fd54466a08ee554a77c893d447289b30d5841c7f79b2a23244a269d8ecac8f7fbd8a34dda45ce2d8b1d46817 + SHA512 f017252b3fbccd5b91088a00c98a610606c5e98b920bf6c0889b6bf0f33f923c38a6116df7d9784381fd6b81ff4c303f55a609fde2e7182958a3c9cbab1f9f47 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 9a9055931d7d2b..23409d58860dee 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.19.0", - "port-version": 1, + "version": "2.20.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -296,6 +295,18 @@ } ] }, + "cloudquotas": { + "description": "Cloud Quotas API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "commerce": { "description": "Cloud Commerce C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7ab60b29cd2c14..f54232a1c6ec81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3057,8 +3057,8 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "2.19.0", - "port-version": 1 + "baseline": "2.20.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 63cf94c174c503..ad2ec86cc35534 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b6b859d3c9db3328c9cb34949d5d618f4999090", + "version": "2.20.0", + "port-version": 0 + }, { "git-tree": "815f9e2c25c4aa47b16ec69ac6c41e2d52655d89", "version": "2.19.0", From ce46ba8777d8f899d8dc11afefb8eca39293df39 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 5 Jan 2024 16:57:04 -0500 Subject: [PATCH 0770/1039] [opentelemetry-cpp] Update to 1.13.0 (#35996) --- .../add-missing-dependencies.patch | 15 -- .../fix-nominmax-problems.patch | 224 ++++++++++++++++++ ports/opentelemetry-cpp/portfile.cmake | 12 +- ports/opentelemetry-cpp/vcpkg.json | 6 +- versions/baseline.json | 4 +- versions/o-/opentelemetry-cpp.json | 5 + 6 files changed, 237 insertions(+), 29 deletions(-) delete mode 100644 ports/opentelemetry-cpp/add-missing-dependencies.patch create mode 100644 ports/opentelemetry-cpp/fix-nominmax-problems.patch diff --git a/ports/opentelemetry-cpp/add-missing-dependencies.patch b/ports/opentelemetry-cpp/add-missing-dependencies.patch deleted file mode 100644 index 2de8be70c7a2c1..00000000000000 --- a/ports/opentelemetry-cpp/add-missing-dependencies.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake -index 34b33d3..19e67e9 100644 ---- a/cmake/opentelemetry-proto.cmake -+++ b/cmake/opentelemetry-proto.cmake -@@ -311,6 +311,10 @@ if(WITH_OTLP_GRPC) - endif() - endif() - -+if(TARGET gRPC::grpc++) -+ target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++) -+endif() -+ - if(BUILD_SHARED_LIBS) - foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS}) - set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/ports/opentelemetry-cpp/fix-nominmax-problems.patch b/ports/opentelemetry-cpp/fix-nominmax-problems.patch new file mode 100644 index 00000000000000..7cf003711337ea --- /dev/null +++ b/ports/opentelemetry-cpp/fix-nominmax-problems.patch @@ -0,0 +1,224 @@ +diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h +index 2a3dc12a84..1160d54fbe 100644 +--- a/api/include/opentelemetry/std/span.h ++++ b/api/include/opentelemetry/std/span.h +@@ -60,7 +60,7 @@ OPENTELEMETRY_END_NAMESPACE + OPENTELEMETRY_BEGIN_NAMESPACE + namespace nostd + { +-constexpr std::size_t dynamic_extent = (std::numeric_limits::max()); ++constexpr std::size_t dynamic_extent = (std::numeric_limits::max)(); + + template + using span = std::span; +index 7deb369ab3..6da8bdd032 100644 +--- a/docs/cpp-ostream-exporter-design.md ++++ b/docs/cpp-ostream-exporter-design.md +@@ -154,7 +154,7 @@ public: + return sdktrace::ExportResult::kSuccess; + } + +- bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept ++ bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept + { + isShutdown = true; + return true; +diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +index 8579c99138..b72ff4f917 100644 +--- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h ++++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h +@@ -100,14 +100,14 @@ class ElasticsearchLogRecordExporter final : public opentelemetry::sdk::logs::Lo + * @return return true when all data are exported, and false when timeout + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shutdown this exporter. + * @param timeout The maximum time to wait for the shutdown method to return + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + // Stores if this exporter had its Shutdown() method called +diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc +index c90072e4e4..e167faf3d9 100644 +--- a/exporters/elasticsearch/src/es_log_record_exporter.cc ++++ b/exporters/elasticsearch/src/es_log_record_exporter.cc +@@ -430,7 +430,7 @@ bool ElasticsearchLogRecordExporter::ForceFlush( + std::chrono::duration_cast(timeout); + if (timeout_steady <= std::chrono::steady_clock::duration::zero()) + { +- timeout_steady = std::chrono::steady_clock::duration::max(); ++ timeout_steady = (std::chrono::steady_clock::duration::max)(); + } + + std::unique_lock lk_cv(synchronization_data_->force_flush_cv_m); +diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h +index 7aff1e24a5..870e5a043a 100644 +--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h ++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h +@@ -58,7 +58,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter + * @return return true when all data are exported, and false when timeout + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shut down the exporter. +@@ -67,7 +67,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter + * @return return the status of this operation + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + // The configuration options associated with this exporter. +diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h +index 29333703b1..f1cd96888c 100644 +--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h ++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h +@@ -60,14 +60,14 @@ class OtlpGrpcLogRecordExporter : public opentelemetry::sdk::logs::LogRecordExpo + * @return return true when all data are exported, and false when timeout + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shutdown this exporter. + * @param timeout The maximum time to wait for the shutdown method to return. + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + // Configuration options for the exporter +diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h +index 1adbbc70b9..b5faf1a9b8 100644 +--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h ++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h +@@ -59,7 +59,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t + * @return return true when all data are exported, and false when timeout + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shut down the exporter. +@@ -68,7 +68,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t + * @return return the status of this operation + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + // The configuration options associated with this exporter. +diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h +index 4393345dfd..f481fdab0b 100644 +--- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h ++++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h +@@ -58,14 +58,14 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco + * @return return true when all data are exported, and false when timeout + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shutdown this exporter. + * @param timeout The maximum time to wait for the shutdown method to return + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + // Configuration options for the exporter +diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc +index 9c57a9bd83..7814199ef2 100644 +--- a/exporters/otlp/src/otlp_http_client.cc ++++ b/exporters/otlp/src/otlp_http_client.cc +@@ -782,7 +782,7 @@ bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept + std::chrono::duration_cast(timeout); + if (timeout_steady <= std::chrono::steady_clock::duration::zero()) + { +- timeout_steady = std::chrono::steady_clock::duration::max(); ++ timeout_steady = (std::chrono::steady_clock::duration::max)(); + } + + while (timeout_steady > std::chrono::steady_clock::duration::zero()) +diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h +index e93ebf3d6b..d6a44df142 100644 +--- a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h ++++ b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h +@@ -72,7 +72,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor + * NOTE: Timeout functionality not supported yet. + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of +@@ -82,7 +82,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor + * NOTE: Timeout functionality not supported yet. + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Class destructor which invokes the Shutdown() method. +diff --git a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h +index 335da7f668..8ca5cffcca 100644 +--- a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h ++++ b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h +@@ -45,7 +45,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor + * @return a result code indicating whether it succeeded, failed or timed out + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shuts down the processor and does any cleanup required. +@@ -55,7 +55,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor + * @return true if the shutdown succeeded, false otherwise + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + private: + std::vector> processors_; +diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h +index a748b06361..afbf4486b0 100644 +--- a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h ++++ b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h +@@ -69,7 +69,7 @@ class BatchSpanProcessor : public SpanProcessor + * NOTE: Timeout functionality not supported yet. + */ + bool ForceFlush( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of +@@ -79,7 +79,7 @@ class BatchSpanProcessor : public SpanProcessor + * NOTE: Timeout functionality not supported yet. + */ + bool Shutdown( +- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; ++ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; + + /** + * Class destructor which invokes the Shutdown() method. The Shutdown() method is supposed to be diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index abf959e27b09ed..e691bd29e5b551 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,14 +6,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb + SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec HEAD_REF main PATCHES - # When compiling code generated by gRPC we need to link the gRPC library - # too. - add-missing-dependencies.patch # Missing find_dependency for Abseil add-missing-find-dependency.patch + # Fix problems from removing NOMINMAX on Windows. Fixed in 1.14.0 + fix-nominmax-problems.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -24,7 +23,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS elasticsearch WITH_ELASTICSEARCH jaeger WITH_JAEGER otlp-http WITH_OTLP_HTTP - zpages WITH_ZPAGES otlp-grpc WITH_OTLP_GRPC ) @@ -43,7 +41,7 @@ if(WITH_OTLP_GRPC) # Create empty .git directory to prevent opentelemetry from cloning it during build time file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=14) - list(APPEND FEATURE_OPTIONS -DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}) + list(APPEND FEATURE_OPTIONS "-DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() vcpkg_cmake_configure( @@ -62,7 +60,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 5ac8f88894746f..3de8314a24d433 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.12.0", - "port-version": 1, + "version-semver": "1.13.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." @@ -87,9 +86,6 @@ }, "zipkin": { "description": "Whether to include the Zipkin exporter in the SDK" - }, - "zpages": { - "description": "Whether to include the Zpages Server in the SDK" } } } diff --git a/versions/baseline.json b/versions/baseline.json index f54232a1c6ec81..f829494a9559f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6361,8 +6361,8 @@ "port-version": 1 }, "opentelemetry-cpp": { - "baseline": "1.12.0", - "port-version": 1 + "baseline": "1.13.0", + "port-version": 0 }, "opentelemetry-fluentd": { "baseline": "2.0.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 1fbfbd2d19b476..e20d473aaaf063 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe04f9f3867c1225a0636a9f410871b30dce6670", + "version-semver": "1.13.0", + "port-version": 0 + }, { "git-tree": "71dd31a63ee43f477bad710ccce04ffac2be5238", "version-semver": "1.12.0", From d479877dc49a4c16e2d884f1034dc093d90b517f Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Mon, 8 Jan 2024 22:05:57 +0100 Subject: [PATCH 0771/1039] [rendergraph] Update to v1.4.0. (#36057) --- ports/rendergraph/portfile.cmake | 6 +++--- ports/rendergraph/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rendergraph.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/rendergraph/portfile.cmake b/ports/rendergraph/portfile.cmake index ddb4e1bb3f4120..d9ba8668532f76 100644 --- a/ports/rendergraph/portfile.cmake +++ b/ports/rendergraph/portfile.cmake @@ -2,14 +2,14 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/RenderGraph REF v${VERSION} HEAD_REF master - SHA512 48bb3211022499538eebca0051f931ec105af9ccd3fea21d546fcd9cb41bc9d2191c70382e00caaf79fce48303e56d83d7089f7b975f635bcef3645c80abda30 + SHA512 34b8991d65a792367ba1f95738297993fae0320558bc94b2f271270081acafe6c6a4463097bf9c6e69e69379fdf63651667ed62945d0c3b5f95109c6b3b89074 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 7d355194fa795c437ce970cecf00e23ae10fc686 + REF 4e0292ed50d76dab5fc8c81840ae0e021dc60c2a HEAD_REF master - SHA512 ca25b19bdeb3e8fda7abc32f8548731f0ba1cd09889a70f6f287ad76d2fdfa0fedbb7f6f65b26d356ea51543bed8926c6bb463f8e8461b7d51d3b7b33134374c + SHA512 c79c6a5ef2e059b56d4de20cc73e74386bf8b6acea2f6b76fd9949a6a2760f82302c90419e4a753f50c30d01cc4f3a039e04b585f5c0d4461cce3464d9fb9c95 ) get_filename_component(SRC_PATH "${CMAKE_SOURCE_PATH}" DIRECTORY) diff --git a/ports/rendergraph/vcpkg.json b/ports/rendergraph/vcpkg.json index 31742bca514975..259fb1a1fa55cb 100644 --- a/ports/rendergraph/vcpkg.json +++ b/ports/rendergraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rendergraph", - "version": "1.3.0", + "version": "1.4.0", "description": "Vulkan render graph implementation.", "homepage": "https://github.com/DragonJoker/RenderGraph", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f829494a9559f4..446f9fc0ede690 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7465,7 +7465,7 @@ "port-version": 0 }, "rendergraph": { - "baseline": "1.3.0", + "baseline": "1.4.0", "port-version": 0 }, "replxx": { diff --git a/versions/r-/rendergraph.json b/versions/r-/rendergraph.json index 4d750620b56964..13e8f1c607087e 100644 --- a/versions/r-/rendergraph.json +++ b/versions/r-/rendergraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21b4a86663cc8e58b90c3298520db171f349ffbc", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "189085fb654a90d03e8e1b15971e0b9d6f575270", "version": "1.3.0", From 3fe97e0ea75b58c3337d074cf43d2411ddbc8c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 8 Jan 2024 22:06:39 +0100 Subject: [PATCH 0772/1039] [utfcpp] Update to 4.0.5 (#36054) * [utfcpp] Update to 4.0.5 * [utfcpp] Update version files --- ports/utfcpp/fix-include-path.patch | 21 --------------------- ports/utfcpp/portfile.cmake | 3 +-- ports/utfcpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/utfcpp.json | 5 +++++ 5 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 ports/utfcpp/fix-include-path.patch diff --git a/ports/utfcpp/fix-include-path.patch b/ports/utfcpp/fix-include-path.patch deleted file mode 100644 index 6dbaf759175601..00000000000000 --- a/ports/utfcpp/fix-include-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ca50a6..d707dc7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,7 +10,7 @@ include(GNUInstallDirs) - - target_include_directories(utf8cpp INTERFACE - "$" -- $ -+ $ - ) - - include(CMakePackageConfigHelpers) -@@ -44,5 +44,5 @@ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake) - --install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include) --install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include) -+install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include/utf8cpp) -+install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include/utf8cpp) diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index a955feddbc8e58..c054263be53e37 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -4,9 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemtrif/utfcpp REF "v${VERSION}" - SHA512 e02c10c7e9c8c6ee8b8d45bb7521997106be1bf6778d964d4c66a4f025b6ce46df43be12dc74b03639be9f99db8aa4d8c22a65880a057aeb0e76a90bb87c760c + SHA512 49ca33bfb2ee44515f555184b51191f7b706a228fb84ddc62e1e6b59c7d69a5ff836f38694daad0012a0f651b6199451974fe44ebe80081df00cf8c2759e3249 HEAD_REF master - PATCHES fix-include-path.patch ) vcpkg_cmake_configure( diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json index 5c88be2dd4a5a9..256a723f76b2ee 100644 --- a/ports/utfcpp/vcpkg.json +++ b/ports/utfcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "utfcpp", - "version": "4.0.2", + "version": "4.0.5", "description": "UTF-8 with C++ in a Portable Way", "homepage": "https://github.com/nemtrif/utfcpp", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 446f9fc0ede690..44d5a722b8efd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8765,7 +8765,7 @@ "port-version": 1 }, "utfcpp": { - "baseline": "4.0.2", + "baseline": "4.0.5", "port-version": 0 }, "utfz": { diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index 367b9b61749684..abc7777801091c 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4aa82d07c18c1a5b1ec311a0a23fddc81b162b5a", + "version": "4.0.5", + "port-version": 0 + }, { "git-tree": "f3ceee3e19b95edf9e59c813da7764a68145bfd1", "version": "4.0.2", From e43977947dc875e8bb0ccbc12c06f4d1a0707f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 8 Jan 2024 22:07:07 +0100 Subject: [PATCH 0773/1039] [catch2] Update to 3.5.1 (#36053) * [catch2] Update to 3.5.1 * [catch2] Update version files --- ports/catch2/portfile.cmake | 2 +- ports/catch2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 2f9549c927f858..851b94bf5ac6e6 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 REF v${VERSION} - SHA512 2ffdc8e7851cacc2ab3062ee2c9531d7d90e9a906da8e0f9b3db4a93967a34d3f25e674b03facd7b63367bc2545e39e00ec30f8e10896967993dd01af9a5af92 + SHA512 90c5fcf2d4b9771f5b30e027099da0d15e294b85d28702020435606efda2a4edc96b3d2007b60e5a32178248ad129b4aba0fb96582156244d62e1edacda6ce7d HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 64ef09d789e260..4e16be640d677d 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "catch2", - "version-semver": "3.5.0", + "version-semver": "3.5.1", "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 44d5a722b8efd4..734d6cc7744df5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1461,7 +1461,7 @@ "port-version": 2 }, "catch2": { - "baseline": "3.5.0", + "baseline": "3.5.1", "port-version": 0 }, "cccapstone": { diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 9440649740f706..51203a96d15702 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b749693bba3f346f03e2ccd047ee26b22c123c3", + "version-semver": "3.5.1", + "port-version": 0 + }, { "git-tree": "6bac6509e806556e539c116680228c6df5802ed4", "version-semver": "3.5.0", From 18b028fe785e707265fa0e35590b7537ae1d12ea Mon Sep 17 00:00:00 2001 From: SunBlack Date: Mon, 8 Jan 2024 22:08:13 +0100 Subject: [PATCH 0774/1039] [xerces-c] Update to 3.2.5 (#36045) --- ports/xerces-c/portfile.cmake | 2 +- ports/xerces-c/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/x-/xerces-c.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 2dda3eabf23388..27c011b6bfd3b3 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/xerces-c REF "v${VERSION}" - SHA512 0da61e000e871c045fb6e546cabba244eb6470a7a972c1d1b817ba5ce91c0d1d12dfb3ff1479d8b57ab06c49deefd1c16c36dc2541055e41a1cdb15dbd769fcf + SHA512 55bf16456408af7c5aa420a55b27555889fc102a24e86aecb918c165acc80bbc344420687061e020fe223ea04dd78bef929ceedc4b3e24727787f12b8d79b610 HEAD_REF master PATCHES dependencies.patch diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json index 7d9885d79b3f61..636ca480956c56 100644 --- a/ports/xerces-c/vcpkg.json +++ b/ports/xerces-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xerces-c", - "version": "3.2.4", - "port-version": 3, + "version-semver": "3.2.5", "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", "homepage": "https://github.com/apache/xerces-c", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 734d6cc7744df5..909a01437efebe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9241,8 +9241,8 @@ "port-version": 1 }, "xerces-c": { - "baseline": "3.2.4", - "port-version": 3 + "baseline": "3.2.5", + "port-version": 0 }, "xeus": { "baseline": "0.24.3", diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json index 36dffce1d6f1ed..2f72440a61b4a9 100644 --- a/versions/x-/xerces-c.json +++ b/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a127df4687908c60c7d7c7a37342a7ab6c509cf", + "version-semver": "3.2.5", + "port-version": 0 + }, { "git-tree": "4026f062e68881d5a72ecd5d900c70a46f92a8d9", "version": "3.2.4", From ea11fd4ba0bc7b5c0f489049af02cb1bf51fe3ae Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Mon, 8 Jan 2024 22:11:41 +0100 Subject: [PATCH 0775/1039] [paho-mqtt] use high performance (#36069) * [paho-mqtt] use high performance * [paho-mqtt] regenerate version info --- ports/paho-mqtt/portfile.cmake | 1 + ports/paho-mqtt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/paho-mqtt.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 75198458ce931c..57dec0b28fc3ae 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPAHO_WITH_SSL=TRUE + -DPAHO_HIGH_PERFORMANCE=TRUE -DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC} -DPAHO_BUILD_STATIC=${PAHO_BUILD_STATIC} -DPAHO_ENABLE_TESTING=FALSE diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index 49d7a853c80568..724826895db9ed 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "paho-mqtt", "version": "1.3.13", + "port-version": 1, "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", "homepage": "https://github.com/eclipse/paho.mqtt.c", "license": "EPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 909a01437efebe..f93798919126b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6462,7 +6462,7 @@ }, "paho-mqtt": { "baseline": "1.3.13", - "port-version": 0 + "port-version": 1 }, "paho-mqttpp3": { "baseline": "1.3.2", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index 0df488f43ec98d..c708abf973bdf6 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ea6a82c6e59b0300a88ba3ce22c81cc0346af9f", + "version": "1.3.13", + "port-version": 1 + }, { "git-tree": "afbbb351ea649d52651cd70c71bd133d6527215f", "version": "1.3.13", From 5517637cbe0b92512c4260c6ba9e83f35ec64d2a Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 9 Jan 2024 04:15:52 +0700 Subject: [PATCH 0776/1039] [libiconv] Build for ios (#36035) --- ports/libiconv/portfile.cmake | 2 +- ports/libiconv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index b834b2aadf2497..134de5683a2168 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -1,4 +1,4 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) +if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID AND NOT VCPKG_TARGET_IS_IOS) set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/iconv") file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/iconv") diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index 0ed97096b0ae3a..67225b186f4629 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", "version": "1.17", - "port-version": 1, + "port-version": 2, "description": "GNU Unicode text conversion", "homepage": "https://www.gnu.org/software/libiconv/", "license": null diff --git a/versions/baseline.json b/versions/baseline.json index f93798919126b5..7aa62358c81fe8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4406,7 +4406,7 @@ }, "libiconv": { "baseline": "1.17", - "port-version": 1 + "port-version": 2 }, "libics": { "baseline": "1.6.6", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index bd0520181dc375..142978f1151729 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6103c3aaaf279f20df4c758fd25d5954c8582cbd", + "version": "1.17", + "port-version": 2 + }, { "git-tree": "4226589d5d658f4d96df83f8539de54dc57a5996", "version": "1.17", From 614e7b491b8eeb4232172b5c93cfc83e664dfb77 Mon Sep 17 00:00:00 2001 From: Carsten Grimm <97085459+carsten-grimm-at-ipolog@users.noreply.github.com> Date: Mon, 8 Jan 2024 22:37:34 +0100 Subject: [PATCH 0777/1039] [simonbrunel-qtpromise] add port (#35787) * [simonbrunel-qtpromise] add simonbrunel-qtpromise to vcpkg * [simonbrunel-qtpromise] use version rather than version-string * [simonbrunel-qtpromise] generate version info * [simonbrunel-qtpromise] remove unnecessary cmake settings * [simonbrunel-qtpromise] regenerate version info * use quotes in portfile Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [simonbrunel-qtpromise] regenerate version info * [simonbrunel-qtpromise] fix qt dependency in cmake config * [simonbrunel-qtpromise] define include directory in terms of CMAKE_CURRENT_LIST_DIR * [simonbrunel-qtpromise] add patch for installing header files * [simonbrunel-qtpromise] remove error flags * [simonbrunel-qtpromise] add hint for qt5 support * [simonbrunel-qtpromise] regenerate version info --------- Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- .../patches/install_headers.patch | 17 +++++++++++++ .../patches/remove_error_flags.patch | 21 ++++++++++++++++ ports/simonbrunel-qtpromise/portfile.cmake | 24 +++++++++++++++++++ .../unofficial-config.cmake.in | 19 +++++++++++++++ ports/simonbrunel-qtpromise/usage | 4 ++++ ports/simonbrunel-qtpromise/vcpkg.json | 15 ++++++++++++ versions/baseline.json | 4 ++++ versions/s-/simonbrunel-qtpromise.json | 9 +++++++ 8 files changed, 113 insertions(+) create mode 100644 ports/simonbrunel-qtpromise/patches/install_headers.patch create mode 100644 ports/simonbrunel-qtpromise/patches/remove_error_flags.patch create mode 100644 ports/simonbrunel-qtpromise/portfile.cmake create mode 100644 ports/simonbrunel-qtpromise/unofficial-config.cmake.in create mode 100644 ports/simonbrunel-qtpromise/usage create mode 100644 ports/simonbrunel-qtpromise/vcpkg.json create mode 100644 versions/s-/simonbrunel-qtpromise.json diff --git a/ports/simonbrunel-qtpromise/patches/install_headers.patch b/ports/simonbrunel-qtpromise/patches/install_headers.patch new file mode 100644 index 00000000000000..6bbbd98ad60e3d --- /dev/null +++ b/ports/simonbrunel-qtpromise/patches/install_headers.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,14 @@ add_library(qtpromise::qtpromise ALIAS qtpromise) + target_link_libraries(qtpromise INTERFACE Qt${QT_VERSION_MAJOR}::Core) + target_include_directories(qtpromise INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include") + ++if(QTPROMISE_HEADER_INSTALL_DESTINATION) ++ install( ++ DIRECTORY "include" "src" ++ DESTINATION "${QTPROMISE_HEADER_INSTALL_DESTINATION}" ++ CONFIGURATIONS "${QTPROMISE_HEADER_INSTALL_COMPONENTS}" ++ ) ++endif() ++ + add_definitions( + -DQT_DEPRECATED_WARNINGS + -DQT_NO_KEYWORDS diff --git a/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch b/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch new file mode 100644 index 00000000000000..8499cbcfdb16aa --- /dev/null +++ b/ports/simonbrunel-qtpromise/patches/remove_error_flags.patch @@ -0,0 +1,21 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,6 +34,7 @@ add_definitions( + -DQT_NO_KEYWORDS + ) + ++#[[ remove error flags + # https://github.com/simonbrunel/qtpromise/issues/10 + if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html +@@ -83,8 +84,10 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + /WX + ) + endif() ++]] + + if(NOT SUBPROJECT) + enable_testing() + add_subdirectory(tests) + endif() ++ diff --git a/ports/simonbrunel-qtpromise/portfile.cmake b/ports/simonbrunel-qtpromise/portfile.cmake new file mode 100644 index 00000000000000..e0907e4974ef8f --- /dev/null +++ b/ports/simonbrunel-qtpromise/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO simonbrunel/qtpromise + REF "v${VERSION}" + SHA512 0d6316ec9503a7781b4d9e615e6d538b21b6282a76e5e28e3f323bcdb740e6f66e6c55944e31fc62cec7cc25a90b0f7318277f044a630500202971ca6e2e85b6 + HEAD_REF master + PATCHES + patches/install_headers.patch + patches/remove_error_flags.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DQTPROMISE_HEADER_INSTALL_DESTINATION="${CURRENT_PACKAGES_DIR}/include/${PORT}" + -DQTPROMISE_HEADER_INSTALL_COMPONENTS="Release" +) +vcpkg_cmake_install() + +set(USE_QT_VERSION "6") # for Qt5, replace this number with 5, and replace the dependency on port qtbase in vcpkg.json with port qt5-base +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" @ONLY) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/simonbrunel-qtpromise/unofficial-config.cmake.in b/ports/simonbrunel-qtpromise/unofficial-config.cmake.in new file mode 100644 index 00000000000000..2458704aa6f7c9 --- /dev/null +++ b/ports/simonbrunel-qtpromise/unofficial-config.cmake.in @@ -0,0 +1,19 @@ + +set(@PORT@_VERSION "@VERSION@") + +if(TARGET unofficial-@PORT@) + set(unofficial-@PORT@_FOUND TRUE) + return() +endif() + +include(CMakeFindDependencyMacro) + +find_dependency(Qt@USE_QT_VERSION@ REQUIRED COMPONENTS Core) + +add_library(unofficial-@PORT@ INTERFACE) + +target_link_libraries(unofficial-@PORT@ INTERFACE Qt::Core) +target_include_directories(unofficial-@PORT@ INTERFACE "${CMAKE_CURRENT_LIST_DIR}/../../include/@PORT@/include") + +set(unofficial-@PORT@_FOUND TRUE) + diff --git a/ports/simonbrunel-qtpromise/usage b/ports/simonbrunel-qtpromise/usage new file mode 100644 index 00000000000000..ed536b15ebcd95 --- /dev/null +++ b/ports/simonbrunel-qtpromise/usage @@ -0,0 +1,4 @@ +simonbrunel-qtpromise provides CMake targets: + +find_package(unofficial-simonbrunel-qtpromise CONFIG REQUIRED) +target_link_libraries(main PRIVATE unofficial-simonbrunel-qtpromise) \ No newline at end of file diff --git a/ports/simonbrunel-qtpromise/vcpkg.json b/ports/simonbrunel-qtpromise/vcpkg.json new file mode 100644 index 00000000000000..6917e4407be2a4 --- /dev/null +++ b/ports/simonbrunel-qtpromise/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "simonbrunel-qtpromise", + "version": "0.7.0", + "maintainers": "Simon Brunel", + "description": "Promises/A+ implementation for Qt/C++", + "homepage": "https://qtpromise.netlify.app/", + "license": "MIT", + "dependencies": [ + "qtbase", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7aa62358c81fe8..44f14eb50c0019 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7920,6 +7920,10 @@ "baseline": "3.2.16", "port-version": 0 }, + "simonbrunel-qtpromise": { + "baseline": "0.7.0", + "port-version": 0 + }, "simple-fft": { "baseline": "2020-06-14", "port-version": 2 diff --git a/versions/s-/simonbrunel-qtpromise.json b/versions/s-/simonbrunel-qtpromise.json new file mode 100644 index 00000000000000..dfe3f3acb99f7c --- /dev/null +++ b/versions/s-/simonbrunel-qtpromise.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b416eec5f84996491c4656f6b01723453abac31f", + "version": "0.7.0", + "port-version": 0 + } + ] +} From 5f290607687c3998e47d40a9d6453f2ed0218fbf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 8 Jan 2024 22:43:05 +0100 Subject: [PATCH 0778/1039] [gettext-libintl] Avoid conftest triggering debugger window (#36055) --- ports/gettext-libintl/portfile.cmake | 5 ++++- ports/gettext-libintl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gettext-libintl.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/gettext-libintl/portfile.cmake b/ports/gettext-libintl/portfile.cmake index a52c9fff061813..b72e7f7b874ebc 100644 --- a/ports/gettext-libintl/portfile.cmake +++ b/ports/gettext-libintl/portfile.cmake @@ -54,9 +54,12 @@ if(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS # Avoid unnecessary tests. am_cv_func_iconv_works=yes - ## This is required. For some reason these do not get correctly identified for release builds. + # This is required. For some reason these do not get correctly identified for release builds. ac_cv_func_wcslen=yes ac_cv_func_memmove=yes + # May trigger debugger window in debug builds, even in unattended builds. + # Cf. https://github.com/microsoft/vcpkg/issues/35974 + gl_cv_func_printf_directive_n=no ) if(NOT VCPKG_TARGET_IS_MINGW) list(APPEND OPTIONS diff --git a/ports/gettext-libintl/vcpkg.json b/ports/gettext-libintl/vcpkg.json index 3721740c09f19b..a86c4b7b68f35b 100644 --- a/ports/gettext-libintl/vcpkg.json +++ b/ports/gettext-libintl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gettext-libintl", "version": "0.22.4", + "port-version": 1, "description": "The libintl C library from GNU gettext-runtime.", "homepage": "https://www.gnu.org/software/gettext/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 44f14eb50c0019..ade83f9af3d4f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2938,7 +2938,7 @@ }, "gettext-libintl": { "baseline": "0.22.4", - "port-version": 0 + "port-version": 1 }, "gettimeofday": { "baseline": "2017-10-14", diff --git a/versions/g-/gettext-libintl.json b/versions/g-/gettext-libintl.json index 148d85c3e00af1..808a708f9622f0 100644 --- a/versions/g-/gettext-libintl.json +++ b/versions/g-/gettext-libintl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b81c3757a4f5b2eb78c45e29d51803e5a3418fdb", + "version": "0.22.4", + "port-version": 1 + }, { "git-tree": "003232270da6a899ac59d4e61d7fead638584deb", "version": "0.22.4", From d64c5e8b3d505585d4667801ee7e245e26c3dabd Mon Sep 17 00:00:00 2001 From: kiwixz Date: Mon, 8 Jan 2024 23:10:55 +0100 Subject: [PATCH 0779/1039] Add mapping for the None config (#35940) --- scripts/buildsystems/vcpkg.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 8ae279069d91b6..0ac8f99fb37079 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -218,15 +218,15 @@ endif() #it will map those configuration to the first valid configuration in CMAKE_CONFIGURATION_TYPES or the targets IMPORTED_CONFIGURATIONS. #In most cases this is the debug configuration which is wrong. if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL) - set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;") + set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL "MinSizeRel;Release;None;") if(VCPKG_VERBOSE) - message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;") + message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL set to MinSizeRel;Release;None;") endif() endif() if(NOT DEFINED CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO) - set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;") + set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO "RelWithDebInfo;Release;None;") if(VCPKG_VERBOSE) - message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;") + message(STATUS "VCPKG-Info: CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO set to RelWithDebInfo;Release;None;") endif() endif() From 3bc5ff7f7ab72b57f0945d35bbbdaac2060bc268 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Mon, 8 Jan 2024 14:36:00 -0800 Subject: [PATCH 0780/1039] [juce] add port for JUCE (#35439) * [juce] add port for JUCE * [juce] install linux dependencies in ci * [juce] fix tool installation and cleaning * [juce] fix freetype includes for juce graphics * [juce] fix freetype includes for juceaide * [juce] simplify the freetype find check * [juce] use find_path in addition for freetype * [juce] allow setting freetype usage for juceaide * [juce] forward freetype setting + guard with option * [juce] do not use freetype for console apps * [juce] freetype is needed for console apps on Linux * [juce] link freetype on Linux for juce_build_tools * [juce] forward-vcpkg-toolchain for Builder * [juce] fix linux dependencies + forward vcpkg args * [juce] fix installation of juce tools and juce extra tools * [juce] use jack2 only on Linux * [juce] add docs for targets and descriptions * [juce] fix installation path references in CMake * [juce] do not move Cmake files + fix tool install dir * [juce] remove libwebkit2gtk-4.0-dev from ci * [juce] add ONLY_STATIC_LIBRARY to the port for windows * [juce] fix the CMake path installation paths * Revert "[juce] add ONLY_STATIC_LIBRARY to the port for windows" This reverts commit 0eb5c6f1c6baa48cebf03b6bd36641528582d5ff. * [juce] improve linux dependencies find/linkage * [juce] remove libxcomposite-dev from vm --- ...allow-setting-JUCE_PLUGINHOST_LADSPA.patch | 15 ++ .../juce/0002-build-linux-find_packages.patch | 36 ++++ .../0003-build-forward-vcpkg-toolchain.patch | 32 ++++ ports/juce/0004-install-paths.patch | 49 ++++++ ports/juce/portfile.cmake | 155 ++++++++++++++++++ ports/juce/usage | 30 ++++ ports/juce/vcpkg.json | 105 ++++++++++++ versions/baseline.json | 4 + versions/j-/juce.json | 9 + 9 files changed, 435 insertions(+) create mode 100644 ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch create mode 100644 ports/juce/0002-build-linux-find_packages.patch create mode 100644 ports/juce/0003-build-forward-vcpkg-toolchain.patch create mode 100644 ports/juce/0004-install-paths.patch create mode 100644 ports/juce/portfile.cmake create mode 100644 ports/juce/usage create mode 100644 ports/juce/vcpkg.json create mode 100644 versions/j-/juce.json diff --git a/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch b/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch new file mode 100644 index 00000000000000..3c714e65cf0795 --- /dev/null +++ b/ports/juce/0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch @@ -0,0 +1,15 @@ +diff --git a/extras/AudioPluginHost/CMakeLists.txt b/extras/AudioPluginHost/CMakeLists.txt +index 852796383..37a5306c9 100644 +--- a/extras/AudioPluginHost/CMakeLists.txt ++++ b/extras/AudioPluginHost/CMakeLists.txt +@@ -51,7 +51,7 @@ target_compile_definitions(AudioPluginHost PRIVATE + JUCE_CONTENT_SHARING=1 + JUCE_DIRECTSOUND=1 + JUCE_DISABLE_CAUTIOUS_PARAMETER_ID_CHECKING=1 +- JUCE_PLUGINHOST_LADSPA=1 ++ JUCE_PLUGINHOST_LADSPA=${JUCE_PLUGINHOST_LADSPA} + JUCE_PLUGINHOST_LV2=1 + JUCE_PLUGINHOST_VST3=1 + JUCE_PLUGINHOST_VST=0 +-- +2.34.1 diff --git a/ports/juce/0002-build-linux-find_packages.patch b/ports/juce/0002-build-linux-find_packages.patch new file mode 100644 index 00000000000000..da51607cc04886 --- /dev/null +++ b/ports/juce/0002-build-linux-find_packages.patch @@ -0,0 +1,36 @@ +diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake +index e18dd5e08..45cc9245f 100644 +--- a/extras/Build/CMake/JUCEModuleSupport.cmake ++++ b/extras/Build/CMake/JUCEModuleSupport.cmake +@@ -353,6 +353,29 @@ function(_juce_create_pkgconfig_target name) + return() + endif() + ++ # The package that can be found via find_package instead of pkg-config ++ if("${name}" STREQUAL "freetype2") ++ find_package(Freetype REQUIRED) ++ add_library(juce::pkgconfig_${name} INTERFACE) ++ target_link_libraries(juce::pkgconfig_${name} INTERFACE Freetype::Freetype) ++ return() ++ elseif("${name}" STREQUAL "libcurl") ++ find_package(CURL REQUIRED) ++ add_library(juce::pkgconfig_${name} INTERFACE) ++ target_link_libraries(juce::pkgconfig_${name} INTERFACE CURL::libcurl) ++ return() ++ elseif("${name}" STREQUAL "alsa") ++ find_package(ALSA REQUIRED) ++ add_library(juce::pkgconfig_${name} INTERFACE) ++ target_link_libraries(juce::pkgconfig_${name} INTERFACE ALSA::ALSA) ++ return() ++ elseif("${name}" STREQUAL "gl") ++ find_package(OpenGL REQUIRED) ++ add_library(juce::pkgconfig_${name} INTERFACE) ++ target_link_libraries(juce::pkgconfig_${name} INTERFACE OpenGL::GL) ++ return() ++ endif() ++ + find_package(PkgConfig REQUIRED) + pkg_check_modules(${name} ${ARGN}) + +-- +2.34.1 diff --git a/ports/juce/0003-build-forward-vcpkg-toolchain.patch b/ports/juce/0003-build-forward-vcpkg-toolchain.patch new file mode 100644 index 00000000000000..02342ebb168d45 --- /dev/null +++ b/ports/juce/0003-build-forward-vcpkg-toolchain.patch @@ -0,0 +1,32 @@ +diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt +index 163f203cc..f4cdba7f7 100644 +--- a/extras/Build/juceaide/CMakeLists.txt ++++ b/extras/Build/juceaide/CMakeLists.txt +@@ -111,6 +111,25 @@ else() + "-DCMAKE_BUILD_TYPE=Debug" + "-DJUCE_BUILD_HELPER_TOOLS=ON" + "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" ++ # forward vcpkg flags ++ "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" ++ "-DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}" ++ "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=${CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION}" ++ "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=${CMAKE_EXPORT_NO_PACKAGE_REGISTRY}" ++ "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}" ++ "-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}" ++ "-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}" ++ "-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}" ++ "-DVCPKG_APPLOCAL_DEPS=${VCPKG_APPLOCAL_DEPS}" ++ "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" ++ "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" ++ "-DVCPKG_MANIFEST_INSTALL=${VCPKG_MANIFEST_INSTALL}" ++ "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" ++ "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" ++ "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" ++ "-DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}" ++ "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" ++ "-D_VCPKG_ROOT_DIR=${_VCPKG_ROOT_DIR}" + ${extra_compiler_flag_arguments} + WORKING_DIRECTORY "${JUCE_SOURCE_DIR}" + OUTPUT_VARIABLE command_output +-- +2.34.1 diff --git a/ports/juce/0004-install-paths.patch b/ports/juce/0004-install-paths.patch new file mode 100644 index 00000000000000..ccbd4d0e78aa25 --- /dev/null +++ b/ports/juce/0004-install-paths.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4262a9852..a46b51f1a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,14 +167,14 @@ if(("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}") AND (NOT JUCE_BUILD_HEL + _juce_add_lv2_manifest_helper_target() + + if(TARGET juce_lv2_helper) +- install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}") ++ install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "${JUCE_TOOL_INSTALL_DIR}") + install(EXPORT LV2_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}") + endif() + + _juce_add_vst3_manifest_helper_target() + + if(TARGET juce_vst3_helper) +- install(TARGETS juce_vst3_helper EXPORT VST3_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}") ++ install(TARGETS juce_vst3_helper EXPORT VST3_HELPER DESTINATION "${JUCE_TOOL_INSTALL_DIR}") + install(EXPORT VST3_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}") + endif() + endif() +diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt +index f4cdba7f7..fab57fdb4 100644 +--- a/extras/Build/juceaide/CMakeLists.txt ++++ b/extras/Build/juceaide/CMakeLists.txt +@@ -164,7 +164,7 @@ else() + + add_executable(juce::juceaide ALIAS juceaide) + +- set(JUCE_TOOL_INSTALL_DIR "bin/JUCE-${JUCE_VERSION}" CACHE STRING ++ set(JUCE_TOOL_INSTALL_DIR "tools/juce" CACHE STRING + "The location, relative to the install prefix, where juceaide will be installed") + + install(PROGRAMS "${imported_location}" DESTINATION "${JUCE_TOOL_INSTALL_DIR}") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a46b51f1a..38f863a3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,7 +123,7 @@ write_basic_package_version_file("${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake" + COMPATIBILITY ExactVersion + ${extra_version_arg}) + +-set(JUCE_INSTALL_DESTINATION "lib/cmake/JUCE-${JUCE_VERSION}" CACHE STRING ++set(JUCE_INSTALL_DESTINATION "share/juce" CACHE STRING + "The location, relative to the install prefix, where the JUCE config file will be installed") + + set(JUCE_MODULE_PATH "include/JUCE-${JUCE_VERSION}/modules") +-- +2.34.1 diff --git a/ports/juce/portfile.cmake b/ports/juce/portfile.cmake new file mode 100644 index 00000000000000..d81f211eece039 --- /dev/null +++ b/ports/juce/portfile.cmake @@ -0,0 +1,155 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO juce-framework/JUCE + REF "${VERSION}" + SHA512 e8519ca4ee55f126e14d7c927e2f36e7c30117a34da84f2b4e730afcea4a864b07455ad3f89d751fa47c8c155548b0c3150a667f1a9d199e582eadd146b6c697 + HEAD_REF master + PATCHES + "0001-build-allow-setting-JUCE_PLUGINHOST_LADSPA.patch" + "0002-build-linux-find_packages.patch" + "0003-build-forward-vcpkg-toolchain.patch" + "0004-install-paths.patch" +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "extras" JUCE_BUILD_EXTRAS + "ladspa" JUCE_PLUGINHOST_LADSPA + "jack" JUCE_JACK + "curl" JUCE_USE_CURL + "freetype" JUCE_USE_FREETYPE + "xcursor" JUCE_USE_XCURSOR + "xinerama" JUCE_USE_XINERAMA + "xrandr" JUCE_USE_XRANDR + "xrender" JUCE_USE_XRENDER + "web-browser" JUCE_WEB_BROWSER + "opengl" JUCE_OPENGL +) +# Based on https://github.com/juce-framework/JUCE/blob/master/docs/Linux%20Dependencies.md +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + message("juce currently requires the following programs from the system package manager: + libx11-dev libxcomposite-dev libxext-dev +On Ubuntu derivatives: + sudo apt install libx11-dev libxcomposite-dev libxext-dev +") + if(JUCE_OPENGL) + message("juce with opengl feature requires the following packages via the system package manager: + libglu1-mesa-dev mesa-common-dev +On Ubuntu derivatives: + sudo apt install libglu1-mesa-dev mesa-common-dev +") + endif() + + if(${JUCE_PLUGINHOST_LADSPA}) + message("juce with ladspa feature requires the following packages via the system package manager: + ladspa-sdk +On Ubuntu derivatives: + sudo apt install ladspa-sdk +") + endif() + + if(JUCE_USE_XCURSOR) + message("juce with xcursor feature requires the following packages via the system package manager: + libxcursor-dev +On Ubuntu derivatives: + sudo apt install libxcursor-dev +") + endif() + + if(JUCE_USE_XINERAMA) + message("juce with xinerama feature requires the following packages via the system package manager: + libxinerama-dev +On Ubuntu derivatives: + sudo apt install libxinerama-dev +") + endif() + + if(JUCE_USE_XRANDR) + message("juce with xrandr feature requires the following packages via the system package manager: + libxrandr-dev +On Ubuntu derivatives: + sudo apt install libxrandr-dev +") + endif() + + if(JUCE_USE_XRENDER) + message("juce with xrender feature requires the following packages via the system package manager: + libxrender-dev +On Ubuntu derivatives: + sudo apt install libxrender-dev +") + endif() + + if(JUCE_WEB_BROWSER) + message("juce with web-browser feature requires the following packages via the system package manager: + libwebkit2gtk-4.0-dev +On Ubuntu derivatives: + sudo apt install libwebkit2gtk-4.0-dev +") + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DJUCE_ENABLE_MODULE_SOURCE_GROUPS=ON + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + JUCE_PLUGINHOST_LADSPA + JUCE_JACK + JUCE_OPENGL + JUCE_USE_CURL + JUCE_USE_FREETYPE + JUCE_USE_XCURSOR + JUCE_USE_XINERAMA + JUCE_USE_XRANDR + JUCE_USE_XRENDER + JUCE_WEB_BROWSER +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +# Copy tools +file(GLOB JUCE_TOOLS "${CURRENT_PACKAGES_DIR}/bin/JUCE-${VERSION}/*") +foreach(JUCE_TOOL_PATH IN LISTS JUCE_TOOLS) + get_filename_component(JUCE_TOOL "${JUCE_TOOL_PATH}" NAME_WLE) + get_filename_component(JUCE_TOOL_DIR "${JUCE_TOOL_PATH}" DIRECTORY) + vcpkg_copy_tools(TOOL_NAMES ${JUCE_TOOL} SEARCH_DIR "${JUCE_TOOL_DIR}") +endforeach() + +# Copy extras tools +if(JUCE_BUILD_EXTRAS) + file(GLOB JUCE_EXTRA_TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/extras/*/*_artefacts/Release/*") + foreach(JUCE_EXTRA_TOOL_PATH IN LISTS JUCE_EXTRA_TOOLS) + get_filename_component(JUCE_EXTRA_TOOL "${JUCE_EXTRA_TOOL_PATH}" NAME_WLE) + get_filename_component(JUCE_EXTRA_TOOL_DIR "${JUCE_EXTRA_TOOL_PATH}" DIRECTORY) + vcpkg_copy_tools(TOOL_NAMES ${JUCE_EXTRA_TOOL} SEARCH_DIR "${JUCE_EXTRA_TOOL_DIR}") + endforeach() +endif() + +# Copy JUCE modules including the cpp/cmake files +file(GLOB JUCE_MODULES_FOLDERS "${CURRENT_PACKAGES_DIR}/include/JUCE-${VERSION}/modules/*") +foreach(JUCE_MODULE_FOLDER IN LISTS JUCE_MODULES_FOLDERS) + file(COPY "${JUCE_MODULE_FOLDER}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +endforeach() + +# Remove duplicate tools directories +file(REMOVE_RECURSE +"${CURRENT_PACKAGES_DIR}/bin" +"${CURRENT_PACKAGES_DIR}/debug/bin" +) + +# Remove duplicate debug files +file(REMOVE_RECURSE +"${CURRENT_PACKAGES_DIR}/debug/" +) + +# Copy license +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") + +# Copy usage examples +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/juce/usage b/ports/juce/usage new file mode 100644 index 00000000000000..a9567433b09277 --- /dev/null +++ b/ports/juce/usage @@ -0,0 +1,30 @@ +juce provides the following common CMake targets: + + find_package(JUCE CONFIG REQUIRED) + target_link_libraries(main PRIVATE + juce::juce_core + juce::juce_audio_basics + juce::juce_events + juce::juce_audio_devices + juce::juce_recommended_config_flags + juce::juce_recommended_lto_flags + juce::juce_recommended_warning_flags) + +See the Juce CMake API documentation and the License for details on how to create targets. Here are other available targets: + + juce::juce_graphics + juce::juce_gui_basics + juce::juce_gui_extra + juce::juce_opengl + juce::juce_analytics + juce::juce_audio_formats + juce::juce_audio_plugin_client + juce::juce_audio_processors + juce::juce_audio_utils + juce::juce_box2d + juce::juce_cryptography + juce::juce_data_structures + juce::juce_dsp + juce::juce_osc + juce::juce_product_unlocking + juce::juce_video diff --git a/ports/juce/vcpkg.json b/ports/juce/vcpkg.json new file mode 100644 index 00000000000000..10a37cd14bdcc5 --- /dev/null +++ b/ports/juce/vcpkg.json @@ -0,0 +1,105 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", + "name": "juce", + "version": "7.0.9", + "description": "Open-source cross-platform C++ application framework for desktop and mobile applications, including VST, VST3, AU, AUv3, AAX and LV2 audio plug-ins and plug-in hosts", + "homepage": "https://juce.com", + "license": null, + "supports": "!android & !uwp", + "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, + { + "name": "juce", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "curl", + "freetype", + "jack", + "opengl", + "xcursor", + "xinerama", + "xrandr", + "xrender" + ], + "features": { + "curl": { + "description": "Enable CURL support", + "dependencies": [ + "curl" + ] + }, + "extras": { + "description": "Enable JUCE Extras such as Projucer, AudioPluginHost, BinaryBuilder." + }, + "freetype": { + "description": "Enable FreeType support", + "dependencies": [ + "freetype" + ] + }, + "jack": { + "description": "Enable JACK audio support", + "dependencies": [ + { + "name": "jack2", + "platform": "linux" + } + ] + }, + "ladspa": { + "description": "Enable LADSPA plugin host support." + }, + "opengl": { + "description": "Enable OpenGL support", + "dependencies": [ + "opengl" + ] + }, + "web-browser": { + "description": "Enable WebBrowser support" + }, + "xcursor": { + "description": "Enable XCursor support" + }, + "xinerama": { + "description": "Enable Xinerama support", + "dependencies": [ + { + "name": "libxinerama", + "platform": "linux" + } + ] + }, + "xrandr": { + "description": "Enable XRandR support", + "dependencies": [ + { + "name": "libxrandr", + "platform": "linux" + } + ] + }, + "xrender": { + "description": "Enable XRender support", + "dependencies": [ + { + "name": "libxrender", + "platform": "linux" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index ade83f9af3d4f0..5d3cabbacc6900 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3708,6 +3708,10 @@ "baseline": "0.20.0", "port-version": 0 }, + "juce": { + "baseline": "7.0.9", + "port-version": 0 + }, "jwt-cpp": { "baseline": "0.6.0", "port-version": 0 diff --git a/versions/j-/juce.json b/versions/j-/juce.json new file mode 100644 index 00000000000000..e3dda1ab04abb6 --- /dev/null +++ b/versions/j-/juce.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "884ac8253be9804c493b3dfc00a792570797716d", + "version": "7.0.9", + "port-version": 0 + } + ] +} From c59f322676c8af1a6bda9756747e8bdfba04a775 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 10 Jan 2024 02:40:59 +0800 Subject: [PATCH 0781/1039] [mongo-c-driver] update to 1.25.4 (#36070) * update to 1.25.4 * update version * static * update veresion --- ports/libbson/portfile.cmake | 2 +- ports/libbson/vcpkg.json | 2 +- .../disable-dynamic-when-static.patch | 51 ++++++------------- ports/mongo-c-driver/portfile.cmake | 2 +- ports/mongo-c-driver/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/l-/libbson.json | 5 ++ versions/m-/mongo-c-driver.json | 5 ++ 8 files changed, 31 insertions(+), 42 deletions(-) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 790e95cd40a65e..503bb788d5136d 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 77569b9816eb9bfcc6fe2f3cfab69845410aa2e7c6a5db987957eef74cff5cfd51006373bbc8539ecf385adf8c9c067df5a151bdf9b5f7ee71cdf5c9c64040a8 + SHA512 a80e20917edb752ac5eb42534beaa0122a383037f83a554ee00ce37ae690be68521eaa282b4a5802a5440b61038bcd5414356e16a2ce729ba1193d0738a6ce1c HEAD_REF master PATCHES fix-include-directory.patch # vcpkg legacy decision diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index e202657e386ea1..175d79b5c510f7 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libbson", - "version": "1.25.2", + "version": "1.25.4", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/mongo-c-driver/disable-dynamic-when-static.patch b/ports/mongo-c-driver/disable-dynamic-when-static.patch index e40742cdb237be..5b20964b7d02db 100644 --- a/ports/mongo-c-driver/disable-dynamic-when-static.patch +++ b/ports/mongo-c-driver/disable-dynamic-when-static.patch @@ -1,55 +1,34 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 61cae9c..5f553c5 100644 +index c36dff1..525e065 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -812,6 +812,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) +@@ -812,7 +812,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") endif () +-if (ENABLE_SHARED) +if (NOT MONGOC_ENABLE_STATIC_BUILD) - add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - if(WIN32) - # Add resource-definition script for Windows shared library (.dll). -@@ -865,7 +866,7 @@ set_target_properties (mongoc_shared PROPERTIES - ) - mongo_generate_pkg_config(mongoc_shared INSTALL RENAME libmongoc-${MONGOC_API_VERSION}.pc) - --if (MONGOC_ENABLE_STATIC_BUILD) -+else() - add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES} mongo::detail::c_dependencies) - if (NOT WIN32 AND ENABLE_PIC) -@@ -934,7 +935,11 @@ if (ENABLE_APPLE_FRAMEWORK) + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + if(WIN32) + # Add resource-definition script for Windows shared library (.dll). +@@ -1253,7 +1253,7 @@ if (MONGOC_ENABLE_STATIC_INSTALL) + list (APPEND TARGETS_TO_INSTALL mongoc_static) endif () - add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) --target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +-if (ENABLE_SHARED) +if (NOT MONGOC_ENABLE_STATIC_BUILD) -+ target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) -+else() -+ target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) -+endif() - - # mongoc-stat works if shared memory performance counters are enabled. - if (ENABLE_SHM_COUNTERS) -@@ -1244,7 +1249,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} - file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) - - if (MONGOC_ENABLE_STATIC_INSTALL) -- set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) -+ set (TARGETS_TO_INSTALL mongoc_static) - else () - set (TARGETS_TO_INSTALL mongoc_shared) + list (APPEND TARGETS_TO_INSTALL mongoc_shared) endif () -@@ -1299,6 +1304,7 @@ endif() - # Relative include-path will be given the install prefix: + +@@ -1308,6 +1308,7 @@ endif() set_property(TARGET ${TARGETS_TO_INSTALL} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${MONGOC_HEADER_INSTALL_DIR}") -+if(NOT MONGOC_ENABLE_STATIC_INSTALL) # Deprecated alias for libmongoc-1.0.pc, see CDRIVER-2086. ++if(NOT MONGOC_ENABLE_STATIC_INSTALL) if (MONGOC_ENABLE_SSL) configure_file ( -@@ -1310,6 +1316,7 @@ if (MONGOC_ENABLE_SSL) + ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-ssl-1.0.pc.in +@@ -1318,6 +1319,7 @@ if (MONGOC_ENABLE_SSL) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) endif () diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 71232e8ec07078..c45ce6147ff164 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 77569b9816eb9bfcc6fe2f3cfab69845410aa2e7c6a5db987957eef74cff5cfd51006373bbc8539ecf385adf8c9c067df5a151bdf9b5f7ee71cdf5c9c64040a8 + SHA512 a80e20917edb752ac5eb42534beaa0122a383037f83a554ee00ce37ae690be68521eaa282b4a5802a5440b61038bcd5414356e16a2ce729ba1193d0738a6ce1c HEAD_REF master PATCHES disable-dynamic-when-static.patch diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index e2015df97496e1..a54e6fc09c6755 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.25.2", + "version": "1.25.4", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5d3cabbacc6900..c4404cf2499e85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4117,7 +4117,7 @@ "port-version": 4 }, "libbson": { - "baseline": "1.25.2", + "baseline": "1.25.4", "port-version": 0 }, "libcaer": { @@ -5665,7 +5665,7 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.25.2", + "baseline": "1.25.4", "port-version": 0 }, "mongo-cxx-driver": { diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index dcb2293ce8d97f..6a8b98cb7d4650 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d14fb7001fd70dd80e15562bbe90a30060adef40", + "version": "1.25.4", + "port-version": 0 + }, { "git-tree": "0c4c352f8b6c44b8cb678e906b8f8431b54d2d27", "version": "1.25.2", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index cdfe3002c31889..d6014444132ab2 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "219d51be972af0596a2c538b530fc379d136fcb2", + "version": "1.25.4", + "port-version": 0 + }, { "git-tree": "654476156359ba012d49880fbf0acf549c6eaa35", "version": "1.25.2", From 8025d0e2a27a7f485e1a50750d242cd9e6cad834 Mon Sep 17 00:00:00 2001 From: Hossein Moein <31854960+hosseinmoein@users.noreply.github.com> Date: Tue, 9 Jan 2024 13:44:36 -0500 Subject: [PATCH 0782/1039] [dataframe] Upgrading C++ DataFrame to version 2.3.0 (#36059) * Upgrading C++ DataFrame to version 2.3.0 * Fixed indentation * ran ./vcpkg x-add-version --all * Added the failure list * Excluded some failuers * Removed unnecessary comments --- ports/dataframe/portfile.cmake | 2 +- ports/dataframe/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dataframe.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/dataframe/portfile.cmake b/ports/dataframe/portfile.cmake index f197f360bbc86e..33f7ea4397f9e5 100644 --- a/ports/dataframe/portfile.cmake +++ b/ports/dataframe/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hosseinmoein/DataFrame REF "${VERSION}" - SHA512 fba75b7f86c678bbfda7574d618530a88cf4b054fc7fae045e3506353ae687b5b4c59e93017439055599bf2739f0f34a4ac28c88246c185510b05b85f41a766f + SHA512 2eaa4f8323b3c4a371164b8579898c9ebce1db16451cd25595a763d6ecb5f5ec43460f1505f7ed5bd013534d44e7b9bdb5d78644df2f15130349c37db27a93a1 HEAD_REF master ) vcpkg_cmake_configure( diff --git a/ports/dataframe/vcpkg.json b/ports/dataframe/vcpkg.json index 7139997a8a0e4b..904fe6d044387b 100644 --- a/ports/dataframe/vcpkg.json +++ b/ports/dataframe/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dataframe", - "version": "2.1.0", + "version": "2.3.0", "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python", "homepage": "https://github.com/hosseinmoein/DataFrame", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c4404cf2499e85..529bff65cf4c12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2097,7 +2097,7 @@ "port-version": 3 }, "dataframe": { - "baseline": "2.1.0", + "baseline": "2.3.0", "port-version": 0 }, "date": { diff --git a/versions/d-/dataframe.json b/versions/d-/dataframe.json index 8e6b6b474ef140..d6a84d3d59eb72 100644 --- a/versions/d-/dataframe.json +++ b/versions/d-/dataframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d385417bae605d78f4c7c9d7188b51649c69deb", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "9e44b0c459e2d1d35a587de3b8126794d57c7f8c", "version": "2.1.0", From 59c9eade06fd73fa877fb4d608b077d3cd507899 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 9 Jan 2024 11:01:57 -0800 Subject: [PATCH 0783/1039] [opencascade] Fix feature freeimage build failure (#36079) * [opencascade] Fix feature freeimage build failure * update version --- ports/opencascade/fix-link-freeimage.patch | 31 ++++++++++++++++++++++ ports/opencascade/portfile.cmake | 1 + ports/opencascade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 ++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 ports/opencascade/fix-link-freeimage.patch diff --git a/ports/opencascade/fix-link-freeimage.patch b/ports/opencascade/fix-link-freeimage.patch new file mode 100644 index 00000000000000..3b7621290a87a9 --- /dev/null +++ b/ports/opencascade/fix-link-freeimage.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3252b3..33d50b8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -634,6 +634,9 @@ if (CAN_USE_FREEIMAGE) + add_definitions (-DHAVE_FREEIMAGE) + find_package(freeimage CONFIG REQUIRED) + set(CSF_FreeImagePlus freeimage::FreeImagePlus) ++ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") ++ add_definitions (-DDEBUG_FREEIMAGE_LIB) ++ endif() + else() + OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE") + OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE") +diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx +index f869e8f..f12e17a 100644 +--- a/src/Image/Image_AlienPixMap.cxx ++++ b/src/Image/Image_AlienPixMap.cxx +@@ -21,7 +21,11 @@ + #include + + #ifdef _MSC_VER +- #pragma comment( lib, "FreeImage.lib" ) ++ #ifdef DEBUG_FREEIMAGE_LIB ++ #pragma comment( lib, "FreeImaged.lib" ) ++ #else ++ #pragma comment( lib, "FreeImage.lib" ) ++ #endif + #endif + #elif defined(HAVE_WINCODEC) + #include diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index cb1b8a8a827c08..aa32cd6aa48f89 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch + fix-link-freeimage.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index c4b93778f091bf..cdc1be8d4161a6 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencascade", "version": "7.7.2", - "port-version": 2, + "port-version": 3, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 529bff65cf4c12..5b880fd2aa7803 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6230,7 +6230,7 @@ }, "opencascade": { "baseline": "7.7.2", - "port-version": 2 + "port-version": 3 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 5d8c462b5d792e..b033a3db74c8df 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cff97ecb51449af3dc81c849ba7ceb36eedd4917", + "version": "7.7.2", + "port-version": 3 + }, { "git-tree": "2b1d21c510a4aa414a64ac5e2e46fa0767ff76b1", "version": "7.7.2", From c9919121dde6f61c0436adda94624636e041226b Mon Sep 17 00:00:00 2001 From: Nick Logozzo Date: Tue, 9 Jan 2024 14:02:36 -0500 Subject: [PATCH 0784/1039] [libnick] Add libnick V2024.1.3 (#36065) * Add libaura V2024.1.2 * Add Versions * Update libaura.json * Better Port Files * Update libaura.json * Remove gtest as tests not built * Update libaura.json * glib only needed on linux * Update libaura.json * libaura --> libnick * Update versions --- ports/libnick/portfile.cmake | 31 +++++++++++++++++++++++++++++ ports/libnick/usage | 4 ++++ ports/libnick/vcpkg.json | 38 ++++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libnick.json | 9 +++++++++ 5 files changed, 86 insertions(+) create mode 100644 ports/libnick/portfile.cmake create mode 100644 ports/libnick/usage create mode 100644 ports/libnick/vcpkg.json create mode 100644 versions/l-/libnick.json diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake new file mode 100644 index 00000000000000..5be8fe0400d0ac --- /dev/null +++ b/ports/libnick/portfile.cmake @@ -0,0 +1,31 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NickvisionApps/libnick + REF "${VERSION}" + SHA512 db06770546c0c57375fdbb409c1a960ca5fb19831548ca585f93b0b1eca04e7f1f6d2d46e48aebb0ed2eeb24b9e50622e4770f66d617b7cbffc5ea9849bd0f16 + 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/libnick) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/libnick/usage b/ports/libnick/usage new file mode 100644 index 00000000000000..a2e202096125d6 --- /dev/null +++ b/ports/libnick/usage @@ -0,0 +1,4 @@ +libnick provides CMake targets: + +find_package(libnick CONFIG REQUIRED) +target_link_libraries(main PRIVATE libnick::libnick) diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json new file mode 100644 index 00000000000000..417896a296452a --- /dev/null +++ b/ports/libnick/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "libnick", + "version": "2024.1.3", + "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com", + "description": "A cross-platform base for native Nickvision applications.", + "homepage": "https://github.com/NickvisionApps/libnick", + "documentation": "https://github.com/NickvisionApps/libnick/tree/main/docs", + "license": "GPL-3.0", + "supports": "(windows & x64) | (linux & x64)", + "dependencies": [ + "boost-locale", + "curl", + "gettext-libintl", + { + "name": "glib", + "platform": "linux" + }, + "jsoncpp", + { + "name": "libsecret", + "platform": "linux" + }, + { + "name": "libuuid", + "platform": "linux" + }, + "maddy", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5b880fd2aa7803..8eecaad90a936e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4588,6 +4588,10 @@ "baseline": "0.1.21", "port-version": 3 }, + "libnick": { + "baseline": "2024.1.3", + "port-version": 0 + }, "libnoise": { "baseline": "1.0.0", "port-version": 3 diff --git a/versions/l-/libnick.json b/versions/l-/libnick.json new file mode 100644 index 00000000000000..db2779907d0950 --- /dev/null +++ b/versions/l-/libnick.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "35ec7d0edb38c8b621ca1a20bbe0eca5d0415ed2", + "version": "2024.1.3", + "port-version": 0 + } + ] +} From eda37a91fdf70d2a13268fcee43d53f1492fccee Mon Sep 17 00:00:00 2001 From: Deshan Xiao <42019462+deshanxiao@users.noreply.github.com> Date: Thu, 11 Jan 2024 00:59:01 +0000 Subject: [PATCH 0785/1039] update to v1.9.2 (#36098) --- ports/orc/portfile.cmake | 2 +- ports/orc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/orc.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index 67a96af992e5e7..fc7d0d94afce29 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc REF "v${VERSION}" - SHA512 21ae89915acb731b19f2cba10b35731c5d0993a44160a7afd063f04fa5cc714e1fe3984282214d1fe8a19944969f28d5e6d67a33ac6dafcbc2cecf30d34b752f + SHA512 141afbd6d83b8c8032df071838e7da61eedb3d22289642f76669b6efd167d7550b200bd3542f012d0b63c9ae2572d83fcb1b7f76537b6fa6f980aebf37e2cde2 HEAD_REF master PATCHES fix-cmake.patch diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index c7af34b06ad2c2..f6fdc45c1330b3 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "orc", - "version": "1.9.1", + "version": "1.9.2", "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8eecaad90a936e..e9649dc83e1aab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6425,7 +6425,7 @@ "port-version": 1 }, "orc": { - "baseline": "1.9.1", + "baseline": "1.9.2", "port-version": 0 }, "orocos-kdl": { diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 82911f719841ba..8b587ad02ae269 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "181bf753a7e9da2d5c98907c58270f9ccb64e4db", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "1d045d211a7c1a657c3c6d1f2df0df8faf69c459", "version": "1.9.1", From 3de47528ca4b1f84e507338e9464faa802172831 Mon Sep 17 00:00:00 2001 From: Nick Logozzo Date: Wed, 10 Jan 2024 19:59:23 -0500 Subject: [PATCH 0786/1039] [libnick] Update to 2024.1.4 (#36096) * [libnick] Update to V2024.1.4 * Update libnick.json --- ports/libnick/portfile.cmake | 2 +- ports/libnick/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libnick.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake index 5be8fe0400d0ac..4c8ab613e85c1a 100644 --- a/ports/libnick/portfile.cmake +++ b/ports/libnick/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NickvisionApps/libnick REF "${VERSION}" - SHA512 db06770546c0c57375fdbb409c1a960ca5fb19831548ca585f93b0b1eca04e7f1f6d2d46e48aebb0ed2eeb24b9e50622e4770f66d617b7cbffc5ea9849bd0f16 + SHA512 22fe6d4b2f4af13d1bd15aaf526724ab5bb95af0a8ef2876cc46b9d60ec0c61ea1341d25504cdbebe222f32d4d2e6fc60852336937969c77ae7e52825cce53f8 HEAD_REF main ) diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json index 417896a296452a..b325e2936fc865 100644 --- a/ports/libnick/vcpkg.json +++ b/ports/libnick/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnick", - "version": "2024.1.3", + "version": "2024.1.4", "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com", "description": "A cross-platform base for native Nickvision applications.", "homepage": "https://github.com/NickvisionApps/libnick", diff --git a/versions/baseline.json b/versions/baseline.json index e9649dc83e1aab..ab6c8d73d87ec7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4589,7 +4589,7 @@ "port-version": 3 }, "libnick": { - "baseline": "2024.1.3", + "baseline": "2024.1.4", "port-version": 0 }, "libnoise": { diff --git a/versions/l-/libnick.json b/versions/l-/libnick.json index db2779907d0950..c5ba4e8c76d1e7 100644 --- a/versions/l-/libnick.json +++ b/versions/l-/libnick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38683a613ad0152233a04004b14707675c696189", + "version": "2024.1.4", + "port-version": 0 + }, { "git-tree": "35ec7d0edb38c8b621ca1a20bbe0eca5d0415ed2", "version": "2024.1.3", From 6df4d4f49866212aa00fcd85fde5356503dafed1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 11 Jan 2024 02:01:00 +0100 Subject: [PATCH 0787/1039] [gdal] Update to 3.8.3 (#36082) --- ports/gdal/portfile.cmake | 2 +- ports/gdal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index edb284fe45d195..740d0eaa1fe36d 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal REF "v${VERSION}" - SHA512 65119bf83d8680cb1648dce8997a131a256856aed1ad16fdb60812c6a159e4e1352e8463cb5c6fcf831113df58d2f6f9b814e13119d593c9319abd7cd63048a6 + SHA512 d834bb1cc891db4e04bdd684a0ac94ef1669c6040ed2e7e248714e00f6ff75dcd6d16c6e99b1084a2279c3b384e9ecfde1e7ed557a0564288fb4a8377f221964 HEAD_REF master PATCHES find-link-libraries.patch diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index ad209de355a623..709b633e28fc03 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.8.2", - "port-version": 1, + "version-semver": "3.8.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 ab6c8d73d87ec7..e911f7a5e29605 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2881,8 +2881,8 @@ "port-version": 0 }, "gdal": { - "baseline": "3.8.2", - "port-version": 1 + "baseline": "3.8.3", + "port-version": 0 }, "gdcm": { "baseline": "3.0.22", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index c3b853b28e96fd..6de632a8216aae 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf4439e847b66a9af7d5789d19f0752e8a634fb9", + "version-semver": "3.8.3", + "port-version": 0 + }, { "git-tree": "833ca497db5bfb3e95b313c6bfbf793d20548326", "version-semver": "3.8.2", From 8a5830e45ca045097580f528f5b20b1e1bd5298e Mon Sep 17 00:00:00 2001 From: Markus Vieth <39675748+mvieth@users.noreply.github.com> Date: Thu, 11 Jan 2024 02:02:56 +0100 Subject: [PATCH 0788/1039] [pcl] update to version 1.14.0 (#36032) * [pcl] update to version 1.14.0 * Add new patch --- ports/pcl/add-gcc-version-check.patch | 2 +- ports/pcl/add_bigobj_option.patch | 15 ---- ports/pcl/devendor-zlib.patch | 76 ------------------- ports/pcl/disable_kinfu_for_cuda12.patch | 36 --------- ports/pcl/fix-clang-cl.patch | 36 --------- ports/pcl/fix-numeric-literals-flag.patch | 4 +- ports/pcl/fix-pcl-exports.patch | 25 ++++++ ports/pcl/fix_opennurbs_win32.patch | 24 ------ .../pcl/outofcore_viewer_remove_include.patch | 12 --- ports/pcl/portfile.cmake | 4 +- ports/pcl/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/p-/pcl.json | 5 ++ 13 files changed, 38 insertions(+), 208 deletions(-) delete mode 100644 ports/pcl/add_bigobj_option.patch delete mode 100644 ports/pcl/devendor-zlib.patch delete mode 100644 ports/pcl/disable_kinfu_for_cuda12.patch create mode 100644 ports/pcl/fix-pcl-exports.patch delete mode 100644 ports/pcl/fix_opennurbs_win32.patch delete mode 100644 ports/pcl/outofcore_viewer_remove_include.patch diff --git a/ports/pcl/add-gcc-version-check.patch b/ports/pcl/add-gcc-version-check.patch index 1a9740faca8326..fb5a5fccf51be0 100644 --- a/ports/pcl/add-gcc-version-check.patch +++ b/ports/pcl/add-gcc-version-check.patch @@ -12,7 +12,7 @@ index 63b38df68..29f79d31b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -311,6 +311,10 @@ if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL - message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}") + endif() endif() +if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) diff --git a/ports/pcl/add_bigobj_option.patch b/ports/pcl/add_bigobj_option.patch deleted file mode 100644 index de0ddf27c4ed1f..00000000000000 --- a/ports/pcl/add_bigobj_option.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17020e162..132fbcedb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -142,8 +142,9 @@ endif() - if(CMAKE_COMPILER_IS_MSVC) - add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}") - -+ string(APPEND CMAKE_CXX_FLAGS " /bigobj") - if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}") -- string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS} /bigobj") -+ string(APPEND CMAKE_CXX_FLAGS " /fp:precise ${SSE_FLAGS} ${AVX_FLAGS}") - - # Add extra code generation/link optimizations - if(CMAKE_MSVC_CODE_LINK_OPTIMIZATION AND (NOT BUILD_CUDA) AND (NOT BUILD_GPU)) diff --git a/ports/pcl/devendor-zlib.patch b/ports/pcl/devendor-zlib.patch deleted file mode 100644 index 9ca7bdd4a5f936..00000000000000 --- a/ports/pcl/devendor-zlib.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h -index 12787e1..b500233 100644 ---- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h -+++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_zlib.h -@@ -31,13 +31,16 @@ - - #if !defined(Z_PREFIX) - /* decorates zlib functions with a "z_" prefix to prevent symbol collision. */ --#define Z_PREFIX - #endif -+#define z_deflate deflate -+#define z_inflate inflate -+#define z_Bytef Bytef - - #if !defined(MY_ZCALLOC) - /* have zlib use oncalloc() and onfree() for memory managment*/ --#define MY_ZCALLOC - #endif -+#define zcalloc pcl_zcalloc -+#define zcfree pcl_zcfree - - #include "zlib.h" - -diff --git a/surface/src/3rdparty/opennurbs/openNURBS.cmake b/surface/src/3rdparty/opennurbs/openNURBS.cmake -index 51ca678..4ee5192 100644 ---- a/surface/src/3rdparty/opennurbs/openNURBS.cmake -+++ b/surface/src/3rdparty/opennurbs/openNURBS.cmake -@@ -102,6 +102,8 @@ set(OPENNURBS_INCLUDES - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_workspace.h - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_xform.h - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/opennurbs_zlib.h -+) -+file(REMOVE - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/crc32.h - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/deflate.h - include/pcl/${SUBSYS_NAME}/3rdparty/opennurbs/inffast.h -@@ -222,6 +224,8 @@ set(OPENNURBS_SOURCES - src/3rdparty/opennurbs/opennurbs_xform.cpp - src/3rdparty/opennurbs/opennurbs_zlib.cpp - src/3rdparty/opennurbs/opennurbs_zlib_memory.cpp -+) -+file(REMOVE - src/3rdparty/opennurbs/adler32.c - src/3rdparty/opennurbs/compress.c - src/3rdparty/opennurbs/crc32.c -diff --git a/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp b/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp -index 688c803..d1bc977 100644 ---- a/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp -+++ b/surface/src/3rdparty/opennurbs/opennurbs_zlib.cpp -@@ -68,7 +68,6 @@ - - #endif // if WIN64 else WIN32 - --#pragma comment(lib, "\"" OPENNURBS_ZLIB_OUTPUT_ROOT_DIR "/" OPENNURBS_CONFIGURATION_DIR "/" OPENNURBS_ZLIB_FILE_NAME "\"") - - #endif // ON_DLL_EXPORTS - -@@ -641,7 +640,7 @@ struct ON_CompressedBufferHelper - sizeof_x_buffer = 16384 - }; - unsigned char buffer[sizeof_x_buffer]; -- z_stream strm; -+ z_stream strm = []() { z_stream zs; zs.zalloc = zcalloc; zs.zfree = zcfree; return zs; } (); - std::size_t m_buffer_compressed_capacity; - }; - -diff --git a/surface/src/on_nurbs/on_nurbs.cmake b/surface/src/on_nurbs/on_nurbs.cmake -index 20d4269..a7b5631 100644 ---- a/surface/src/on_nurbs/on_nurbs.cmake -+++ b/surface/src/on_nurbs/on_nurbs.cmake -@@ -55,3 +55,5 @@ else() - set(ON_NURBS_SOURCES ${ON_NURBS_SOURCES} src/on_nurbs/nurbs_solve_eigen.cpp) - endif() - -+find_package(ZLIB REQUIRED) -+set(ON_NURBS_LIBRARIES ${ON_NURBS_LIBRARIES} ${ZLIB_LIBRARIES}) diff --git a/ports/pcl/disable_kinfu_for_cuda12.patch b/ports/pcl/disable_kinfu_for_cuda12.patch deleted file mode 100644 index 7585c66e8bb909..00000000000000 --- a/ports/pcl/disable_kinfu_for_cuda12.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/gpu/kinfu/CMakeLists.txt b/gpu/kinfu/CMakeLists.txt -index 29cb73e95..fbbd294fd 100644 ---- a/gpu/kinfu/CMakeLists.txt -+++ b/gpu/kinfu/CMakeLists.txt -@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu) - set(SUBSYS_PATH gpu/kinfu) - set(SUBSYS_DESC "Kinect Fusion implementation") - set(SUBSYS_DEPS common io gpu_containers geometry search) --set(DEFAULT TRUE) -+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0") -+ set(DEFAULT FALSE) -+ set(REASON "Kinfu uses textures which was removed in CUDA 12") -+else() -+ set(DEFAULT TRUE) -+endif() - - PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}") - PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS}) -diff --git a/gpu/kinfu_large_scale/CMakeLists.txt b/gpu/kinfu_large_scale/CMakeLists.txt -index d7efc4ad5..0488fcb46 100644 ---- a/gpu/kinfu_large_scale/CMakeLists.txt -+++ b/gpu/kinfu_large_scale/CMakeLists.txt -@@ -2,7 +2,12 @@ set(SUBSYS_NAME gpu_kinfu_large_scale) - set(SUBSYS_PATH gpu/kinfu_large_scale) - set(SUBSYS_DESC "Kinect Fusion implementation, with volume shifting") - set(SUBSYS_DEPS common io gpu_containers gpu_utils geometry search octree filters kdtree features surface) --set(DEFAULT TRUE) -+if(${CUDA_VERSION_STRING} VERSION_GREATER_EQUAL "12.0") -+ set(DEFAULT FALSE) -+ set(REASON "Kinfu_large_scale uses textures which was removed in CUDA 12") -+else() -+ set(DEFAULT TRUE) -+endif() - - PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}") - PCL_SUBSYS_DEPEND(build NAME ${SUBSYS_NAME} DEPS ${SUBSYS_DEPS}) diff --git a/ports/pcl/fix-clang-cl.patch b/ports/pcl/fix-clang-cl.patch index a80f6b9c62df1d..245c917917f75b 100644 --- a/ports/pcl/fix-clang-cl.patch +++ b/ports/pcl/fix-clang-cl.patch @@ -11,42 +11,6 @@ index ea73a0c..4cfc92b 100644 #define PCL_INSTANTIATE_PRODUCT_IMPL(r, product) \ BOOST_PP_CAT(PCL_INSTANTIATE_, BOOST_PP_SEQ_HEAD(product)) \ BOOST_PP_EXPAND(BOOST_PP_SEQ_TO_TUPLE(BOOST_PP_SEQ_TAIL(product))) -diff --git a/common/src/colors.cpp b/common/src/colors.cpp -index 4d53ab1..ba0c114 100644 ---- a/common/src/colors.cpp -+++ b/common/src/colors.cpp -@@ -39,6 +39,7 @@ - #include - - #include -+#include - - /// Glasbey lookup table - static constexpr std::array GLASBEY_LUT = -diff --git a/common/src/gaussian.cpp b/common/src/gaussian.cpp -index 69bbd12..2b6a667 100644 ---- a/common/src/gaussian.cpp -+++ b/common/src/gaussian.cpp -@@ -36,6 +36,7 @@ - */ - - #include -+#include - - void - pcl::GaussianKernel::compute (float sigma, -diff --git a/common/src/range_image_planar.cpp b/common/src/range_image_planar.cpp -index 97b249b..dddd7f7 100644 ---- a/common/src/range_image_planar.cpp -+++ b/common/src/range_image_planar.cpp -@@ -35,6 +35,7 @@ - /** \author Bastian Steder */ - - #include -+#include - using std::cout; - using std::cerr; - diff --git a/CMakeLists.txt b/CMakeLists.txt index fad95c9..b4ca305 100644 --- a/CMakeLists.txt diff --git a/ports/pcl/fix-numeric-literals-flag.patch b/ports/pcl/fix-numeric-literals-flag.patch index b3db97390e258f..69a1223c1c00ee 100644 --- a/ports/pcl/fix-numeric-literals-flag.patch +++ b/ports/pcl/fix-numeric-literals-flag.patch @@ -19,8 +19,8 @@ index 7cf86f74b..e07fd430a 100644 + add_definitions(-fext-numeric-literals) +endif() - ### ---[ Create the config.h file - set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in") + # System zlib (for nurbs on surface) + option(WITH_SYSTEM_ZLIB "Use system zlib" TRUE) -- 2.32.0.windows.1 diff --git a/ports/pcl/fix-pcl-exports.patch b/ports/pcl/fix-pcl-exports.patch new file mode 100644 index 00000000000000..84d994797baced --- /dev/null +++ b/ports/pcl/fix-pcl-exports.patch @@ -0,0 +1,25 @@ +diff --git a/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp b/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp +index 2e2be0de3..d1340a93c 100644 +--- a/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp ++++ b/gpu/segmentation/include/pcl/gpu/segmentation/impl/gpu_extract_clusters.hpp +@@ -44,7 +44,7 @@ namespace pcl { + namespace detail { + + //// Downloads only the neccssary cluster indices from the device to the host. +-void ++PCL_EXPORTS void + economical_download(const pcl::gpu::NeighborIndices& source_indices, + const pcl::Indices& buffer_indices, + std::size_t buffer_size, +diff --git a/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h b/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h +index b427e76d9..7958f80e6 100644 +--- a/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h ++++ b/visualization/include/pcl/visualization/vtk/vtkRenderWindowInteractorFix.h +@@ -38,5 +38,6 @@ + #pragma once + + #include ++#include + +-vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew (); ++PCL_EXPORTS vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew (); diff --git a/ports/pcl/fix_opennurbs_win32.patch b/ports/pcl/fix_opennurbs_win32.patch deleted file mode 100644 index 407f2429bb3fd3..00000000000000 --- a/ports/pcl/fix_opennurbs_win32.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h -index 384e7bac8..cde079401 100644 ---- a/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h -+++ b/surface/include/pcl/surface/3rdparty/opennurbs/opennurbs_system.h -@@ -137,15 +137,15 @@ - #if defined(_M_X64) && defined(WIN32) && defined(WIN64) - // 23 August 2007 Dale Lear - --#if defined(_INC_WINDOWS) -+//#if defined(_INC_WINDOWS) - // The user has included Microsoft's windows.h before opennurbs.h, - // and windows.h has nested includes that unconditionally define WIN32. - // Just undo the damage here or everybody that includes opennurbs.h after - // windows.h has to fight with this Microsoft bug. - #undef WIN32 --#else --#error do not define WIN32 for x64 builds --#endif -+//#else -+//#error do not define WIN32 for x64 builds -+//#endif - - // NOTE _WIN32 is defined for any type of Windows build - #endif diff --git a/ports/pcl/outofcore_viewer_remove_include.patch b/ports/pcl/outofcore_viewer_remove_include.patch deleted file mode 100644 index e0435016f5c4c6..00000000000000 --- a/ports/pcl/outofcore_viewer_remove_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/outofcore/tools/outofcore_viewer.cpp b/outofcore/tools/outofcore_viewer.cpp -index 6ec57e09359..795e03d7598 100644 ---- a/outofcore/tools/outofcore_viewer.cpp -+++ b/outofcore/tools/outofcore_viewer.cpp -@@ -112,7 +112,6 @@ using AlignedPointT = Eigen::aligned_allocator; - #include - #include - #include --#include - #include - #include - #include diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 297467a59ba38a..917442a3b75b3f 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl REF "pcl-${VERSION}" - SHA512 f6860b2103cb033839d044c3fed1fc3e8a989cd4f9776ae9d20e7d381b05eff8efde33dd06316ce419b44d877877ed21735d80b09d1daf64b0f94cdd302374fb + SHA512 0ea388d5f4ccdc1e5fcace6a1e1b90843be1a4ed2e1d37cc3c80d8abc0e868324d8f9da80513f1cb3f16738e00586f29cac151ce0d501645514f280aee8b1d7f HEAD_REF master PATCHES add-gcc-version-check.patch @@ -12,8 +12,8 @@ vcpkg_from_github( pcl_utils.patch install-examples.patch no-absolute.patch - devendor-zlib.patch fix-clang-cl.patch + fix-pcl-exports.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PCL_SHARED_LIBS) diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index d2011d740f2b07..27d880be88db92 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pcl", - "version": "1.13.1", - "port-version": 2, + "version": "1.14.0", "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e911f7a5e29605..9442eb8a004d5c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6533,8 +6533,8 @@ "port-version": 0 }, "pcl": { - "baseline": "1.13.1", - "port-version": 2 + "baseline": "1.14.0", + "port-version": 0 }, "pcre": { "baseline": "8.45", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index e6884c400fcca6..cf246ad8d019d6 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "547556098f29483403ca91d1b4ece9b7dc73d104", + "version": "1.14.0", + "port-version": 0 + }, { "git-tree": "55fa760d44b858555a5c350ec8b2a1f26e97e84e", "version": "1.13.1", From 1489e83212265319f6e90ee244cc23e04ded2380 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 10 Jan 2024 17:04:32 -0800 Subject: [PATCH 0789/1039] [coin] Add a warning message for installing libgl and libglu (#36073) * [coin] Add a warning message for installing libgl and libglu * update version --- ports/coin/portfile.cmake | 19 +++++++++++++++++-- ports/coin/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/c-/coin.json | 5 +++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index f8ebaaa069ae96..cb8cef4fd4e031 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -1,7 +1,22 @@ +if(NOT VCPKG_HOST_IS_WINDOWS) + message(WARNING "${PORT} currently requires the following programs from the system package manager: + libgl libglu +On Debian and Ubuntu derivatives: + sudo apt-get install libgl-dev libglu1-mesa-dev +On CentOS and recent Red Hat derivatives: + yum install mesa-libGL-devel mesa-libGLU-devel +On Fedora derivatives: + sudo dnf install mesa-libGL-devel mesa-libGLU-devel +On Arch Linux and derivatives: + sudo pacman -S gl glu +On Alpine: + apk add gl glu\n") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/coin - REF v${VERSION} + REF "v${VERSION}" SHA512 f913f1b1ec5819d72e054dc94702effe9ee2a28547fc9bebc2f6b2e55d8a67c6cfa05e43239461e806cbead0a7548f82b31d5b86181eed4ffc5c801d3b94aa67 HEAD_REF master PATCHES @@ -33,7 +48,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Coin-${VERSION}) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index 989345ff389ded..1de1b9274b7884 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,8 +1,10 @@ { "name": "coin", "version": "4.0.2", + "port-version": 1, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", + "license": "BSD-3-Clause", "supports": "!(arm | arm64 | uwp)", "dependencies": [ "boost-assert", diff --git a/versions/baseline.json b/versions/baseline.json index 9442eb8a004d5c..739fdbb41c840e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1694,7 +1694,7 @@ }, "coin": { "baseline": "4.0.2", - "port-version": 0 + "port-version": 1 }, "coin-or-buildtools": { "baseline": "2023-02-02", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 8ce9e08d4599de..d145e7e6257d59 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f679393fe0adfac4fbc6aa8235ce8a35e106cd7a", + "version": "4.0.2", + "port-version": 1 + }, { "git-tree": "1f151412ad103c9cafd511a97783d60b85aae246", "version": "4.0.2", From 491be104edbafba126d375dc97ad7dc010dce7b3 Mon Sep 17 00:00:00 2001 From: Pravila Date: Thu, 11 Jan 2024 01:06:15 +0000 Subject: [PATCH 0790/1039] [thomasmonkman-filewatch] Fix patch for the latest version of FileWatch (#36091) * Fix template type * Add version --------- Co-authored-by: Pablo Rodriguez Avila --- ports/thomasmonkman-filewatch/fix-unix-listen.patch | 4 ++-- ports/thomasmonkman-filewatch/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/thomasmonkman-filewatch.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/thomasmonkman-filewatch/fix-unix-listen.patch b/ports/thomasmonkman-filewatch/fix-unix-listen.patch index 0e526dd9528da5..c0363c5d6c9d10 100644 --- a/ports/thomasmonkman-filewatch/fix-unix-listen.patch +++ b/ports/thomasmonkman-filewatch/fix-unix-listen.patch @@ -26,11 +26,11 @@ index 4eba08b..2c0ff6d 100644 } + else if (event->mask & IN_MOVED_FROM) + { -+ parsed_information.emplace_back(T{ changed_file }, Event::renamed_old); ++ parsed_information.emplace_back(StringType{ changed_file }, Event::renamed_old); + } + else if (event->mask & IN_MOVED_TO) + { -+ parsed_information.emplace_back(T{ changed_file }, Event::renamed_new); ++ parsed_information.emplace_back(StringType{ changed_file }, Event::renamed_new); + } } } diff --git a/ports/thomasmonkman-filewatch/vcpkg.json b/ports/thomasmonkman-filewatch/vcpkg.json index 50da66e19857f0..c078ddf806de88 100644 --- a/ports/thomasmonkman-filewatch/vcpkg.json +++ b/ports/thomasmonkman-filewatch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "thomasmonkman-filewatch", "version-date": "2023-01-16", - "port-version": 1, + "port-version": 2, "description": "File watcher in C++.", "homepage": "https://github.com/ThomasMonkman/filewatch", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 739fdbb41c840e..caaa9731923b67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8418,7 +8418,7 @@ }, "thomasmonkman-filewatch": { "baseline": "2023-01-16", - "port-version": 1 + "port-version": 2 }, "thor": { "baseline": "2022-04-16", diff --git a/versions/t-/thomasmonkman-filewatch.json b/versions/t-/thomasmonkman-filewatch.json index 586cad78b79833..f6975ed0031d11 100644 --- a/versions/t-/thomasmonkman-filewatch.json +++ b/versions/t-/thomasmonkman-filewatch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3f6f9e4f5a7ac943e3f0ec0c81bcdc3db371705", + "version-date": "2023-01-16", + "port-version": 2 + }, { "git-tree": "6dede6ba1ac505ea4bd64c60bf97edfe7b8d5647", "version-date": "2023-01-16", From 9d6269598051f11945d64215c0af106d62617823 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 11 Jan 2024 02:13:38 +0100 Subject: [PATCH 0791/1039] [sentry-native] update to 0.7.0 (#36088) Signed-off-by: Vitalii Koshura --- ports/sentry-native/fix-config-cmake.patch | 74 +++++++++------------- ports/sentry-native/fix-warningC5105.patch | 12 ---- ports/sentry-native/portfile.cmake | 3 +- ports/sentry-native/vcpkg.json | 8 ++- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 ++ 6 files changed, 43 insertions(+), 61 deletions(-) delete mode 100644 ports/sentry-native/fix-warningC5105.patch diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch index 34aa2405e8e958..1025a194a733f8 100644 --- a/ports/sentry-native/fix-config-cmake.patch +++ b/ports/sentry-native/fix-config-cmake.patch @@ -1,59 +1,43 @@ -diff --git a/external/crashpad/crashpad-config.cmake.in b/external/crashpad/crashpad-config.cmake.in -index 846797d..d7c4ae6 100644 ---- a/external/crashpad/crashpad-config.cmake.in -+++ b/external/crashpad/crashpad-config.cmake.in -@@ -1,6 +1,9 @@ - include("${CMAKE_CURRENT_LIST_DIR}/crashpad-targets.cmake") - - if(@CRASHPAD_ZLIB_SYSTEM@) -+ include(CMakeFindDependencyMacro) -+ find_dependency(ZLIB) -+elseif(0) - find_package(ZLIB REQUIRED) - target_include_directories(crashpad::zlib INTERFACE ${ZLIB_INCLUDE_DIRS}) - target_compile_definitions(crashpad::zlib INTERFACE ${ZLIB_COMPILE_DEFINITIONS}) -diff --git a/external/crashpad/third_party/zlib/CMakeLists.txt b/external/crashpad/third_party/zlib/CMakeLists.txt -index eeb449f..59a6ff1 100644 ---- a/external/crashpad/third_party/zlib/CMakeLists.txt -+++ b/external/crashpad/third_party/zlib/CMakeLists.txt -@@ -1,11 +1,10 @@ - if(CRASHPAD_ZLIB_SYSTEM) - add_library(crashpad_zlib INTERFACE) - target_compile_definitions(crashpad_zlib INTERFACE - ZLIB_CONST - CRASHPAD_ZLIB_SOURCE_SYSTEM -- $ - ) - target_link_libraries(crashpad_zlib INTERFACE ZLIB::ZLIB) - else() - add_library(crashpad_zlib STATIC - zlib/adler32.c diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in -index 89ea345..acbd5e2 100644 +index 70ce7d3..796d428 100644 --- a/sentry-config.cmake.in +++ b/sentry-config.cmake.in -@@ -3,9 +3,14 @@ - set(SENTRY_BACKEND @SENTRY_BACKEND@) - set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) +@@ -1,5 +1,7 @@ + @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) -+if("@SENTRY_LINK_PTHREAD@") -+ find_dependency(Threads) -+endif() + - if(SENTRY_BACKEND STREQUAL "crashpad") - if(@SENTRY_CRASHPAD_SYSTEM@) -- find_package(crashpad REQUIRED) -+ find_dependency(crashpad) - else() - include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") + set(SENTRY_BACKEND @SENTRY_BACKEND@) + set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) + set(SENTRY_BUILD_SHARED_LIBS @SENTRY_BUILD_SHARED_LIBS@) +@@ -8,14 +10,14 @@ set(SENTRY_LINK_PTHREAD @SENTRY_LINK_PTHREAD@) + if(SENTRY_BACKEND STREQUAL "crashpad" AND NOT SENTRY_BUILD_SHARED_LIBS) + include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") + if(NOT MSVC AND NOT SENTRY_BUILD_SHARED_LIBS) +- find_package(ZLIB REQUIRED) ++ find_depenency(ZLIB) endif() -@@ -14,7 +19,5 @@ endif() + endif() + + if(SENTRY_BACKEND STREQUAL "breakpad" AND NOT SENTRY_BUILD_SHARED_LIBS) + set(SENTRY_BREAKPAD_SYSTEM @SENTRY_BREAKPAD_SYSTEM@) + if(SENTRY_BREAKPAD_SYSTEM) +- find_package(PkgConfig REQUIRED) ++ find_dependency(PkgConfig) + pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client) + endif() + endif() +@@ -23,11 +25,9 @@ endif() include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake") - if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@) + if(SENTRY_TRANSPORT STREQUAL "curl" AND (NOT @BUILD_SHARED_LIBS@ OR NOT SENTRY_BUILD_SHARED_LIBS)) - find_package(CURL REQUIRED) - set_property(TARGET sentry::sentry APPEND - PROPERTY INTERFACE_LINK_LIBRARIES ${CURL_LIBRARIES}) + find_dependency(CURL) endif() + + if(SENTRY_LINK_PTHREAD AND NOT SENTRY_BUILD_SHARED_LIBS) +- find_package(Threads REQUIRED) ++ find_dependency(Threads) + endif() diff --git a/ports/sentry-native/fix-warningC5105.patch b/ports/sentry-native/fix-warningC5105.patch deleted file mode 100644 index 52f0dc705bef6e..00000000000000 --- a/ports/sentry-native/fix-warningC5105.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/external/crashpad/third_party/zlib/zlib/x86.c b/external/crashpad/third_party/zlib/zlib/x86.c -index e56fe8b..902e373 100644 ---- a/external/crashpad/third_party/zlib/zlib/x86.c -+++ b/external/crashpad/third_party/zlib/zlib/x86.c -@@ -8,6 +8,7 @@ - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -+#pragma warning(disable : 5105) - #include "x86.h" - #include "zutil.h" - diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 87bd7bfc00ed62..3404f89d5e8442 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/getsentry/sentry-native/releases/download/${VERSION}/sentry-native.zip" FILENAME "sentry-native-${VERSION}.zip" - SHA512 fb2c03c9e3662078e4475390b785760ede1a156713fdfdba2cc8979148a9b4788203c4f923f2b59fcd1fcfa6a4ff77613484186b2a99a4e16100e24d7fc765ae + SHA512 745e2a4590df5412ab62ec6bb32efa7674423d4f0466f4ead9d327d6b0f9308ee8ae328b4beac00b31b34cf88d1dc0a102e81363b4a4a0395e98fcb0758c0551 ) vcpkg_extract_source_archive( @@ -9,7 +9,6 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL PATCHES - fix-warningC5105.patch fix-config-cmake.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/external/crashpad/third_party/zlib/zlib") diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 1ab22c1ef08aa2..aec774adc322ed 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.6.7", + "version": "0.7.0", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", @@ -27,6 +27,12 @@ "Cf. https://github.com/getsentry/sentry-native#compile-time-options" ], "dependencies": [ + { + "$comment": "pkgcong is used by the breakpad backend.", + "name": "pkgconf", + "host": true, + "platform": "!android & !ios" + }, { "$comment": "zlib is used by the crashpad backend.", "name": "zlib", diff --git a/versions/baseline.json b/versions/baseline.json index caaa9731923b67..c318de3166e8e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7813,7 +7813,7 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.6.7", + "baseline": "0.7.0", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 53a5d971bcee04..fe640062e30d8f 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b7467839d13128952c0f944197f8d2fcbc7a763", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "095696cc8cbe39b017311226154e23b909318ef1", "version": "0.6.7", From 64750c8977d7c8eeadd882b4ce641a48ef783340 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:14:28 +0800 Subject: [PATCH 0792/1039] [cctz] Fix compilation error when vs version is greater than 17.7 (#36097) * Fix compilation errors for VS versions greater than 17.7 * update version --- ports/cctz/fix_vs177.patch | 18 ++++++++++++++++++ ports/cctz/portfile.cmake | 2 ++ ports/cctz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cctz.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/cctz/fix_vs177.patch diff --git a/ports/cctz/fix_vs177.patch b/ports/cctz/fix_vs177.patch new file mode 100644 index 00000000000000..02f3839d5f8141 --- /dev/null +++ b/ports/cctz/fix_vs177.patch @@ -0,0 +1,18 @@ +diff --git a/include/cctz/civil_time_detail.h b/include/cctz/civil_time_detail.h +index decc5f2..26c5aef 100644 +--- a/include/cctz/civil_time_detail.h ++++ b/include/cctz/civil_time_detail.h +@@ -353,11 +353,11 @@ class civil_time { + : civil_time(ct.f_) {} + + // Factories for the maximum/minimum representable civil_time. +- static CONSTEXPR_F civil_time (max)() { ++ static CONSTEXPR_F auto (max)() -> civil_time { + const auto max_year = (std::numeric_limits::max)(); + return civil_time(max_year, 12, 31, 23, 59, 59); + } +- static CONSTEXPR_F civil_time (min)() { ++ static CONSTEXPR_F auto (min)() -> civil_time { + const auto min_year = (std::numeric_limits::min)(); + return civil_time(min_year, 1, 1, 0, 0, 0); + } diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake index d6562446b43fe8..e9ba61e343507e 100644 --- a/ports/cctz/portfile.cmake +++ b/ports/cctz/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v2.3 SHA512 e688ddac1bff108e8315bf94cb61483b72b0d16f601e4e1eeb0fd5c064aefe5a573eee66e8903401aa4c2be71ea9f10dd6c9a9cdf8379f5bb6073248a21a83ff HEAD_REF master + PATCHES + fix_vs177.patch #https://github.com/google/cctz/pull/273 ) vcpkg_cmake_configure( diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json index 4d9fae6b6fac77..2c5ebb92be476b 100644 --- a/ports/cctz/vcpkg.json +++ b/ports/cctz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cctz", "version": "2.3", - "port-version": 6, + "port-version": 7, "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", "homepage": "https://github.com/google/cctz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c318de3166e8e1..2f9500edddbbf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1482,7 +1482,7 @@ }, "cctz": { "baseline": "2.3", - "port-version": 6 + "port-version": 7 }, "cdt": { "baseline": "1.3.0", diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index 386c935057fc77..5a2d1989a9a75c 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "527442456bc48c0fd960541f6489dd0ac2add02c", + "version": "2.3", + "port-version": 7 + }, { "git-tree": "02114f18edd1088204f039ab6bc662e23d2e4fcc", "version": "2.3", From 6901e713ee13b88bb1418a3d159303a32f15d831 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 10 Jan 2024 17:24:17 -0800 Subject: [PATCH 0793/1039] [kd-soap] update to 2.2.0 and rename to kdsoap (#36101) * kd-soap update to 2.2.0 * update version --------- Co-authored-by: vzhli17 --- .../Ensure-KDSoapConfig-finds-Qt-first.patch | 26 ------------------- ports/{kd-soap => kdsoap}/portfile.cmake | 6 ++--- ports/{kd-soap => kdsoap}/vcpkg.json | 5 ++-- versions/baseline.json | 4 +++ versions/k-/kdsoap.json | 9 +++++++ 5 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch rename ports/{kd-soap => kdsoap}/portfile.cmake (73%) rename ports/{kd-soap => kdsoap}/vcpkg.json (85%) create mode 100644 versions/k-/kdsoap.json diff --git a/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch b/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch deleted file mode 100644 index e37bfd73d24753..00000000000000 --- a/ports/kd-soap/Ensure-KDSoapConfig-finds-Qt-first.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cb2df4c372c115df84805043a7785f38eb4eb082 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 26 Mar 2023 17:27:02 +0200 -Subject: [PATCH] Ensure KDSoapConfig.cmake finds Qt first. - -Fixes #258 ---- - KDSoapConfig.cmake.in | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/KDSoapConfig.cmake.in b/KDSoapConfig.cmake.in -index d20649a4..f7bfa82b 100644 ---- a/KDSoapConfig.cmake.in -+++ b/KDSoapConfig.cmake.in -@@ -8,6 +8,11 @@ - - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+ -+find_dependency(Qt@Qt_VERSION_MAJOR@Core @QT_MIN_VERSION@) -+find_dependency(Qt@Qt_VERSION_MAJOR@Network @QT_MIN_VERSION@) -+ - set_and_check(KDSoap_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR@") - - set(KDSoap_INCLUDE_DIRS "${KDSoap_INCLUDE_DIR}") diff --git a/ports/kd-soap/portfile.cmake b/ports/kdsoap/portfile.cmake similarity index 73% rename from ports/kd-soap/portfile.cmake rename to ports/kdsoap/portfile.cmake index 93a1f488e1c7f5..3b56a95c0253b8 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kdsoap/portfile.cmake @@ -1,14 +1,12 @@ vcpkg_download_distfile(ARCHIVE URLS "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${VERSION}/kdsoap-${VERSION}.tar.gz" FILENAME "kdsoap-${VERSION}.tar.gz" - SHA512 12224f664dcae7ceb7395a7c3de48a208ae81c10f6fba4d0db233613472c6b9cdbea6375297c27b58fe7338d7db27a4447844f4e8f40a24ec1b4dd3fa38d20bb + SHA512 6ed5cd6a0d02a9faf6881facbd28391c553b3671512153ecd058ab53bfbe9d3f0afa3704d580e66010ddf6a3de7e578a632339f8c1ae7529c28f9d5fd7d1eb5f ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES - Ensure-KDSoapConfig-finds-Qt-first.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC) @@ -34,4 +32,4 @@ 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(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/kd-soap/vcpkg.json b/ports/kdsoap/vcpkg.json similarity index 85% rename from ports/kd-soap/vcpkg.json rename to ports/kdsoap/vcpkg.json index c633915a990048..ecadec916a5511 100644 --- a/ports/kd-soap/vcpkg.json +++ b/ports/kdsoap/vcpkg.json @@ -1,7 +1,6 @@ { - "name": "kd-soap", - "version": "2.1.1", - "port-version": 1, + "name": "kdsoap", + "version": "2.2.0", "description": "A Qt-based client-side and server-side SOAP component", "homepage": "https://www.kdab.com/products/kd-soap", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2f9500edddbbf5..bd0321edeaed18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3748,6 +3748,10 @@ "baseline": "2.0.0", "port-version": 0 }, + "kdsoap": { + "baseline": "2.2.0", + "port-version": 0 + }, "kealib": { "baseline": "1.5.3", "port-version": 0 diff --git a/versions/k-/kdsoap.json b/versions/k-/kdsoap.json new file mode 100644 index 00000000000000..49deb010961074 --- /dev/null +++ b/versions/k-/kdsoap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fb0537658cffb2606f6eed9d444a5d8f88cdf2a4", + "version": "2.2.0", + "port-version": 0 + } + ] +} From dba5cc8a765bfa8b4a6be7e9e530ccbad829bfbd Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 10 Jan 2024 17:24:54 -0800 Subject: [PATCH 0794/1039] [civetweb] add option support USE_ZLIB (#36083) * [civetweb] add option support USE_ZLIB * update version --------- Co-authored-by: vzhli17 --- ports/civetweb/portfile.cmake | 1 + ports/civetweb/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/c-/civetweb.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 35cc9d163592b4..caa0b3113035c8 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_cmake_configure( -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_WEBSOCKETS=ON -DCIVETWEB_ALLOW_WARNINGS=ON + -DCIVETWEB_ENABLE_ZLIB=ON "-DVERSION=${VERSION}" ${FEATURE_OPTIONS} ) diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index 9c097815586cf3..bb2dd92aa34776 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "civetweb", "version": "1.16", - "port-version": 1, + "port-version": 2, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", @@ -13,7 +13,8 @@ { "name": "vcpkg-cmake-config", "host": true - } + }, + "zlib" ], "features": { "ssl": { diff --git a/versions/baseline.json b/versions/baseline.json index bd0321edeaed18..0b2287bea5907d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1586,7 +1586,7 @@ }, "civetweb": { "baseline": "1.16", - "port-version": 1 + "port-version": 2 }, "cjson": { "baseline": "1.7.16", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 3faace72dd04d0..1e1a69ef06c85a 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4dd629e48dc2fc142165bf825c99512544b568c", + "version": "1.16", + "port-version": 2 + }, { "git-tree": "23fa18e460290d6b0629ca6487f69b56845cfbda", "version": "1.16", From 83444c57754d01d584a4a371a070c5147e8a5aae Mon Sep 17 00:00:00 2001 From: cDc Date: Thu, 11 Jan 2024 03:32:10 +0200 Subject: [PATCH 0795/1039] [pmp-library] add port (#33698) * [pmp-library] add port * disable warnings * update version * add version * address review * update version * reviews * update version --- ports/pmp-library/portfile.cmake | 25 +++++++++++++++++++++++++ ports/pmp-library/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/p-/pmp-library.json | 9 +++++++++ 4 files changed, 57 insertions(+) create mode 100644 ports/pmp-library/portfile.cmake create mode 100644 ports/pmp-library/vcpkg.json create mode 100644 versions/p-/pmp-library.json diff --git a/ports/pmp-library/portfile.cmake b/ports/pmp-library/portfile.cmake new file mode 100644 index 00000000000000..f6526e1f526048 --- /dev/null +++ b/ports/pmp-library/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pmp-library/pmp-library + REF "${VERSION}" + SHA512 8ee6f731619b92ad3d555b96c9e486446a4b9b3871992b389f9a55a0d07ca9f69cb4e03c1dc1c986357fc5a06ad60b2657ee0d58a78cb5da3c8f5692fb4c8b0f + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPMP_BUILD_EXAMPLES=OFF + -DPMP_BUILD_TESTS=OFF + -DPMP_BUILD_DOCS=OFF + -DPMP_BUILD_VIS=OFF + -DPMP_STRICT_COMPILATION=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pmp" PACKAGE_NAME pmp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/pmp-library/vcpkg.json b/ports/pmp-library/vcpkg.json new file mode 100644 index 00000000000000..0ef7c63a3d009b --- /dev/null +++ b/ports/pmp-library/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "pmp-library", + "version": "3.0.0", + "description": "The Polygon Mesh Processing Library", + "homepage": "https://github.com/pmp-library/pmp-library", + "license": "MIT", + "supports": "!xbox", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0b2287bea5907d..09f73e2e464dd1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6688,6 +6688,10 @@ "baseline": "1.12.0", "port-version": 2 }, + "pmp-library": { + "baseline": "3.0.0", + "port-version": 0 + }, "pngpp": { "baseline": "0.2.10", "port-version": 2 diff --git a/versions/p-/pmp-library.json b/versions/p-/pmp-library.json new file mode 100644 index 00000000000000..6195479b42d6e4 --- /dev/null +++ b/versions/p-/pmp-library.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "33881ff54702d1e4d2d35ba545953a4044294b22", + "version": "3.0.0", + "port-version": 0 + } + ] +} From 02286a84c7a3b7341ba70e4c71e79541cfe117d2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 12 Jan 2024 00:32:36 +0100 Subject: [PATCH 0796/1039] Run python in isolate mode (#35990) * Run python in isolate mode. * v db --- ports/vcpkg-get-python-packages/vcpkg.json | 2 +- .../x_vcpkg_get_python_packages.cmake | 6 +++--- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++++- versions/baseline.json | 2 +- versions/v-/vcpkg-get-python-packages.json | 5 +++++ 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json index 7a2873183ba649..a2d7a151761c11 100644 --- a/ports/vcpkg-get-python-packages/vcpkg.json +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2023-07-28", + "version-date": "2024-01-02", "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 c67fb1e0bfa791..10306e00c32bed 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 @@ -91,7 +91,7 @@ function(x_vcpkg_get_python_packages) 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}" + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -I -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}") @@ -101,13 +101,13 @@ 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} + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -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} + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -m pip install ${arg_PACKAGES} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME "pip-install-packages-${TARGET_TRIPLET}") endif() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 3b92d822b7c323..1d653cf6fe0de0 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -84,7 +84,11 @@ function(z_vcpkg_find_acquire_program_find_internal program) PATHS ${arg_PATHS} NO_DEFAULT_PATH) if(SCRIPT_${program}) - set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "") + if(arg_INTERPRETER MATCHES "PYTHON") + set("${program}" ${${arg_INTERPRETER}} -I ${SCRIPT_${program}} CACHE INTERNAL "") + else() + set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "") + endif() endif() unset(SCRIPT_${program} CACHE) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 09f73e2e464dd1..d82bc775690dd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8857,7 +8857,7 @@ "port-version": 0 }, "vcpkg-get-python-packages": { - "baseline": "2023-07-28", + "baseline": "2024-01-02", "port-version": 0 }, "vcpkg-gfortran": { diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json index 289a729f8039f4..882ff2e6805167 100644 --- a/versions/v-/vcpkg-get-python-packages.json +++ b/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6f23effcf3057ccc837f864b9207b651209e608", + "version-date": "2024-01-02", + "port-version": 0 + }, { "git-tree": "80e0cf9d38d72126b34eb1ee9b33f936c778a696", "version-date": "2023-07-28", From e6a1dc4f53017b75f747adea876f4750ec23f795 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 11 Jan 2024 15:37:32 -0800 Subject: [PATCH 0797/1039] [vcpkg baseline][mongo-c-driver] Fix the race condition during CMake configure (#36099) * [vcpkg baseline][mongo-c-driver] Fix the race condition during CMake configure * update version * update fix * update version --- ports/mongo-c-driver/portfile.cmake | 6 +++--- ports/mongo-c-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index c45ce6147ff164..d54926f636096c 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,7 +1,4 @@ # This port needs to be updated at the same time as libbson - -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver @@ -45,6 +42,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS ${OPTIONS} "-DBUILD_VERSION=${VERSION}" @@ -56,6 +54,8 @@ vcpkg_cmake_configure( -DENABLE_UNINSTALL=OFF -DENABLE_ZLIB=SYSTEM -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH + -DCMAKE_DISABLE_FIND_PACKAGE_Python=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON MAYBE_UNUSED_VARIABLES ENABLE_ICU ) diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index a54e6fc09c6755..8db615bb114768 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-c-driver", "version": "1.25.4", + "port-version": 1, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d82bc775690dd0..2bf0507fe16cd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5674,7 +5674,7 @@ }, "mongo-c-driver": { "baseline": "1.25.4", - "port-version": 0 + "port-version": 1 }, "mongo-cxx-driver": { "baseline": "3.9.0", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index d6014444132ab2..394c36ac86cf4b 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a6dfbb8124275c3987495969f7f79e5a7023b74", + "version": "1.25.4", + "port-version": 1 + }, { "git-tree": "219d51be972af0596a2c538b530fc379d136fcb2", "version": "1.25.4", From 97c1d748be4ed5d95e3a68b2fe4a9ef7837f19aa Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 11 Jan 2024 15:42:29 -0800 Subject: [PATCH 0798/1039] Fix paths with single quotes in bootstrap. (#36115) Fixes https://github.com/microsoft/vcpkg/issues/25058 --- bootstrap-vcpkg.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-vcpkg.bat b/bootstrap-vcpkg.bat index 1f9baa3d0b6ecb..54e0b85a225030 100644 --- a/bootstrap-vcpkg.bat +++ b/bootstrap-vcpkg.bat @@ -1,2 +1,2 @@ @echo off -powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1' %*}" +powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& \"%~dp0scripts\bootstrap.ps1\" %*}" From ffa05508d1bb2e9af8af8a94923dd996bd3ded2e Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 12 Jan 2024 07:42:53 +0800 Subject: [PATCH 0799/1039] [bond] Disable example and test (#36118) * [bond] Disable example and test * version --- ports/bond/portfile.cmake | 1 + ports/bond/vcpkg.json | 2 +- versions/b-/bond.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 2e119751510866..cadcb3e037aa35 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -50,6 +50,7 @@ vcpkg_cmake_configure( -DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_SKIP_GBC_TESTS=TRUE -DBOND_FIND_RAPIDJSON=TRUE + -DBOND_SKIP_CORE_TESTS=TRUE -DBOND_STACK_OPTIONS=--allow-different-user ${FEATURE_OPTIONS} ) diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 7e28e4a4e60162..93b2647d2a4b16 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bond", "version": "10.0.0", - "port-version": 1, + "port-version": 2, "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/versions/b-/bond.json b/versions/b-/bond.json index 8fb5504bdc9e04..40c22156642d62 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "800bba87d345e620b88cd1b31b34fb76ac80aee6", + "version": "10.0.0", + "port-version": 2 + }, { "git-tree": "5d9b960403809575097267ac43d1ce18e9b2a7f2", "version": "10.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2bf0507fe16cd7..86b614e73d686b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -678,7 +678,7 @@ }, "bond": { "baseline": "10.0.0", - "port-version": 1 + "port-version": 2 }, "boolinq": { "baseline": "3.0.4", From ee9c88f9ec9ada660a5ab0c92ac71bfea9e3704f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Markl=C3=A9n?= Date: Fri, 12 Jan 2024 00:43:37 +0100 Subject: [PATCH 0800/1039] [libmaxminddb] Updated version to 1.9.1 (#36112) * Updated libmaxminddb to version 1.9.1 * Cleanup portfile * Use vcpkg_install_copyright function * Updated versions * Update ci.baseline.txt * Implemented fixes from dg0yt * Versions updated * Update portfile.cmake * Update libmaxminddb.json --------- Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> --- ports/libmaxminddb/CMakeLists.txt | 34 ------------------------ ports/libmaxminddb/fix-linux-build.patch | 19 ------------- ports/libmaxminddb/portfile.cmake | 22 ++++++++------- ports/libmaxminddb/vcpkg.json | 6 ++++- scripts/ci.baseline.txt | 5 +++- versions/baseline.json | 2 +- versions/l-/libmaxminddb.json | 5 ++++ 7 files changed, 28 insertions(+), 65 deletions(-) delete mode 100644 ports/libmaxminddb/CMakeLists.txt delete mode 100644 ports/libmaxminddb/fix-linux-build.patch diff --git a/ports/libmaxminddb/CMakeLists.txt b/ports/libmaxminddb/CMakeLists.txt deleted file mode 100644 index c46c6319be1d05..00000000000000 --- a/ports/libmaxminddb/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -cmake_minimum_required (VERSION 3.9) -project(maxminddb C) - -set(CMAKE_DEBUG_POSTFIX d) -set(CMAKE_SHARED_LIBRARY_PREFIX lib) -set(CMAKE_STATIC_LIBRARY_PREFIX lib) - -if(MSVC) - add_compile_options(-D_CRT_SECURE_NO_WARNINGS) -endif() - -set(SRCS - src/maxminddb.c - src/data-pool.c -) - -include_directories(. src include projects/VS12) - -add_library(maxminddb ${SRCS}) - -if(WIN32) - target_link_libraries(maxminddb ws2_32) -endif() - -install( - TARGETS maxminddb - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES include/maxminddb.h projects/VS12/maxminddb_config.h DESTINATION include/maxminddb) -endif() diff --git a/ports/libmaxminddb/fix-linux-build.patch b/ports/libmaxminddb/fix-linux-build.patch deleted file mode 100644 index db35979e633618..00000000000000 --- a/ports/libmaxminddb/fix-linux-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/include/maxminddb.h b/include/maxminddb.h -index 4002ec6..65482c5 100644 ---- a/include/maxminddb.h -+++ b/include/maxminddb.h -@@ -24,11 +24,12 @@ extern "C" { - #include - #include - -+/* libmaxminddb package version from configure */ -+#define PACKAGE_VERSION "1.7.1" -+ - #ifdef _WIN32 - #include - #include --/* libmaxminddb package version from configure */ --#define PACKAGE_VERSION "1.7.1" - - typedef ADDRESS_FAMILY sa_family_t; - diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index 70a393c3999b83..f58b4cee7ee622 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -3,22 +3,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO maxmind/libmaxminddb - REF "${VERSION}" - SHA512 0a5caa267712310ef5de4c33e008d02dff76f8a9672e370719cd1d3e0f8de1146b9120991f5c2e34ed81a4ee011510dcc4b30051f6e23a6fd0634f50d35252ec - HEAD_REF master - PATCHES fix-linux-build.patch + REF "${VERSION}" + SHA512 0fc69bb09b74b892317c64d11822e29311e016566b60fc217efb20aec713e29dc02400839497cfcf5e837fcee9efa3536452997fa76bbc23464fad92a5a89bef + HEAD_REF main ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_SHARED_LIBRARY_PREFIX=lib + -DCMAKE_STATIC_LIBRARY_PREFIX=lib OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=ON + -DCMAKE_DEBUG_POSTFIX=d ) - vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index 9fdd6d252a9018..07fafac385ea6d 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libmaxminddb", - "version": "1.7.1", + "version": "1.9.1", "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "dependencies": [ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1c34876165db94..72f313250a83ac 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -75,7 +75,7 @@ berkeleydb:arm64-android=fail berkeleydb:x64-android=fail binlog:arm-neon-android=fail blitz:x64-android=fail -blitz:x64-linux=fail # python2 +blitz:x64-linux=fail # python2 blitz:x64-osx=fail boinc:arm-neon-android=fail boinc:arm64-android=fail @@ -568,6 +568,9 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip +libmaxminddb:arm64-android=fail +libmaxminddb:arm-neon-android=fail +libmaxminddb:x64-android=fail # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:x64-linux=skip libmikmod:arm-neon-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 86b614e73d686b..4beb07359d1001 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4521,7 +4521,7 @@ "port-version": 3 }, "libmaxminddb": { - "baseline": "1.7.1", + "baseline": "1.9.1", "port-version": 0 }, "libmediainfo": { diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index da9a71ac9b1cba..992f08d71acf52 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "446fd110747f3e6bc09f822e89d30f144eb52a9f", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "a396718bfaa9c8e9e950cb3aaedb7bd562a157a7", "version": "1.7.1", From a45fe2ce6039339ee7a076ebd3dcee0fa6cc1287 Mon Sep 17 00:00:00 2001 From: Paul-Edouard Sarlin <15985472+sarlinpe@users.noreply.github.com> Date: Fri, 12 Jan 2024 00:43:52 +0100 Subject: [PATCH 0801/1039] [libraw] Disable default features of jasper (#36110) * No default features for jasper in libraw * Increment port version --- ports/libraw/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/l-/libraw.json | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index b501d9b1904127..67a713d0eaffe1 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,13 +1,16 @@ { "name": "libraw", "version": "0.21.1", - "port-version": 2, + "port-version": 3, "description": "raw image decoder library", "homepage": "https://www.libraw.org", "license": "LGPL-2.1-only OR CDDL-1.0", "supports": "!uwp & !xbox", "dependencies": [ - "jasper", + { + "name": "jasper", + "default-features": false + }, "lcms", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 4beb07359d1001..715bd272866c34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4742,7 +4742,7 @@ }, "libraw": { "baseline": "0.21.1", - "port-version": 2 + "port-version": 3 }, "librdkafka": { "baseline": "2.3.0", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 3259e9b05842b9..88d8717e5fcd34 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a10e9f3c0a023e53a82eb8408365f50e6825e80", + "version": "0.21.1", + "port-version": 3 + }, { "git-tree": "ca8608b21d32cbd238b21eafc1ceb19ab91729b5", "version": "0.21.1", From 3938ee38c58cb5b99f72864d8cc22321261003f9 Mon Sep 17 00:00:00 2001 From: gerard-ryan-immersaview <64181775+gerard-ryan-immersaview@users.noreply.github.com> Date: Fri, 12 Jan 2024 09:46:53 +1000 Subject: [PATCH 0802/1039] [mpg123] Support system dependency CFLAGS better (#36100) * https://sourceforge.net/p/mpg123/bugs/366/ --- ports/mpg123/fix-modules-cmake-cflags.patch | 19 +++++++++++++++++++ ports/mpg123/portfile.cmake | 1 + ports/mpg123/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mpg123.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/mpg123/fix-modules-cmake-cflags.patch diff --git a/ports/mpg123/fix-modules-cmake-cflags.patch b/ports/mpg123/fix-modules-cmake-cflags.patch new file mode 100644 index 00000000000000..b43bb5cf692c96 --- /dev/null +++ b/ports/mpg123/fix-modules-cmake-cflags.patch @@ -0,0 +1,19 @@ +diff --git a/ports/cmake/src/libout123/modules/CMakeLists.txt b/ports/cmake/src/libout123/modules/CMakeLists.txt +index 21810c6..51c673d 100644 +--- a/ports/cmake/src/libout123/modules/CMakeLists.txt ++++ b/ports/cmake/src/libout123/modules/CMakeLists.txt +@@ -17,11 +17,11 @@ if(NOT USE_MODULES) + $<$:${WIN32_LIBRARIES}> + $<$:${WIN32_WASAPI_LIBRARIES}>) + if(DEFAULT_OUTPUT_MODULE STREQUAL "pulse") +- target_compile_definitions(defaultmodule PRIVATE ${PULSE_CFLAGS}) ++ target_compile_options(defaultmodule PRIVATE ${PULSE_CFLAGS}) + elseif(DEFAULT_OUTPUT_MODULE STREQUAL "jack") +- target_compile_definitions(defaultmodule PRIVATE ${JACK_CFLAGS}) ++ target_compile_options(defaultmodule PRIVATE ${JACK_CFLAGS}) + elseif(DEFAULT_OUTPUT_MODULE STREQUAL "tinyalsa") +- target_compile_definitions(defaultmodule PRIVATE ${TINYALSA_CFLAGS}) ++ target_compile_options(defaultmodule PRIVATE ${TINYALSA_CFLAGS}) + endif() + if(BUILD_SHARED_LIBS) + set_target_properties(defaultmodule PROPERTIES POSITION_INDEPENDENT_CODE ON) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 01856176c5c5fd..933b611a306bd1 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_sourceforge( fix-checktypesize.patch fix-modulejack.patch fix-m1-build.patch + fix-modules-cmake-cflags.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 57a6faca7fd20f..d4e95cf1925cde 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpg123", "version": "1.31.3", - "port-version": 3, + "port-version": 4, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 715bd272866c34..782185f40e283a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5738,7 +5738,7 @@ }, "mpg123": { "baseline": "1.31.3", - "port-version": 3 + "port-version": 4 }, "mpi": { "baseline": "1", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 27abc59b73d05e..0633842bd80280 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37566a41dbc98698c2fb1236e378f181a965b0d3", + "version": "1.31.3", + "port-version": 4 + }, { "git-tree": "6e990602e7caa6965db94c4ef01e3f1b44fb4f67", "version": "1.31.3", From c9140a3b500812ad3206317885860d9553b93f13 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Fri, 12 Jan 2024 07:53:34 +0800 Subject: [PATCH 0803/1039] [ktx] Update to v4.3.0-beta1 and fix unix2dos command does not exist (#36007) * update to v4.3.0-beta1 * update version * delete msys * update version * modify patch * update version * add pathc * update version * delete patch * update version * fix download method * update version * portfile * update version * portfile * update version --- ports/ktx/0001-Use-vcpkg-zstd.patch | 51 ++++++++++++++--------------- ports/ktx/0004-quirks.patch | 18 +++++----- ports/ktx/portfile.cmake | 5 ++- ports/ktx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/ktx.json | 5 +++ 6 files changed, 45 insertions(+), 38 deletions(-) diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch index f74fe7e245b192..71a587bd6ed5f7 100644 --- a/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0653da5..1265f3d 100644 +index 9a56491..d7ca937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -265,7 +265,6 @@ set(KTX_MAIN_SRC +@@ -345,7 +345,6 @@ set(KTX_MAIN_SRC lib/basisu/transcoder/basisu_transcoder.cpp lib/basisu/transcoder/basisu_transcoder.h lib/basisu/transcoder/basisu.h @@ -10,15 +10,15 @@ index 0653da5..1265f3d 100644 lib/checkheader.c lib/dfdutils/createdfd.c lib/dfdutils/colourspaces.c -@@ -448,7 +447,6 @@ macro(common_libktx_settings target enable_write library_type) +@@ -532,7 +531,6 @@ macro(common_libktx_settings target enable_write library_type) $ $ - $ - $ - $ -@@ -538,6 +536,11 @@ macro(common_libktx_settings target enable_write library_type) + $ + $ +@@ -627,6 +625,11 @@ macro(common_libktx_settings target enable_write library_type) target_compile_definitions(${target} PUBLIC KTX_FEATURE_KTX2) endif() @@ -46,19 +46,20 @@ index 6386ba2..537bf4f 100644 include("${CMAKE_CURRENT_LIST_DIR}/KtxTargets.cmake") diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt -index 492233a..2663169 100644 +index 492233a..152ceb5 100644 --- a/lib/basisu/CMakeLists.txt +++ b/lib/basisu/CMakeLists.txt -@@ -146,7 +146,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} +@@ -145,9 +145,6 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} + transcoder/basisu_transcoder.cpp ) - if (ZSTD) +-if (ZSTD) - set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") - endif() +-endif() if (APPLE) -@@ -165,6 +165,10 @@ else() + set(BIN_DIRECTORY "bin_osx") +@@ -165,6 +162,10 @@ else() target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0) endif() @@ -70,54 +71,52 @@ index 492233a..2663169 100644 # For Non-Windows builds, let cmake try and find the system OpenCL headers/libs for us. if (OPENCL_FOUND) diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt -index 588d91b..edd7457 100644 +index 588d91b..a337b13 100644 --- a/lib/basisu/webgl/encoder/CMakeLists.txt +++ b/lib/basisu/webgl/encoder/CMakeLists.txt -@@ -34,9 +34,7 @@ if (EMSCRIPTEN) +@@ -34,9 +34,6 @@ if (EMSCRIPTEN) ) if (KTX2_ZSTANDARD) - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstd.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -56,6 +54,10 @@ if (EMSCRIPTEN) +@@ -55,6 +52,10 @@ if (EMSCRIPTEN) + target_compile_options(basis_encoder.js PRIVATE -fno-strict-aliasing -O3) target_include_directories(basis_encoder.js PRIVATE ../../transcoder) - ++ + if(ZSTD_LIBRARIES) + target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES}) + endif() -+ + set_target_properties(basis_encoder.js PROPERTIES OUTPUT_NAME "basis_encoder" - SUFFIX ".js" diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt -index 372653d..3c9ed0c 100644 +index 372653d..5ebc3cf 100644 --- a/lib/basisu/webgl/transcoder/CMakeLists.txt +++ b/lib/basisu/webgl/transcoder/CMakeLists.txt -@@ -28,9 +28,7 @@ if (EMSCRIPTEN) +@@ -28,9 +28,6 @@ if (EMSCRIPTEN) endif() if (KTX2_ZSTANDARD) - set(SRC_LIST ${SRC_LIST} - ../../zstd/zstddeclib.c - ) -+ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) else() set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) -@@ -45,6 +43,10 @@ if (EMSCRIPTEN) +@@ -44,6 +41,10 @@ if (EMSCRIPTEN) + target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} ) target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing) target_include_directories(basis_transcoder.js PRIVATE ../../transcoder) - ++ + if(ZSTD_LIBRARIES) + target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES}) + endif() -+ + set_target_properties(basis_transcoder.js PROPERTIES OUTPUT_NAME "basis_transcoder" - SUFFIX ".js" diff --git a/ports/ktx/0004-quirks.patch b/ports/ktx/0004-quirks.patch index f0692f5c72879a..afc34236dd99f8 100644 --- a/ports/ktx/0004-quirks.patch +++ b/ports/ktx/0004-quirks.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9775c89..a4dfc2a 100644 +index 1500844..810914e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -235,7 +235,7 @@ include(cmake/mkvk.cmake) - # Global compile & link options including optimization flags - if(MSVC) - add_compile_options( /W4;/WX ) +@@ -263,7 +263,7 @@ if(MSVC) + # ";" argument separator is problematic. Can't use a GenEx `$:/WX> ) - add_compile_options( $,/Gz,/O2> ) + add_compile_options( $,,/O2> ) - elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" - OR ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - add_compile_options(-Wall -Wextra -Werror) -@@ -851,6 +851,7 @@ if(EMSCRIPTEN) + # Enable UTF-8 support + add_compile_options( $<$:/utf-8> ) + add_compile_options( $<$:/utf-8> ) +@@ -946,6 +946,7 @@ if(EMSCRIPTEN) endif() add_library( objUtil STATIC diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index 854fb4cfd2a935..7a6d8edb108ed1 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software REF "v${VERSION}" - SHA512 9ef0100a402321b00faa822eb2a50fd0d1e17fa703edacdbacf9231484d911cc254aed1fa517988537dc5b7059921a793edaeb92e8b2965d25672cd9a2589a0f + SHA512 5a89f8986464705ec36ac1becaddd0ff335e4c3c235468aaef0e963fcfeda4c0d669a086b91e61c16a3ae9e1fa5bf456dccf12cc65720e1a22e7cc0f30552541 HEAD_REF master PATCHES 0001-Use-vcpkg-zstd.patch @@ -21,6 +21,9 @@ if(VCPKG_TARGET_IS_WINDOWS) # Required for "getopt" "https://repo.msys2.org/msys/x86_64/util-linux-2.35.2-3-x86_64.pkg.tar.zst" da26540881cd5734072717133307e5d1a27a60468d3656885507833b80f24088c5382eaa0234b30bdd9e8484a6638b4514623f5327f10b19eed36f12158e8edb + # Required for "dos2unix" + "https://mirror.msys2.org/msys/x86_64/dos2unix-7.5.1-1-x86_64.pkg.tar.zst" + 83d85e6ccea746ef9e8153a0d605e774dbe7efc0ee952804acfee4ffd7e3b0386a353b45ff989dd99bc3ce75968209fea3d246ad2af88bbb5c4eca12fc5a8f92 ) vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") vcpkg_list(APPEND OPTIONS "-DBASH_EXECUTABLE=${MSYS_ROOT}/usr/bin/bash.exe") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 36bfc6b05cc575..b71850ef9c2f6e 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ktx", - "version-semver": "4.3.0-alpha3", + "version-semver": "4.3.0-beta1", "description": [ "The Khronos KTX library and tools.", "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ESâ„¢ï¸ and Vulkan® textures from them." diff --git a/versions/baseline.json b/versions/baseline.json index 782185f40e283a..403ffea52715f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3957,7 +3957,7 @@ "port-version": 0 }, "ktx": { - "baseline": "4.3.0-alpha3", + "baseline": "4.3.0-beta1", "port-version": 0 }, "kubazip": { diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 7883f0191f9f10..8ed84c6a48231b 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d9ea81aabca83f512d64a46fd545d353552034", + "version-semver": "4.3.0-beta1", + "port-version": 0 + }, { "git-tree": "47559725520a0015829f65dfda7f3b28a7a7d78f", "version-semver": "4.3.0-alpha3", From ae96d9dfa041d073257c27e6cd0f10bd8a20f036 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 12 Jan 2024 10:17:14 -0800 Subject: [PATCH 0804/1039] Update vcpkg to 2024-01-11. (#36141) https://github.com/microsoft/vcpkg-tool/releases/tag/2024-01-11 --- scripts/vcpkg-tool-metadata.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt index 4b957bd80e99b7..27cdb9d4a02b39 100644 --- a/scripts/vcpkg-tool-metadata.txt +++ b/scripts/vcpkg-tool-metadata.txt @@ -1,5 +1,5 @@ -VCPKG_TOOL_RELEASE_TAG=2023-12-12 -VCPKG_MACOS_SHA=57acd637005d783ff0eee93e5e580b94c91533c56be2d9b1159970e9f5141c94586bb52a7ffb15a1ed6b9d3ae97ffcb390e2a8a119668d33983833bb9c979f63 -VCPKG_MUSLC_SHA=e7afae6cfa704f2f789e4b88ecdfa29ccc10a93b340bb06703cd53c671179731248a2c9c3f95955e257ae5d1bdb17aa0102e92d446d1f11fa5525687115c0f34 -VCPKG_GLIBC_SHA=be3415acf864476d4ab9eb9fd76a7cdabb4a17c9bb6a1a34efaca5a8958dfb07cabda2aae92c91737f20156d0d0f0be555d3c04285452d95591c8cc99d317cf5 -VCPKG_TOOL_SOURCE_SHA=e3620cea7b34ba2e7bc2d718d039091b9dc2abf70208aefb0b8dce03cf01223d29fcdf8c609ccb4bb45accf60de0453c080cf53757f14b59c99919cd0dd7fe4f +VCPKG_TOOL_RELEASE_TAG=2024-01-11 +VCPKG_MACOS_SHA=ed980cf6c66b253c7cecd03d1f0803d2ba9df2265d945cd6c3f3bda7f96a2932adbb59cea95353db048edb46f9d099dbdcb393a8ca277047373bea91e554d3c3 +VCPKG_MUSLC_SHA=a08e784fb5add2c6394aed82b5067f4160eda16191b69dd06b5a766d3a4eff40c1aaf74926de0e92e612015b9edd3251d341fd09ccf4c73023ae1e4cb0ccbba3 +VCPKG_GLIBC_SHA=7bbc8de6e1516c67abbf0bda276e0ebd2fa3fb47cf9c3e2f54a63c1c64d7ceb133ffd174458719a5e6f0c1db388de06493249c7359905be83469cd5ed110dc87 +VCPKG_TOOL_SOURCE_SHA=93bff2ac9ffb821c88e17334b3bf8229860fdfb1792eb669234289a034afa790b8bf7c36b98b94e98cb27180273912d310d9fa3d6a1c96cdd2c056543ea08ce6 From 91df376407370afb56ab1afb536fcaec3a05b86a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 12 Jan 2024 10:20:52 -0800 Subject: [PATCH 0805/1039] [azure-*-cpp] Update to January releases (#36138) * [azure-messaging-eventhubs-cpp] Update to 1.0.0-beta.5 ## 1.0.0-beta.5 (2024-01-11) ### Breaking Changes - EventHub `ConsumerClient` and `ProcessorClient` objects now return pointers to `EventData` objects instead of `EventData` objects by value. * [azure-core-amqp-cpp] Update to 1.0.0-beta.6 ## 1.0.0-beta.6 (2024-01-11) ### Features Added - AMQP Value reference counts are now atomic, this fixes several AMQP related crashes. ### Breaking Changes - `MessageReceiver` returns a pointer to the received message instead of a copy. ### Bugs Fixed - Fixed several memory leaks. - AMQP Link Credits now work as expected. - Integrated the fix for NVD - CVE-2024-21646. * [azure-core-cpp] Update to 1.11.0 ## 1.11.0 (2024-01-11) ### Features Added - Added 'OPTIONS' HTTP method to `Azure::Core::Http::HttpMethod` enum. - Added TLS 1.3 support to WinHTTP transport. - Environment Log Level Listener now logs the ThreadID for the thread originating the trace. - [[#4983]](https://github.com/Azure/azure-sdk-for-cpp/issues/4983) Added support for setting `CURLOPT_CAPATH` libcurl option on Linux. (A community contribution, courtesy of _[phoebusm](https://github.com/phoebusm)_) ### Bugs Fixed - [[#5172]](https://github.com/Azure/azure-sdk-for-cpp/issues/5172) `Azure::Nullable::Emplace()` does not set `HasValue()` to `true`. - [[#5130]](https://github.com/Azure/azure-sdk-for-cpp/issues/5130) `Url::AppendPath()` and `Url::SetPath()` may end up with a double slash at the beginning of a path. - [[#5007]](https://github.com/Azure/azure-sdk-for-cpp/issues/5007) Some versions of GCC no longer include stdint.h in cstdint. ### Other Changes - [[#4756]] (https://github.com/Azure/azure-sdk-for-cpp/issues/4756) `BearerTokenAuthenticationPolicy` now uses shared mutex lock for read operations. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Phoebus Mak _([GitHub](https://github.com/phoebusm))_ --- ports/azure-core-amqp-cpp/portfile.cmake | 4 +- ports/azure-core-amqp-cpp/vcpkg.json | 7 +- ports/azure-core-cpp/fix_gcc13.patch | 115 ------------------ ports/azure-core-cpp/portfile.cmake | 9 +- ports/azure-core-cpp/vcpkg.json | 7 +- .../portfile.cmake | 4 +- .../azure-messaging-eventhubs-cpp/vcpkg.json | 7 +- versions/a-/azure-core-amqp-cpp.json | 5 + versions/a-/azure-core-cpp.json | 5 + .../a-/azure-messaging-eventhubs-cpp.json | 5 + versions/baseline.json | 8 +- 11 files changed, 43 insertions(+), 133 deletions(-) delete mode 100644 ports/azure-core-cpp/fix_gcc13.patch diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake index 6b1f056805af73..21182a23da522d 100644 --- a/ports/azure-core-amqp-cpp/portfile.cmake +++ b/ports/azure-core-amqp-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-amqp_1.0.0-beta.5 - SHA512 d9a75d1cdac2a58b2064f12c4f61adfc9969d4fd860146d6de398eb466e61602d6ce6db4a69554aadaa4f77105b8b746f51ca4a80758981895bb0a82cdf5aa70 + REF azure-core-amqp_1.0.0-beta.6 + SHA512 dd4ad71a1658e79c8abc6beabd78da5281bfba75f80a85a6ec47335ac416c13538b95196fd553c5c4131bdc496b5a43a8653379cca5a9b73d1e5f233fa16940d ) if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp") diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json index 23ed1da1ba0b10..a763d8c3b9d302 100644 --- a/ports/azure-core-amqp-cpp/vcpkg.json +++ b/ports/azure-core-amqp-cpp/vcpkg.json @@ -1,7 +1,10 @@ { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-amqp-cpp", - "version-semver": "1.0.0-beta.5", + "version-semver": "1.0.0-beta.6", "description": [ "Microsoft Azure AMQP SDK for C++", "This library provides AMQP functionality to Azure SDK services." diff --git a/ports/azure-core-cpp/fix_gcc13.patch b/ports/azure-core-cpp/fix_gcc13.patch deleted file mode 100644 index b283e1bdd3a718..00000000000000 --- a/ports/azure-core-cpp/fix_gcc13.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff --git a/CMakePresets.json b/CMakePresets.json -index eb862b0..2331864 100644 ---- a/CMakePresets.json -+++ b/CMakePresets.json -@@ -370,6 +370,24 @@ - "rhs": "Linux" - } - }, -+ { -+ "name": "linux-basic-clang-13", -+ "displayName": "Linux clang-13", -+ "description": "Using compilers: C = /usr/bin/clang-13, CXX = /usr/bin/clang++-13", -+ "binaryDir": "${sourceDir}/out/build/${presetName}", -+ "generator": "Ninja", -+ "hidden": true, -+ "cacheVariables": { -+ "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}", -+ "CMAKE_C_COMPILER": "/usr/bin/clang-13", -+ "CMAKE_CXX_COMPILER": "/usr/bin/clang++-13" -+ }, -+ "condition": { -+ "type": "equals", -+ "lhs": "${hostSystemName}", -+ "rhs": "Linux" -+ } -+ }, - { - "name": "linux-basic-g++", - "displayName": "Linux G++", -@@ -403,9 +421,19 @@ - "inherits": [ "linux-basic-clang-11", "debug-build" ] - }, - { -- "name": "linux-clang-11-debug-tests", -- "inherits": [ "linux-basic-clang-11", "debug-build", "enable-tests" ], -- "displayName": "Linux clang 11 Debug+Tests" -+ "name": "linux-clang-13-debug-tests", -+ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], -+ "displayName": "Linux clang 13 Debug+Tests" -+ }, -+ { -+ "name": "linux-clang-11-debug", -+ "displayName": "Linux clang 11 Debug", -+ "inherits": [ "linux-basic-clang-11", "debug-build" ] -+ }, -+ { -+ "name": "linux-clang-13-debug-tests", -+ "inherits": [ "linux-basic-clang-13", "debug-build", "enable-tests" ], -+ "displayName": "Linux clang 13 Debug+Tests" - }, - { - "name": "linux-g++-debug", -diff --git a/sdk/core/azure-core/inc/azure/core/base64.hpp b/sdk/core/azure-core/inc/azure/core/base64.hpp -index 97d01ce..97264cb 100644 ---- a/sdk/core/azure-core/inc/azure/core/base64.hpp -+++ b/sdk/core/azure-core/inc/azure/core/base64.hpp -@@ -10,8 +10,9 @@ - #pragma once - - #include --#include -+#include // defines std::uint8_t - #include -+#include // deprecated, defines uint8_t in global namespace. TODO: Remove when uint8_t in the global namespace is removed. - #include - #include - -diff --git a/sdk/core/azure-core/inc/azure/core/uuid.hpp b/sdk/core/azure-core/inc/azure/core/uuid.hpp -index 1fe0788..d2acb48 100644 ---- a/sdk/core/azure-core/inc/azure/core/uuid.hpp -+++ b/sdk/core/azure-core/inc/azure/core/uuid.hpp -@@ -11,8 +11,9 @@ - #include "azure/core/platform.hpp" - - #include --#include -+#include // defines std::uint8_t - #include -+#include // deprecated, defines uint8_t in global namespace. TODO: Remove in the future when references to uint8_t and friends are removed. - #include - - namespace Azure { namespace Core { -diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json -index e0ac5ae..af17184 100644 ---- a/eng/pipelines/templates/stages/platform-matrix.json -+++ b/eng/pipelines/templates/stages/platform-matrix.json -@@ -148,6 +148,16 @@ - "AptDependencies": "g++-9", - "CC": "/usr/bin/gcc-9", - "CXX": "/usr/bin/g++-9" -+ }, -+ "clang-13": { -+ "AptDependencies": "clang-13", -+ "CC": "/usr/bin/clang-13", -+ "CXX": "/usr/bin/clang++-13" -+ }, -+ "clang-15": { -+ "AptDependencies": "clang-15", -+ "CC": "/usr/bin/clang-15", -+ "CXX": "/usr/bin/clang++-15" - }, - "included_coverage": { - "AptDependencies": "gcovr lcov", -@@ -156,6 +166,11 @@ - "CODE_COVERAGE": "enabled", - "PublishMapFiles": "true" - }, -+ "included_debug": { -+ "CMAKE_BUILD_TYPE": "Debug", -+ "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", -+ "PublishMapFiles": "true" -+ }, - "included_release": { - "CMAKE_BUILD_TYPE": "Release", - "CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON", diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 7701007537d037..16f9c0651acf94 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,10 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.10.3 - SHA512 b3705cf757a14693f65a5ea4a43cc3c5f8377b3156ef24869bd664e9e8b25797fd21107ad543db476335bbb2389687cc1ed8fb8fe1010bb9b5a0eb406f3c0d59 - PATCHES - fix_gcc13.patch + REF azure-core_1.11.0 + SHA512 0627e65ba429e6caba027e1e0473ad00de1a5a0259df9f2ac823fb37dda6e9dbd307bd75ab92b1acb2967b123d221b25ea9cfe07f0b7d7ec89c789142e7643ac ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index f7d5e2da39c1fb..e0ee8792a6edc9 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-cpp", - "version-semver": "1.10.3", - "port-version": 2, + "version-semver": "1.11.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/ports/azure-messaging-eventhubs-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-cpp/portfile.cmake index 175f59d56fde9f..b2189d927ed5fa 100644 --- a/ports/azure-messaging-eventhubs-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-messaging-eventhubs_1.0.0-beta.4 - SHA512 a96adb497b583356e7d38e3a24814b2ed12e116d273ad1bd4b710a65ae32b5840a72905d107b8ec157a75b80135416af9326839741795082d187d39335b14bf7 + REF azure-messaging-eventhubs_1.0.0-beta.5 + SHA512 1c8200a0ae2618ef7c4fbf82770a45fcd922cdc76618022711f9cb934355cc13ccc49c61ca48f70235d799e217cc813c27d57cdb4bd74ddc1916e9dfbb768367 ) if(EXISTS "${SOURCE_PATH}/sdk/eventhubs/azure-messaging-eventhubs") diff --git a/ports/azure-messaging-eventhubs-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-cpp/vcpkg.json index e13512e01b1496..18af5d7cdf4383 100644 --- a/ports/azure-messaging-eventhubs-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-cpp/vcpkg.json @@ -1,7 +1,10 @@ { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-messaging-eventhubs-cpp", - "version-semver": "1.0.0-beta.4", + "version-semver": "1.0.0-beta.5", "description": [ "Microsoft Azure Messaging Event Hubs SDK for C++", "This library provides Azure Messaging Event Hubs SDK." diff --git a/versions/a-/azure-core-amqp-cpp.json b/versions/a-/azure-core-amqp-cpp.json index 2ff612fadd94e2..7d404d71c71afe 100644 --- a/versions/a-/azure-core-amqp-cpp.json +++ b/versions/a-/azure-core-amqp-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67e6280661e8992e3fd118517ac0f1d0f0cc662e", + "version-semver": "1.0.0-beta.6", + "port-version": 0 + }, { "git-tree": "a5742923375357a52887b2c969db207937b01592", "version-semver": "1.0.0-beta.5", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index aa128c4a14d975..70c9320e69f14a 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30673e31e776858e870bff22344de32cada95d13", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "3de5ec61efe0f113131a5a7847a2964b930b8f88", "version-semver": "1.10.3", diff --git a/versions/a-/azure-messaging-eventhubs-cpp.json b/versions/a-/azure-messaging-eventhubs-cpp.json index 7e7f4994a6b487..09136a27c55435 100644 --- a/versions/a-/azure-messaging-eventhubs-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b863a91f0ee55df12d178fb00837d37d640e6f80", + "version-semver": "1.0.0-beta.5", + "port-version": 0 + }, { "git-tree": "bde9f1c76919eecaaf6680e602eba5126c8d1fad", "version-semver": "1.0.0-beta.4", diff --git a/versions/baseline.json b/versions/baseline.json index 403ffea52715f3..26e0a49f621123 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -417,12 +417,12 @@ "port-version": 0 }, "azure-core-amqp-cpp": { - "baseline": "1.0.0-beta.5", + "baseline": "1.0.0-beta.6", "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.10.3", - "port-version": 2 + "baseline": "1.11.0", + "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", @@ -449,7 +449,7 @@ "port-version": 0 }, "azure-messaging-eventhubs-cpp": { - "baseline": "1.0.0-beta.4", + "baseline": "1.0.0-beta.5", "port-version": 0 }, "azure-security-attestation-cpp": { From 9ac63262a8cff64651db8c3e6e2423a202c8272b Mon Sep 17 00:00:00 2001 From: eao197 Date: Fri, 12 Jan 2024 21:21:18 +0300 Subject: [PATCH 0806/1039] [json-dto] Update to v.0.3.2 (#36127) * json-dto updated to the latest version. * x-add-version for json-dto-0.3.2. --- ports/json-dto/portfile.cmake | 4 ++-- ports/json-dto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/json-dto.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index 133fcd706d2d2c..bd5d2f9e63828a 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/json_dto - REF 9a08aaab6caee28300043c96e1ad3e6700f0f8fc # v.0.3.1 - SHA512 09ca1072a3de2cc5c5ab6eeaa1b82014dcc6139992da84558e77fe4bfa42210ff9f7fa6ee7d7e6b2d4ac15fd7ae6286a6a56d8a72cce75fc73b91755bb831864 + REF "v.${VERSION}" + SHA512 476091f78f0c3b2dd0da2a83964fbf280259c163f058b2578eb17055fce0a2162e14bbea12e3bbdef93afda1f1c9f48a91e570f8f5e0f53a58a4f7188ebd437e ) vcpkg_cmake_configure( diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json index 6c91808bcb68ac..117262618eaff2 100644 --- a/ports/json-dto/vcpkg.json +++ b/ports/json-dto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-dto", - "version": "0.3.1", + "version": "0.3.2", "description": "A small header-only library for converting data between json representation and c++ structs.", "homepage": "https://github.com/Stiffstream/json_dto", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 26e0a49f621123..26b6cdf7d07a54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3669,7 +3669,7 @@ "port-version": 3 }, "json-dto": { - "baseline": "0.3.1", + "baseline": "0.3.2", "port-version": 0 }, "json-rpc-cxx": { diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index 80ba6b3a8efe92..58ef2f522aacdf 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "217034e6dfd4139a952dea7e21091522367f8189", + "version": "0.3.2", + "port-version": 0 + }, { "git-tree": "39f955915ba68ad247df8963e6427bd3c0f3479a", "version": "0.3.1", From 88b81397bbf10f554d54246b50f188dac41470f1 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 13 Jan 2024 02:25:19 +0800 Subject: [PATCH 0807/1039] [live555] Pass options to fix osx (#36120) * [live555] Pass options to fix osx * format * version * EOL * version --- ports/live555/CMakeLists.txt | 7 +++++++ ports/live555/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ports/live555/CMakeLists.txt b/ports/live555/CMakeLists.txt index d5b71ea1629244..fa26729c936eb2 100644 --- a/ports/live555/CMakeLists.txt +++ b/ports/live555/CMakeLists.txt @@ -17,6 +17,13 @@ if (NOT MSVC) add_compile_options(-DSOCKLEN_T=socklen_t) endif() +if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + add_compile_options(-DBSD=1) + add_compile_options(-DHAVE_SOCKADDR_LEN=1) + add_compile_options(-DTIME_BASE=int) + add_compile_options(-DNEED_XLOCALE_H=1) +endif() + file(GLOB BASIC_USAGE_ENVIRONMENT_SRCS BasicUsageEnvironment/*.c BasicUsageEnvironment/*.cpp) add_library(BasicUsageEnvironment ${BASIC_USAGE_ENVIRONMENT_SRCS}) diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index a6cebf49bb031b..65aaf3d7090681 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,6 +1,7 @@ { "name": "live555", "version-date": "2023-11-30", + "port-version": 1, "description": "A complete RTSP server application", "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 26b6cdf7d07a54..b003abbb7a9481 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5238,7 +5238,7 @@ }, "live555": { "baseline": "2023-11-30", - "port-version": 0 + "port-version": 1 }, "llfio": { "baseline": "2023-11-06", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index efba17ae30018a..cd16fc8d95f49b 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2402cdcc3405afe25f02e4a6d3c44ec1b1c68aaf", + "version-date": "2023-11-30", + "port-version": 1 + }, { "git-tree": "80eb597529bc497ceb274509b6224bf0524930c1", "version-date": "2023-11-30", From 53bef8994c541b6561884a8395ea35715ece75db Mon Sep 17 00:00:00 2001 From: Doug Cook <45909143+idigdoug@users.noreply.github.com> Date: Fri, 12 Jan 2024 10:25:51 -0800 Subject: [PATCH 0808/1039] [libtracepoint] Upgrade to v1.3.0 (#36137) * [libtracepoint] Upgrade to v1.3.0 * [libtracepoint] Upgrade to v1.3.0 versions --- ports/libeventheader-decode/portfile.cmake | 2 +- ports/libeventheader-decode/vcpkg.json | 6 +++--- ports/libeventheader-tracepoint/portfile.cmake | 2 +- ports/libeventheader-tracepoint/vcpkg.json | 4 ++-- ports/libtracepoint-control/portfile.cmake | 2 +- ports/libtracepoint-control/vcpkg.json | 4 ++-- ports/libtracepoint-decode/portfile.cmake | 2 +- ports/libtracepoint-decode/vcpkg.json | 2 +- ports/libtracepoint/portfile.cmake | 2 +- ports/libtracepoint/vcpkg.json | 2 +- versions/baseline.json | 10 +++++----- versions/l-/libeventheader-decode.json | 5 +++++ versions/l-/libeventheader-tracepoint.json | 5 +++++ versions/l-/libtracepoint-control.json | 5 +++++ versions/l-/libtracepoint-decode.json | 5 +++++ versions/l-/libtracepoint.json | 5 +++++ 16 files changed, 44 insertions(+), 19 deletions(-) diff --git a/ports/libeventheader-decode/portfile.cmake b/ports/libeventheader-decode/portfile.cmake index cfd4f684488c6d..7cc80c9be77297 100644 --- a/ports/libeventheader-decode/portfile.cmake +++ b/ports/libeventheader-decode/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" REF "v${VERSION}" - SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 + SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-decode/vcpkg.json b/ports/libeventheader-decode/vcpkg.json index a4215bc43322f5..3169dfbdd6af28 100644 --- a/ports/libeventheader-decode/vcpkg.json +++ b/ports/libeventheader-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-decode", - "version": "1.2.1", + "version": "1.3.0", "description": "C++ classes for decoding EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,11 +8,11 @@ "dependencies": [ { "name": "libeventheader-tracepoint", - "version>=": "1.2.1" + "version>=": "1.3.0" }, { "name": "libtracepoint-decode", - "version>=": "1.2.1" + "version>=": "1.3.0" }, { "name": "vcpkg-cmake", diff --git a/ports/libeventheader-tracepoint/portfile.cmake b/ports/libeventheader-tracepoint/portfile.cmake index 7eaceed698d72f..0da581146b762f 100644 --- a/ports/libeventheader-tracepoint/portfile.cmake +++ b/ports/libeventheader-tracepoint/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" REF "v${VERSION}" - SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 + SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libeventheader-tracepoint/vcpkg.json b/ports/libeventheader-tracepoint/vcpkg.json index d1256054025269..0e78b42f6ca054 100644 --- a/ports/libeventheader-tracepoint/vcpkg.json +++ b/ports/libeventheader-tracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libeventheader-tracepoint", - "version": "1.2.1", + "version": "1.3.0", "description": "C/C++ interface for generating EventHeader-encoded Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint", - "version>=": "1.2.1" + "version>=": "1.3.0" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-control/portfile.cmake b/ports/libtracepoint-control/portfile.cmake index 98bf67cb3865b8..cd0869504e13b3 100644 --- a/ports/libtracepoint-control/portfile.cmake +++ b/ports/libtracepoint-control/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" REF "v${VERSION}" - SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 + SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-control/vcpkg.json b/ports/libtracepoint-control/vcpkg.json index 015c36ab4ecd94..49dd752867ca2e 100644 --- a/ports/libtracepoint-control/vcpkg.json +++ b/ports/libtracepoint-control/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-control", - "version": "1.2.1", + "version": "1.3.0", "description": "C++ classes for collecting Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libtracepoint-decode", - "version>=": "1.2.1" + "version>=": "1.3.0" }, { "name": "vcpkg-cmake", diff --git a/ports/libtracepoint-decode/portfile.cmake b/ports/libtracepoint-decode/portfile.cmake index f5b9baa1fe0fab..579cdf8dec1550 100644 --- a/ports/libtracepoint-decode/portfile.cmake +++ b/ports/libtracepoint-decode/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" REF "v${VERSION}" - SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 + SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint-decode/vcpkg.json b/ports/libtracepoint-decode/vcpkg.json index 6502d573378855..8409d8f68179f7 100644 --- a/ports/libtracepoint-decode/vcpkg.json +++ b/ports/libtracepoint-decode/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint-decode", - "version": "1.2.1", + "version": "1.3.0", "description": "C++ classes for decoding Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/ports/libtracepoint/portfile.cmake b/ports/libtracepoint/portfile.cmake index 2dd1328d131ad1..e72ae72f93fcd2 100644 --- a/ports/libtracepoint/portfile.cmake +++ b/ports/libtracepoint/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO "microsoft/LinuxTracepoints" REF "v${VERSION}" - SHA512 3ef4881b66c8990afe3aab844f4e5b9dcc98b67f954027ffe60f2b868a0501f04d6bb0747021b4ffff2e984987028d641975215b7ab32d0fd710171385f0f030 + SHA512 6b22ecded7029dfb9d9fba4fb76a8c25a28fbb3a6295b8ff6f66cea83d5b7645a85244126f52896065eccb9d08cbafa89dd1a23971c38842c4f752a274e5a72d HEAD_REF main) vcpkg_cmake_configure( diff --git a/ports/libtracepoint/vcpkg.json b/ports/libtracepoint/vcpkg.json index 433dd8e408b8a9..bb45ea60d1fbd8 100644 --- a/ports/libtracepoint/vcpkg.json +++ b/ports/libtracepoint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtracepoint", - "version": "1.2.1", + "version": "1.3.0", "description": "C/C++ interface for generating Linux Tracepoints", "homepage": "https://github.com/microsoft/LinuxTracepoints/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b003abbb7a9481..57740d721cdf00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4265,11 +4265,11 @@ "port-version": 0 }, "libeventheader-decode": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "libeventheader-tracepoint": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "libevhtp": { @@ -4937,15 +4937,15 @@ "port-version": 0 }, "libtracepoint": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "libtracepoint-control": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "libtracepoint-decode": { - "baseline": "1.2.1", + "baseline": "1.3.0", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libeventheader-decode.json b/versions/l-/libeventheader-decode.json index 739d960aa7a86d..46ee8b0a9d92e8 100644 --- a/versions/l-/libeventheader-decode.json +++ b/versions/l-/libeventheader-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "857383da3bf1b1947838e23bb1a9066c31cb00da", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "75e4da728961822b82de47fb036aeae025893fb6", "version": "1.2.1", diff --git a/versions/l-/libeventheader-tracepoint.json b/versions/l-/libeventheader-tracepoint.json index 6b1255fd9830ff..ae92c6a02f2f85 100644 --- a/versions/l-/libeventheader-tracepoint.json +++ b/versions/l-/libeventheader-tracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32f98983357ea758d5d4e9a7fd6ccd119fa5d598", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "076106bc342a9e9253ced5bfd4e13ac16b360d20", "version": "1.2.1", diff --git a/versions/l-/libtracepoint-control.json b/versions/l-/libtracepoint-control.json index 0e32295690ae1b..a5605027475a02 100644 --- a/versions/l-/libtracepoint-control.json +++ b/versions/l-/libtracepoint-control.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26f974a4e3a3dbbdea53a0111f0e854875df4f62", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "410f33d930822507551474d486031021c4fea1dd", "version": "1.2.1", diff --git a/versions/l-/libtracepoint-decode.json b/versions/l-/libtracepoint-decode.json index cf62f1e72bab52..878aaa0e84a77c 100644 --- a/versions/l-/libtracepoint-decode.json +++ b/versions/l-/libtracepoint-decode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0783b839d7fd6457a9f26ec6c51d85e51aa7104", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "51ab3448c97daa75b873c3e4b70f2894908fc2f4", "version": "1.2.1", diff --git a/versions/l-/libtracepoint.json b/versions/l-/libtracepoint.json index f6a59a85d7552d..c56dbcd70d26d8 100644 --- a/versions/l-/libtracepoint.json +++ b/versions/l-/libtracepoint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "701e69ab507fc9cd97aaf936d5b82dfebe17c046", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "9f85708521c851b4c64ad10c04ad0261343fef25", "version": "1.2.1", From 2d547a1a57eb04a80b64cf08d041ac784126674e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Fr=C3=B6hlich?= Date: Tue, 16 Jan 2024 19:51:10 +0100 Subject: [PATCH 0809/1039] [gul14] Update to version 2.10.0 (#36193) --- ports/gul14/portfile.cmake | 4 ++-- ports/gul14/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gul14.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gul14/portfile.cmake b/ports/gul14/portfile.cmake index c6dfa515435222..75a474ecc1cb7a 100644 --- a/ports/gul14/portfile.cmake +++ b/ports/gul14/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gul-cpp/gul14 - REF v2.9.2 - SHA512 d9b364638d595cb03cbc8793750947d393f9e7632016ec9e6f31a8ea1b0f235444be5c1aa7cd5c18b47c85463e15db9240d08aab86797e5ca3452a4646dfa8d1 + REF v2.10.0 + SHA512 497e95a8bbd3a8060f3775de561afe755aac0054bd4279da6aea79b1bd35d111c41f92622a0a7e8ba99f6c5aa2dd3a2b2a10c2534482c36cf8c80d0b8ce3fe8a HEAD_REF main ) diff --git a/ports/gul14/vcpkg.json b/ports/gul14/vcpkg.json index c4f22929563ed3..cbef43fedb0031 100644 --- a/ports/gul14/vcpkg.json +++ b/ports/gul14/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gul14", - "version": "2.9.2", + "version": "2.10.0", "description": [ "General Utility Library for C++14.", "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", diff --git a/versions/baseline.json b/versions/baseline.json index 57740d721cdf00..6bb059c49d38c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3189,7 +3189,7 @@ "port-version": 0 }, "gul14": { - "baseline": "2.9.2", + "baseline": "2.10.0", "port-version": 0 }, "gumbo": { diff --git a/versions/g-/gul14.json b/versions/g-/gul14.json index 6a6a9889eaf6ea..9892d1420023ed 100644 --- a/versions/g-/gul14.json +++ b/versions/g-/gul14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b96d6a06013e4d0d58af377c43728ca2e78e592", + "version": "2.10.0", + "port-version": 0 + }, { "git-tree": "83f62f0824bba51279ec18b9e4dedfa607bc2e3b", "version": "2.9.2", From c8b536f2eafd69b0c7e304461158c3671414e56d Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Wed, 17 Jan 2024 02:51:28 +0800 Subject: [PATCH 0810/1039] [proxy] update to 2.1.0 (#36190) * [proxy] update to 2.1.0 * [proxy] update versions --- ports/proxy/portfile.cmake | 2 +- ports/proxy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/proxy.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/proxy/portfile.cmake b/ports/proxy/portfile.cmake index ee635acf5b6dbd..660460524b3873 100644 --- a/ports/proxy/portfile.cmake +++ b/ports/proxy/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/proxy REF ${VERSION} - SHA512 09399eda8667cb575bcf826903bccbd5efaa989d2e0f4614ef3a112bae9eeb40c1da964587444aeb84d1b9a8c28e37a4262675cae885cc84d6a41c9b6729f7d1 + SHA512 4a92584c7bddc52593998c8c4f058f03ea7933dcf8e98db27c65b0dc7311937fd1f9139600b64e802c6c6ea7e78089948dd622243332076f0ea5812b6b2bf990 HEAD_REF main ) diff --git a/ports/proxy/vcpkg.json b/ports/proxy/vcpkg.json index 43e90270908630..700427a1a3dbbb 100644 --- a/ports/proxy/vcpkg.json +++ b/ports/proxy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxy", - "version": "2.0.0", + "version": "2.1.0", "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 6bb059c49d38c1..7ca43c213749b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6829,7 +6829,7 @@ "port-version": 0 }, "proxy": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/proxy.json b/versions/p-/proxy.json index 5a2381b36c5993..1f785805afbf6a 100644 --- a/versions/p-/proxy.json +++ b/versions/p-/proxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d6ef205bfb7dac5655566fafba65ebc4df5d961", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "02fdcb0499f6f91a041a8e444f33256f4284e808", "version": "2.0.0", From e6aaec7b92aaa1b7042e0f13a904e1729c989aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 16 Jan 2024 19:51:41 +0100 Subject: [PATCH 0811/1039] [catch2] Update to 3.5.2 (#36185) * [catch2] Update to 3.5.2 * [catch2] Update version files --- ports/catch2/portfile.cmake | 2 +- ports/catch2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 851b94bf5ac6e6..0c8fd1444e4984 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 REF v${VERSION} - SHA512 90c5fcf2d4b9771f5b30e027099da0d15e294b85d28702020435606efda2a4edc96b3d2007b60e5a32178248ad129b4aba0fb96582156244d62e1edacda6ce7d + SHA512 1b9d5f35144f6c7acef0e76558a4adf3ff41c2c2292fbdcb3e2c2917fa2deb7fba593738105dd3c111f02ee8aca64010cf68f69bb8fb1815dbf771b509ab0576 HEAD_REF devel PATCHES fix-install-path.patch diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 4e16be640d677d..5b40af271b0a05 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "catch2", - "version-semver": "3.5.1", + "version-semver": "3.5.2", "description": "A modern, C++-native, test framework for unit-tests, TDD and BDD.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7ca43c213749b8..3b7b23ffa16b14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1461,7 +1461,7 @@ "port-version": 2 }, "catch2": { - "baseline": "3.5.1", + "baseline": "3.5.2", "port-version": 0 }, "cccapstone": { diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 51203a96d15702..1de555e61404fb 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f5159aa8db5056e1f5531bc4292c27499e23f9a", + "version-semver": "3.5.2", + "port-version": 0 + }, { "git-tree": "9b749693bba3f346f03e2ccd047ee26b22c123c3", "version-semver": "3.5.1", From 12a8d58dcdd4162a308327053f7bdeb5b22b2c07 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Wed, 17 Jan 2024 02:52:00 +0800 Subject: [PATCH 0812/1039] [aws-c-http] update to 0.8.0 (#36173) * [aws-c-http] update to 0.8.0 * [aws-c-http] update to 0.8.0 --- ports/aws-c-http/portfile.cmake | 2 +- ports/aws-c-http/vcpkg.json | 2 +- versions/a-/aws-c-http.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake index 12301dd48db7a7..7ced2cb23e3b99 100644 --- a/ports/aws-c-http/portfile.cmake +++ b/ports/aws-c-http/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-http REF "v${VERSION}" - SHA512 205cf1cc4b766fd42cfca6ab84974e0797f2a52f8cdf64fed0c4327a2b70c251e5c9561b1cf714cbe4b7ef87092a094830071e6621bd0e0e1684b2e66ea718e2 + SHA512 c440ad1590c050c45634f0245fb26e9193b00e3020d26e132715ca1321fa4a36f1cc765753950c2f220a05ec7a6fe3ffa31c07ed0e83d40447714c65cbd36fb9 HEAD_REF master ) diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json index dcbb887aa9e0ad..431ea3e1f38f4a 100644 --- a/ports/aws-c-http/vcpkg.json +++ b/ports/aws-c-http/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-http", - "version": "0.7.14", + "version": "0.8.0", "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", "homepage": "https://github.com/awslabs/aws-c-http", "license": "Apache-2.0", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json index b614134bec873b..37e35089b6924a 100644 --- a/versions/a-/aws-c-http.json +++ b/versions/a-/aws-c-http.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa98598f65061ac8a183b36862eac0c4e89d38a8", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "eb6f67641f77b8ba24d435c6cf49b7a36cf80536", "version": "0.7.14", diff --git a/versions/baseline.json b/versions/baseline.json index 3b7b23ffa16b14..50b1a24ace66d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -373,7 +373,7 @@ "port-version": 0 }, "aws-c-http": { - "baseline": "0.7.14", + "baseline": "0.8.0", "port-version": 0 }, "aws-c-io": { From 9b6e67975f6812ea75ff1efa20007f0c6ecb9cc1 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 17 Jan 2024 02:52:18 +0800 Subject: [PATCH 0813/1039] [vcpkg baseline][live555] Passing remove form fail list (#36170) * [vcpkg baseline][live555] Passing remove form fail * remove arm64-osx --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 72f313250a83ac..b2d7633a8eb9e7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -663,8 +663,6 @@ live555:arm-neon-android=fail live555:arm64-uwp=fail live555:arm64-android=fail live555:x64-android=fail -live555:x64-osx=fail -live555:arm64-osx=fail live555:x64-uwp=fail llfio:arm-neon-android=fail llfio:arm64-android=fail From 8100a2d0a1f389016f7c568d92c6a6a58f5b7753 Mon Sep 17 00:00:00 2001 From: Nick Logozzo Date: Tue, 16 Jan 2024 13:52:35 -0500 Subject: [PATCH 0814/1039] [libnick] Update to 2024.1.5 (#36169) * V2024.1.5 * Update versions --- ports/libnick/portfile.cmake | 2 +- ports/libnick/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libnick.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libnick/portfile.cmake b/ports/libnick/portfile.cmake index 4c8ab613e85c1a..669d9434662ed5 100644 --- a/ports/libnick/portfile.cmake +++ b/ports/libnick/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NickvisionApps/libnick REF "${VERSION}" - SHA512 22fe6d4b2f4af13d1bd15aaf526724ab5bb95af0a8ef2876cc46b9d60ec0c61ea1341d25504cdbebe222f32d4d2e6fc60852336937969c77ae7e52825cce53f8 + SHA512 87e26a45de6f32f476b174d007f71199302ef8a0884c1067ed679b52a0665f86d99bb8d23d7725a00d7055db0db944ed738e3d5e59d3d8eed2e57fc648ab0deb HEAD_REF main ) diff --git a/ports/libnick/vcpkg.json b/ports/libnick/vcpkg.json index b325e2936fc865..d13ccc96e15a5c 100644 --- a/ports/libnick/vcpkg.json +++ b/ports/libnick/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libnick", - "version": "2024.1.4", + "version": "2024.1.5", "maintainers": "Nicholas Logozzo nlogozzo225@gmail.com", "description": "A cross-platform base for native Nickvision applications.", "homepage": "https://github.com/NickvisionApps/libnick", diff --git a/versions/baseline.json b/versions/baseline.json index 50b1a24ace66d5..dab0bb9bcd97d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4593,7 +4593,7 @@ "port-version": 3 }, "libnick": { - "baseline": "2024.1.4", + "baseline": "2024.1.5", "port-version": 0 }, "libnoise": { diff --git a/versions/l-/libnick.json b/versions/l-/libnick.json index c5ba4e8c76d1e7..3f5e7e6937ee06 100644 --- a/versions/l-/libnick.json +++ b/versions/l-/libnick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da9e05ccca28d860df92a3f8b43b7e657de0540", + "version": "2024.1.5", + "port-version": 0 + }, { "git-tree": "38683a613ad0152233a04004b14707675c696189", "version": "2024.1.4", From 0b17830509929d93fe355bf018e8f334376aea0c Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 17 Jan 2024 01:52:53 +0700 Subject: [PATCH 0815/1039] [libdatachannel] Update to 0.19.5 (#36160) --- ports/libdatachannel/portfile.cmake | 2 +- ports/libdatachannel/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index a91db51253527c..eb4b311eb1c247 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel REF "v${VERSION}" - SHA512 2c8da820ebf6751d696645092ea5e562f7cb303d4f5cec9a8ca8e69b65321e79cc8a645095a4ecea710f5afd54499e71f4cdf261a0a2e32e28aef96a50ace28c + SHA512 63551a9f2ce8de7f7aba13b2114418d3d705a6c190d91eac7cf6deba93ccbe9bda053000feb7ac109d538646c77da62b31686a58f83d752f191cac3a015f2d69 HEAD_REF master PATCHES ${PATCHES} diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 275a755a0517b6..56fb4795447e74 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.19.4", - "port-version": 1, + "version-semver": "0.19.5", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index dab0bb9bcd97d2..e70197b6edaa88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4193,8 +4193,8 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.19.4", - "port-version": 1 + "baseline": "0.19.5", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 922eda14d6c51e..87b2c9c46f8ad4 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a9fb42ed13d38aae4df0b774cde05e26dcea241", + "version-semver": "0.19.5", + "port-version": 0 + }, { "git-tree": "b3364c6dfb715277d483a8e0410a98fe84a65345", "version-semver": "0.19.4", From 295bb9fa06f4ac56715dce94a121b11625d4dbd8 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Tue, 16 Jan 2024 21:53:23 +0300 Subject: [PATCH 0816/1039] [sail] Update to 0.9.1 (#36157) * [sail] Update to 0.9.1 * [sail] vcpkg x-add-version --all --- ports/sail/portfile.cmake | 10 ++++++++-- ports/sail/vcpkg.json | 36 +++++++++++++++++++++++------------- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index e582897b6c8244..93548c714e36a2 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -2,14 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail REF "v${VERSION}" - SHA512 9d2e783a597bea5923db4eb822985488a24c5337376384f69bedeb2952d23e84005639c0e1aa243b81b40e87e428da470895ce30418fc31e0f1b60bc71b17d09 + SHA512 c8cface60031c5e84b99eaedb216f9e3af0354d24f5db7d6d0ec1f97d593ae46cb13c86bc244b6b8673cddfecf829a8b7738fdde8620472c12e95a5b61495133 HEAD_REF master ) # Enable selected codecs set(ONLY_CODECS "") -foreach(CODEC avif bmp gif ico jpeg jpeg2000 jpegxl pcx png psd qoi tga tiff wal webp xbm) +foreach(CODEC avif bmp gif ico jpeg jpeg2000 jpegxl pcx png psd qoi svg tga tiff wal webp xbm) if (${CODEC} IN_LIST FEATURES) list(APPEND ONLY_CODECS ${CODEC}) endif() @@ -17,11 +17,17 @@ endforeach() list(JOIN ONLY_CODECS "\;" ONLY_CODECS_ESCAPED) +# Enable OpenMP +if ("openmp" IN_LIST FEATURES) + set(SAIL_ENABLE_OPENMP ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DSAIL_COMBINE_CODECS=ON + -DSAIL_ENABLE_OPENMP=${SAIL_ENABLE_OPENMP} -DSAIL_ONLY_CODECS=${ONLY_CODECS_ESCAPED} -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index d6f400e89360ec..22ff86a9b77c0a 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0", + "version-semver": "0.9.1", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", @@ -16,7 +16,7 @@ } ], "default-features": [ - "highest-priority" + "highest-priority-codecs" ], "features": { "all": { @@ -25,11 +25,11 @@ { "name": "sail", "features": [ - "high-priority", - "highest-priority", - "low-priority", - "lowest-priority", - "medium-priority" + "high-priority-codecs", + "highest-priority-codecs", + "low-priority-codecs", + "lowest-priority-codecs", + "medium-priority-codecs" ] } ] @@ -49,18 +49,19 @@ "giflib" ] }, - "high-priority": { + "high-priority-codecs": { "description": "Enable high priority codecs such as BMP", "dependencies": [ { "name": "sail", "features": [ - "bmp" + "bmp", + "svg" ] } ] }, - "highest-priority": { + "highest-priority-codecs": { "description": "Enable highest priority codecs such as JPEG or PNG", "dependencies": [ { @@ -95,7 +96,7 @@ "libjxl" ] }, - "low-priority": { + "low-priority-codecs": { "description": "Enable low priority codecs such as TGA", "dependencies": [ { @@ -110,7 +111,7 @@ } ] }, - "lowest-priority": { + "lowest-priority-codecs": { "description": "Enable lowest priority codecs such as XBM", "dependencies": [ { @@ -122,7 +123,7 @@ } ] }, - "medium-priority": { + "medium-priority-codecs": { "description": "Enable medium priority codecs such as AVIF", "dependencies": [ { @@ -136,6 +137,9 @@ } ] }, + "openmp": { + "description": "Enable OpenMP support" + }, "pcx": { "description": "Enable PCX codec" }, @@ -151,6 +155,12 @@ "qoi": { "description": "Enable QOI codec" }, + "svg": { + "description": "Enable SVG codec", + "dependencies": [ + "nanosvg" + ] + }, "tga": { "description": "Enable TGA codec" }, diff --git a/versions/baseline.json b/versions/baseline.json index e70197b6edaa88..729d04d20ee54f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7661,7 +7661,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0", + "baseline": "0.9.1", "port-version": 0 }, "sajson": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 47a423d9d5ed0d..4dec5508173b6c 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e673bf75a449ebb5474953cb8eaa69333fc08b4", + "version-semver": "0.9.1", + "port-version": 0 + }, { "git-tree": "63143e644f5e386b1b8aae22194e8b157bcdca5e", "version-semver": "0.9.0", From 4803f65e11b94719983a69b65b59fdbeca04cdb4 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Tue, 16 Jan 2024 19:53:44 +0100 Subject: [PATCH 0817/1039] [spdlog] update to 1.13.0 (#36148) --- ports/spdlog/portfile.cmake | 2 +- ports/spdlog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 44fd69854d1ae6..b063d165fb2723 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog REF "v${VERSION}" - SHA512 db9a4f13b6c39ffde759db99bcdfe5e2dbe4231e73b29eb906a3fa78d6b8ec66920b8bd4371df17ae21b7b562472a236bc4435678f3af92b6496be090074181d + SHA512 44fcb414ad9fbbe2a6d72c29143eeeae477b687ed30ae870d661b032a029ad4214ef43e7ef6350d02791d05504492978ade2d6733fab12ce4884d8f0bc4c6340 HEAD_REF v1.x ) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 401c1f3e20d558..f1ebe3bec5d276 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spdlog", - "version-semver": "1.12.0", + "version-semver": "1.13.0", "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 729d04d20ee54f..eb964ad01bf449 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8113,7 +8113,7 @@ "port-version": 3 }, "spdlog": { - "baseline": "1.12.0", + "baseline": "1.13.0", "port-version": 0 }, "spectra": { diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index f01a029f7e8d4e..0352b1745974bb 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ee97c0faf23e06508ca097e013e2bea40579d06", + "version-semver": "1.13.0", + "port-version": 0 + }, { "git-tree": "41cf31aa350a44644863d7777489501d240f248c", "version-semver": "1.12.0", From a14456f6fbf9f3e36e65df15e756e930f56a8659 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:58:08 -0800 Subject: [PATCH 0818/1039] [arrow] Add option -DARROW_FLIGHT_SQL (#36172) * add flight-sql * update version --------- Co-authored-by: Monica --- ports/arrow/portfile.cmake | 3 ++- ports/arrow/vcpkg.json | 1 + versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 2d3859eee98e12..e6a34a89e86a43 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dataset ARROW_DATASET filesystem ARROW_FILESYSTEM flight ARROW_FLIGHT + flight ARROW_FLIGHT_SQL gcs ARROW_GCS jemalloc ARROW_JEMALLOC json ARROW_JSON @@ -133,4 +134,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt" "${SOURCE_PATH}/NOTICE.txt") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 9d3a45c7fbf605..94dcbfd492396d 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", "version": "14.0.2", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 2fbb58ec6407c2..5cf383af075aa8 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93a9cd414e5d170755234571e42746b413b7deb3", + "version": "14.0.2", + "port-version": 1 + }, { "git-tree": "a8cadbfff7756e4b3ae2589f7312f80b82e0ff88", "version": "14.0.2", diff --git a/versions/baseline.json b/versions/baseline.json index eb964ad01bf449..d6d1ea1f5e2a46 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -238,7 +238,7 @@ }, "arrow": { "baseline": "14.0.2", - "port-version": 0 + "port-version": 1 }, "arsenalgear": { "baseline": "2.1.0", From a215c6a9a0f348362a1a36ed641029085c5d4819 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Tue, 16 Jan 2024 11:02:55 -0800 Subject: [PATCH 0819/1039] [opencv3/opencv4] Check whether TARGET libprotobuf is defined (#36116) * fix opencv3 * update version * fix opencv4 * format * update version * add comment * update git-tree --------- Co-authored-by: Monica --- ports/opencv3/portfile.cmake | 4 ++-- ports/opencv3/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 2 +- ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 797aa6ca369656..86c96a553f3b40 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -420,7 +420,7 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -if(${BUILD_opencv_flann}) +if(${BUILD_opencv_flann} AND NOT TARGET libprotobuf) #Check if the CMake target libprotobuf is already defined find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) @@ -538,4 +538,4 @@ endif() configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) -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/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index f61e73abbd46e9..ab39093154e054 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.18", - "port-version": 12, + "port-version": 13, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index ac8c28f1c99972..a85879d191f12d 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -490,7 +490,7 @@ endif() file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -if(${BUILD_opencv_dnn}) +if(${BUILD_opencv_dnn} AND NOT TARGET libprotobuf) #Check if the CMake target libprotobuf is already defined find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 939fc1602ba8e8..8c6eb97fcaffa0 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 14, + "port-version": 15, "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 d6d1ea1f5e2a46..decb9b09c804ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6274,11 +6274,11 @@ }, "opencv3": { "baseline": "3.4.18", - "port-version": 12 + "port-version": 13 }, "opencv4": { "baseline": "4.8.0", - "port-version": 14 + "port-version": 15 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 474a6545e4fe2d..832720a0a58e9c 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "577dd8933e58290664f4290476069978692ed4f2", + "version": "3.4.18", + "port-version": 13 + }, { "git-tree": "f5ee69ffa1b6c98a28fc805afffaeb799b4d22a8", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 6d8efa13a3860d..5752ba2e07c6a9 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4e040d476cee60b2fc21a1f847d30905ac9726", + "version": "4.8.0", + "port-version": 15 + }, { "git-tree": "852583d8f7a5bb15998efad9c0305a8ce686e59b", "version": "4.8.0", From c7f0cc50382f575f242f517091f1d0ffacc307ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 16 Jan 2024 20:04:54 +0100 Subject: [PATCH 0820/1039] Fix typo in vcpkg.cmake (#36158) --- scripts/buildsystems/vcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 0ac8f99fb37079..fdd82f07c1f371 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -884,7 +884,7 @@ set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY}") set(Z_VCPKG_UNUSED "${CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY}") set(Z_VCPKG_UNUSED "${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP}") -# Propogate these values to try-compile configurations so the triplet and toolchain load +# Propagate these values to try-compile configurations so the triplet and toolchain load if(NOT Z_VCPKG_CMAKE_IN_TRY_COMPILE) list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES VCPKG_TARGET_TRIPLET From 02e210ef56f2c2b35bfaf599e0b7f6ea6a3fb1c4 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Wed, 17 Jan 2024 03:13:36 +0800 Subject: [PATCH 0821/1039] [opencascade] Update to 7.8.0 (#35829) * update to 7.8.0 * update version * update version * update version * fix dep * update version * del patch * update version --- ports/opencascade/dependencies.patch | 47 +++++++++++----------- ports/opencascade/fix-link-freeimage.patch | 31 -------------- ports/opencascade/portfile.cmake | 3 +- ports/opencascade/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/o-/opencascade.json | 5 +++ 6 files changed, 33 insertions(+), 60 deletions(-) delete mode 100644 ports/opencascade/fix-link-freeimage.patch diff --git a/ports/opencascade/dependencies.patch b/ports/opencascade/dependencies.patch index d26a420deb0811..9067a449515f63 100644 --- a/ports/opencascade/dependencies.patch +++ b/ports/opencascade/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bb6ab2db..e58b1afa 100644 +index 8690528..834ca79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -596,7 +596,8 @@ if (CAN_USE_FREETYPE) +@@ -605,7 +605,8 @@ if (CAN_USE_FREETYPE) if (USE_FREETYPE) message (STATUS "Info: FreeType is used by OCCT") add_definitions (-DHAVE_FREETYPE) @@ -12,7 +12,7 @@ index bb6ab2db..e58b1afa 100644 else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE") OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2") -@@ -613,7 +614,9 @@ endif() +@@ -622,7 +623,9 @@ endif() if (USE_VTK) add_definitions (-DHAVE_VTK) set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE) @@ -23,7 +23,7 @@ index bb6ab2db..e58b1afa 100644 else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK") -@@ -629,7 +632,8 @@ endif() +@@ -638,7 +641,8 @@ endif() if (CAN_USE_FREEIMAGE) if (USE_FREEIMAGE) add_definitions (-DHAVE_FREEIMAGE) @@ -33,7 +33,7 @@ index bb6ab2db..e58b1afa 100644 else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE") OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE") -@@ -730,7 +734,8 @@ endif() +@@ -739,7 +743,8 @@ endif() if (NOT DEFINED ANDROID AND CAN_USE_TBB) if (USE_TBB) add_definitions (-DHAVE_TBB) @@ -43,7 +43,7 @@ index bb6ab2db..e58b1afa 100644 else() OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB") OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC") -@@ -750,7 +755,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON) +@@ -759,7 +764,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON) if (CAN_USE_RAPIDJSON) if (USE_RAPIDJSON) add_definitions (-DHAVE_RAPIDJSON) @@ -54,7 +54,7 @@ index bb6ab2db..e58b1afa 100644 OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON") OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON") diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake -index c9399159..f707e00f 100644 +index c939915..f707e00 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake @@ -475,11 +475,11 @@ else() @@ -72,13 +72,13 @@ index c9399159..f707e00f 100644 if (USE_QT) diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in -index c926c499..3b6db678 100644 +index e391ddf..9cc3d49 100644 --- a/adm/templates/OpenCASCADEConfig.cmake.in +++ b/adm/templates/OpenCASCADEConfig.cmake.in -@@ -4,6 +4,22 @@ - # +@@ -5,6 +5,23 @@ # This file is configured by OpenCASCADE. # + +include(CMakeFindDependencyMacro) +if("@USE_FREEIMAGE@") + find_dependency(freeimage CONFIG) @@ -95,18 +95,19 @@ index c926c499..3b6db678 100644 +if("@USE_VTK@") + find_dependency(VTK REQUIRED) +endif() - ++ if(OpenCASCADE_ALREADY_INCLUDED) return() -diff --git a/src/Standard/Standard_MMgrTBBalloc.cxx b/src/Standard/Standard_MMgrTBBalloc.cxx -index 8c7a2df1..8499e1af 100644 ---- a/src/Standard/Standard_MMgrTBBalloc.cxx -+++ b/src/Standard/Standard_MMgrTBBalloc.cxx -@@ -18,7 +18,6 @@ - - // paralleling with Intel TBB - #ifdef HAVE_TBB --#pragma comment (lib, "tbbmalloc.lib") - #include - using namespace tbb; - #else + endif() +diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx +index f869e8f..538d5b9 100644 +--- a/src/Image/Image_AlienPixMap.cxx ++++ b/src/Image/Image_AlienPixMap.cxx +@@ -21,7 +21,6 @@ + #include + + #ifdef _MSC_VER +- #pragma comment( lib, "FreeImage.lib" ) + #endif + #elif defined(HAVE_WINCODEC) + #include diff --git a/ports/opencascade/fix-link-freeimage.patch b/ports/opencascade/fix-link-freeimage.patch deleted file mode 100644 index 3b7621290a87a9..00000000000000 --- a/ports/opencascade/fix-link-freeimage.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3252b3..33d50b8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -634,6 +634,9 @@ if (CAN_USE_FREEIMAGE) - add_definitions (-DHAVE_FREEIMAGE) - find_package(freeimage CONFIG REQUIRED) - set(CSF_FreeImagePlus freeimage::FreeImagePlus) -+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") -+ add_definitions (-DDEBUG_FREEIMAGE_LIB) -+ endif() - else() - OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE") - OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE") -diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx -index f869e8f..f12e17a 100644 ---- a/src/Image/Image_AlienPixMap.cxx -+++ b/src/Image/Image_AlienPixMap.cxx -@@ -21,7 +21,11 @@ - #include - - #ifdef _MSC_VER -- #pragma comment( lib, "FreeImage.lib" ) -+ #ifdef DEBUG_FREEIMAGE_LIB -+ #pragma comment( lib, "FreeImaged.lib" ) -+ #else -+ #pragma comment( lib, "FreeImage.lib" ) -+ #endif - #endif - #elif defined(HAVE_WINCODEC) - #include diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index aa32cd6aa48f89..a665a66c1aff76 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT REF "${VERSION_STR}" - SHA512 d9e882d44bb65616f8cfce68ebdcd5765669b84e3d82cfb2d1bc22b71b0e878442c079bacc37e9d54f28ce98a7c23bf81f2a3e3e7bbeeec38927ca739f423dee + SHA512 af176cbd105c49949282c16bb6e30f69167bc6c00a50e0ae69aea555815d47ac3c4540c233e596c5add7cb846c2b33d7be267d8e02472286e758b662b4a652ab HEAD_REF master PATCHES dependencies.patch @@ -11,7 +11,6 @@ vcpkg_from_github( fix-pdb-find.patch fix-install-prefix-path.patch install-include-dir.patch - fix-link-freeimage.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index cdc1be8d4161a6..f1e32cc79d7657 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencascade", - "version": "7.7.2", - "port-version": 3, + "version": "7.8.0", "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index decb9b09c804ac..b8095056550444 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6237,8 +6237,8 @@ "port-version": 0 }, "opencascade": { - "baseline": "7.7.2", - "port-version": 3 + "baseline": "7.8.0", + "port-version": 0 }, "opencc": { "baseline": "1.1.6", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index b033a3db74c8df..faefcd83beb725 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b53f4c5f2a5e1b878488d7076761faf6284bfc32", + "version": "7.8.0", + "port-version": 0 + }, { "git-tree": "cff97ecb51449af3dc81c849ba7ceb36eedd4917", "version": "7.7.2", From c268e9fc37f847f47e3de42932abf24e3cf046ad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 16 Jan 2024 20:24:32 +0100 Subject: [PATCH 0822/1039] [curl] Fix android API < 24 (#36156) --- ports/curl/cmake-project-include.cmake | 5 +++++ ports/curl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/curl/cmake-project-include.cmake b/ports/curl/cmake-project-include.cmake index c43df547fc8f5d..093a09df2894b9 100644 --- a/ports/curl/cmake-project-include.cmake +++ b/ports/curl/cmake-project-include.cmake @@ -1,3 +1,8 @@ +if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 24) + # https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md + set(HAVE_FILE_OFFSET_BITS FALSE CACHE INTERNAL "") +endif() + # Process the libs and targets in the variable named by `input` # into a flat list of libs in the variable named by `output`. # Simplify -framework elements. diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index e80232b80b894c..11407a476328dd 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "8.5.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": "curl AND ISC AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b8095056550444..08d7f63815a717 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2038,7 +2038,7 @@ }, "curl": { "baseline": "8.5.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 99635e65b7068b..99f7e743359971 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b2bf8e8f4e0c7d000cb3b3311f4b9f185cb2d52", + "version": "8.5.0", + "port-version": 1 + }, { "git-tree": "b30c6697e314cdba601dee9bdef0ed01e1d09c8f", "version": "8.5.0", From 67e366d850ffd003e95a29f1222717d0c4035dc2 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 17 Jan 2024 07:00:15 +0800 Subject: [PATCH 0823/1039] [cuda-api-wrappers] Update to 0.6.7 (#36145) * [cuda-api-wrappers] Update to 0.6.7 * remove vcpkg_fixup_pkgconfig() --- ports/cuda-api-wrappers/portfile.cmake | 15 +-------------- ports/cuda-api-wrappers/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cuda-api-wrappers.json | 5 +++++ 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/ports/cuda-api-wrappers/portfile.cmake b/ports/cuda-api-wrappers/portfile.cmake index 9467e3875b5ec9..3bfa260ac0e1e9 100644 --- a/ports/cuda-api-wrappers/portfile.cmake +++ b/ports/cuda-api-wrappers/portfile.cmake @@ -2,28 +2,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eyalroz/cuda-api-wrappers REF "v${VERSION}" - SHA512 4bc095513ed1a40f7239810abf7f6edcfde5471a89de8cf27a76038f6a54f6234542693bb606cc5e389403f3d12cb186b5a9cfb31c2bf3e437c112d215fb872d + SHA512 71170b59a116a886c319f6409204d610636a16148754a9811a8c608912b14c09f5f9037b9366c2d0a012c3fd88b5c90d289ce3da692663f1a86f3c3f2bbd7b02 HEAD_REF master ) # head only library set(VCPKG_BUILD_TYPE release) -# cuda toolkit check -vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) -message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") - -# nvcc compiler path -set(CMAKE_CUDA_COMPILER "${CUDA_TOOLKIT_ROOT}/bin/nvcc${VCPKG_HOST_EXECUTABLE_SUFFIX}") - -set(CUDA_ARCHITECTURES "native") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCAW_BUILD_EXAMPLES=OFF - "-DCMAKE_CUDA_ARCHITECTURES=${CUDA_ARCHITECTURES}" - "-DCMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}" ) vcpkg_cmake_install() @@ -34,5 +23,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - -vcpkg_fixup_pkgconfig() diff --git a/ports/cuda-api-wrappers/vcpkg.json b/ports/cuda-api-wrappers/vcpkg.json index 78ad5bf9c93e36..4d826d5dc55384 100644 --- a/ports/cuda-api-wrappers/vcpkg.json +++ b/ports/cuda-api-wrappers/vcpkg.json @@ -1,7 +1,8 @@ { "name": "cuda-api-wrappers", - "version": "0.6.6", + "version": "0.6.7", "description": "header-only library of integrated wrappers around the core parts of NVIDIA's CUDA execution ecosystem", + "homepage": "https://github.com/eyalroz/cuda-api-wrappers", "license": "BSD-3-Clause", "dependencies": [ "cuda", diff --git a/versions/baseline.json b/versions/baseline.json index 08d7f63815a717..a1e863043313c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2025,7 +2025,7 @@ "port-version": 13 }, "cuda-api-wrappers": { - "baseline": "0.6.6", + "baseline": "0.6.7", "port-version": 0 }, "cudnn": { diff --git a/versions/c-/cuda-api-wrappers.json b/versions/c-/cuda-api-wrappers.json index adccf36c244b6a..faa7d31439a113 100644 --- a/versions/c-/cuda-api-wrappers.json +++ b/versions/c-/cuda-api-wrappers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a504ca0e13729c26c4df96ba5b7a321069219be", + "version": "0.6.7", + "port-version": 0 + }, { "git-tree": "f31ca06768d00b72f8387dce98f3a8d2d867cfcb", "version": "0.6.6", From 763a397e3087ad639a6c1a2a0f0649d7c788d18b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 17 Jan 2024 00:04:21 +0100 Subject: [PATCH 0824/1039] [netgen] add new port (#31288) * [netgen] add new port * v db * fix config path for linux * v db * add supports * figure out CI error * fix the path correctly * v db * fix install layout * v db * more cleanup * v db * fix cmake usage and missing filesystem include * v db * disable parallel configure * v db * update to latest tag * v db * control cmake install loc * v db * more install control for mac * v db * more mac fixes * v db * remove old version * replace cgns patch * v db --------- Co-authored-by: vzhli17 --- ports/netgen/add_filesystem.patch | 12 ++++ ports/netgen/cgns-scoped-enum.patch | 69 ++++++++++++++++++++++ ports/netgen/cmake-adjustments.patch | 14 +++++ ports/netgen/downstream-fixes.patch | 25 ++++++++ ports/netgen/git-ver.patch | 14 +++++ ports/netgen/portfile.cmake | 80 ++++++++++++++++++++++++++ ports/netgen/static-exports.patch | 38 ++++++++++++ ports/netgen/vcpkg-fix-cgns-link.patch | 13 +++++ ports/netgen/vcpkg.json | 35 +++++++++++ versions/baseline.json | 4 ++ versions/n-/netgen.json | 9 +++ 11 files changed, 313 insertions(+) create mode 100644 ports/netgen/add_filesystem.patch create mode 100644 ports/netgen/cgns-scoped-enum.patch create mode 100644 ports/netgen/cmake-adjustments.patch create mode 100644 ports/netgen/downstream-fixes.patch create mode 100644 ports/netgen/git-ver.patch create mode 100644 ports/netgen/portfile.cmake create mode 100644 ports/netgen/static-exports.patch create mode 100644 ports/netgen/vcpkg-fix-cgns-link.patch create mode 100644 ports/netgen/vcpkg.json create mode 100644 versions/n-/netgen.json diff --git a/ports/netgen/add_filesystem.patch b/ports/netgen/add_filesystem.patch new file mode 100644 index 00000000000000..47f9c2ae257878 --- /dev/null +++ b/ports/netgen/add_filesystem.patch @@ -0,0 +1,12 @@ +diff --git a/libsrc/core/logging.hpp b/libsrc/core/logging.hpp +index adfed7e..d34d3e9 100644 +--- a/libsrc/core/logging.hpp ++++ b/libsrc/core/logging.hpp +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "exception.hpp" + #include "ngcore_api.hpp" diff --git a/ports/netgen/cgns-scoped-enum.patch b/ports/netgen/cgns-scoped-enum.patch new file mode 100644 index 00000000000000..3ea2db45169b8a --- /dev/null +++ b/ports/netgen/cgns-scoped-enum.patch @@ -0,0 +1,69 @@ +diff --git a/libsrc/interface/rw_cgns.cpp b/libsrc/interface/rw_cgns.cpp +index 096fbfdca..edf199cfd 100644 +--- a/libsrc/interface/rw_cgns.cpp ++++ b/libsrc/interface/rw_cgns.cpp +@@ -6,6 +6,37 @@ + + #include + ++//vcpkg builds cgns with scoped enumes. So the associcated types and values need to be correctly scoped. ++#define ElementType_t CGNS_ENUMT(ElementType_t) ++#define GridLocation_t CGNS_ENUMT(GridLocation_t) ++#define PointSetType_t CGNS_ENUMT(PointSetType_t) ++#define DataType_t CGNS_ENUMT(DataType_t) ++#define ZoneType_t CGNS_ENUMT(ZoneType_t) ++#define Unstructured CGNS_ENUMV(Unstructured) ++#define RealDouble CGNS_ENUMV(RealDouble) ++#define MIXED CGNS_ENUMV(MIXED) ++#define EdgeCenter CGNS_ENUMV(EdgeCenter) ++#define KFaceCenter CGNS_ENUMV(KFaceCenter) ++#define JFaceCenter CGNS_ENUMV(JFaceCenter) ++#define IFaceCenter CGNS_ENUMV(IFaceCenter) ++#define FaceCenter CGNS_ENUMV(FaceCenter) ++#define CellCenter CGNS_ENUMV(CellCenter) ++#define Vertex CGNS_ENUMV(Vertex) ++#define BAR_2 CGNS_ENUMV(BAR_2) ++#define BAR_3 CGNS_ENUMV(BAR_3) ++#define TRI_3 CGNS_ENUMV(TRI_3) ++#define TRI_6 CGNS_ENUMV(TRI_6) ++#define QUAD_4 CGNS_ENUMV(QUAD_4) ++#define QUAD_8 CGNS_ENUMV(QUAD_8) ++#define TETRA_4 CGNS_ENUMV(TETRA_4) ++#define TETRA_10 CGNS_ENUMV(TETRA_10) ++#define PYRA_5 CGNS_ENUMV(PYRA_5) ++#define PYRA_13 CGNS_ENUMV(PYRA_13) ++#define HEXA_8 CGNS_ENUMV(HEXA_8) ++#define HEXA_20 CGNS_ENUMV(HEXA_20) ++#define PENTA_6 CGNS_ENUMV(PENTA_6) ++#define PENTA_15 CGNS_ENUMV(PENTA_15) ++ + namespace netgen::cg + { + typedef ngcore::ClosedHashTable, size_t> PointTable; +@@ -215,7 +246,7 @@ namespace netgen::cg + if(codim==2) name += mesh.GetCD2Name(index); + + int ne = 0; +- Array data; ++ Array data; + + if(dim==3) + for(const auto el : mesh.VolumeElements()) +@@ -333,7 +364,7 @@ namespace netgen::cg + ZoneType_t zone_type; + int fn, base, zone; + int first_index_1d, first_index_2d, first_index_3d; +- int nv=0, ne_1d=0, ne_2d=0, ne_3d=0; ++ cgsize_t nv=0, ne_1d=0, ne_2d=0, ne_3d=0; + + Array names_1d, names_2d, names_3d; + +@@ -643,7 +674,7 @@ namespace netgen + int n_vertices = 0; + for (auto zi : Range(1, nzones+1)) + { +- int size[3]; ++ cgsize_t size[3]; + char name[100]; + cg_zone_read(fn,base,zi, name, size); + n_vertices += size[0]; diff --git a/ports/netgen/cmake-adjustments.patch b/ports/netgen/cmake-adjustments.patch new file mode 100644 index 00000000000000..0683f567cb4ca7 --- /dev/null +++ b/ports/netgen/cmake-adjustments.patch @@ -0,0 +1,14 @@ +diff --git a/libsrc/core/CMakeLists.txt b/libsrc/core/CMakeLists.txt +index c4f4795..cd5ad50 100644 +--- a/libsrc/core/CMakeLists.txt ++++ b/libsrc/core/CMakeLists.txt +@@ -28,8 +28,7 @@ endif(USE_PYTHON) + + if(WIN32) + target_compile_options(ngcore PUBLIC /bigobj /MP /W1 /wd4068) +- get_WIN32_WINNT(ver) +- target_compile_definitions(ngcore PUBLIC _WIN32_WINNT=${ver} WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32) ++ target_compile_definitions(ngcore PUBLIC WNT WNT_WINDOW NOMINMAX MSVC_EXPRESS _CRT_SECURE_NO_WARNINGS HAVE_STRUCT_TIMESPEC WIN32) + target_link_options(ngcore PUBLIC /ignore:4273 /ignore:4217 /ignore:4049) + endif(WIN32) + diff --git a/ports/netgen/downstream-fixes.patch b/ports/netgen/downstream-fixes.patch new file mode 100644 index 00000000000000..d570ec874211bb --- /dev/null +++ b/ports/netgen/downstream-fixes.patch @@ -0,0 +1,25 @@ +diff --git a/libsrc/stlgeom/stltopology.hpp b/libsrc/stlgeom/stltopology.hpp +index 2a3822f70..a14dc5bda 100644 +--- a/libsrc/stlgeom/stltopology.hpp ++++ b/libsrc/stlgeom/stltopology.hpp +@@ -350,7 +350,7 @@ public: + int GetNP() const { return points.Size(); } + int AddPoint(const Point<3> & p) { points.Append(p); return points.Size(); } + const Point<3> & GetPoint(STLPointId nr) const { return points[nr]; } // .Get(nr); } ++ DLL_HEADER int GetPointNum (const Point<3> & p); +- int GetPointNum (const Point<3> & p); + void SetPoint(STLPointId nr, const Point<3> & p) { points[nr] = p; } // { points.Elem(nr) = p; } + auto & GetPoints() const { return points; } + +diff --git a/nglib/nglib.cpp b/nglib/nglib.cpp +index ee25f3814..c8fe35cb2 100644 +--- a/nglib/nglib.cpp ++++ b/nglib/nglib.cpp +@@ -619,6 +619,7 @@ namespace nglib + } + */ + geo->AddEdges(readedges); ++ readedges.SetSize(0); + } + + if (geo->GetStatus() == STLTopology::STL_GOOD || geo->GetStatus() == STLTopology::STL_WARNING) return NG_OK; diff --git a/ports/netgen/git-ver.patch b/ports/netgen/git-ver.patch new file mode 100644 index 00000000000000..f1cfe73260e6cb --- /dev/null +++ b/ports/netgen/git-ver.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e9f4cc..bf92061 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -430,7 +430,8 @@ endif (USE_MPEG) + ####################################################################### + add_custom_target(ng_generate_version_file + ${CMAKE_COMMAND} +- -DBDIR=${CMAKE_CURRENT_BINARY_DIR} ++ -DBDIR=${CMAKE_CURRENT_BINARY_DIR}, ++ -DNETGEN_VERSION_GIT=${NETGEN_VERSION_GIT} + -P ${CMAKE_CURRENT_LIST_DIR}/cmake/generate_version_file.cmake + ) + ####################################################################### diff --git a/ports/netgen/portfile.cmake b/ports/netgen/portfile.cmake new file mode 100644 index 00000000000000..a01a3aa3e9f7e2 --- /dev/null +++ b/ports/netgen/portfile.cmake @@ -0,0 +1,80 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NGSolve/netgen + REF v${VERSION} + SHA512 647ccc0f1990918330457c2d014f243791e7dae8f9ec91880dbab714fa9b2e9b030387958fe74e94a9b4988c3d185c251c5c47764d587826d6d56277658b57d9 + HEAD_REF master + PATCHES + git-ver.patch + static-exports.patch + cmake-adjustments.patch + vcpkg-fix-cgns-link.patch + cgns-scoped-enum.patch + downstream-fixes.patch + add_filesystem.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND OPTIONS + "-DNGLIB_LIBRARY_TYPE=STATIC" + "-DNGCORE_LIBRARY_TYPE=STATIC" + "-DNGGUI_LIBRARY_TYPE=STATIC" + ) + string(APPEND VCPKG_C_FLAGS " -DNGSTATIC_BUILD") + string(APPEND VCPKG_CXX_FLAGS " -DNGSTATIC_BUILD") +endif() + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -DUSE_PYTHON=OFF + -DUSE_JPEG=ON + -DUSE_CGNS=ON + -DUSE_OCC=ON + -DUSE_MPEG=ON + -DUSE_SPDLOG=OFF # will be vendored otherwise + -DUSE_GUI=OFF + -DPREFER_SYSTEM_PYBIND11=ON + -DENABLE_UNIT_TESTS=OFF + -DUSE_NATIVE_ARCH=OFF + -DUSE_MPI=OFF + -DUSE_SUPERBUILD=OFF + -DNETGEN_VERSION_GIT=v${VERSION} # this variable is patched in via git-ver.patch + -DNG_INSTALL_DIR_CMAKE=lib/cmake/netgen + -DNG_INSTALL_DIR_BIN=bin + -DNG_INSTALL_DIR_LIB=lib + -DNG_INSTALL_DIR_RES=share + -DNG_INSTALL_DIR_INCLUDE=include + -DSKBUILD=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/netgen) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nglib.h" "defined(NGSTATIC_BUILD)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/nglib.h" "define NGLIB" "define NGLIB\n#define OCCGEOMETRY\n#define JPEGLIB\n#define FFMPEG\n") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/core/ngcore_api.hpp" "!defined(NGSTATIC_BUILD)" "0") +endif() + +set(config_file "${CURRENT_PACKAGES_DIR}/share/netgen/NetgenConfig.cmake") +file(READ "${config_file}" contents) +string(REPLACE "${SOURCE_PATH}" "NOT-USABLE" contents "${contents}") +string(REGEX REPLACE "\\\$<\\\$:([^>]+)>" "\\1" contents "${contents}") +string(REPLACE "\${NETGEN_CMAKE_DIR}/../" "\${NETGEN_CMAKE_DIR}/../../" contents "${contents}") +if(NOT VCPKG_BUILD_TYPE) + string(REPLACE "/lib" "$<$:/debug>/lib" contents "${contents}") +endif() +string(REGEX REPLACE "$:([^>]+)>" "\\1" contents "${contents}") +file(WRITE "${config_file}" "${contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/netgen/NetgenConfig.cmake" "${SOURCE_PATH}" "NOT-USABLE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/netgen/static-exports.patch b/ports/netgen/static-exports.patch new file mode 100644 index 00000000000000..452f14cfe58945 --- /dev/null +++ b/ports/netgen/static-exports.patch @@ -0,0 +1,38 @@ +diff --git a/libsrc/core/ngcore_api.hpp b/libsrc/core/ngcore_api.hpp +index e66e9b8..4ecaa05 100644 +--- a/libsrc/core/ngcore_api.hpp ++++ b/libsrc/core/ngcore_api.hpp +@@ -35,8 +35,13 @@ + + + #ifdef WIN32 ++#if !defined(NGSTATIC_BUILD) + #define NGCORE_API_EXPORT __declspec(dllexport) + #define NGCORE_API_IMPORT __declspec(dllimport) ++#else ++ #define NGCORE_API_EXPORT ++ #define NGCORE_API_IMPORT ++#endif + #else + #define NGCORE_API_EXPORT __attribute__((visibility("default"))) + #define NGCORE_API_IMPORT __attribute__((visibility("default"))) +diff --git a/nglib/nglib.h b/nglib/nglib.h +index f8c745a..e4587d2 100644 +--- a/nglib/nglib.h ++++ b/nglib/nglib.h +@@ -26,11 +26,15 @@ + // Philippose - 14.02.2009 + // Modifications for creating a DLL in Windows + #ifdef WIN32 ++ #if defined(NGSTATIC_BUILD) ++ #define NGLIB_API ++ #else + #ifdef nglib_EXPORTS + #define NGLIB_API __declspec(dllexport) + #else + #define NGLIB_API __declspec(dllimport) + #endif ++ #endif + #else + #define NGLIB_API __attribute__((visibility("default"))) + #endif diff --git a/ports/netgen/vcpkg-fix-cgns-link.patch b/ports/netgen/vcpkg-fix-cgns-link.patch new file mode 100644 index 00000000000000..e3fbc22d68e1f9 --- /dev/null +++ b/ports/netgen/vcpkg-fix-cgns-link.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf92061..933505d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -500,7 +500,7 @@ endif(ENABLE_CPP_CORE_GUIDELINES_CHECK) + + add_library(netgen_cgns INTERFACE) + if(USE_CGNS) +- find_library( CGNS_LIBRARY NAMES cgns cgnsdll ) ++ find_library( CGNS_LIBRARY NAMES cgnsdll cgns) + find_path( CGNS_INCLUDE_DIR cgnslib.h ) + target_compile_definitions(netgen_cgns INTERFACE NG_CGNS) + target_include_directories(netgen_cgns INTERFACE ${CGNS_INCLUDE_DIR}) diff --git a/ports/netgen/vcpkg.json b/ports/netgen/vcpkg.json new file mode 100644 index 00000000000000..7ca38d98a31d17 --- /dev/null +++ b/ports/netgen/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "netgen", + "version": "6.2.2307", + "description": "NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement.", + "homepage": "https://ngsolve.org/", + "license": "LGPL-2.1-or-later", + "supports": "arm64 | x64", + "dependencies": [ + { + "name": "cgns", + "default-features": false + }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec" + ] + }, + "libjpeg-turbo", + { + "name": "opencascade", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a1e863043313c4..5e5374142849c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5948,6 +5948,10 @@ "baseline": "4.3.1", "port-version": 5 }, + "netgen": { + "baseline": "6.2.2307", + "port-version": 0 + }, "nethost": { "baseline": "8.0.0", "port-version": 0 diff --git a/versions/n-/netgen.json b/versions/n-/netgen.json new file mode 100644 index 00000000000000..0588fe206bb818 --- /dev/null +++ b/versions/n-/netgen.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9326bf9f2364487f83d80a4b594e469db805a511", + "version": "6.2.2307", + "port-version": 0 + } + ] +} From 91b17dd72add5718332e9a2bf55497e2b126b0a0 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 16 Jan 2024 19:51:14 -0800 Subject: [PATCH 0825/1039] Patch Tuesday for January 2023 (#36143) --- ports/jasper/check-for-atomics-support.patch | 12 ++++++++++++ ports/jasper/portfile.cmake | 1 + ports/jasper/vcpkg.json | 1 + ports/portable-snippets/CMakeLists.txt | 4 ++++ ports/portable-snippets/vcpkg.json | 2 +- scripts/azure-pipelines/android/Dockerfile | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- versions/baseline.json | 4 ++-- versions/j-/jasper.json | 5 +++++ versions/p-/portable-snippets.json | 5 +++++ 11 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 ports/jasper/check-for-atomics-support.patch diff --git a/ports/jasper/check-for-atomics-support.patch b/ports/jasper/check-for-atomics-support.patch new file mode 100644 index 00000000000000..132d07f894fbf6 --- /dev/null +++ b/ports/jasper/check-for-atomics-support.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d2e9f9..110c245 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -591,6 +591,7 @@ set(JAS_HAVE_WIN32_THREADS FALSE) + if(JAS_ENABLE_MULTITHREADING_SUPPORT) + check_c_source_compiles(" + #include ++ #include + int main() { + thrd_t thread; + mtx_t mutex; diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index 52b735443667c1..e89a1762010917 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES no_stdc_check.patch fix-library-name.patch + check-for-atomics-support.patch # https://github.com/jasper-software/jasper/pull/370 ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index 369b7e6e676842..fbc9e9cf08a941 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jasper", "version": "4.1.0", + "port-version": 1, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/jasper-software/jasper", "license": null, diff --git a/ports/portable-snippets/CMakeLists.txt b/ports/portable-snippets/CMakeLists.txt index 5f511265ad05bf..0931363ce9708d 100644 --- a/ports/portable-snippets/CMakeLists.txt +++ b/ports/portable-snippets/CMakeLists.txt @@ -62,6 +62,10 @@ foreach (subdir ${subdirs}) else () add_library(${module} STATIC ${entries}) + if (MSVC) + target_compile_definitions(${module} PUBLIC __STDC_NO_THREADS__=1) + endif () + set_target_properties( ${module} PROPERTIES diff --git a/ports/portable-snippets/vcpkg.json b/ports/portable-snippets/vcpkg.json index b1f66080fdf9c8..efcb6e53382290 100644 --- a/ports/portable-snippets/vcpkg.json +++ b/ports/portable-snippets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "portable-snippets", "version-date": "2019-09-20", - "port-version": 3, + "port-version": 4, "description": "Collection of miscellaneous portable C snippets", "homepage": "https://github.com/nemequ/portable-snippets", "license": null, diff --git a/scripts/azure-pipelines/android/Dockerfile b/scripts/azure-pipelines/android/Dockerfile index 0e51a8bf632ee9..e089221281eca0 100644 --- a/scripts/azure-pipelines/android/Dockerfile +++ b/scripts/azure-pipelines/android/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM ubuntu:20.04 +FROM ubuntu:focal-20231211 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 1a826aa5d5ce0f..263a05c94f08fa 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,9 +4,9 @@ variables: android-pool: 'PrAnd-1ES-Pool' linux-pool: 'PrLin-1ES-Pool' - windows-pool: 'PrWin-2023-12-12' + windows-pool: 'PrWin-2024-01-11' osx-pool: 'PrOsx-2023-09-11' - linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05' + linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2024-01-11' parameters: - name: vcpkgToolSha diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index 298fe59ffac7e9..2bb6d25971a5f1 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.4.0/PowerShell-7.4.0-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/versions/baseline.json b/versions/baseline.json index 5e5374142849c4..faf0e747fc53b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3630,7 +3630,7 @@ }, "jasper": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "jbig2dec": { "baseline": "0.20", @@ -6754,7 +6754,7 @@ }, "portable-snippets": { "baseline": "2019-09-20", - "port-version": 3 + "port-version": 4 }, "portaudio": { "baseline": "19.7", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index 2d0db8e255247d..498bc70539417a 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3155b993a1ac52e0101edecb422a74513fc3a470", + "version": "4.1.0", + "port-version": 1 + }, { "git-tree": "bbbc1e3a2819d3e823e778a5a35045cc44946c23", "version": "4.1.0", diff --git a/versions/p-/portable-snippets.json b/versions/p-/portable-snippets.json index 7235f311e03599..090d30c437f96a 100644 --- a/versions/p-/portable-snippets.json +++ b/versions/p-/portable-snippets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e84e5d30ffa9c566c1a27ff12416163694c8ff26", + "version-date": "2019-09-20", + "port-version": 4 + }, { "git-tree": "cb5584d76235e5a975e7c201d244c385cfd1dae7", "version-date": "2019-09-20", From 2f61f9e99e57e0c4bce1c64301a871b759381fc4 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:13:28 -0800 Subject: [PATCH 0826/1039] [arrow] Fix feature FlightSQL (#36215) * [arrow] Fix feature FlightSQL * update version --- ports/arrow/portfile.cmake | 15 ++++++++++++++- ports/arrow/usage-flightsql | 3 +++ ports/arrow/vcpkg.json | 14 +++++++++++++- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 ports/arrow/usage-flightsql diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index e6a34a89e86a43..1a19cc9dccaf78 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -23,7 +23,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dataset ARROW_DATASET filesystem ARROW_FILESYSTEM flight ARROW_FLIGHT - flight ARROW_FLIGHT_SQL + flightsql ARROW_FLIGHT_SQL gcs ARROW_GCS jemalloc ARROW_JEMALLOC json ARROW_JSON @@ -98,6 +98,14 @@ if("flight" IN_LIST FEATURES) ) endif() +if("flightsql" IN_LIST FEATURES) + vcpkg_cmake_config_fixup( + PACKAGE_NAME ArrowFlightSql + CONFIG_PATH lib/cmake/ArrowFlightSql + DO_NOT_DELETE_PARENT_CONFIG_PATH + ) +endif() + if("parquet" IN_LIST FEATURES) vcpkg_cmake_config_fixup( PACKAGE_NAME parquet @@ -126,6 +134,11 @@ if("flight" IN_LIST FEATURES) file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flight}") endif() +if("flightsql" IN_LIST FEATURES) + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-flightsql" usage-flightsql) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-flightsql}") +endif() + if("example" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") endif() diff --git a/ports/arrow/usage-flightsql b/ports/arrow/usage-flightsql new file mode 100644 index 00000000000000..2f7e9cf1f1226c --- /dev/null +++ b/ports/arrow/usage-flightsql @@ -0,0 +1,3 @@ + + find_package(ArrowFlightSql CONFIG REQUIRED) + target_link_libraries(main PRIVATE "$,ArrowFlightSql::arrow_flight_sql_static,ArrowFlightSql::arrow_flight_sql_shared>") diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 94dcbfd492396d..1134e5bec49b44 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrow", "version": "14.0.2", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -71,6 +71,18 @@ "protobuf" ] }, + "flightsql": { + "description": "FlightSQL support", + "dependencies": [ + { + "name": "arrow", + "default-features": false, + "features": [ + "flight" + ] + } + ] + }, "gcs": { "description": "GCS support", "dependencies": [ diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 5cf383af075aa8..d8eab37bf813f7 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68021accce836c6b394076d1494379df640dcb8c", + "version": "14.0.2", + "port-version": 2 + }, { "git-tree": "93a9cd414e5d170755234571e42746b413b7deb3", "version": "14.0.2", diff --git a/versions/baseline.json b/versions/baseline.json index faf0e747fc53b7..0357d1915cb54c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -238,7 +238,7 @@ }, "arrow": { "baseline": "14.0.2", - "port-version": 1 + "port-version": 2 }, "arsenalgear": { "baseline": "2.1.0", From 2da8bb1a93064db0994a172a34f575ef82c84365 Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Thu, 18 Jan 2024 03:13:59 +0800 Subject: [PATCH 0827/1039] [entt] update to 3.13.0 (#36207) * [entt] update to 3.13.0 * [entt] update versions --- ports/entt/portfile.cmake | 2 +- ports/entt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 2b980a8827b873..e5c95ed4b13888 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt REF "v${VERSION}" - SHA512 8382092339476fa187e0110ec4ba9a0ff93966a31263b28d9edb25068705815d120520b55c640bc3ced852a91762abed6da2bd9a50eaf274272605a8b5b493b9 + SHA512 65064199790e5ba69ef01188ce04105e5d8ad673de253e6247dd4b26a394b115cc4030e7f87285fb7e63d72f28c0be3a05ad286585ded0bb2229b47268159a39 HEAD_REF master ) diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index b17445c4a79a31..eed8e6fa4f2db9 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "entt", - "version": "3.12.2", + "version": "3.13.0", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0357d1915cb54c..f510db61687556 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2453,7 +2453,7 @@ "port-version": 5 }, "entt": { - "baseline": "3.12.2", + "baseline": "3.13.0", "port-version": 0 }, "epsilon": { diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 7db600939d9790..fa38639d6d2278 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3643359b0f55263734639170eb29b481f86436a", + "version": "3.13.0", + "port-version": 0 + }, { "git-tree": "556ac85a20d7294c42222cb292a2753113953015", "version": "3.12.2", From 6b008ab290d2fbb8d3ace822477273628c17a827 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:14:25 -0800 Subject: [PATCH 0828/1039] [azure-security-keyvault-*-cpp] Update to January releases (#36205) * [azure-security-keyvault-secrets-cpp] Update to 4.2.1 ## 4.2.1 (2024-01-16) ### Bugs Fixed - [[#4754]](https://github.com/Azure/azure-sdk-for-cpp/issues/4754) Thread safety for authentication policy. * not-specified * [azure-security-keyvault-certificates-cpp] Update to 4.2.1 ## 4.2.1 (2024-01-16) ### Bugs Fixed - [[#4754]](https://github.com/Azure/azure-sdk-for-cpp/issues/4754) Thread safety for authentication policy. * [azure-security-keyvault-keys-cpp] Update to 4.4.1 ## 4.4.1 (2024-01-16) ### Bugs Fixed - [[#4754]](https://github.com/Azure/azure-sdk-for-cpp/issues/4754) Thread safety for authentication policy. ### Other Changes - Fixed GCC 13 compilation error. (A community contribution, courtesy of _[adamdebreceni](https://github.com/adamdebreceni)_) - Use well-formed URL for the HTTP request made in `KeyClient::GetRandomBytes()`. ### Acknowledgments Thank you to our developer community members who helped to make Azure Key Vault Keys better with their contributions to this release: - adamdebreceni _([GitHub](https://github.com/adamdebreceni))_ --- .../portfile.cmake | 8 ++++++-- .../vcpkg.json | 7 +++++-- .../portfile.cmake | 8 ++++++-- .../vcpkg.json | 7 +++++-- .../portfile.cmake | 8 ++++++-- .../azure-security-keyvault-keys-cpp/vcpkg.json | 7 +++++-- .../portfile.cmake | 8 ++++++-- .../vcpkg.json | 7 +++++-- ...ure-security-keyvault-administration-cpp.json | 5 +++++ ...azure-security-keyvault-certificates-cpp.json | 5 +++++ .../a-/azure-security-keyvault-keys-cpp.json | 5 +++++ .../a-/azure-security-keyvault-secrets-cpp.json | 5 +++++ versions/baseline.json | 16 ++++++++-------- 13 files changed, 72 insertions(+), 24 deletions(-) diff --git a/ports/azure-security-keyvault-administration-cpp/portfile.cmake b/ports/azure-security-keyvault-administration-cpp/portfile.cmake index d1f7ae837065b0..31ddd965f06737 100644 --- a/ports/azure-security-keyvault-administration-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-administration-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-administration_4.0.0-beta.3 - SHA512 1209811b470821f929ffd5d09df58ff19b19f13a657acf304fefd457ee533acb3e91774ca6d72d0106e42d601d0bd4d23fbd563f62a4c9a62d686afe61cb4e6c + REF azure-security-keyvault-administration_4.0.0-beta.4 + SHA512 2a9c04fd2d98484632e3a53b98c09bd1c30cf117f34baa15e859d50736c2cfc26c19c6e846be6ad71f1b6b3def317dfb28d0586a1b0b55949246218479445660 ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-administration") @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-security-keyvault-administration-cpp/vcpkg.json b/ports/azure-security-keyvault-administration-cpp/vcpkg.json index 5f04262e573898..af0beabe660cd9 100644 --- a/ports/azure-security-keyvault-administration-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-administration-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-administration-cpp", - "version-semver": "4.0.0-beta.3", - "port-version": 1, + "version-semver": "4.0.0-beta.4", "description": [ "Microsoft Azure Key Vault Administration SDK for C++", "This library provides Azure Key Vault Administration SDK." diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index b0cba5d37ad48a..1f19e6ab22562e 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.2.0 - SHA512 bcfbeb47bbf0871113be3a7704b519af2b3209304be8f9c29874325e8efd3e4e440706aae1f86139076097b31e3777b85e3c9b01861bc5ace9113645d8a97260 + REF azure-security-keyvault-certificates_4.2.1 + SHA512 f18d205ee0be9ab4289860fe4fdc0f4a6c3571eb0a8d0ca0ea66e7fef477e04ed0ba455e1a5af687e0980d7f12b919d1a5c85ee40d41dbcfd695f5d62843dcd5 ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates") @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index 841abd2114b846..080d0161798ac5 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.2.0", - "port-version": 1, + "version-semver": "4.2.1", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 08d8764a64fce7..cc9c0a6c2fa6f1 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.4.0 - SHA512 00fc21a1ecf4b40543a1a381777970739579f3384392cdb9a2eb44563d05a5ac648f797cb5198df27f74cd4b45d341b06e45f552ed2a878f2cfd50f3461ad4fd + REF azure-security-keyvault-keys_4.4.1 + SHA512 758ff05ce33672d81cf14d347edada2a7c008c7df61639b7bac9ce1a1114144a1f6fcc3d364d1d90f5f9cda8f8c1db14f80873403d4190d4aca1844fb25dd517 ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys") @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 76b30472e038b4..0010de718dbd42 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.4.0", - "port-version": 1, + "version-semver": "4.4.1", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index 4709ea977c32a3..e72cb0a7917865 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,8 +1,11 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.2.0 - SHA512 1f464e60f9cb234bb28c3daa5abb0a27fdb9c75327f7eb84b3d5215524457aae9b6c64617a35175341afcaf0da39373190c867fb1d5a1780b9395062a7420aaa + REF azure-security-keyvault-secrets_4.2.1 + SHA512 8d944bbcc29b670b884234a789455bb6b33e33fa45c7b02a4200c2267189597cb849f3cbbaa5f7c4db013ec74a2ea0b073237254db7fcac96c290888c05dcba5 ) if(EXISTS "${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets") @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index f912e278088f4a..003420195c6051 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,7 +1,10 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.2.0", - "port-version": 1, + "version-semver": "4.2.1", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." diff --git a/versions/a-/azure-security-keyvault-administration-cpp.json b/versions/a-/azure-security-keyvault-administration-cpp.json index c10aff06de478b..371d66c827516b 100644 --- a/versions/a-/azure-security-keyvault-administration-cpp.json +++ b/versions/a-/azure-security-keyvault-administration-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd36ccbfee4987cbea6cee9fae8e752b1fc9f3cb", + "version-semver": "4.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "478811ebfa9d552d2b1fcf03e1721cc9175b17bf", "version-semver": "4.0.0-beta.3", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index df7c006d2ae72f..97a90f52be09bb 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": "24b5030675a24e25b0fb571b39d33e7ee6caa61e", + "version-semver": "4.2.1", + "port-version": 0 + }, { "git-tree": "b0dd2ae87c69a4637e82ea188db1ee1e2624ac2c", "version-semver": "4.2.0", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 947631e9c7af94..8d6dc18f51a199 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": "6ca701263f474612b070c37fbc5a7932a562838e", + "version-semver": "4.4.1", + "port-version": 0 + }, { "git-tree": "7e455823cb2d81cf79f550f26d1fa3b9cff61e86", "version-semver": "4.4.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index f35b728831909c..c0cba7187c7f1c 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": "5edd7b9816c3c93ff452244bb579effa3c863787", + "version-semver": "4.2.1", + "port-version": 0 + }, { "git-tree": "5c41c5b32fe02aeb4ab47a5ddaa19df33fac9ee7", "version-semver": "4.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f510db61687556..a999a2e1bc0b12 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -457,20 +457,20 @@ "port-version": 1 }, "azure-security-keyvault-administration-cpp": { - "baseline": "4.0.0-beta.3", - "port-version": 1 + "baseline": "4.0.0-beta.4", + "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.2.0", - "port-version": 1 + "baseline": "4.2.1", + "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.4.0", - "port-version": 1 + "baseline": "4.4.1", + "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.2.0", - "port-version": 1 + "baseline": "4.2.1", + "port-version": 0 }, "azure-storage-blobs-cpp": { "baseline": "12.10.0", From df2f1a4872ab0d682cda2c442b97363165eccf58 Mon Sep 17 00:00:00 2001 From: Rostyslav Skrypnyk Date: Wed, 17 Jan 2024 20:49:29 +0100 Subject: [PATCH 0829/1039] [zeromq] Updated to the released 4.3.5 version. (#36194) * Updated the port for ZeroMQ to the released 4.3.5 version. * Corrected port version and updated baseline file. * Updated git-tree object id for zeromq port v4.3.5#0 * Update ports/zeromq/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update ports/zeromq/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Updated the version metadata file for ZeroMQ port again. --------- Co-authored-by: Rostyslav Skrypnyk Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/zeromq/portfile.cmake | 4 ++-- ports/zeromq/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/z-/zeromq.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 4b33b2bbba2461..1636322d754c0d 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq - REF ecc63d0d3b0e1a62c90b58b1ccdb5ac16cb2400a - SHA512 4e8f709691d8f3f64d41cc0f0fd70fe0a676247dc88b1283fa90f41b838f5b83100ccabd18714e5638cfa66c5cec0ac67943a3559d535357ff3499de62e47069 + REF "v${VERSION}" + SHA512 108d9c5fa761c111585c30f9c651ed92942dda0ac661155bca52cc7b6dbeb3d27b0dd994abde206eacfc3bc88d19ed24e45b291050c38469e34dca5f8c9a037d PATCHES fix-arm.patch ) diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index d6c0434cccbf64..d460fdcaedb264 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "zeromq", - "version-date": "2023-06-20", - "port-version": 1, + "version": "4.3.5", "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a999a2e1bc0b12..a549f6a03a71c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9409,8 +9409,8 @@ "port-version": 4 }, "zeromq": { - "baseline": "2023-06-20", - "port-version": 1 + "baseline": "4.3.5", + "port-version": 0 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 2b1b76c31866c8..df515c353884d6 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c31f33a815e20807d89d684435dcab872c37d2a", + "version": "4.3.5", + "port-version": 0 + }, { "git-tree": "6f361429d0511b651b4f7b98f0dc47adf2601843", "version-date": "2023-06-20", From 0dbf7befd7939e303878b0bfdb9f3bb06e24e2ed Mon Sep 17 00:00:00 2001 From: SunBlack Date: Wed, 17 Jan 2024 20:50:40 +0100 Subject: [PATCH 0830/1039] [libe57format] Update to 3.0.1 (#36188) --- ports/libe57format/portfile.cmake | 4 ++-- ports/libe57format/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libe57format.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libe57format/portfile.cmake b/ports/libe57format/portfile.cmake index ec47b23d6ca950..fb8336fef0bc2d 100644 --- a/ports/libe57format/portfile.cmake +++ b/ports/libe57format/portfile.cmake @@ -2,10 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmaloney/libE57Format REF "v${VERSION}" - SHA512 5458e35b319f41290594daefe5de18476ff1c4ed94712d881ed907b72a9c7a470e4d091d68cc1d6115838843e682ed158fc8c7a9fa68eef6c2cf421cda361f7e + SHA512 8a788411a7f02c76c6befe96f09f4ac91c87fc0506a543fb64af4d68330c84d84229560128b1ccb64a0463d2529bc5d486b4af81e534710382e189ef9f1f98cd HEAD_REF master PATCHES - prevent_warning_as_errors.diff # see https://github.com/asmaloney/libE57Format/issues/232 + prevent_warning_as_errors.diff # see https://github.com/asmaloney/libE57Format/issues/256 ) vcpkg_cmake_configure( diff --git a/ports/libe57format/vcpkg.json b/ports/libe57format/vcpkg.json index b0c08548e1ba46..c1eb5124dd2c7d 100644 --- a/ports/libe57format/vcpkg.json +++ b/ports/libe57format/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libe57format", - "version": "3.0.0", + "version": "3.0.1", "description": "A library to provide read & write support for the E57 file format.", "homepage": "https://github.com/asmaloney/libE57Format", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index a549f6a03a71c0..bff35f6c6a170e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4241,7 +4241,7 @@ "port-version": 4 }, "libe57format": { - "baseline": "3.0.0", + "baseline": "3.0.1", "port-version": 0 }, "libebur128": { diff --git a/versions/l-/libe57format.json b/versions/l-/libe57format.json index c70f993ff64e52..ae0e8acbb46300 100644 --- a/versions/l-/libe57format.json +++ b/versions/l-/libe57format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "420f72aa03611d2e9c0418eaf2d442d2ae260cfd", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "fc02f3676ee791122d4afca45f363564a293da8a", "version": "3.0.0", From 74b5049dea31afcf65dd7540eeedd605c650488a Mon Sep 17 00:00:00 2001 From: rinechran Date: Thu, 18 Jan 2024 04:51:42 +0900 Subject: [PATCH 0831/1039] [Thorvg] Update Thorvg port to v0.12.1 (#36179) * update : thorvg 0.12.1 * update : baseline update * update : tools * update : baseline * update : not support uwp * update : baseline --- ports/thorvg/portfile.cmake | 4 ++-- ports/thorvg/vcpkg.json | 7 +++---- versions/baseline.json | 2 +- versions/t-/thorvg.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/thorvg/portfile.cmake b/ports/thorvg/portfile.cmake index c5ae01319543aa..35bc6117d83050 100644 --- a/ports/thorvg/portfile.cmake +++ b/ports/thorvg/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thorvg/thorvg REF "v${VERSION}" - SHA512 cc73f7e01755141a245eecd1dc8fa6754e21b342e3734f1200e859c2360474fc9931a934eb49968c65b15c537812b81fa1f3f82ac12f9e00e3959748cf1e286f + SHA512 6162e05a172abc1445857999907701ed829e850d4d06677907d4cff7372304e442e6037fb1700cdbde5ecda1da5bec63145717db163c0154830b28dc339ef9d4 HEAD_REF master ) @@ -39,7 +39,7 @@ vcpkg_install_meson() vcpkg_fixup_pkgconfig() if ("tools" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES svg2tvg svg2png AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES svg2tvg svg2png lottie2gif AUTO_CLEAN) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/thorvg/vcpkg.json b/ports/thorvg/vcpkg.json index cc45c146ae301e..4cf9940f85119c 100644 --- a/ports/thorvg/vcpkg.json +++ b/ports/thorvg/vcpkg.json @@ -1,10 +1,10 @@ { "name": "thorvg", - "version": "0.11.3", + "version": "0.12.1", "description": "ThorVG is a platform-independent portable library for drawing vector-based scenes and animations", "homepage": "https://www.thorvg.org", "license": "MIT", - "supports": "!(arm & uwp)", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-tool-meson", @@ -13,8 +13,7 @@ ], "features": { "tools": { - "description": "Build tools", - "supports": "!windows" + "description": "Build tools" } } } diff --git a/versions/baseline.json b/versions/baseline.json index bff35f6c6a170e..fe6dc56ed519b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8437,7 +8437,7 @@ "port-version": 0 }, "thorvg": { - "baseline": "0.11.3", + "baseline": "0.12.1", "port-version": 0 }, "threadpool": { diff --git a/versions/t-/thorvg.json b/versions/t-/thorvg.json index a04fb4389cf406..3bef73b6c2ce89 100644 --- a/versions/t-/thorvg.json +++ b/versions/t-/thorvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e76612a36df3034ad703e603692ae10c9ca315e1", + "version": "0.12.1", + "port-version": 0 + }, { "git-tree": "d1d0212fb939be388b501f845991c03a56213ef8", "version": "0.11.3", From 409107802e95bcb8f6f9f6ab38f6c69674d64578 Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Wed, 17 Jan 2024 14:52:27 -0500 Subject: [PATCH 0832/1039] [jsoncons] Update to 0.173.2 (#36163) * [jsoncons] Update to 0.173.2 * git add -u && git commit * [jsoncons] Update to 0.173.2 * [jsoncons] vcpkg x-add-version --all --- ports/jsoncons/portfile.cmake | 2 +- ports/jsoncons/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jsoncons.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jsoncons/portfile.cmake b/ports/jsoncons/portfile.cmake index 50c086c279ca97..8802234a159850 100644 --- a/ports/jsoncons/portfile.cmake +++ b/ports/jsoncons/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danielaparker/jsoncons REF v${VERSION} - SHA512 6cfe09f0464f3212017fa96e25772397cd849e91b7d08ff0b685bbee1884003d974ebc244b0cbc5f643215b0168c2e9d93496790a38fb9496b1c1ae86c610522 + SHA512 7419c199c4bbc237efc2964047fd78bd580dc11a16ffa6fb2e838a1af43c7d6e31324dd4470ac238fdae6400495ab5dac66855c4431d8e1db7fe9d98092de533 HEAD_REF master ) diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json index dbc95568f5b63d..0f198e8b51dadd 100644 --- a/ports/jsoncons/vcpkg.json +++ b/ports/jsoncons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jsoncons", - "version": "0.171.0", + "version": "0.173.2", "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", "homepage": "https://github.com/danielaparker/jsoncons", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index fe6dc56ed519b6..4a712dcc61805b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3693,7 +3693,7 @@ "port-version": 5 }, "jsoncons": { - "baseline": "0.171.0", + "baseline": "0.173.2", "port-version": 0 }, "jsoncpp": { diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index 605e6479e31513..8b5a30c854040a 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "067500e38e95bfc4ba3a02470871628b640b73c5", + "version": "0.173.2", + "port-version": 0 + }, { "git-tree": "9ac2b57ee5cadef41175e8b3e2a13b28751bfb2d", "version": "0.171.0", From a1c22c4aabb36b61a93cb093e80c8340d48cede4 Mon Sep 17 00:00:00 2001 From: Kevin Leonardic Date: Wed, 17 Jan 2024 21:02:49 +0100 Subject: [PATCH 0833/1039] [dcmtk] Update to 3.6.8 (#36124) --- ports/dcmtk/fix-pc-format.patch | 32 -------------------------------- ports/dcmtk/portfile.cmake | 19 +++++++++++-------- ports/dcmtk/usage | 6 +++--- ports/dcmtk/vcpkg.json | 3 +-- ports/dcmtk/windows-patch.patch | 32 -------------------------------- versions/baseline.json | 4 ++-- versions/d-/dcmtk.json | 5 +++++ 7 files changed, 22 insertions(+), 79 deletions(-) delete mode 100644 ports/dcmtk/fix-pc-format.patch delete mode 100644 ports/dcmtk/windows-patch.patch diff --git a/ports/dcmtk/fix-pc-format.patch b/ports/dcmtk/fix-pc-format.patch deleted file mode 100644 index 4cbffe98b0121c..00000000000000 --- a/ports/dcmtk/fix-pc-format.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in -index 13c79c0..46fc98a 100644 ---- a/CMake/dcmtk.pc.in -+++ b/CMake/dcmtk.pc.in -@@ -1,14 +1,14 @@ -- prefix="@CMAKE_INSTALL_PREFIX@" -- exec_prefix="${prefix}" -- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" -- includedir="${prefix}/include/" -+prefix="@CMAKE_INSTALL_PREFIX@" -+exec_prefix="${prefix}" -+libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" -+includedir="${prefix}/include/" - -- Name: DCMTK -- Description: DICOM Toolkit (DCMTK) -- URL: https://dcmtk.org -- Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ -- Requires: @PKGCONF_REQ_PUB@ -- Requires.private: @PKGCONF_REQ_PRIV@ -- Cflags: -I"${includedir}" -- Libs: -L"${libdir}" @PKGCONF_LIBS@ -- Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ -+Name: DCMTK -+Description: DICOM Toolkit (DCMTK) -+URL: https://dcmtk.org -+Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@ -+Requires: @PKGCONF_REQ_PUB@ -+Requires.private: @PKGCONF_REQ_PRIV@ -+Cflags: -I"${includedir}" -+Libs: -L"${libdir}" @PKGCONF_LIBS@ -+Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@ diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 859581c400b5f3..b46cea19541231 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk - REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7 - SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a + REF 59f75a8b50e50ae1bb1ff12098040c6327500740 # DCMTK-3.6.8 + SHA512 2719e2163d57339a81f079c8c28d4e9e3ee6b1b85bc3db5b94a2279e3dd9881ab619d432d64984e6371569866d7aa4f01bf8b41841b773bcd60bbb8ad2118cac HEAD_REF master PATCHES dcmtk.patch - windows-patch.patch - fix-pc-format.patch fix_link_xml2.patch ) @@ -40,6 +38,8 @@ vcpkg_cmake_configure( -DINSTALL_HEADERS=OFF -DINSTALL_OTHER=OFF -DBUILD_APPS=OFF + MAYBE_UNUSED_VARIABLES + -DDCMTK_USE_FIND_PACKAGE_WIN_DEFAULT=ON ) vcpkg_cmake_install() @@ -107,9 +107,12 @@ if ("tools" IN_LIST FEATURES) findscu getscu img2dcm + mkcsmapper + mkesdb mkreport movescu msgserv + oficonv_tests ofstd_tests pdf2dcm stl2dcm @@ -130,12 +133,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCMTK_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk/private.dic\"" "") -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_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/private.dic\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk-${VERSION}/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk-${VERSION}/\"" "") vcpkg_fixup_pkgconfig() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/dcmtk/usage b/ports/dcmtk/usage index 9335b7839c5f17..770f881140a54c 100644 --- a/ports/dcmtk/usage +++ b/ports/dcmtk/usage @@ -18,8 +18,8 @@ Add the following cmake code to your CMakeLists.txt to create definitions for DC target_compile_definitions(main PUBLIC "DCMTK_PREFIX=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" - "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/private.dic" - "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk/" - "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/" + "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/private.dic" + "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk-@VERSION@/" + "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk-@VERSION@/" ) endif() diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 470cd87dd42334..19656f52246c6f 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dcmtk", - "version": "3.6.7", - "port-version": 6, + "version": "3.6.8", "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/ports/dcmtk/windows-patch.patch b/ports/dcmtk/windows-patch.patch deleted file mode 100644 index 83322ea9220500..00000000000000 --- a/ports/dcmtk/windows-patch.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 4a712dcc61805b..ac07c0125ef976 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2145,8 +2145,8 @@ "port-version": 2 }, "dcmtk": { - "baseline": "3.6.7", - "port-version": 6 + "baseline": "3.6.8", + "port-version": 0 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index c2c22d9cb9760a..a2c08d51df4f55 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04c152f7113c88dcfb84b3f4963cadd60c254a74", + "version": "3.6.8", + "port-version": 0 + }, { "git-tree": "bea28d42632b9740c795d645252307fe02c273cc", "version": "3.6.7", From 38d1652f152d36481f2f4e8a85c0f1e14f3769f7 Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Thu, 18 Jan 2024 04:12:40 +0800 Subject: [PATCH 0834/1039] [pulsar-client-cpp] Fix build failure when CMAKE_BUILD_TYPE is not specified (#36147) * [pulsar-client-cpp] Fix build failure when CMAKE_BUILD_TYPE is not specified * Force finding debug libraries by default --- .../unofficial-pulsar-config.cmake | 25 +++++++++++-------- ports/pulsar-client-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pulsar-client-cpp.json | 5 ++++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake b/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake index d8406a7060040f..3ae79afaf5bf07 100644 --- a/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake +++ b/ports/pulsar-client-cpp/unofficial-pulsar-config.cmake @@ -3,14 +3,9 @@ if (NOT TARGET unofficial::pulsar::pulsar) get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH) get_filename_component(VCPKG_IMPORT_PREFIX "${VCPKG_IMPORT_PREFIX}" PATH) - find_path(_pulsar_include_dir NAMES "pulsar/Client.h" PATH "${VCPKG_IMPORT_PREFIX}/include") - set(_temp_cmake_ignore_path ${CMAKE_IGNORE_PATH}) - # Without setting CMAKE_IGNORE_PATH, the library under debug/lib/ directory could be found - set(CMAKE_IGNORE_PATH "${VCPKG_IMPORT_PREFIX}/debug/lib") - find_library(_pulsar_library_release NAMES pulsar pulsar-static PATH "${VCPKG_IMPORT_PREFIX}/lib") - set(CMAKE_IGNORE_PATH ${_temp_cmake_ignore_path}) - unset(_temp_cmake_ignore_path) - find_library(_pulsar_library_debug NAMES pulsar pulsar-static PATH "${VCPKG_IMPORT_PREFIX}/debug/lib") + find_path(_pulsar_include_dir NAMES "pulsar/Client.h" PATHS "${VCPKG_IMPORT_PREFIX}/include" NO_DEFAULT_PATH) + find_library(_pulsar_library_release NAMES pulsar pulsar-static PATHS "${VCPKG_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH) + find_library(_pulsar_library_debug NAMES pulsar pulsar-static PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH) message(STATUS "Found _pulsar_library_release: ${_pulsar_library_release}") message(STATUS "Found _pulsar_library_debug: ${_pulsar_library_debug}") if (NOT _pulsar_include_dir OR NOT _pulsar_library_release) @@ -27,13 +22,19 @@ if (NOT TARGET unofficial::pulsar::pulsar) message(STATUS "Found _pulsar_debug_dll: ${_pulsar_debug_dll}") endif () + # When CMAKE_BUILD_TYPE is not specified, debug libraries will be found for dependencies except ZLIB. + # So set it with Debug here to link debug ZLIB library by default. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Debug) + endif () + include(CMakeFindDependencyMacro) find_dependency(OpenSSL) find_dependency(ZLIB) find_dependency(protobuf CONFIG) find_dependency(CURL CONFIG) find_dependency(zstd CONFIG) - find_dependency(snappy CONFIG) + find_dependency(Snappy CONFIG) if (MSVC) find_dependency(dlfcn-win32 CONFIG) endif () @@ -41,12 +42,12 @@ if (NOT TARGET unofficial::pulsar::pulsar) if (_pulsar_release_dll) add_library(unofficial::pulsar::pulsar SHARED IMPORTED) set_target_properties(unofficial::pulsar::pulsar PROPERTIES - IMPORTED_CONFIGURATIONS "Release" + IMPORTED_CONFIGURATIONS "RELEASE" IMPORTED_IMPLIB_RELEASE "${_pulsar_library_release}" IMPORTED_LOCATION_RELEASE "${_pulsar_release_dll}") if (_pulsar_debug_dll) set_target_properties(unofficial::pulsar::pulsar PROPERTIES - IMPORTED_CONFIGURATIONS "Release;DEBUG" + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" IMPORTED_IMPLIB_DEBUG "${_pulsar_library_debug}" IMPORTED_LOCATION_DEBUG "${_pulsar_debug_dll}") unset(_pulsar_debug_dll CACHE) @@ -55,9 +56,11 @@ if (NOT TARGET unofficial::pulsar::pulsar) else () add_library(unofficial::pulsar::pulsar UNKNOWN IMPORTED) set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_CONFIGURATIONS "RELEASE" IMPORTED_LOCATION_RELEASE "${_pulsar_library_release}") if (_pulsar_library_debug) set_target_properties(unofficial::pulsar::pulsar PROPERTIES + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" IMPORTED_LOCATION_DEBUG "${_pulsar_library_debug}") unset(_pulsar_library_debug CACHE) endif () diff --git a/ports/pulsar-client-cpp/vcpkg.json b/ports/pulsar-client-cpp/vcpkg.json index c746bb53120433..1210a5d722d380 100644 --- a/ports/pulsar-client-cpp/vcpkg.json +++ b/ports/pulsar-client-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pulsar-client-cpp", "version": "3.4.2", + "port-version": 1, "description": "The Apache Pulsar C++ library", "homepage": "https://github.com/apache/pulsar-client-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ac07c0125ef976..6427615e84d84d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6878,7 +6878,7 @@ }, "pulsar-client-cpp": { "baseline": "3.4.2", - "port-version": 0 + "port-version": 1 }, "pulzed-mini": { "baseline": "0.9.14", diff --git a/versions/p-/pulsar-client-cpp.json b/versions/p-/pulsar-client-cpp.json index 1611cc33230a78..acf73a8b6079e7 100644 --- a/versions/p-/pulsar-client-cpp.json +++ b/versions/p-/pulsar-client-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dc7014a2c8493a0124f08335cb9056c359604e4", + "version": "3.4.2", + "port-version": 1 + }, { "git-tree": "f022e5dacbf10b0a6cead0f065ce6ab885b4c9af", "version": "3.4.2", From 234d20e4843a25b9523b91394dd5f19247eea9cc Mon Sep 17 00:00:00 2001 From: Saad Date: Wed, 17 Jan 2024 18:40:23 -0500 Subject: [PATCH 0835/1039] [nanojsonc] Add new port (#34909) * Create nanojson (JSON Parser for C/C++) Event-Driven JSON Parser for C/C++ * Creating nanojson port Event-Driven JSON Parser for C/C++ * init * update nanojson * update sha512 Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update copy license Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update dependencies Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update vcpkg * update license filename * deleted license * update * update hash * update * update * update * [saadshams-nanojson] Add new port * update version * never agreed to the name, it was published without consent * rebranded as nanojsonc * update hash * update * update * update * format vcpkg.sjon * update version * update version * update * update * update * update * fix error * update version * update * update * update fixed share * update * update * formating vcpkg.json * update version * additional empty line * update version --------- Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: vzhli17 --- ports/nanojsonc/portfile.cmake | 19 +++++++++++++++++++ ports/nanojsonc/usage | 4 ++++ ports/nanojsonc/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/n-/nanojsonc.json | 9 +++++++++ 5 files changed, 54 insertions(+) create mode 100644 ports/nanojsonc/portfile.cmake create mode 100644 ports/nanojsonc/usage create mode 100644 ports/nanojsonc/vcpkg.json create mode 100644 versions/n-/nanojsonc.json diff --git a/ports/nanojsonc/portfile.cmake b/ports/nanojsonc/portfile.cmake new file mode 100644 index 00000000000000..0b9fc7806af858 --- /dev/null +++ b/ports/nanojsonc/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-source-patterns/nanojsonc + REF "${VERSION}" + SHA512 306fce8f90c1e5b9031f3f2b1cec5430722477425766fc05e430cceb03bb85188f2c451c0c7d34aed49b506e6a2cd835e419792362f992acbafc0b099fbe4b5e + HEAD_REF main +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() # removes /debug/share +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # removes debug/include + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") # Install License +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Install Usage diff --git a/ports/nanojsonc/usage b/ports/nanojsonc/usage new file mode 100644 index 00000000000000..6e1e2c3ae9ecf6 --- /dev/null +++ b/ports/nanojsonc/usage @@ -0,0 +1,4 @@ +The package nanojsonc provides CMake targets: + + find_package(nanojsonc CONFIG REQUIRED) + target_link_libraries(main PRIVATE nanojsonc::nanojsonc) diff --git a/ports/nanojsonc/vcpkg.json b/ports/nanojsonc/vcpkg.json new file mode 100644 index 00000000000000..48eb35f0ebb164 --- /dev/null +++ b/ports/nanojsonc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "nanojsonc", + "version": "1.0.0", + "maintainers": "Saad Shams", + "description": "Event-Driven JSON Parser for C", + "homepage": "https://github.com/open-source-patterns/nanojsonc", + "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 6427615e84d84d..e5f01355e2cd31 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5876,6 +5876,10 @@ "baseline": "2019-09-23", "port-version": 5 }, + "nanojsonc": { + "baseline": "1.0.0", + "port-version": 0 + }, "nanomsg": { "baseline": "1.2.0", "port-version": 1 diff --git a/versions/n-/nanojsonc.json b/versions/n-/nanojsonc.json new file mode 100644 index 00000000000000..3a8ad2e97a6420 --- /dev/null +++ b/versions/n-/nanojsonc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7680709fd527db1cc26d47f8897c0669cacbfb0f", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 97dd26728e3856ed1ab62ee74ee3a391d9c81d19 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 18 Jan 2024 00:50:19 +0100 Subject: [PATCH 0836/1039] [magma] add port (#35928) * Add magma port * fix patch * no cmake config to fix * deleted wrong dir * mark magma fail in ci baseline * v db * fix Cflags * v db --------- Co-authored-by: MonicaLiu --- ports/magma/clang-cuda.patch | 50 +++++++++++++++++++++++++ ports/magma/disable-openmp-msvc.patch | 15 ++++++++ ports/magma/no-tests.patch | 35 +++++++++++++++++ ports/magma/portfile.cmake | 54 +++++++++++++++++++++++++++ ports/magma/vcpkg.json | 16 ++++++++ scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 ++ versions/m-/magma.json | 9 +++++ 8 files changed, 184 insertions(+) create mode 100644 ports/magma/clang-cuda.patch create mode 100644 ports/magma/disable-openmp-msvc.patch create mode 100644 ports/magma/no-tests.patch create mode 100644 ports/magma/portfile.cmake create mode 100644 ports/magma/vcpkg.json create mode 100644 versions/m-/magma.json diff --git a/ports/magma/clang-cuda.patch b/ports/magma/clang-cuda.patch new file mode 100644 index 00000000000000..5aaee14ff8e448 --- /dev/null +++ b/ports/magma/clang-cuda.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eeb0bb0b8f..6a5e0a747a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -310,10 +309,17 @@ if (MAGMA_ENABLE_CUDA) + ) + else() + # No Position Independent Code on Windows. Compiler will complain if you add that flag. +- target_compile_options(magma_nvcc_flags +- INTERFACE +- $<$:--compiler-options;${FORTRAN_CONVENTION}> +- ) ++ if(NOT CMAKE_CUDA_COMPILER_ID STREQUAL "Clang") ++ target_compile_options(magma_nvcc_flags ++ INTERFACE ++ $<$:--compiler-options;${FORTRAN_CONVENTION}> ++ ) ++ else() ++ target_compile_options(magma_nvcc_flags ++ INTERFACE ++ $<$:${FORTRAN_CONVENTION}> ++ ) ++ endif() + endif(COMPILER_SUPPORTS_FPIC) + + set(MAGMA_HAVE_CUDA "1") +diff --git a/control/magma_internal.h b/control/magma_internal.h +index 2310659235..c4d0eb8f6b 100644 +--- a/control/magma_internal.h ++++ b/control/magma_internal.h +@@ -33,7 +33,7 @@ + // functions where Microsoft fails to provide C99 standard + // (only with Microsoft, not with nvcc on Windows) + // in both magma_internal.h and testings.h +- #ifndef __NVCC__ ++ #if !defined(__NVCC__) && !defined(__clang__) + + #include + #define copysign(x,y) _copysign(x,y) +@@ -42,7 +42,9 @@ + #define isfinite(x) _finite(x) + // note _snprintf has slightly different semantics than snprintf + #define snprintf _snprintf +- ++ #elif !defined(__NVCC__) ++ // make sure this actually uses the C version and not the C++ overloads ++ #define copysign(x,y) copysign((double)x,(double)y) + #endif + + #else diff --git a/ports/magma/disable-openmp-msvc.patch b/ports/magma/disable-openmp-msvc.patch new file mode 100644 index 00000000000000..b1439952a7f053 --- /dev/null +++ b/ports/magma/disable-openmp-msvc.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 828911d05f..a4f5b35ef3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,6 +103,10 @@ endif() + + # ---------------------------------------- + # locate OpenMP ++if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++ set(CMAKE_DISBLE_FIND_PACKAGE_OpenMP ON) ++ # MSVC OpenMP is not enough to compile ++endif() + find_package( OpenMP ) + if (OPENMP_FOUND) + message( STATUS "Found OpenMP" ) diff --git a/ports/magma/no-tests.patch b/ports/magma/no-tests.patch new file mode 100644 index 00000000000000..4a7d92636fe7ff --- /dev/null +++ b/ports/magma/no-tests.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a4f5b35ef3..eeb0bb0b8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -663,7 +670,7 @@ target_link_libraries( lapacktest + + # ---------------------------------------- + # compile tester library +-add_library( tester ${libtest_all} ) ++add_library( tester EXCLUDE_FROM_ALL ${libtest_all} ) + target_link_libraries( tester + magma + lapacktest +@@ -726,11 +726,12 @@ foreach( filename ${testing_all} ) + list( APPEND testing_all_cpp ${filename} ) + endif() + endforeach() ++set(testing_all_cpp "") + foreach( TEST ${testing_all_cpp} ) + string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} ) + string( REGEX REPLACE "testing/" "" EXE ${EXE} ) + #message( "${TEST} --> ${EXE}" ) +- add_executable( ${EXE} ${TEST} ) ++ add_executable( ${EXE} EXCLUDE_FROM_ALL ${TEST} ) + target_link_libraries( ${EXE} tester lapacktest magma ) + list( APPEND testing ${EXE} ) + endforeach() +@@ -749,6 +750,7 @@ endif() + + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${SPARSE_TEST_DIR}" ) + cmake_policy( SET CMP0037 OLD) ++set(sparse_testing_all "") + foreach( TEST ${sparse_testing_all} ) + string( REGEX REPLACE "\\.(cpp|f90|F90)" "" EXE ${TEST} ) + string( REGEX REPLACE "${SPARSE_TEST_DIR}/" "" EXE ${EXE} ) diff --git a/ports/magma/portfile.cmake b/ports/magma/portfile.cmake new file mode 100644 index 00000000000000..fc117d65588585 --- /dev/null +++ b/ports/magma/portfile.cmake @@ -0,0 +1,54 @@ + +set(opts "") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(opts + -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON + -DCMAKE_CUDA_SEPARABLE_COMPILATION:BOOL=OFF + ) +endif() + +vcpkg_download_distfile( + dist_file + URLS https://icl.utk.edu/projectsfiles/magma/downloads/magma-${VERSION}.tar.gz + FILENAME magma-${VERSION}.tar.gz + SHA512 7ab52ad09f452f7b997da573f74465d5bc8c83392f724747b131a7015b1445c457defdb59ae7a2fd4930e2cdc5bce3c7b99a069f04db1752a5df36ddc6e84987 +) + +vcpkg_extract_source_archive( + src_path + ARCHIVE "${dist_file}" + PATCHES + disable-openmp-msvc.patch + no-tests.patch + clang-cuda.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${src_path}" + OPTIONS + -DMAGMA_ENABLE_CUDA=ON + -DMAGMA_ENABLE_HIP=OFF # HIP is backend and seems additive?! + -DUSE_FORTRAN=OFF + ${opts} +) + +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() + +file(READ "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/magma.pc" contents) +string(REGEX REPLACE "Cflags: [^\n]+" "Cflags: -I\${includedir}" contents "${contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/magma.pc" "${contents}") + +if(NOT VCPKG_BUILD_TYPE) + file(READ "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/magma.pc" contents) + string(REGEX REPLACE "Cflags: [^\n]+" "Cflags: -I\${includedir}" contents "${contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/magma.pc" "${contents}") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +vcpkg_install_copyright(FILE_LIST "${src_path}/COPYRIGHT") diff --git a/ports/magma/vcpkg.json b/ports/magma/vcpkg.json new file mode 100644 index 00000000000000..eec7bc6a8665be --- /dev/null +++ b/ports/magma/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "magma", + "version": "2.7.2", + "description": "Matrix Algebra on GPU and Multi-core Architectures (MAGMA) is a collection of next-generation linear algebra libraries for heterogeneous computing", + "homepage": "https://icl.utk.edu/magma/", + "license": null, + "dependencies": [ + "blas", + "cuda", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index b2d7633a8eb9e7..84888e10949f0b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -679,6 +679,7 @@ log4cpp:x64-linux=fail # dynamic exception specifications loguru:arm-neon-android=fail loguru:arm64-android=fail loguru:x64-android=fail +magma:x64-linux=fail mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index e5f01355e2cd31..5a983f0b30db43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5400,6 +5400,10 @@ "baseline": "2019-09-02", "port-version": 3 }, + "magma": { + "baseline": "2.7.2", + "port-version": 0 + }, "magnum": { "baseline": "2020.06", "port-version": 17 diff --git a/versions/m-/magma.json b/versions/m-/magma.json new file mode 100644 index 00000000000000..29a77b62f926a6 --- /dev/null +++ b/versions/m-/magma.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "44b519ef789c70ffb247ac2fc1686038b0616515", + "version": "2.7.2", + "port-version": 0 + } + ] +} From 1c6363670a10eb353d45bc14b16c1f78c261918e Mon Sep 17 00:00:00 2001 From: miyanyan <40262194+miyanyan@users.noreply.github.com> Date: Sat, 20 Jan 2024 03:55:49 +0800 Subject: [PATCH 0837/1039] [proxy] update to 2.1.2 (#36254) * [proxy] update to 2.1.2 * [proxy] update versions --- ports/proxy/portfile.cmake | 2 +- ports/proxy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/proxy.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/proxy/portfile.cmake b/ports/proxy/portfile.cmake index 660460524b3873..f798435cfe40b9 100644 --- a/ports/proxy/portfile.cmake +++ b/ports/proxy/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/proxy REF ${VERSION} - SHA512 4a92584c7bddc52593998c8c4f058f03ea7933dcf8e98db27c65b0dc7311937fd1f9139600b64e802c6c6ea7e78089948dd622243332076f0ea5812b6b2bf990 + SHA512 901815cd4456ce73d129311c8bf81ab7c5d87f290893ad47698b632c7d31c8648e9616975c942d6599d906b073452aae6fcdeffaee8f5b790febaab8a7fa4a6b HEAD_REF main ) diff --git a/ports/proxy/vcpkg.json b/ports/proxy/vcpkg.json index 700427a1a3dbbb..2598c916b688e5 100644 --- a/ports/proxy/vcpkg.json +++ b/ports/proxy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxy", - "version": "2.1.0", + "version": "2.1.2", "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 5a983f0b30db43..ba9f73b4c0e153 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6841,7 +6841,7 @@ "port-version": 0 }, "proxy": { - "baseline": "2.1.0", + "baseline": "2.1.2", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/proxy.json b/versions/p-/proxy.json index 1f785805afbf6a..c417ac5c355fc9 100644 --- a/versions/p-/proxy.json +++ b/versions/p-/proxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a1c9b5683c080a7ef0e35f968bc912e0fac88d4", + "version": "2.1.2", + "port-version": 0 + }, { "git-tree": "6d6ef205bfb7dac5655566fafba65ebc4df5d961", "version": "2.1.0", From b674f6fe41d0b916020d12f439896192d599856e Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 20 Jan 2024 03:56:09 +0800 Subject: [PATCH 0838/1039] [cargs] update to 1.1.0 (#36248) * [cargs] update to 1.1.0 * [cargs] update to 1.1.0 * pkgconfig fixup --- ports/cargs/portfile.cmake | 5 +++-- ports/cargs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cargs.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/cargs/portfile.cmake b/ports/cargs/portfile.cmake index 6f42c08712c93a..ac9b76fa9568dc 100644 --- a/ports/cargs/portfile.cmake +++ b/ports/cargs/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO likle/cargs - REF v1.0.3 - SHA512 4f82f6857af6ae7bd1263f4c812a770fa3c3f94c84d5a0ba6256289a3d3084cd35b3aca6769241451d2acd57577ccc6638327b5bb70328800e9c3c4f5054f7de + REF "v${VERSION}" + SHA512 936fa94da31b07de27c0278688199705f9fdc55cf248c7a88405c373e5c77eed2a703d9398d3ea80a3a534db3d542898babb49db268d26c5945c4907540ccc1b HEAD_REF master ) @@ -16,6 +16,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cargs) +vcpkg_fixup_pkgconfig() 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/cargs/vcpkg.json b/ports/cargs/vcpkg.json index 6a2d24f67abf8f..303609360e9018 100644 --- a/ports/cargs/vcpkg.json +++ b/ports/cargs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cargs", - "version": "1.0.3", + "version": "1.1.0", "description": "A lightweight cross-platform getopt alternative that works on Linux, Windows and macOS. Command line argument parser library for C/C++. Can be used to parse argv and argc parameters.", "homepage": "https://likle.github.io/cargs/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ba9f73b4c0e153..14241e9c32b2d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1441,7 +1441,7 @@ "port-version": 1 }, "cargs": { - "baseline": "1.0.3", + "baseline": "1.1.0", "port-version": 0 }, "cartographer": { diff --git a/versions/c-/cargs.json b/versions/c-/cargs.json index b25f1fc0fdc126..684fbc95736f3e 100644 --- a/versions/c-/cargs.json +++ b/versions/c-/cargs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88fea433a3287ccd49ae6a5bb168071418fa4469", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "afa520193b882259b02bd2f8646982d340374d2d", "version": "1.0.3", From 6dad517ad648fecb3255707333f22ffcc60841b0 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Fri, 19 Jan 2024 20:56:35 +0100 Subject: [PATCH 0839/1039] [libe57format] Update to 3.0.2 (#36239) --- ports/libe57format/portfile.cmake | 2 +- ports/libe57format/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libe57format.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libe57format/portfile.cmake b/ports/libe57format/portfile.cmake index fb8336fef0bc2d..f213d8691d3cf0 100644 --- a/ports/libe57format/portfile.cmake +++ b/ports/libe57format/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmaloney/libE57Format REF "v${VERSION}" - SHA512 8a788411a7f02c76c6befe96f09f4ac91c87fc0506a543fb64af4d68330c84d84229560128b1ccb64a0463d2529bc5d486b4af81e534710382e189ef9f1f98cd + SHA512 d194dce5cb455da9e27e3e766054ee46ab7ecc140ce05d29da96179de547791a2de866710bc99d9d1a5c1f8e8c963df1ec13aae81e2c4f20f71ad3d2eb1f05ed HEAD_REF master PATCHES prevent_warning_as_errors.diff # see https://github.com/asmaloney/libE57Format/issues/256 diff --git a/ports/libe57format/vcpkg.json b/ports/libe57format/vcpkg.json index c1eb5124dd2c7d..a31dd54ade6b12 100644 --- a/ports/libe57format/vcpkg.json +++ b/ports/libe57format/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libe57format", - "version": "3.0.1", + "version": "3.0.2", "description": "A library to provide read & write support for the E57 file format.", "homepage": "https://github.com/asmaloney/libE57Format", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 14241e9c32b2d4..992b0d782b6e4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4241,7 +4241,7 @@ "port-version": 4 }, "libe57format": { - "baseline": "3.0.1", + "baseline": "3.0.2", "port-version": 0 }, "libebur128": { diff --git a/versions/l-/libe57format.json b/versions/l-/libe57format.json index ae0e8acbb46300..7ef20bf8169381 100644 --- a/versions/l-/libe57format.json +++ b/versions/l-/libe57format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3974e65293fa5a2b211751a766336b7d9f916ace", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "420f72aa03611d2e9c0418eaf2d442d2ae260cfd", "version": "3.0.1", From bbbdfc30f71dce37029a2c78ff55367b35ff4001 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 20 Jan 2024 02:56:53 +0700 Subject: [PATCH 0840/1039] [libbacktrace] Update to commit from 2023-11-30. (#36238) --- ports/libbacktrace/portfile.cmake | 4 ++-- ports/libbacktrace/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libbacktrace.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libbacktrace/portfile.cmake b/ports/libbacktrace/portfile.cmake index 1931568fc7f294..1dfc5784ce04d3 100644 --- a/ports/libbacktrace/portfile.cmake +++ b/ports/libbacktrace/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ianlancetaylor/libbacktrace - REF 4f57c999716847e45505b3df170150876b545088 - SHA512 1df2c9d3c119a2ec7b8b8940bff7ba6d28fe99587f565066ae25c216021431d3c26c8b336c38dd0490165244c66d68f9cba20dfc7836042b62f9d588946be4b5 + REF 14818b7783eeb9a56c3f0fca78cefd3143f8c5f6 + SHA512 d96c337cda6d230b162d983b2ab6ff6643895158f1d6f2e814bf28a2212a0cf46313935c2ed95a4408e6ad1da3c0c1ccb09847cf8b8b2ca6ad299101b8f79dd4 ) vcpkg_configure_make( diff --git a/ports/libbacktrace/vcpkg.json b/ports/libbacktrace/vcpkg.json index 4136d4f6b87108..5b70495e1adcdd 100644 --- a/ports/libbacktrace/vcpkg.json +++ b/ports/libbacktrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libbacktrace", - "version-date": "2021-03-14", - "port-version": 1, + "version-date": "2023-11-30", "description": "The libbacktrace library may be linked into a program or library and used to produce symbolic backtraces.", "homepage": "https://github.com/ianlancetaylor/libbacktrace", "supports": "!windows" diff --git a/versions/baseline.json b/versions/baseline.json index 992b0d782b6e4c..9cdb0a6b37a47b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4113,8 +4113,8 @@ "port-version": 6 }, "libbacktrace": { - "baseline": "2021-03-14", - "port-version": 1 + "baseline": "2023-11-30", + "port-version": 0 }, "libbf": { "baseline": "1.0.0", diff --git a/versions/l-/libbacktrace.json b/versions/l-/libbacktrace.json index 7204869c5acfe2..6c88e1c71c91ed 100644 --- a/versions/l-/libbacktrace.json +++ b/versions/l-/libbacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "273bcea92baf4dde93589d50f1e131e96002c358", + "version-date": "2023-11-30", + "port-version": 0 + }, { "git-tree": "a9544b83bfa32d57ce62d9193a427a246b71f685", "version-date": "2021-03-14", From 541cee663d4c0031b04ea643189731830887a7c1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Sat, 20 Jan 2024 02:57:07 +0700 Subject: [PATCH 0841/1039] [yoga] Update to 2.0.1 (#36234) --- ports/yoga/portfile.cmake | 2 +- ports/yoga/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yoga.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index 41d3fc22d77271..c918a1953d28b5 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga REF "v${VERSION}" - SHA512 0b1a7e4db856845137c0d6f4bf440b0e56a4c288e50446000c4093dd01ef1469100d1ca25a963af3e5f786e1c439b3cca47f4fbf4c28fd87ae7f160a47657f26 + SHA512 54ec9d4cee822d7480bb10f973769b3bc4c408720bfbaf9b8247747ae64ca75dca62b2d53dd4cb29addc9ec99d135d090c0e3e831108ac36e34863bf814448eb HEAD_REF master PATCHES disable_tests.patch diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json index 6e4985df8f91c4..f4cbb39bcd584f 100644 --- a/ports/yoga/vcpkg.json +++ b/ports/yoga/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yoga", - "version": "2.0.0", + "version": "2.0.1", "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9cdb0a6b37a47b..8a3371459968e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9389,7 +9389,7 @@ "port-version": 0 }, "yoga": { - "baseline": "2.0.0", + "baseline": "2.0.1", "port-version": 0 }, "yomm2": { diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index 32b5f584330fc8..a8dccaa402033d 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a388f93a28c77a78787ec7456af92ef63d8f80a2", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "e3693a2905113d25a725c3319740f069a37c60d7", "version": "2.0.0", From 7195f9e3f535cad68d78ebe3cd2a1858e740531e Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 20 Jan 2024 03:58:10 +0800 Subject: [PATCH 0842/1039] [asio] update to 1.29.0 (#36229) * [asio] update to 1.29.0 * [asio] update to 1.29.0 --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 2 +- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 7afa452b8c6410..3a99e5455a968d 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-28-2 - SHA512 435c13f6f14a35bde042c6d86965ec104ae33be0b6a3c156518b29f851ad2b69c67bf760a20932d847e3b171f571bedc541c6a0d0541980aee8558b09e70357f + REF asio-1-29-0 + SHA512 f8df39c5a5e89dcfe4bd37c7e757e44e3e94d9b79d7ab08d1804ad8980993a607070f7e12238ffe3286840cd08c0b3c8e3639d3a1177e5ff795994cbc42a8292 HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 86724d9c9deb70..e6741a20da9007 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio", - "version": "1.28.2", + "version": "1.29.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.28.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index bd0f8bc0928a5e..7ecfc22ec29a4f 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e307fe0a4e0e82f761ef6b6b15dc34f847fae6d", + "version": "1.29.0", + "port-version": 0 + }, { "git-tree": "4c8d95a50172d0fd6bf736540379a37a4ec0a512", "version": "1.28.2", diff --git a/versions/baseline.json b/versions/baseline.json index 8a3371459968e3..920c84e18bc9a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -249,7 +249,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.28.2", + "baseline": "1.29.0", "port-version": 0 }, "asio-grpc": { From 283105571ca86cb6d183d8ee029fe4a00e62ae33 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 19 Jan 2024 12:58:30 -0700 Subject: [PATCH 0843/1039] [c-ares] Update to 1.25.0 (#36223) --- ports/c-ares/fix-uwp.patch | 85 ------------------------------------- ports/c-ares/portfile.cmake | 3 +- ports/c-ares/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/c-ares.json | 5 +++ 5 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 ports/c-ares/fix-uwp.patch diff --git a/ports/c-ares/fix-uwp.patch b/ports/c-ares/fix-uwp.patch deleted file mode 100644 index afc20469b78982..00000000000000 --- a/ports/c-ares/fix-uwp.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a29fef..08ed974 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -225,6 +225,9 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - # Don't define _XOPEN_SOURCE on FreeBSD, it actually reduces visibility instead of increasing it - ELSEIF (WIN32) - LIST (APPEND SYSFLAGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_WIN32_WINNT=0x0600) -+ IF (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") -+ LIST (APPEND SYSFLAGS -DWINRT) -+ ENDIF () - ENDIF () - ADD_DEFINITIONS(${SYSFLAGS}) - -diff --git a/src/lib/ares__addrinfo_localhost.c b/src/lib/ares__addrinfo_localhost.c -index 7940ecd..aacfa52 100644 ---- a/src/lib/ares__addrinfo_localhost.c -+++ b/src/lib/ares__addrinfo_localhost.c -@@ -131,7 +131,7 @@ static int ares__system_loopback_addrs(int aftype, - unsigned short port, - struct ares_addrinfo_node **nodes) - { --#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(__WATCOMC__) -+#if defined(_WIN32) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600 && !defined(__WATCOMC__) && !defined(WINRT) - PMIB_UNICASTIPADDRESS_TABLE table; - unsigned int i; - int status; -diff --git a/src/lib/ares_getaddrinfo.c b/src/lib/ares_getaddrinfo.c -index bc9f19b..1bb0e15 100644 ---- a/src/lib/ares_getaddrinfo.c -+++ b/src/lib/ares_getaddrinfo.c -@@ -467,8 +467,10 @@ static int file_lookup(struct host_query *hquery) - RegCloseKey(hkeyHosts); - } - } -+#ifndef WINRT - else if (platform == WIN_9X) - GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH); -+#endif - else - return ARES_ENOTFOUND; - -diff --git a/src/lib/ares_gethostbyaddr.c b/src/lib/ares_gethostbyaddr.c -index c62d230..6d47328 100644 ---- a/src/lib/ares_gethostbyaddr.c -+++ b/src/lib/ares_gethostbyaddr.c -@@ -194,8 +194,10 @@ static int file_lookup(struct ares_addr *addr, struct hostent **host) - RegCloseKey(hkeyHosts); - } - } -+#ifndef WINRT - else if (platform == WIN_9X) - GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH); -+#endif - else - return ARES_ENOTFOUND; - -diff --git a/src/lib/ares_gethostbyname.c b/src/lib/ares_gethostbyname.c -index 8c71cc6..3954244 100644 ---- a/src/lib/ares_gethostbyname.c -+++ b/src/lib/ares_gethostbyname.c -@@ -278,8 +278,10 @@ static int file_lookup(const char *name, int family, struct hostent **host) - RegCloseKey(hkeyHosts); - } - } -+#ifndef WINRT - else if (platform == WIN_9X) - GetWindowsDirectoryA(PATH_HOSTS, MAX_PATH); -+#endif - else - return ARES_ENOTFOUND; - -diff --git a/src/lib/ares_init.c b/src/lib/ares_init.c -index 3f9cec6..63143e0 100644 ---- a/src/lib/ares_init.c -+++ b/src/lib/ares_init.c -@@ -745,7 +745,7 @@ static ULONG getBestRouteMetric(IF_LUID * const luid, /* Can't be const :( */ - const ULONG interfaceMetric) - { - /* On this interface, get the best route to that destination. */ --#if defined(__WATCOMC__) -+#if defined(__WATCOMC__) || defined(WINRT) - /* OpenWatcom's builtin Windows SDK does not have a definition for - * MIB_IPFORWARD_ROW2, and also does not allow the usage of SOCKADDR_INET - * as a variable. Let's work around this by returning the worst possible diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index f7ede9ded904b9..6ce7b5e7380eb3 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -7,11 +7,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares REF "cares-${_c_ares_version_major}_${_c_ares_version_minor}_${_c_ares_version_patch}" - SHA512 73b5ee9d7e5ada6dd95dc32606821ea1307f30552242491e738f673d1ab9de1fdb3360d7a67c66a4a801b0e81ffb7382bfd93dbca836460dae515dd631ec6b91 + SHA512 a99ca6066490ef31b37f6be12f9fa1d7599c3736c04c8df50a4a0d2e489c99c1c776028fcfec4e6029c8aa5845f3bede364cceb39cd95b2689305d23277bdd8d HEAD_REF main PATCHES avoid-docs.patch - fix-uwp.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index 5994ebf7864ceb..93efa8c48d4900 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,6 +1,6 @@ { "name": "c-ares", - "version-semver": "1.19.1", + "version-semver": "1.25.0", "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", "license": "MIT-CMU", diff --git a/versions/baseline.json b/versions/baseline.json index 920c84e18bc9a5..e6ec33b4b714c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1381,7 +1381,7 @@ "port-version": 5 }, "c-ares": { - "baseline": "1.19.1", + "baseline": "1.25.0", "port-version": 0 }, "c-dbg-macro": { diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index f88c03adb60232..15bd1bdf123281 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79f168b5491191bf701a2683c2352c67d664e99a", + "version-semver": "1.25.0", + "port-version": 0 + }, { "git-tree": "55836d9576708f8126f2070e2a698afe72f5f948", "version-semver": "1.19.1", From 564e69a906940b89aef4144510d79a7fc83af2cb Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 20 Jan 2024 03:58:51 +0800 Subject: [PATCH 0844/1039] [botan] Update to 3.2.0 (#36211) * update to 3.2.0 * update version * fix android * update version * fix patch * update verseion --- ports/botan/embed-debug-info.patch | 6 +++--- ports/botan/fix_android.patch | 13 +++++++++++++ ports/botan/portfile.cmake | 3 ++- ports/botan/vcpkg.json | 3 +-- versions/b-/botan.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 ports/botan/fix_android.patch diff --git a/ports/botan/embed-debug-info.patch b/ports/botan/embed-debug-info.patch index 09a17202e0dd17..840f6e73269076 100644 --- a/ports/botan/embed-debug-info.patch +++ b/ports/botan/embed-debug-info.patch @@ -1,11 +1,11 @@ diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt -index 2306a4485..977e2e958 100644 +index 64b6eae..66258ca 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt -@@ -17,10 +17,10 @@ optimization_flags "/O2 /Oi" +@@ -20,10 +20,10 @@ optimization_flags "/O2 /Oi" size_optimization_flags "/O1 /Os" - # for debug info in the object file: + # for debug info in the object file (required if using sccache): -#debug_info_flags "/Z7" +debug_info_flags "/Z7" diff --git a/ports/botan/fix_android.patch b/ports/botan/fix_android.patch new file mode 100644 index 00000000000000..a8b562861ad39f --- /dev/null +++ b/ports/botan/fix_android.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/utils/prefetch.cpp b/src/lib/utils/prefetch.cpp +index 40786b3..e0d5239 100644 +--- a/src/lib/utils/prefetch.cpp ++++ b/src/lib/utils/prefetch.cpp +@@ -12,7 +12,7 @@ + namespace Botan { + + uint64_t prefetch_array_raw(size_t bytes, const void* arrayv) noexcept { +-#if defined(__cpp_lib_hardware_interference_size) ++#if defined(__cpp_lib_hardware_interference_size) && (!defined(BOTAN_TARGET_OS_IS_ANDROID) || defined(NDK_IS_NEWER_THAN_25)) + const size_t cache_line_size = std::hardware_destructive_interference_size; + #else + // We arbitrarily use a 64 byte cache line, which is by far the most diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index c22752e397b823..f788e8b42570be 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -2,13 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan REF "${VERSION}" - SHA512 fb6be83b0292bb28319061721fe10ea16776a942b381780a8d4bece9b86e3525a0f533e3572e54c6498b08c4dc421a746bff8f0302f3ea0d810e266811331a65 + SHA512 13f40635fc92b00b9392aa8ed96b5825f0cc8147d51337e2c225e0f29d0428732293190aa5fb2a7d2c5e7d57db748ae0fbed4536dee8af00e8d6fd405e784e1d HEAD_REF master PATCHES embed-debug-info.patch pkgconfig.patch verbose-install.patch configure-zlib.patch + fix_android.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/configure" DESTINATION "${SOURCE_PATH}") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 8c9fe75aee7c8f..25020a9c4674a9 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,6 @@ { "name": "botan", - "version": "3.1.1", - "port-version": 1, + "version": "3.2.0", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 012914ab7c153a..a2fa214d3ed259 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3482b0255e093b6d091aa4aff11992c89ec45d6e", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "c031a70866fae7751496d7edfd01caad2773dd08", "version": "3.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index e6ec33b4b714c1..f86f3c5be1918c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1301,8 +1301,8 @@ "port-version": 0 }, "botan": { - "baseline": "3.1.1", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", From 0e8929718e8069b3582a81083fe4cf5b1870c4ae Mon Sep 17 00:00:00 2001 From: Gubaydullin Nurislam <108585608+tonitaga@users.noreply.github.com> Date: Fri, 19 Jan 2024 23:00:27 +0300 Subject: [PATCH 0845/1039] [mtlt] Add new port (#36105) * add mtl library new port * add mtl library new port * add mtl library new port * [mtl] new port * Update version database * Update version database * Update version database * Update ports/mtl/vcpkg.json Co-authored-by: Kai Pastor * Update ports/mtl/portfile.cmake Co-authored-by: Kai Pastor * add mlt-config.cmake autogen * Update version database * Quick Fix CE with MSVC compiler * Update version database * Update ports/mtl/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/mtl/usage Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Remove -DMTL-CMAKE-DIR macro because is not necessary * Update version database * Update ports/mtl/usage Co-authored-by: Kai Pastor * Update ports/mtl/portfile.cmake Co-authored-by: Kai Pastor * Update ports/mtl/portfile.cmake Co-authored-by: Kai Pastor * Update database version * Remove white spaces and add line break * Update database version * end line * version * add new version of mtl * Update database version * Rename port name from mtl to mtlt (last 't' is tonitaga) * Update database version * Update database version --------- Co-authored-by: Kai Pastor Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <1433351828@qq.com> --- ports/mtlt/portfile.cmake | 23 +++++++++++++++++++++++ ports/mtlt/usage | 4 ++++ ports/mtlt/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/m-/mtlt.json | 9 +++++++++ 5 files changed, 57 insertions(+) create mode 100644 ports/mtlt/portfile.cmake create mode 100644 ports/mtlt/usage create mode 100644 ports/mtlt/vcpkg.json create mode 100644 versions/m-/mtlt.json diff --git a/ports/mtlt/portfile.cmake b/ports/mtlt/portfile.cmake new file mode 100644 index 00000000000000..45dd7ac6a9b172 --- /dev/null +++ b/ports/mtlt/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_BUILD_TYPE release) # Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tonitaga/MTLT + REF 8e30e6636b06ad008082e22f37e0d79873142e1b + SHA512 2addaa4f84037a14431b20734fe5ca1ea11c4d9d1a0ddf82a16b9efaacbbac3873038bd16f93ba94288559585ae76d12884166931c91a214a3e3ed0cecea6b3b + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "mtlt" CONFIG_PATH "lib/cmake/mtlt") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +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/mtlt/usage b/ports/mtlt/usage new file mode 100644 index 00000000000000..ea8d6e60ac55d0 --- /dev/null +++ b/ports/mtlt/usage @@ -0,0 +1,4 @@ +The package mtlt provides CMake targets: + + find_package(mtlt REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE mtlt::mtlt) diff --git a/ports/mtlt/vcpkg.json b/ports/mtlt/vcpkg.json new file mode 100644 index 00000000000000..4f29fc3376c659 --- /dev/null +++ b/ports/mtlt/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "mtlt", + "version": "1.0.0", + "description": "Tonitaga 2024. MTLT is a header-only math matrix library that allows you to do compile-time calculations, perform atomic operations, and contains all the basic operations on matrices. The library is written in STL style, supports joint work with STL algorithms. Since C++11", + "homepage": "https://github.com/tonitaga/MTLT", + "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 f86f3c5be1918c..41aa5addb48c39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5816,6 +5816,10 @@ "baseline": "1.0.2", "port-version": 5 }, + "mtlt": { + "baseline": "1.0.0", + "port-version": 0 + }, "mujoco": { "baseline": "2.3.2", "port-version": 1 diff --git a/versions/m-/mtlt.json b/versions/m-/mtlt.json new file mode 100644 index 00000000000000..dce0e7a53f6708 --- /dev/null +++ b/versions/m-/mtlt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8f0c1e8f63efeb1e1cd7c6484837539caa0dc1d1", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 8c088486c8a2c55e30ec6e11654e19898da3396a Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 20 Jan 2024 04:25:50 +0800 Subject: [PATCH 0846/1039] [libdatachannel] Delete the redundant dependency libSRTP in the config file (#36191) * Fix libsrtp not found * update version * add dep * update version * update version --- ports/libdatachannel/portfile.cmake | 2 +- ports/libdatachannel/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index eb4b311eb1c247..9a9f22fc7715b6 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -47,7 +47,7 @@ find_dependency(Threads) find_dependency(OpenSSL) find_dependency(LibJuice) find_dependency(plog CONFIG) -find_dependency(libSRTP CONFIG) +find_dependency(unofficial-usrsctp CONFIG) ${DATACHANNEL_CONFIG}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 56fb4795447e74..0f6c8660c355a8 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.19.5", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 41aa5addb48c39..79b231bfb3091e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4194,7 +4194,7 @@ }, "libdatachannel": { "baseline": "0.19.5", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.13", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 87b2c9c46f8ad4..8f1bca0e096de3 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b2d69b30260c468757b11bea046e2dabcba0516", + "version-semver": "0.19.5", + "port-version": 1 + }, { "git-tree": "1a9fb42ed13d38aae4df0b774cde05e26dcea241", "version-semver": "0.19.5", From 4b4f83d12bc357cb7cd33bd74065a205de88ead3 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:26:25 -0800 Subject: [PATCH 0847/1039] [azure-data-tables-cpp] Update to 1.0.0-beta.1 (#36204) ## 1.0.0-beta.1 (2024-01-16) ### Features Added - Initial release. --- ports/azure-data-tables-cpp/portfile.cmake | 32 ++++++++++++++++++++ ports/azure-data-tables-cpp/vcpkg.json | 34 ++++++++++++++++++++++ versions/a-/azure-data-tables-cpp.json | 9 ++++++ versions/baseline.json | 4 +++ 4 files changed, 79 insertions(+) create mode 100644 ports/azure-data-tables-cpp/portfile.cmake create mode 100644 ports/azure-data-tables-cpp/vcpkg.json create mode 100644 versions/a-/azure-data-tables-cpp.json diff --git a/ports/azure-data-tables-cpp/portfile.cmake b/ports/azure-data-tables-cpp/portfile.cmake new file mode 100644 index 00000000000000..c9dfbb6bddc8af --- /dev/null +++ b/ports/azure-data-tables-cpp/portfile.cmake @@ -0,0 +1,32 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-data-tables_1.0.0-beta.1 + SHA512 64c887337e593ffc95ab5d5afb25b283255dafbf8ddce2b3207c928dee9277737d3713e02feb3991305ecf89243bf82753843c4a7c127b991a332efcaee875b3 +) + +if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/tables/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/sdk/_") + file(REMOVE_RECURSE "${SOURCE_PATH}/_") + + file(RENAME "${SOURCE_PATH}/sdk/tables/azure-data-tables" "${SOURCE_PATH}/sdk/tables/_") + file(RENAME "${SOURCE_PATH}/sdk/tables" "${SOURCE_PATH}/sdk/_") + file(RENAME "${SOURCE_PATH}/sdk" "${SOURCE_PATH}/_") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/_/_/_" + OPTIONS + -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=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-data-tables-cpp/vcpkg.json b/ports/azure-data-tables-cpp/vcpkg.json new file mode 100644 index 00000000000000..3ba80bb649006a --- /dev/null +++ b/ports/azure-data-tables-cpp/vcpkg.json @@ -0,0 +1,34 @@ +{ + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], + "name": "azure-data-tables-cpp", + "version-semver": "1.0.0-beta.1", + "description": [ + "Microsoft Azure Data Tables SDK for C++", + "This library provides Azure Data Tables SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/tables/azure-data-tables", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.11.0" + }, + { + "name": "libxml2", + "default-features": false, + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-data-tables-cpp.json b/versions/a-/azure-data-tables-cpp.json new file mode 100644 index 00000000000000..61ed6026d843d2 --- /dev/null +++ b/versions/a-/azure-data-tables-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0b296b42b6c89f3400486fbf366d34ebaea13530", + "version-semver": "1.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 79b231bfb3091e..3dfa344bd91638 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -428,6 +428,10 @@ "baseline": "1.0.0-beta.4", "port-version": 1 }, + "azure-data-tables-cpp": { + "baseline": "1.0.0-beta.1", + "port-version": 0 + }, "azure-identity-cpp": { "baseline": "1.6.0", "port-version": 0 From 10d497f148d40957251dcbee35e71c9d497b209f Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:27:36 -0800 Subject: [PATCH 0848/1039] [azure-*-cpp] Append note to manifest files (#36222) Co-authored-by: Anton Kolesnyk --- ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake | 4 ++++ ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json | 6 +++++- .../portfile.cmake | 3 +++ .../vcpkg.json | 5 +++++ ports/azure-security-attestation-cpp/portfile.cmake | 4 ++++ ports/azure-security-attestation-cpp/vcpkg.json | 6 +++++- versions/a-/azure-core-tracing-opentelemetry-cpp.json | 5 +++++ .../azure-messaging-eventhubs-checkpointstore-blob-cpp.json | 5 +++++ versions/a-/azure-security-attestation-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index 88a9bf04856c78..c1761559754fd8 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -1,3 +1,6 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index c678ba9de6fed1..9d9a6e96c4382c 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -1,7 +1,11 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "1.0.0-beta.4", - "port-version": 1, + "port-version": 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." diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake index 0cb708f1afb333..465381572d9b0e 100644 --- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/portfile.cmake @@ -1,3 +1,6 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp diff --git a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json index 77fe967455bfc6..d2d0d949ee3e99 100644 --- a/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json +++ b/ports/azure-messaging-eventhubs-checkpointstore-blob-cpp/vcpkg.json @@ -1,6 +1,11 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp", "version-semver": "1.0.0-beta.1", + "port-version": 1, "description": [ "Microsoft Azure Messaging Event Hubs Blob Checkpoint Store SDK for C++", "This library provides an Azure-Storage-Blobs based implementation of an Azure Messaging Event Hubs SDK Checkpoint Store." diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake index f1fc4d6680f31f..949d859d4a489f 100644 --- a/ports/azure-security-attestation-cpp/portfile.cmake +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -1,3 +1,6 @@ +# NOTE: All changes made to this file will get overwritten by the next port release. +# Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp. + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp @@ -19,6 +22,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/_/_/_" OPTIONS -DWARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json index 4ec72e8e770e58..073520ff183caa 100644 --- a/ports/azure-security-attestation-cpp/vcpkg.json +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -1,7 +1,11 @@ { + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-attestation-cpp", "version-semver": "1.1.0", - "port-version": 1, + "port-version": 2, "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 40978a276573d1..5b216d05909150 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": "0fb3475fbd40be762b7bb9a1a85fef10eb4af9a3", + "version-semver": "1.0.0-beta.4", + "port-version": 2 + }, { "git-tree": "001d1fc3f1ecbaa77894355634624bc5a7c7d7f2", "version-semver": "1.0.0-beta.4", diff --git a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json index 0d16a7f4acd4c7..74335cde7b68dd 100644 --- a/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json +++ b/versions/a-/azure-messaging-eventhubs-checkpointstore-blob-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c7021f43e5786d7be87b935868e4c283d72755", + "version-semver": "1.0.0-beta.1", + "port-version": 1 + }, { "git-tree": "9289b19329d8fc1b12ef5a71d1cf2d743a32cc2a", "version-semver": "1.0.0-beta.1", diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json index 7ac326180f3a7f..61f551f7d2d710 100644 --- a/versions/a-/azure-security-attestation-cpp.json +++ b/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ece7b864d0d0ab18ba081e5695efea98c5aa2bdf", + "version-semver": "1.1.0", + "port-version": 2 + }, { "git-tree": "812294d664f9765544343cfc8b5265edfb88d061", "version-semver": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3dfa344bd91638..fc548604172749 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -426,7 +426,7 @@ }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.4", - "port-version": 1 + "port-version": 2 }, "azure-data-tables-cpp": { "baseline": "1.0.0-beta.1", @@ -450,7 +450,7 @@ }, "azure-messaging-eventhubs-checkpointstore-blob-cpp": { "baseline": "1.0.0-beta.1", - "port-version": 0 + "port-version": 1 }, "azure-messaging-eventhubs-cpp": { "baseline": "1.0.0-beta.5", @@ -458,7 +458,7 @@ }, "azure-security-attestation-cpp": { "baseline": "1.1.0", - "port-version": 1 + "port-version": 2 }, "azure-security-keyvault-administration-cpp": { "baseline": "4.0.0-beta.4", From 0258ea3338f34afda8d7c9a9fe2deeac5a4346af Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 19 Jan 2024 21:29:00 +0100 Subject: [PATCH 0849/1039] [netgen] occ 7.8 fix (#36259) * remove accidental , from patch * [netgen] fix build with occ 7.8 * bump port version * v db --- ports/netgen/git-ver.patch | 2 +- ports/netgen/occ-78.patch | 159 ++++++++++++++++++++++++++++++++++++ ports/netgen/portfile.cmake | 1 + ports/netgen/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/netgen.json | 5 ++ 6 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 ports/netgen/occ-78.patch diff --git a/ports/netgen/git-ver.patch b/ports/netgen/git-ver.patch index f1cfe73260e6cb..710b6d60c7db4c 100644 --- a/ports/netgen/git-ver.patch +++ b/ports/netgen/git-ver.patch @@ -7,7 +7,7 @@ index 6e9f4cc..bf92061 100644 add_custom_target(ng_generate_version_file ${CMAKE_COMMAND} - -DBDIR=${CMAKE_CURRENT_BINARY_DIR} -+ -DBDIR=${CMAKE_CURRENT_BINARY_DIR}, ++ -DBDIR=${CMAKE_CURRENT_BINARY_DIR} + -DNETGEN_VERSION_GIT=${NETGEN_VERSION_GIT} -P ${CMAKE_CURRENT_LIST_DIR}/cmake/generate_version_file.cmake ) diff --git a/ports/netgen/occ-78.patch b/ports/netgen/occ-78.patch new file mode 100644 index 00000000000000..5079bd1c4ad3f8 --- /dev/null +++ b/ports/netgen/occ-78.patch @@ -0,0 +1,159 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0846f39bd..f7516afa4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -372,25 +372,20 @@ if (USE_OCC) + TKGeomAlgo + TKGeomBase + TKHLR +- TKIGES + TKLCAF + TKMath + TKMesh + TKOffset + TKPrim +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase +- TKSTL ++ TKDESTL + TKService + TKShHealing + TKTopAlgo + TKV3d + TKVCAF + TKXCAF +- TKXDEIGES +- TKXDESTEP ++ TKDEIGES ++ TKDESTEP + TKXSBase + TKernel + ) +diff --git a/libsrc/occ/Partition_Loop3d.hxx b/libsrc/occ/Partition_Loop3d.hxx +index e1716691c..e8a434911 100644 +--- a/libsrc/occ/Partition_Loop3d.hxx ++++ b/libsrc/occ/Partition_Loop3d.hxx +@@ -10,27 +10,16 @@ + #ifndef _Partition_Loop3d_HeaderFile + #define _Partition_Loop3d_HeaderFile + +-#ifndef _TopTools_ListOfShape_HeaderFile +-#include +-#endif +-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile +-#include +-#endif +-#ifndef _Standard_Boolean_HeaderFile ++#include + #include +-#endif +-#ifndef _Standard_Real_HeaderFile + #include +-#endif +-#ifndef _Standard_Version_HeaderFile +-#include +-#endif ++#include ++#include + +-#if OCC_VERSION_HEX < 0x070000 ++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799 + #else + #include + #include +- #include + #endif + + class TopoDS_Shape; +@@ -38,6 +27,8 @@ class TopoDS_Shape; + #if OCC_VERSION_HEX < 0x070000 + class TopTools_ListOfShape; + class TopTools_MapOfOrientedShape; ++#else ++#include + #endif + + class TopoDS_Edge; +diff --git a/libsrc/occ/occ_edge.cpp b/libsrc/occ/occ_edge.cpp +index 0c907d78b..fd64c9a42 100644 +--- a/libsrc/occ/occ_edge.cpp ++++ b/libsrc/occ/occ_edge.cpp +@@ -55,7 +55,11 @@ namespace netgen + + size_t OCCEdge::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return edge.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(edge); ++#endif + } + + void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const +diff --git a/libsrc/occ/occ_face.cpp b/libsrc/occ/occ_face.cpp +index 239982aa8..ea4dd15b4 100644 +--- a/libsrc/occ/occ_face.cpp ++++ b/libsrc/occ/occ_face.cpp +@@ -32,7 +32,11 @@ namespace netgen + + size_t OCCFace::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return face.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(face); ++#endif + } + + Point<3> OCCFace::GetCenter() const +diff --git a/libsrc/occ/occ_solid.hpp b/libsrc/occ/occ_solid.hpp +index d598de4a2..66f28d73a 100644 +--- a/libsrc/occ/occ_solid.hpp ++++ b/libsrc/occ/occ_solid.hpp +@@ -16,8 +16,11 @@ namespace netgen + OCCSolid(TopoDS_Shape dshape) + : solid(TopoDS::Solid(dshape)) + { } +- ++#if OCC_VERSION_HEX < 0x070800 + size_t GetHash() const override { return solid.HashCode(std::numeric_limits::max()); } ++#else ++ size_t GetHash() const override { return std::hash{}(solid); } ++#endif + }; + } + +diff --git a/libsrc/occ/occ_vertex.cpp b/libsrc/occ/occ_vertex.cpp +index 6e83c8944..be8e38732 100644 +--- a/libsrc/occ/occ_vertex.cpp ++++ b/libsrc/occ/occ_vertex.cpp +@@ -19,6 +19,10 @@ namespace netgen + + size_t OCCVertex::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return vertex.HashCode(std::numeric_limits::max()); ++#else ++ return std::hash{}(vertex); ++#endif + } + } +diff --git a/libsrc/occ/occgeom.cpp b/libsrc/occ/occgeom.cpp +index bc0383f99..826134ba0 100644 +--- a/libsrc/occ/occgeom.cpp ++++ b/libsrc/occ/occgeom.cpp +@@ -1716,8 +1716,12 @@ namespace netgen + + // enumerate shapes and archive only integers + auto my_hash = [](const TopoDS_Shape & key) { ++#if OCC_VERSION_HEX < 0x070800 + auto occ_hash = key.HashCode(1<<31UL); + return std::hash()(occ_hash); ++#else ++ return std::hash{}(key); ++#endif + }; + TopTools_IndexedMapOfShape shape_map; + Array shape_list; diff --git a/ports/netgen/portfile.cmake b/ports/netgen/portfile.cmake index a01a3aa3e9f7e2..7bc005f60f15ff 100644 --- a/ports/netgen/portfile.cmake +++ b/ports/netgen/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( cgns-scoped-enum.patch downstream-fixes.patch add_filesystem.patch + occ-78.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/netgen/vcpkg.json b/ports/netgen/vcpkg.json index 7ca38d98a31d17..7078bbe7b5e88f 100644 --- a/ports/netgen/vcpkg.json +++ b/ports/netgen/vcpkg.json @@ -1,6 +1,7 @@ { "name": "netgen", "version": "6.2.2307", + "port-version": 1, "description": "NETGEN is an automatic 3d tetrahedral mesh generator. It accepts input from constructive solid geometry (CSG) or boundary representation (BRep) from STL file format. The connection to a geometry kernel allows the handling of IGES and STEP files. NETGEN contains modules for mesh optimization and hierarchical mesh refinement.", "homepage": "https://ngsolve.org/", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index fc548604172749..da195e2eb7162b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5966,7 +5966,7 @@ }, "netgen": { "baseline": "6.2.2307", - "port-version": 0 + "port-version": 1 }, "nethost": { "baseline": "8.0.0", diff --git a/versions/n-/netgen.json b/versions/n-/netgen.json index 0588fe206bb818..176f0e167e2147 100644 --- a/versions/n-/netgen.json +++ b/versions/n-/netgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d4a861ae09a1f970a8a0e100f63ab46bc601d93", + "version": "6.2.2307", + "port-version": 1 + }, { "git-tree": "9326bf9f2364487f83d80a4b594e469db805a511", "version": "6.2.2307", From 915ebafa4b9cf02906ca591c6fd94d61bf351bd6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 19 Jan 2024 21:30:11 +0100 Subject: [PATCH 0850/1039] [python3] Fix lld-link and add port config for python site (#36245) * [python3] remove duplicated symbols for lld-link and add port config * v db --- ports/python3/0016-undup-ffi-symbols.patch | 14 ++++++++++++++ ports/python3/portfile.cmake | 10 ++++++++++ ports/python3/vcpkg-port-config.cmake | 12 ++++++++++++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 6 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ports/python3/0016-undup-ffi-symbols.patch create mode 100644 ports/python3/vcpkg-port-config.cmake diff --git a/ports/python3/0016-undup-ffi-symbols.patch b/ports/python3/0016-undup-ffi-symbols.patch new file mode 100644 index 00000000000000..7faec9f9b8c377 --- /dev/null +++ b/ports/python3/0016-undup-ffi-symbols.patch @@ -0,0 +1,14 @@ +diff --git a/Modules/_ctypes/malloc_closure.c b/Modules/_ctypes/malloc_closure.c +index 788bae6a9..3938f79db 100644 +--- a/Modules/_ctypes/malloc_closure.c ++++ b/Modules/_ctypes/malloc_closure.c +@@ -11,6 +11,9 @@ + #endif + #include "ctypes.h" + ++#undef Py_ffi_closure_alloc ++#undef Py_ffi_closure_free ++ + /* BLOCKSIZE can be adjusted. Larger blocksize will take a larger memory + overhead, but allocate less blocks from the system. It may be that some + systems have a limit of how many mmap'd blocks can be open. diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 5a498e37156185..cc2562dae7c145 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -33,6 +33,7 @@ set(PATCHES 0012-force-disable-modules.patch 0014-fix-get-python-inc-output.patch 0015-dont-use-WINDOWS-def.patch + 0016-undup-ffi-symbols.patch # Required for lld-link. 0018-fix-sysconfig-include.patch ) @@ -375,3 +376,12 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) replace_dirs_in_config_file("${python_config_file}") endif() endif() + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/python3/Lib/distutils/command/build_ext.py" "'libs'" "'../../lib'") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/python3.${PYTHON_VERSION_MINOR}/distutils/command/build_ext.py" "'libs'" "'../../lib'") + file(COPY_FILE "${CURRENT_PACKAGES_DIR}/tools/python3/python3.${PYTHON_VERSION_MINOR}" "${CURRENT_PACKAGES_DIR}/tools/python3/python3") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/python3/vcpkg-port-config.cmake" @ONLY) \ No newline at end of file diff --git a/ports/python3/vcpkg-port-config.cmake b/ports/python3/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..b3eab36d623eb3 --- /dev/null +++ b/ports/python3/vcpkg-port-config.cmake @@ -0,0 +1,12 @@ +set(PYTHON3_VERSION "@VERSION@") +set(PYTHON3_VERSION_MAJOR "@PYTHON_VERSION_MAJOR@") +set(PYTHON3_VERSION_MINOR "@PYTHON_VERSION_MINOR@") +set(PYTHON3_INCLUDE "include/python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR}") +set(site_base "") +if(VCPKG_TARGET_IS_WINDOWS) + set(site_base "tools/python${PYTHON3_VERSION_MAJOR}/Lib") +else() + set(site_base "lib/python${PYTHON3_VERSION_MAJOR}.${PYTHON3_VERSION_MINOR}") +endif() +set(PYTHON3_SITE "${site_base}/site-packages") + diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 4f32a58cec8834..98052df719b032 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.11.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 da195e2eb7162b..8c5f0e78ee1dc9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6914,7 +6914,7 @@ }, "python3": { "baseline": "3.11.5", - "port-version": 3 + "port-version": 4 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 7fd094a947c7fb..c8f25cfa5fdf63 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "196d8baf56879fd416fbcfb05a7033ea61febf24", + "version": "3.11.5", + "port-version": 4 + }, { "git-tree": "e6acf202b9752a04a0b9557d1ea9e4fa2f427e8d", "version": "3.11.5", From 62c0f522f7035c91fa9ab84bc33ad77d12b5fe14 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Fri, 19 Jan 2024 21:31:22 +0100 Subject: [PATCH 0851/1039] [zeromq] fix warning (#36225) * [zeromq] fix warning * use MAYBE_UNUSED_VARIABLES --- ports/zeromq/portfile.cmake | 12 ++++++------ ports/zeromq/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zeromq.json | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 1636322d754c0d..b07ca41fb79f19 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -13,16 +13,16 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - sodium WITH_LIBSODIUM - draft ENABLE_DRAFTS - websockets ENABLE_WS + sodium WITH_LIBSODIUM + draft ENABLE_DRAFTS + websockets ENABLE_WS websockets-secure WITH_TLS - curve ENABLE_CURVE + curve ENABLE_CURVE ) set(PLATFORM_OPTIONS "") if(VCPKG_TARGET_IS_MINGW) - set(PLATFORM_OPTIONS -DCMAKE_SYSTEM_VERSION=6.0 -DZMQ_HAVE_IPC=0) + list(APPEND PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0" "-DZMQ_HAVE_IPC=0") endif() vcpkg_cmake_configure( @@ -42,9 +42,9 @@ vcpkg_cmake_configure( OPTIONS_DEBUG "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" MAYBE_UNUSED_VARIABLES - USE_PERF_TOOLS CMAKE_REQUIRE_FIND_PACKAGE_GnuTLS WITH_LIBBSD + WITH_PERF_TOOL WITH_TLS ) diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index d460fdcaedb264..a0ec4fef335044 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zeromq", "version": "4.3.5", + "port-version": 1, "description": "The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products", "homepage": "https://github.com/zeromq/libzmq", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8c5f0e78ee1dc9..24f70a58604636 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9426,7 +9426,7 @@ }, "zeromq": { "baseline": "4.3.5", - "port-version": 0 + "port-version": 1 }, "zfp": { "baseline": "1.0.0", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index df515c353884d6..3f898f2fed0b32 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ac6a3ee94fb7235dc37fc7042e8270060c685c1", + "version": "4.3.5", + "port-version": 1 + }, { "git-tree": "7c31f33a815e20807d89d684435dcab872c37d2a", "version": "4.3.5", From 5c2221771aefe2620d6c775fc649f9d27d926616 Mon Sep 17 00:00:00 2001 From: vipcxj Date: Sat, 20 Jan 2024 04:33:24 +0800 Subject: [PATCH 0852/1039] [socket-io-client] Update to latest commit (#36226) * Update socket-io-client to latest commit * update git-tree * update hash * update git-tree * add patch * update git-tree * update patch * update git-tree * Update ports/socket-io-client/fix-build.patch Co-authored-by: Kai Pastor * update git-tree --------- Co-authored-by: Kai Pastor --- ports/socket-io-client/fix-build.patch | 13 +++++++++++++ ports/socket-io-client/portfile.cmake | 6 ++++-- ports/socket-io-client/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 ports/socket-io-client/fix-build.patch diff --git a/ports/socket-io-client/fix-build.patch b/ports/socket-io-client/fix-build.patch new file mode 100644 index 00000000000000..e48c9486cc138c --- /dev/null +++ b/ports/socket-io-client/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9c69d5..f2852c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,7 +19,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + endif() + + # Only do these if this is the main project, and not if it is included through add_subdirectory +-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ++if(0) + # Testing only available if this is the main app + # Note this needs to be done in the main CMakeLists + # since it calls enable_testing, which must be in the diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index cce84be9ddf2fe..645a81a63e594f 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -3,9 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO socketio/socket.io-client-cpp - REF b10474e3eaa6b27e75dbc1382ac9af74fdf3fa85 - SHA512 d0529c1fb293bd0a468d224f14e176fc80226dd665d2a947253beabc8fbe1b0b0a939778bce45a2d8f68d10583920329cf404f41d6fd5ccf2d176cec733e8996 + REF 0dc2f7afea17a0e5bfb5e9b1e6d6f26ab1455cef + SHA512 583cc0c6e392243203e4d10163a1cb5a404497472e684dfbeef7ca9634784a1fe4717f926858eea98aa0ac4356fb503abfbbeb58fcb1dd839c917e9f6ee104b1 HEAD_REF master + PATCHES + fix-build.patch ) vcpkg_cmake_configure( diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index 4540570c5a616d..fad58a1e3f784e 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,6 +1,6 @@ { "name": "socket-io-client", - "version-date": "2023-02-14", + "version-date": "2023-11-11", "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 24f70a58604636..33030e74fe4acb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8045,7 +8045,7 @@ "port-version": 3 }, "socket-io-client": { - "baseline": "2023-02-14", + "baseline": "2023-11-11", "port-version": 0 }, "sockpp": { diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index eb286bda802e6a..96b0a515e6068a 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cb320ec7ddd2f7ec85d78172dae5904564b5e04", + "version-date": "2023-11-11", + "port-version": 0 + }, { "git-tree": "2aa8fb06982abcd0918726ba79bf81edc9000a4b", "version-date": "2023-02-14", From 0a14acf3a10d66ea4665de7b000dc5001fc7438a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 20 Jan 2024 04:39:54 +0800 Subject: [PATCH 0853/1039] [rapidjson] Modify the version of cmake_minimum_required() (#36230) --- ports/rapidjson/portfile.cmake | 3 ++- ports/rapidjson/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 7c7c4e16ddca9e..698fe0d5453700 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -34,10 +34,11 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" _contents) +string(REPLACE "VERSION 3.0" "VERSION 3.5" _contents "${_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}") 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) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index ec17e082f51a79..5d1579f29cd516 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rapidjson", "version-date": "2023-07-17", + "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 33030e74fe4acb..52f6ccff90458f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7410,7 +7410,7 @@ }, "rapidjson": { "baseline": "2023-07-17", - "port-version": 0 + "port-version": 1 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index a335aac74cfdd0..c0a5a6df2ace1d 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3dfe7dca3a1a27564b1fc5a9aea657cd9dae01c", + "version-date": "2023-07-17", + "port-version": 1 + }, { "git-tree": "9da8fa409b1afef5674fe412237db0504cf6156e", "version-date": "2023-07-17", From 7d287dbcb9667bb1336df21969ac7ae0dae07d59 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:40:14 -0800 Subject: [PATCH 0854/1039] [open62541] Fix wrong value of OPEN62541_VERSION (#36235) * [open62541] Fix wrong value of OPEN62541_VERSION * update version * apply suggestion * update version --------- Co-authored-by: Lily Wang --- ports/open62541/portfile.cmake | 2 +- ports/open62541/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/open62541.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 0054a496b63378..fe50e93f4bf496 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} ${OPEN62541_ENCRYPTION_OPTIONS} - -DOPEN62541_VERSION=${VERSION} + "-DOPEN62541_VERSION=v${VERSION}" -DUA_MSVC_FORCE_STATIC_CRT=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 1971d3455c2171..83f402b9ef5171 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,7 +1,7 @@ { "name": "open62541", "version": "1.3.8", - "port-version": 1, + "port-version": 2, "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 52f6ccff90458f..67466f5f6a4406 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6246,7 +6246,7 @@ }, "open62541": { "baseline": "1.3.8", - "port-version": 1 + "port-version": 2 }, "openal-soft": { "baseline": "1.23.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index 08975e611eea94..7d70ebab28117f 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bfbedbf2007596294583ab894f5481d754991f2", + "version": "1.3.8", + "port-version": 2 + }, { "git-tree": "66034a6a77c3169eba0a175a4b67fe2ad3eab48b", "version": "1.3.8", From d0b17dbd7e96387ee5a4041d33bb0cf48cdebb8a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 20 Jan 2024 04:40:34 +0800 Subject: [PATCH 0855/1039] [skia] Fixes build error on x64-linux (#36236) --- ports/skia/add-cstdlib.patch | 12 ++++++++++++ ports/skia/portfile.cmake | 1 + ports/skia/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/skia.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/skia/add-cstdlib.patch diff --git a/ports/skia/add-cstdlib.patch b/ports/skia/add-cstdlib.patch new file mode 100644 index 00000000000000..9c7c1655b9c6b7 --- /dev/null +++ b/ports/skia/add-cstdlib.patch @@ -0,0 +1,12 @@ +diff --git a/src/dawn/common/Mutex.cpp b/src/dawn/common/Mutex.cpp +index b8b891f..84c47af 100644 +--- a/src/dawn/common/Mutex.cpp ++++ b/src/dawn/common/Mutex.cpp +@@ -13,6 +13,7 @@ + // limitations under the License. + + #include "dawn/common/Mutex.h" ++#include + + namespace dawn { + Mutex::~Mutex() = default; diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 77e22253c60312..bdcfd94ea4b54d 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -30,6 +30,7 @@ declare_external_from_git(dawn LICENSE_FILE LICENSE PATCHES dawn-dedup-native-proc-gen.patch + add-cstdlib.patch ) declare_external_from_git(dng_sdk URL "https://android.googlesource.com/platform/external/dng_sdk.git" diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 5fef98a364ef26..8be0e9251ef345 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,7 @@ { "name": "skia", "version": "0.38.2", - "port-version": 3, + "port-version": 4, "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 67466f5f6a4406..1d9935e9051de9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7986,7 +7986,7 @@ }, "skia": { "baseline": "0.38.2", - "port-version": 3 + "port-version": 4 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 4733a4c6ce27a3..60cceb6a08e975 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b33b637ea6bf1d04acc4aac659b0238f9d16a0c1", + "version": "0.38.2", + "port-version": 4 + }, { "git-tree": "35eec017ed472e7061cc38768bb4aa9168464332", "version": "0.38.2", From 15ee6c36b35be3453331a9416ccc5310b0e0c9b1 Mon Sep 17 00:00:00 2001 From: moritz-h <7849248+moritz-h@users.noreply.github.com> Date: Fri, 19 Jan 2024 21:41:42 +0100 Subject: [PATCH 0856/1039] [datraw] Add new port (#36183) * [datraw] new port * header-only --- ports/datraw/portfile.cmake | 14 ++++++++++++++ ports/datraw/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/d-/datraw.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/datraw/portfile.cmake create mode 100644 ports/datraw/vcpkg.json create mode 100644 versions/d-/datraw.json diff --git a/ports/datraw/portfile.cmake b/ports/datraw/portfile.cmake new file mode 100644 index 00000000000000..0226cc19e71343 --- /dev/null +++ b/ports/datraw/portfile.cmake @@ -0,0 +1,14 @@ +set(VCPKG_BUILD_TYPE release) # header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO UniStuttgart-VISUS/datraw + REF "v${VERSION}" + SHA512 f38401e0e878f8df8e1b7b9750f4e7fec6920495bfb914a694aab166a0ffbda6dec189693a0d5b9aadb760789706e255f49a382d4e902002aef7120033dce016 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/datraw/datraw.h" "${SOURCE_PATH}/datraw/datraw" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENCE.md") diff --git a/ports/datraw/vcpkg.json b/ports/datraw/vcpkg.json new file mode 100644 index 00000000000000..428deb8e2c2629 --- /dev/null +++ b/ports/datraw/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "datraw", + "version": "1.0.9", + "description": "C++ reimplementation of VIS's datraw library.", + "homepage": "https://github.com/UniStuttgart-VISUS/datraw", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 1d9935e9051de9..13f9a9dc6707a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2108,6 +2108,10 @@ "baseline": "3.0.1", "port-version": 5 }, + "datraw": { + "baseline": "1.0.9", + "port-version": 0 + }, "dav1d": { "baseline": "1.3.0", "port-version": 1 diff --git a/versions/d-/datraw.json b/versions/d-/datraw.json new file mode 100644 index 00000000000000..f91e7ec0a09e39 --- /dev/null +++ b/versions/d-/datraw.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b125e43a3f58c35a31755006e118216a94c72036", + "version": "1.0.9", + "port-version": 0 + } + ] +} From a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:14:40 -0800 Subject: [PATCH 0857/1039] Add period for some descriptions in the new PR and new issue templates (#36237) * Add period in the new PR and new issue template * fix typo --------- Co-authored-by: Lily Wang Co-authored-by: Javier Matos Denizac --- .../00-report-package-build-failure.yml | 2 +- .github/ISSUE_TEMPLATE/01-request-a-new-port.yml | 2 +- ...03-request-a-feature-or-improvement-to-a-port.yml | 2 +- .../04-request-a-feature-or-improvement.yml | 2 +- .../ISSUE_TEMPLATE/05-other-type-of-bug-report.md | 2 +- .github/pull_request_template.md | 12 ++++++------ 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml b/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml index 449da8bc80e448..59252672491ca2 100644 --- a/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml +++ b/.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml @@ -35,7 +35,7 @@ body: id: logs attributes: label: Failure logs - description: The console output and all the logs metioned in the output + description: The console output and all the logs mentioned in the output. validations: required: true - type: textarea diff --git a/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml b/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml index 78299a7f76f54e..ff9d6f0d9dfc2c 100644 --- a/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml +++ b/.github/ISSUE_TEMPLATE/01-request-a-new-port.yml @@ -1,5 +1,5 @@ name: Request a new port -description: Request a new port/library that vcpkg should support +description: Request a new port/library that vcpkg should support. title: "[New Port Request] " labels: ["category:new-port", "info:good-first-issue"] diff --git a/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml b/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml index 62c3765aed1416..231c34ae37b19f 100644 --- a/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml +++ b/.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml @@ -1,5 +1,5 @@ name: Request a feature or improvement to a port -description: Suggest an improvement to one the the ports/libraries in vcpkg +description: Suggest an improvement to one the the ports/libraries in vcpkg. title: "[] " labels: ["category:port-feature"] body: diff --git a/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml b/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml index 1831952c83fbff..c27fbc52aa1a45 100644 --- a/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml +++ b/.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml @@ -1,5 +1,5 @@ name: Request a feature or improvement -description: Suggest an improvement to vcpkg +description: Suggest an improvement to vcpkg. title: '' labels: ["category:vcpkg-feature"] body: diff --git a/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md b/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md index 8a12e861de7ffc..1774b230de1c00 100644 --- a/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md +++ b/.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md @@ -1,6 +1,6 @@ --- name: Other type of bug report -about: Let us know about an issues that does not fit into any of the other issues +about: Let us know about an issues that does not fit into any of the other issues. types title: '' labels: '' diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0d4f7b96db71a5..618be2cbf68256 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,12 +1,12 @@ - +