Skip to content

Commit caa7579

Browse files
authored
[boost] update to v1.83.0 (#33597)
1 parent bc378cc commit caa7579

472 files changed

Lines changed: 3594 additions & 2872 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
From 4a7935e1f8d1756cbeafb2564066551f9bd766f0 Mon Sep 17 00:00:00 2001
2+
From: jjll <jjll@gmv.com>
3+
Date: Wed, 6 Sep 2023 14:25:30 +0200
4+
Subject: [PATCH] compatibility boost >= 1.83
5+
6+
---
7+
src/lib/parallel_progress.h | 11 +++++++++--
8+
1 file changed, 9 insertions(+), 2 deletions(-)
9+
10+
diff --git a/src/lib/parallel_progress.h b/src/lib/parallel_progress.h
11+
index 958b170..ee938d9 100755
12+
--- a/src/lib/parallel_progress.h
13+
+++ b/src/lib/parallel_progress.h
14+
@@ -23,7 +23,14 @@
15+
#ifndef VINA_PARALLEL_PROGRESS_H
16+
#define VINA_PARALLEL_PROGRESS_H
17+
18+
+#include <boost/version.hpp>
19+
+#if BOOST_VERSION < 107200
20+
#include <boost/progress.hpp>
21+
+typedef boost::progress_display boost_progress;
22+
+#else
23+
+#include <boost/timer/progress_display.hpp>
24+
+typedef boost::timer::progress_display boost_progress;
25+
+#endif
26+
#include <boost/thread/mutex.hpp>
27+
28+
#include <functional>
29+
@@ -34,7 +41,7 @@ struct parallel_progress : public incrementable {
30+
parallel_progress(std::function<void(double)>* c = NULL) : p(NULL), callback(c) {}
31+
void init(unsigned long n) {
32+
count = n;
33+
- p = new boost::progress_display(count);
34+
+ p = new boost_progress(count);
35+
}
36+
void operator++() {
37+
if(p) {
38+
@@ -47,7 +54,7 @@ struct parallel_progress : public incrementable {
39+
virtual ~parallel_progress() { delete p; }
40+
private:
41+
boost::mutex self;
42+
- boost::progress_display* p;
43+
+ boost_progress* p;
44+
std::function<void(double)>* callback;
45+
unsigned long count;
46+
};

ports/autodock-vina/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ vcpkg_from_github(
66
REF v${VERSION}
77
SHA512 d36908e5833d22bcbc4dae353ef32b905d6eb46511302f7583a291398bfadff5e75fc99ce7b380860578b2257e5c32434cc75b1ca51fafb4b5f12d9477a878e9
88
HEAD_REF develop
9+
PATCHES fix-compatibility-with-boost-1.83.patch
910
)
1011

1112
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

ports/autodock-vina/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "autodock-vina",
33
"version-semver": "1.2.5",
4+
"port-version": 1,
45
"description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.",
56
"homepage": "http://vina.scripps.edu/",
67
"dependencies": [

ports/boost-accumulators/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/accumulators
6-
REF boost-1.82.0
7-
SHA512 8ad900f0f421af1302682a397d1bffb2aee4c5ab4b2103f3afe427905c7fa86cbabaaaffc6fbcef0f3ddb60f865756aafd1e7b5baa42176ed3ed2d2d8388b264
6+
REF boost-1.83.0
7+
SHA512 6c7b9b03235945e796eb629e632f074262c46c9201918cd636298b87d464f97923fdb6f9d64c8d3ff70a5e4d6afac4f7d95fb338cf67b9c3ee4c0a7812d62984
88
HEAD_REF master
99
)
1010

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,94 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-accumulators",
4-
"version": "1.82.0",
5-
"port-version": 2,
4+
"version": "1.83.0",
65
"description": "Boost accumulators module",
76
"homepage": "https://github.com/boostorg/accumulators",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-array",
12-
"version>=": "1.82.0"
11+
"version>=": "1.83.0"
1312
},
1413
{
1514
"name": "boost-assert",
16-
"version>=": "1.82.0"
15+
"version>=": "1.83.0"
1716
},
1817
{
1918
"name": "boost-circular-buffer",
20-
"version>=": "1.82.0"
19+
"version>=": "1.83.0"
2120
},
2221
{
2322
"name": "boost-concept-check",
24-
"version>=": "1.82.0"
23+
"version>=": "1.83.0"
2524
},
2625
{
2726
"name": "boost-config",
28-
"version>=": "1.82.0"
27+
"version>=": "1.83.0"
2928
},
3029
{
3130
"name": "boost-core",
32-
"version>=": "1.82.0"
31+
"version>=": "1.83.0"
3332
},
3433
{
3534
"name": "boost-fusion",
36-
"version>=": "1.82.0"
35+
"version>=": "1.83.0"
3736
},
3837
{
3938
"name": "boost-iterator",
40-
"version>=": "1.82.0"
39+
"version>=": "1.83.0"
4140
},
4241
{
4342
"name": "boost-mpl",
44-
"version>=": "1.82.0"
43+
"version>=": "1.83.0"
4544
},
4645
{
4746
"name": "boost-numeric-conversion",
48-
"version>=": "1.82.0"
47+
"version>=": "1.83.0"
4948
},
5049
{
5150
"name": "boost-parameter",
52-
"version>=": "1.82.0"
51+
"version>=": "1.83.0"
5352
},
5453
{
5554
"name": "boost-preprocessor",
56-
"version>=": "1.82.0"
55+
"version>=": "1.83.0"
5756
},
5857
{
5958
"name": "boost-range",
60-
"version>=": "1.82.0"
59+
"version>=": "1.83.0"
6160
},
6261
{
6362
"name": "boost-serialization",
64-
"version>=": "1.82.0"
63+
"version>=": "1.83.0"
6564
},
6665
{
6766
"name": "boost-static-assert",
68-
"version>=": "1.82.0"
67+
"version>=": "1.83.0"
6968
},
7069
{
7170
"name": "boost-throw-exception",
72-
"version>=": "1.82.0"
71+
"version>=": "1.83.0"
7372
},
7473
{
7574
"name": "boost-tuple",
76-
"version>=": "1.82.0"
75+
"version>=": "1.83.0"
7776
},
7877
{
7978
"name": "boost-type-traits",
80-
"version>=": "1.82.0"
79+
"version>=": "1.83.0"
8180
},
8281
{
8382
"name": "boost-typeof",
84-
"version>=": "1.82.0"
83+
"version>=": "1.83.0"
8584
},
8685
{
8786
"name": "boost-ublas",
88-
"version>=": "1.82.0"
87+
"version>=": "1.83.0"
8988
},
9089
{
9190
"name": "boost-vcpkg-helpers",
92-
"version>=": "1.82.0"
91+
"version>=": "1.83.0"
9392
}
9493
]
9594
}

ports/boost-algorithm/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/algorithm
6-
REF boost-1.82.0
7-
SHA512 46b49d336360fdaf6b3f28c93e4b4c6949d5b89ea4f718849ef40417811e32819b367513949a3040b343850698dac878a785639e18dc938066a1db9a07490ab6
6+
REF boost-1.83.0
7+
SHA512 88321824ce0ec8c804c6a8451d16fb45b611107aaf0fcc0ee9ca4efd6fb17e60638b55867c811b8c3e57a270c21573ccba4d7e49865ee7a8df2e87d7759f46e4
88
HEAD_REF master
99
)
1010

ports/boost-algorithm/vcpkg.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,82 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-algorithm",
4-
"version": "1.82.0",
5-
"port-version": 2,
4+
"version": "1.83.0",
65
"description": "Boost algorithm module",
76
"homepage": "https://github.com/boostorg/algorithm",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-array",
12-
"version>=": "1.82.0"
11+
"version>=": "1.83.0"
1312
},
1413
{
1514
"name": "boost-assert",
16-
"version>=": "1.82.0"
15+
"version>=": "1.83.0"
1716
},
1817
{
1918
"name": "boost-bind",
20-
"version>=": "1.82.0"
19+
"version>=": "1.83.0"
2120
},
2221
{
2322
"name": "boost-concept-check",
24-
"version>=": "1.82.0"
23+
"version>=": "1.83.0"
2524
},
2625
{
2726
"name": "boost-config",
28-
"version>=": "1.82.0"
27+
"version>=": "1.83.0"
2928
},
3029
{
3130
"name": "boost-core",
32-
"version>=": "1.82.0"
31+
"version>=": "1.83.0"
3332
},
3433
{
3534
"name": "boost-exception",
36-
"version>=": "1.82.0"
35+
"version>=": "1.83.0"
3736
},
3837
{
3938
"name": "boost-function",
40-
"version>=": "1.82.0"
39+
"version>=": "1.83.0"
4140
},
4241
{
4342
"name": "boost-iterator",
44-
"version>=": "1.82.0"
43+
"version>=": "1.83.0"
4544
},
4645
{
4746
"name": "boost-mpl",
48-
"version>=": "1.82.0"
47+
"version>=": "1.83.0"
4948
},
5049
{
5150
"name": "boost-range",
52-
"version>=": "1.82.0"
51+
"version>=": "1.83.0"
5352
},
5453
{
5554
"name": "boost-regex",
56-
"version>=": "1.82.0"
55+
"version>=": "1.83.0"
5756
},
5857
{
5958
"name": "boost-static-assert",
60-
"version>=": "1.82.0"
59+
"version>=": "1.83.0"
6160
},
6261
{
6362
"name": "boost-throw-exception",
64-
"version>=": "1.82.0"
63+
"version>=": "1.83.0"
6564
},
6665
{
6766
"name": "boost-tuple",
68-
"version>=": "1.82.0"
67+
"version>=": "1.83.0"
6968
},
7069
{
7170
"name": "boost-type-traits",
72-
"version>=": "1.82.0"
71+
"version>=": "1.83.0"
7372
},
7473
{
7574
"name": "boost-unordered",
76-
"version>=": "1.82.0"
75+
"version>=": "1.83.0"
7776
},
7877
{
7978
"name": "boost-vcpkg-helpers",
80-
"version>=": "1.82.0"
79+
"version>=": "1.83.0"
8180
}
8281
]
8382
}

ports/boost-align/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/align
6-
REF boost-1.82.0
7-
SHA512 939a4143d07e3656dcc2625288c2e3cbb77aba4b80d48bf2c3f7c403f634857b7898a7b49d90b225adae27c91643b169b5f52e75b93e9d76e664d4d631c8ba08
6+
REF boost-1.83.0
7+
SHA512 4a8a3b9686a29c2d52bb23f52a256aee8f246b72a832af63082b87a8435aeab076a67c0cd220b1bad9d6a9f0184c59a2495594c7a4eb86916495ee2c8d35e5dc
88
HEAD_REF master
99
)
1010

ports/boost-align/vcpkg.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
{
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-align",
4-
"version": "1.82.0",
5-
"port-version": 2,
4+
"version": "1.83.0",
65
"description": "Boost align module",
76
"homepage": "https://github.com/boostorg/align",
87
"license": "BSL-1.0",
98
"dependencies": [
109
{
1110
"name": "boost-assert",
12-
"version>=": "1.82.0"
11+
"version>=": "1.83.0"
1312
},
1413
{
1514
"name": "boost-config",
16-
"version>=": "1.82.0"
15+
"version>=": "1.83.0"
1716
},
1817
{
1918
"name": "boost-core",
20-
"version>=": "1.82.0"
19+
"version>=": "1.83.0"
2120
},
2221
{
2322
"name": "boost-static-assert",
24-
"version>=": "1.82.0"
23+
"version>=": "1.83.0"
2524
},
2625
{
2726
"name": "boost-vcpkg-helpers",
28-
"version>=": "1.82.0"
27+
"version>=": "1.83.0"
2928
}
3029
]
3130
}

ports/boost-any/portfile.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
vcpkg_from_github(
44
OUT_SOURCE_PATH SOURCE_PATH
55
REPO boostorg/any
6-
REF boost-1.82.0
7-
SHA512 3d65777d2b2037e996199c56420f6de419661e6dc79a226d42860f526232b31a256c0ddccb605244d98b9fc854fef42134ffe9e20b138c8f2309984345d3fc86
6+
REF boost-1.83.0
7+
SHA512 5e0916fb16e14bc0d4702b3fa89a2ed1aadf0297abf627d2774604453d5049b799a9958e1bd525ef477e59fb28d65b3763d945603029200534d550e9137541c2
88
HEAD_REF master
99
)
1010

0 commit comments

Comments
 (0)