Merge remote-tracking branch 'origin/master' into HEAD

# Conflicts: # ports/aws-sdk-cpp/vcpkg.json # versions/a-/aws-sdk-cpp.json # versions/baseline.json
microsoft · Sep 13, 2023 · 5288e48 · 5288e48
2 parents 74d81bb + 3d532f1
commit 5288e48
Show file tree

Hide file tree

Showing 597 changed files with 5,334 additions and 3,247 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
     - [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools)
     - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects)
     - [Vcpkg with CLion](#vcpkg-with-clion)
-    - [Vcpkg as a Submodule](#vcpkg-as-a-submodule)
+    - [Vcpkg as a Submodule](#vcpkg-as-a-submodule-with-cmake)
 - [Tab-Completion/Auto-Completion](#tab-completionauto-completion)
 - [Examples](#examples)
 - [Contributing](#contributing)

diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake
@@ -17,10 +17,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 set(CROSSCOMP_OPTIONS "")
-if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET)
+if (VCPKG_CROSSCOMPILING)
     if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
         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)
+    endif() 
 endif()
 
 vcpkg_cmake_configure(

diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apsi",
   "version-semver": "0.9.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "APSI is a research library for asymmetric private set intersection.",
   "homepage": "https://github.com/microsoft/APSI",
   "license": "MIT",

diff --git 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 1040b0cc23c385db713ccc6fe54a0caf0597d497bb2d1ec817d2b86fc77f14f6a82e287ef305e416bd454ab2be2ed01d8d7ceb859461f52c1b13fbb55e45bd34
+    SHA512 0bcb0bc3a08329a11ebe3efee4f919efc7bb8192373efd924f29f63c3bc7ca3ddd2c6e669f5800baf2fb3c5d67ae423e89cc802275d088848da83b2f343f7318
     HEAD_REF main
 )
 

diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "async-mqtt",
-  "version": "1.0.9",
+  "version": "2.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/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch b/ports/autodock-vina/fix-compatibility-with-boost-1.83.patch
@@ -0,0 +1,46 @@
+From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001
+From: jjll <[email protected]>
+Date: Wed, 6 Sep 2023 14:25:30 +0200
+Subject: [PATCH] compatibility boost >= 1.83
+
+---
+ src/lib/parallel_progress.h | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/parallel_progress.h b/src/lib/parallel_progress.h
+index 958b170..ee938d9 100755
+--- a/src/lib/parallel_progress.h
++++ b/src/lib/parallel_progress.h
+@@ -23,7 +23,14 @@
+ #ifndef VINA_PARALLEL_PROGRESS_H
+ #define VINA_PARALLEL_PROGRESS_H
+
++#include <boost/version.hpp>
++#if BOOST_VERSION < 107200
+ #include <boost/progress.hpp>
++typedef boost::progress_display boost_progress;
++#else
++#include <boost/timer/progress_display.hpp>
++typedef boost::timer::progress_display boost_progress;
++#endif
+ #include <boost/thread/mutex.hpp>
+
+ #include <functional>
+@@ -34,7 +41,7 @@ struct parallel_progress : public incrementable {
+ 	parallel_progress(std::function<void(double)>* c = NULL) : p(NULL), callback(c) {}
+ 	void init(unsigned long n) {
+         count = n;
+-        p = new boost::progress_display(count);
++        p = new boost_progress(count);
+     }
+ 	void operator++() {
+ 		if(p) {
+@@ -47,7 +54,7 @@ struct parallel_progress : public incrementable {
+ 	virtual ~parallel_progress() { delete p; }
+ private:
+ 	boost::mutex self;
+-	boost::progress_display* p;
++	boost_progress* p;
+     std::function<void(double)>* callback;
+     unsigned long count;
+ };
diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v${VERSION}
     SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
     HEAD_REF develop
+    PATCHES fix-compatibility-with-boost-1.83.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "autodock-vina",
   "version-semver": "1.2.5",
+  "port-version": 1,
   "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
   "homepage": "http://vina.scripps.edu/",
   "dependencies": [