Skip to content

Commit

Permalink
[boost] update to v1.83.0 (#33597)
Browse files Browse the repository at this point in the history
  • Loading branch information
yurybura committed Sep 13, 2023
1 parent bc378cc commit caa7579
Show file tree
Hide file tree
Showing 472 changed files with 3,594 additions and 2,872 deletions.
46 changes: 46 additions & 0 deletions ports/autodock-vina/fix-compatibility-with-boost-1.83.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001
From: jjll <jjll@gmv.com>
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;
};
1 change: 1 addition & 0 deletions ports/autodock-vina/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
1 change: 1 addition & 0 deletions ports/autodock-vina/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions ports/boost-accumulators/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/accumulators
REF boost-1.82.0
SHA512 8ad900f0f421af1302682a397d1bffb2aee4c5ab4b2103f3afe427905c7fa86cbabaaaffc6fbcef0f3ddb60f865756aafd1e7b5baa42176ed3ed2d2d8388b264
REF boost-1.83.0
SHA512 6c7b9b03235945e796eb629e632f074262c46c9201918cd636298b87d464f97923fdb6f9d64c8d3ff70a5e4d6afac4f7d95fb338cf67b9c3ee4c0a7812d62984
HEAD_REF master
)

Expand Down
45 changes: 22 additions & 23 deletions ports/boost-accumulators/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,95 +1,94 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-accumulators",
"version": "1.82.0",
"port-version": 2,
"version": "1.83.0",
"description": "Boost accumulators module",
"homepage": "https://github.com/boostorg/accumulators",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-array",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-circular-buffer",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-concept-check",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-config",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-core",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-fusion",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-iterator",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-mpl",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-numeric-conversion",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-parameter",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-preprocessor",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-range",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-serialization",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-static-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-tuple",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-type-traits",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-typeof",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-ublas",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.82.0"
"version>=": "1.83.0"
}
]
}
4 changes: 2 additions & 2 deletions ports/boost-algorithm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/algorithm
REF boost-1.82.0
SHA512 46b49d336360fdaf6b3f28c93e4b4c6949d5b89ea4f718849ef40417811e32819b367513949a3040b343850698dac878a785639e18dc938066a1db9a07490ab6
REF boost-1.83.0
SHA512 88321824ce0ec8c804c6a8451d16fb45b611107aaf0fcc0ee9ca4efd6fb17e60638b55867c811b8c3e57a270c21573ccba4d7e49865ee7a8df2e87d7759f46e4
HEAD_REF master
)

Expand Down
39 changes: 19 additions & 20 deletions ports/boost-algorithm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,82 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-algorithm",
"version": "1.82.0",
"port-version": 2,
"version": "1.83.0",
"description": "Boost algorithm module",
"homepage": "https://github.com/boostorg/algorithm",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-array",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-bind",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-concept-check",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-config",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-core",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-exception",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-function",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-iterator",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-mpl",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-range",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-regex",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-static-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-throw-exception",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-tuple",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-type-traits",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-unordered",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.82.0"
"version>=": "1.83.0"
}
]
}
4 changes: 2 additions & 2 deletions ports/boost-align/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/align
REF boost-1.82.0
SHA512 939a4143d07e3656dcc2625288c2e3cbb77aba4b80d48bf2c3f7c403f634857b7898a7b49d90b225adae27c91643b169b5f52e75b93e9d76e664d4d631c8ba08
REF boost-1.83.0
SHA512 4a8a3b9686a29c2d52bb23f52a256aee8f246b72a832af63082b87a8435aeab076a67c0cd220b1bad9d6a9f0184c59a2495594c7a4eb86916495ee2c8d35e5dc
HEAD_REF master
)

Expand Down
13 changes: 6 additions & 7 deletions ports/boost-align/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
{
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-align",
"version": "1.82.0",
"port-version": 2,
"version": "1.83.0",
"description": "Boost align module",
"homepage": "https://github.com/boostorg/align",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-config",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-core",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-static-assert",
"version>=": "1.82.0"
"version>=": "1.83.0"
},
{
"name": "boost-vcpkg-helpers",
"version>=": "1.82.0"
"version>=": "1.83.0"
}
]
}
4 changes: 2 additions & 2 deletions ports/boost-any/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/any
REF boost-1.82.0
SHA512 3d65777d2b2037e996199c56420f6de419661e6dc79a226d42860f526232b31a256c0ddccb605244d98b9fc854fef42134ffe9e20b138c8f2309984345d3fc86
REF boost-1.83.0
SHA512 5e0916fb16e14bc0d4702b3fa89a2ed1aadf0297abf627d2774604453d5049b799a9958e1bd525ef477e59fb28d65b3763d945603029200534d550e9137541c2
HEAD_REF master
)

Expand Down
Loading

0 comments on commit caa7579

Please sign in to comment.