From 5b26b5c8bc7f2d18998bd3dbe95751161eacd454 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 10 Jun 2023 22:00:59 +0200 Subject: [PATCH 01/15] update cmake --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 831c9be01c2f1c..715f9eb665e56f 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.7.nupkg.zip - 3.25.1 - cmake-3.25.1-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-windows-i386.zip - 4a84abdb53781178a99046aa09cf6a6b2bfe159d6b6bbdd2449839d2f50b872b4cc783c44774343b6122ec9400bcfdec65fffd4a246575ba55d178bc180f6adc - cmake-3.25.1-windows-i386.zip + 3.27.0-rc1 + cmake-3.27.0-rc1-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-windows-i386.zip + 88326abdf17f3ae28897a20c578fe6dae4a0151804186ae4ec84b8319738921b8f667c36e8ed2b40aee3f81922f08707a6f26a8ce3c6cfb2114af8b745240612 + cmake-3.27.0-rc1-windows-i386.zip - 3.25.1 - cmake-3.25.1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos-universal.tar.gz - 6009ff799ee516c1ca3bf3a31bacdd59fc48f772a03c822f49e1e9b6a6582e64d75c6005a90574539d61b7094dfe36bfe4b4c1560a4fb7d1287be472c0fd146a - cmake-3.25.1-macos-universal.tar.gz + 3.27.0-rc1 + cmake-3.27.0-rc1-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-macos-universal.tar.gz + 26703b6c88c836c000c69eefa76d51561b827078bce3463ba6cbb4fa0f4900ebb4b9f4e191139e7b3e3c5261c414ce0502d5e792a8b533508dfe8f52471ccacc + cmake-3.27.0-rc1-macos-universal.tar.gz - 3.25.1 - cmake-3.25.1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-linux-x86_64.tar.gz - df456fafa9e63ab0105a6355cc3f66d0567c43172fb424ba75b364f65c6da100dbb303ddd11abd68b42b3b52a90805dfda36aae2468c64c204446f4befda0c78 - cmake-3.25.1-linux-x86_64.tar.gz + 3.27.0-rc1 + cmake-3.27.0-rc1-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-linux-x86_64.tar.gz + e4b8a12c545c5f6795135e9bd39a2527d0aa323b6b3711c816e76e5a17796074532432d77c865cc81807345197f8fa0aa37d0340d9c1ab1ffa01eea7fe659b01 + cmake-3.27.0-rc1-linux-x86_64.tar.gz 3.20.4 From 62fc79ffb789c7c8cf7ba549070946637d515b60 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:34:19 +0200 Subject: [PATCH 02/15] update to rc2 --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 715f9eb665e56f..b28376e07c5439 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.7.nupkg.zip - 3.27.0-rc1 - cmake-3.27.0-rc1-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-windows-i386.zip - 88326abdf17f3ae28897a20c578fe6dae4a0151804186ae4ec84b8319738921b8f667c36e8ed2b40aee3f81922f08707a6f26a8ce3c6cfb2114af8b745240612 - cmake-3.27.0-rc1-windows-i386.zip + 3.27.0-rc2 + cmake-3.27.0-rc2-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-windows-i386.zip + 85c8906d77b5c233f6a44be1f59be0b83db1bd1c88fbab28f5632aaa4c29439b2b293fdf561b4f26a1b3dec7ccdcb8dea7be28e3744af0d20050caf8b545775e + cmake-3.27.0-rc2-windows-i386.zip - 3.27.0-rc1 - cmake-3.27.0-rc1-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-macos-universal.tar.gz - 26703b6c88c836c000c69eefa76d51561b827078bce3463ba6cbb4fa0f4900ebb4b9f4e191139e7b3e3c5261c414ce0502d5e792a8b533508dfe8f52471ccacc - cmake-3.27.0-rc1-macos-universal.tar.gz + 3.27.0-rc2 + cmake-3.27.0-rc2-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-macos-universal.tar.gz + 5a7db06ed979d6c3b489cc5c1a45e4aeb3c0709a7d700859f6a6778a4e9285da99ff655a14a5f3659e8c82a3ad6d18f8e3e53582c37271ba2b27fd2257c8896e + cmake-3.27.0-rc2-macos-universal.tar.gz - 3.27.0-rc1 - cmake-3.27.0-rc1-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc1/cmake-3.27.0-rc1-linux-x86_64.tar.gz - e4b8a12c545c5f6795135e9bd39a2527d0aa323b6b3711c816e76e5a17796074532432d77c865cc81807345197f8fa0aa37d0340d9c1ab1ffa01eea7fe659b01 - cmake-3.27.0-rc1-linux-x86_64.tar.gz + 3.27.0-rc2 + cmake-3.27.0-rc2-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-linux-x86_64.tar.gz + ec688d3563ec368500c2db616e7d80bb8a3946da01e226c072338a412e84f616536d031e509de7fc432d30b0ceaa251c745dced17b6feaa944a79ea503f5f2d5 + cmake-3.27.0-rc2-linux-x86_64.tar.gz 3.20.4 From 907c4084e490e46fba9a7920a2a480779cd26ff1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sun, 18 Jun 2023 18:10:32 +0200 Subject: [PATCH 03/15] use nightly build --- scripts/vcpkgTools.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index b28376e07c5439..aaf20a9d368eb8 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,11 +15,11 @@ python-3.10.7.nupkg.zip - 3.27.0-rc2 - cmake-3.27.0-rc2-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-windows-i386.zip - 85c8906d77b5c233f6a44be1f59be0b83db1bd1c88fbab28f5632aaa4c29439b2b293fdf561b4f26a1b3dec7ccdcb8dea7be28e3744af0d20050caf8b545775e - cmake-3.27.0-rc2-windows-i386.zip + cmake-3.27.20230617 + cmake-3.27.20230617-gf025a44-windows-i386/bin/cmake.exe + https://cmake.org/files/dev/cmake-3.27.20230617-gf025a44-windows-i386.zip + 76e2f048c3451cbb684a3c101c8dd4ba3a9f62b308d0e18883e05271d5326b2128a6f0ea82192113d314bf2eb06db6e2e8a926d00af351e9a6766e8e111e86e2 + cmake-3.27.20230617-gf025a44-windows-i386.zip 3.27.0-rc2 From b6c30a341eb80cb5ae954118991c9fb3618d3ddb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 21 Jun 2023 21:50:25 +0200 Subject: [PATCH 04/15] update to rc3 drop freebsd due to dead link and update git while i am at it --- scripts/vcpkgTools.xml | 43 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index aaf20a9d368eb8..db7762f33486a4 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,39 +15,32 @@ python-3.10.7.nupkg.zip - cmake-3.27.20230617 - cmake-3.27.20230617-gf025a44-windows-i386/bin/cmake.exe - https://cmake.org/files/dev/cmake-3.27.20230617-gf025a44-windows-i386.zip - 76e2f048c3451cbb684a3c101c8dd4ba3a9f62b308d0e18883e05271d5326b2128a6f0ea82192113d314bf2eb06db6e2e8a926d00af351e9a6766e8e111e86e2 - cmake-3.27.20230617-gf025a44-windows-i386.zip + 3.27.0-rc3 + cmake-3.27.0-rc3-windows-i386.zip + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-windows-i386.zip + 0 + cmake-3.27.0-rc3-windows-i386.zip - 3.27.0-rc2 - cmake-3.27.0-rc2-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-macos-universal.tar.gz - 5a7db06ed979d6c3b489cc5c1a45e4aeb3c0709a7d700859f6a6778a4e9285da99ff655a14a5f3659e8c82a3ad6d18f8e3e53582c37271ba2b27fd2257c8896e - cmake-3.27.0-rc2-macos-universal.tar.gz + 3.27.0-rc3 + cmake-3.27.0-rc3-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-macos-universal.tar.gz + 1b72d3495948e7736c297d7648e604450f939253f21a52f04349527512c980ab34d7866a9f883b72c275fc887ce88f570276f061046bf95fe82142e25ae3b1d1 + cmake-3.27.0-rc3-macos-universal.tar.gz - 3.27.0-rc2 - cmake-3.27.0-rc2-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-linux-x86_64.tar.gz - ec688d3563ec368500c2db616e7d80bb8a3946da01e226c072338a412e84f616536d031e509de7fc432d30b0ceaa251c745dced17b6feaa944a79ea503f5f2d5 - cmake-3.27.0-rc2-linux-x86_64.tar.gz - - - 3.20.4 - usr/local/bin/cmake - https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz - 3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475 - cmake-3.20.4.txz + 3.27.0-rc3 + cmake-3.27.0-rc3-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.tar.gz + d7854c0937825b52ab1628bf0ce93b2703b57d8d6dc90524d8079b0fde358b6c1bc71d658685cdc142bb1c97332e04d8ff7a828e0b3a4d532d2848ae9774789f + cmake-3.27.0-rc3-linux-x86_64.tar.gz 2.7.4 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.35.1.windows.2/PortableGit-2.35.1.2-32-bit.7z.exe - f98df16641a615bbc36c5c319c78abb780d824ff35ed5f2a095e2d5fce2acacfc7f6532c96f1c81d3d3cd8a642858cbd9de0e0e5fcde9ca11e6ad9f6598bb82f - PortableGit-2.35.1.2-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-32-bit.7z.exe + e483a890e77b427c20785e7528279338c7d99651e0afbf704bf2ff3cde23d0895c07e961603d133d5d78aea2308a2994e532974de41674e4f334423b1b47bd0e + PortableGit-2.41.0-32-bit.7z.exe 2.7.4 From 0d7c8b50e5ca84af24f9a845436c3d2335794185 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 22 Jun 2023 18:16:18 +0200 Subject: [PATCH 05/15] fix missing sha --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index db7762f33486a4..7420a40af5244e 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -18,7 +18,7 @@ 3.27.0-rc3 cmake-3.27.0-rc3-windows-i386.zip https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-windows-i386.zip - 0 + 057b53764c2b6f51196f7224b6e26885fff4b5c0cd52a9c6b33cf8df524eea0b6d51e04c3cf892092b5e44251a4c4263152a1fb0efb4179fceaf25f490c6cad3 cmake-3.27.0-rc3-windows-i386.zip From a58ec03597940e96d6b9feed1ca99aee567db053 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 23 Jun 2023 15:34:13 +0200 Subject: [PATCH 06/15] fix relative path --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 7420a40af5244e..5cff1ae647b448 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -16,7 +16,7 @@ 3.27.0-rc3 - cmake-3.27.0-rc3-windows-i386.zip + cmake-3.27.0-rc3-windows-i386/bin/cmake.exe https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-windows-i386.zip 057b53764c2b6f51196f7224b6e26885fff4b5c0cd52a9c6b33cf8df524eea0b6d51e04c3cf892092b5e44251a4c4263152a1fb0efb4179fceaf25f490c6cad3 cmake-3.27.0-rc3-windows-i386.zip From ac1ea75ad4a6ac9ea8c22919ce83f9f7d8bba397 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:19:35 +0200 Subject: [PATCH 07/15] update to 3.27 release --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 5cff1ae647b448..ea25235750ee14 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.7.nupkg.zip - 3.27.0-rc3 - cmake-3.27.0-rc3-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-windows-i386.zip - 057b53764c2b6f51196f7224b6e26885fff4b5c0cd52a9c6b33cf8df524eea0b6d51e04c3cf892092b5e44251a4c4263152a1fb0efb4179fceaf25f490c6cad3 - cmake-3.27.0-rc3-windows-i386.zip + 3.27.0 + cmake-3.27.0-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-i386.zip + 587238431fffde2593f49e85d66226c34669a77feaece6fea7b8d140112319843fc0033c69b98d0759054ebddfddf7339da5a2e4617258c051a6a7c8aee3812e + cmake-3.27.0-windows-i386.zip - 3.27.0-rc3 - cmake-3.27.0-rc3-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-macos-universal.tar.gz - 1b72d3495948e7736c297d7648e604450f939253f21a52f04349527512c980ab34d7866a9f883b72c275fc887ce88f570276f061046bf95fe82142e25ae3b1d1 - cmake-3.27.0-rc3-macos-universal.tar.gz + 3.27.0 + cmake-3.27.0-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-macos-universal.tar.gz + ad30b1483e2888afac5bc73c195860e23f099f54bc795536c3ef423d447a0db905c192dea8e76261dea76f36d87fe6b3ed632fc73819ec985d7e71902ef1674f + cmake-3.27.0-macos-universal.tar.gz - 3.27.0-rc3 - cmake-3.27.0-rc3-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0-rc3/cmake-3.27.0-rc3-linux-x86_64.tar.gz - d7854c0937825b52ab1628bf0ce93b2703b57d8d6dc90524d8079b0fde358b6c1bc71d658685cdc142bb1c97332e04d8ff7a828e0b3a4d532d2848ae9774789f - cmake-3.27.0-rc3-linux-x86_64.tar.gz + 3.27.0 + cmake-3.27.0-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-linux-x86_64.tar.gz + 05a288fdee44640611fa1b1dcedc89e5fd161c9ab05dc8f20cd45bada4f8bb55df58f2d02cc3f02232d05afe824b71e011a535d6cbf437ac449b8b4c1157884c + cmake-3.27.0-linux-x86_64.tar.gz 2.7.4 From 4cd77a1bb4e7d80b32cd385ce0373251609da918 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Jul 2023 12:04:35 +0200 Subject: [PATCH 08/15] [paho-mqtt] remove usage of OPENSSL_ROOT_DIR --- ports/paho-mqtt/portfile.cmake | 2 ++ ports/paho-mqtt/vcpkg.json | 1 + 2 files changed, 3 insertions(+) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 55039855ce7a8d..2bb84bd7d6494f 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC) +vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" [[SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")]] "") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index ff004a0e7713e6..76c5ed3104e4ab 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "paho-mqtt", "version": "1.3.12", + "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", From e4a478e87d3a0cc2a657fedeb3d26db5b80263db Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:13:59 +0200 Subject: [PATCH 09/15] [directxtex] control optional directx-headers dep --- ports/directxtex/portfile.cmake | 4 ++++ ports/directxtex/vcpkg.json | 1 + 2 files changed, 5 insertions(+) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 9814f86d8442ac..5a2a0d55bc817d 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -20,6 +20,10 @@ vcpkg_check_features( tools BUILD_TOOLS ) +if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE") +endif() + if(VCPKG_TARGET_IS_MINGW AND ("dx11" IN_LIST FEATURES)) message(NOTICE "Building ${PORT} for MinGW requires the HLSL Compiler fxc.exe also be in the PATH. See https://aka.ms/windowssdk.") endif() diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index ebdee6720a67e1..ce4716ff84c531 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtex", "version-date": "2023-06-13", + "port-version": 1, "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", From ba1f20f593810d7abd75972355520510479411af Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:14:24 +0200 Subject: [PATCH 10/15] v db --- versions/baseline.json | 4 ++-- versions/d-/directxtex.json | 5 +++++ versions/p-/paho-mqtt.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 55a28b61ddfb3b..e8f1b334484b43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2114,7 +2114,7 @@ }, "directxtex": { "baseline": "2023-06-13", - "port-version": 0 + "port-version": 1 }, "directxtk": { "baseline": "2023-06-13", @@ -6174,7 +6174,7 @@ }, "paho-mqtt": { "baseline": "1.3.12", - "port-version": 0 + "port-version": 1 }, "paho-mqttpp3": { "baseline": "1.2.0", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 869ab86cd6f8fa..fad1870e948f33 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4516b65bfb94a960048017127efff0162890a89d", + "version-date": "2023-06-13", + "port-version": 1 + }, { "git-tree": "61211f80ff16adc6b3d278c7a35cf4c3579feaa3", "version-date": "2023-06-13", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index de20423c8637a9..151e187570b728 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e686950d2f0329bc5076bec1d8432e83aaf45fd", + "version": "1.3.12", + "port-version": 1 + }, { "git-tree": "db58caf818518c074d1ab00297ce3a2fc784bc0a", "version": "1.3.12", From a49e0fbaf3bb3e6d425451a86eb12ed74ec31b7a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:26:15 +0200 Subject: [PATCH 11/15] IN LIST -> IN_LIST --- ports/directxtex/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 5a2a0d55bc817d..6152c234579a03 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_check_features( tools BUILD_TOOLS ) -if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN LIST FEATURES) +if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_TARGET_IS_XBOX OR VCPKG_TARGET_IS_MINGW) AND NOT "dx12" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_directx-headers=TRUE") endif() From c8fbb7e5baed03e313aa65503d1a71b3a705f432 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:26:35 +0200 Subject: [PATCH 12/15] v db --- versions/d-/directxtex.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index fad1870e948f33..b8d18c044eca95 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4516b65bfb94a960048017127efff0162890a89d", + "git-tree": "6b99ef3202ed870bad345dddc5e1fba67ff70281", "version-date": "2023-06-13", "port-version": 1 }, From ea7322645c49fd38ee68b915407a8999e13f7fbf Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Jul 2023 22:16:19 +0200 Subject: [PATCH 13/15] try fixing azure-storage-cpp --- ports/azure-storage-cpp/portfile.cmake | 2 ++ ports/azure-storage-cpp/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index ba9154d86b2307..ffde123979be56 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_replace_string("${SOURCE_PATH}/Microsoft.WindowsAzure.Storage/CMakeLists.txt" [[file(GLOB OPENSSL_ROOT_DIR /usr/local/Cellar/openssl/*)]] "") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/Microsoft.WindowsAzure.Storage" OPTIONS diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json index 4b5f6141347252..fad1ab7270c2f4 100644 --- a/ports/azure-storage-cpp/vcpkg.json +++ b/ports/azure-storage-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-storage-cpp", "version": "7.5.0", - "port-version": 5, + "port-version": 6, "description": [ "[legacy] Microsoft Azure Storage Client SDK for C++", "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." From f8aebeeffea17cf0e1dc1f40cf448cf84d2293bb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 21 Jul 2023 22:16:37 +0200 Subject: [PATCH 14/15] v db --- versions/a-/azure-storage-cpp.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index ac883c9fcd1d13..299717df100ab8 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38122f7f0972f1c4d6b01b776f9c1edf81e5dfd0", + "version": "7.5.0", + "port-version": 6 + }, { "git-tree": "bbbb3a066c3002438b0a002b334d861f48887ad3", "version": "7.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index e8f1b334484b43..044dc50752caf4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -454,7 +454,7 @@ }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 5 + "port-version": 6 }, "azure-storage-files-datalake-cpp": { "baseline": "12.7.0", From 0e86ff560bd060e0e0659f5f6a20a6cf2a57fde8 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 26 Jul 2023 13:12:38 +0200 Subject: [PATCH 15/15] update to 3.27.1 --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ea25235750ee14..55b19560956fdf 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.7.nupkg.zip - 3.27.0 - cmake-3.27.0-windows-i386/bin/cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-windows-i386.zip - 587238431fffde2593f49e85d66226c34669a77feaece6fea7b8d140112319843fc0033c69b98d0759054ebddfddf7339da5a2e4617258c051a6a7c8aee3812e - cmake-3.27.0-windows-i386.zip + 3.27.1 + cmake-3.27.1-windows-i386/bin/cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-windows-i386.zip + a847f636fb27ba41ba9e6eaafa56937c614bcb39c6d0c9723241c229a9b0a77b4d00ebee88639561035d43f9aa64895f387eab56c628990c01191da57839cda0 + cmake-3.27.1-windows-i386.zip - 3.27.0 - cmake-3.27.0-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-macos-universal.tar.gz - ad30b1483e2888afac5bc73c195860e23f099f54bc795536c3ef423d447a0db905c192dea8e76261dea76f36d87fe6b3ed632fc73819ec985d7e71902ef1674f - cmake-3.27.0-macos-universal.tar.gz + 3.27.1 + cmake-3.27.1-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-macos-universal.tar.gz + 78e639b93786eb994bdbc6263afc48267d42d9305c1cb1cb9482adf012e7b4f45934e744a98eaf93d8361f154e642cada13398cca064c1700f009a7795746fe7 + cmake-3.27.1-macos-universal.tar.gz - 3.27.0 - cmake-3.27.0-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.27.0/cmake-3.27.0-linux-x86_64.tar.gz - 05a288fdee44640611fa1b1dcedc89e5fd161c9ab05dc8f20cd45bada4f8bb55df58f2d02cc3f02232d05afe824b71e011a535d6cbf437ac449b8b4c1157884c - cmake-3.27.0-linux-x86_64.tar.gz + 3.27.1 + cmake-3.27.1-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.tar.gz + 192374a68e2971f04974a194645726196d9b8ee7abd650d1e6f65f7aa2ccc9b186c3edb473bb4958c764532edcdd42f4182ee1fcb86b17d78b0bcd6305ce3df1 + cmake-3.27.1-linux-x86_64.tar.gz 2.7.4