Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[many ports 2] Include <chrono> for system_clock and high_resolution_clock #42404

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ports/antlr4/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp b/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp
index 9fd86d6..5220492 100644
--- a/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp
+++ b/runtime/Cpp/runtime/src/atn/ProfilingATNSimulator.cpp
@@ -10,6 +10,7 @@
#include "support/CPPUtils.h"

#include "atn/ProfilingATNSimulator.h"
+#include <chrono>

using namespace antlr4;
using namespace antlr4::atn;
1 change: 1 addition & 0 deletions ports/antlr4/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vcpkg_from_github(
SHA512 afd8ecab637a0e70cddf98f63c918eab2b907f87207624e20e80a79f885d6502d4ab734a602b1707969d61944410828b689ec2f8b09c15314fe991024cde1613
PATCHES
set-export-macro-define-as-private.patch
add-include-chrono.patch # https://github.com/antlr/antlr4/pull/4738
)

set(RUNTIME_PATH "${SOURCE_PATH}/runtime/Cpp")
Expand Down
1 change: 1 addition & 0 deletions ports/antlr4/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "antlr4",
"version": "4.13.2",
"port-version": 1,
"description": "ANother Tool for Language Recognition",
"homepage": "https://www.antlr.org",
"license": "BSD-3-Clause",
Expand Down
24 changes: 24 additions & 0 deletions ports/avisynthplus/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/avs_core/core/avisynth.cpp b/avs_core/core/avisynth.cpp
index c66d39e..5bc61a3 100644
--- a/avs_core/core/avisynth.cpp
+++ b/avs_core/core/avisynth.cpp
@@ -45,6 +45,7 @@
#include "FilterConstructor.h"
#include "PluginManager.h"
#include "MappedList.h"
+#include <chrono>
#include <vector>
#include <iostream>
#include <fstream>
diff --git a/avs_core/core/cache.cpp b/avs_core/core/cache.cpp
index 76eb7cf..957e102 100644
--- a/avs_core/core/cache.cpp
+++ b/avs_core/core/cache.cpp
@@ -38,6 +38,7 @@
#include "InternalEnvironment.h"
#include "DeviceManager.h"
#include <cassert>
+#include <chrono>
#include <cstdio>

#ifdef X86_32
4 changes: 3 additions & 1 deletion ports/avisynthplus/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 0e0daa83e3ab729fdc35a52c60c23c9142f1229187af893d0dbbd36f88eced36f63a3e8c767a3dc825edaa5395a49a5aad726f6b61de8f6b291557eec20de426
HEAD_REF master
PATCHES
add-include-chrono.patch # https://github.com/AviSynth/AviSynthPlus/pull/414
)

vcpkg_download_distfile(GHC_ARCHIVE
Expand All @@ -27,4 +29,4 @@ vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/distrib/gpl.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/distrib/gpl.txt")
1 change: 1 addition & 0 deletions ports/avisynthplus/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "avisynthplus",
"version": "3.7.3",
"port-version": 1,
"description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
"homepage": "https://avs-plus.net/",
"license": "GPL-2.0",

Check notice on line 7 in ports/avisynthplus/vcpkg.json

View workflow job for this annotation

GitHub Actions / Check

SPDX deprecated license identifier GPL-2.0. If you feel able to do so, please consider replacing it. Updated license identifiers can be found at https://spdx.org/licenses/.
"supports": "!arm & !uwp & !xbox",
"dependencies": [
{
Expand Down
36 changes: 36 additions & 0 deletions ports/ignition-common1/add-include-chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff --git a/include/ignition/common/Event.hh b/include/ignition/common/Event.hh
index 82c7e55..709f4a0 100644
--- a/include/ignition/common/Event.hh
+++ b/include/ignition/common/Event.hh
@@ -18,6 +18,7 @@
#define IGNITION_COMMON_EVENT_HH_

#include <atomic>
+#include <chrono>
#include <functional>
#include <list>
#include <map>
diff --git a/src/Console.cc b/src/Console.cc
index 1cc70db..d897cd6 100644
--- a/src/Console.cc
+++ b/src/Console.cc
@@ -14,6 +14,7 @@
* limitations under the License.
*
*/
+#include <chrono>
#include <string>
#include <sstream>

diff --git a/src/Util.cc b/src/Util.cc
index 5cd6699..46e8193 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -30,6 +30,7 @@
#include <cstdlib>
#include <cstring>
#include <cctype>
+#include <chrono>

#include <ignition/common/config.hh>
#include <ignition/common/SystemPaths.hh>
4 changes: 3 additions & 1 deletion ports/ignition-common1/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
ignition_modular_library(NAME common
VERSION "1.1.1"
REF ignition-common_1.1.1
SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309)
SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309
PATCHES add-include-chrono.patch
)
2 changes: 1 addition & 1 deletion ports/ignition-common1/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ignition-common1",
"version": "1.1.1",
"port-version": 4,
"port-version": 5,
"description": "Deprecated: Use ignition-common3. Common libraries for robotics applications",
"license": null,
"supports": "windows",
Expand Down
12 changes: 12 additions & 0 deletions ports/ompl/0004_include_chrono.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/ompl/util/src/RandomNumbers.cpp b/src/ompl/util/src/RandomNumbers.cpp
index fe30070..048b42d 100644
--- a/src/ompl/util/src/RandomNumbers.cpp
+++ b/src/ompl/util/src/RandomNumbers.cpp
@@ -37,6 +37,7 @@
#include "ompl/util/RandomNumbers.h"
#include "ompl/util/Exception.h"
#include "ompl/util/Console.h"
+#include <chrono>
#include <mutex>
#include <memory>
#include <boost/math/constants/constants.hpp>
1 change: 1 addition & 0 deletions ports/ompl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ vcpkg_from_github(
0001_Export_targets.patch
0002_Fix_config.patch
0003_fix_dep.patch
0004_include_chrono.patch # https://github.com/ompl/ompl/pull/1201
)

# Based on selected features different files get downloaded, so use the following command instead of patch.
Expand Down
2 changes: 1 addition & 1 deletion ports/ompl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ompl",
"version": "1.6.0",
"port-version": 2,
"port-version": 3,
"description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
"homepage": "https://ompl.kavrakilab.org/",
"dependencies": [
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/antlr4.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "419f0511764db2cbdf8f8c5c3aad4f984f1c8fe5",
"version": "4.13.2",
"port-version": 1
},
{
"git-tree": "f2803934714fc26ec4ef9d6df467e05b0f6c1096",
"version": "4.13.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/avisynthplus.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "02aec32ec997a98d60fe28b529bc2ad132d4b5c7",
"version": "3.7.3",
"port-version": 1
},
{
"git-tree": "d6a5198252f84212548934db0f73184919283928",
"version": "3.7.3",
Expand Down
8 changes: 4 additions & 4 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
},
"antlr4": {
"baseline": "4.13.2",
"port-version": 0
"port-version": 1
},
"any-lite": {
"baseline": "0.4.0",
Expand Down Expand Up @@ -374,7 +374,7 @@
},
"avisynthplus": {
"baseline": "3.7.3",
"port-version": 0
"port-version": 1
},
"avro-c": {
"baseline": "1.11.3",
Expand Down Expand Up @@ -3614,7 +3614,7 @@
},
"ignition-common1": {
"baseline": "1.1.1",
"port-version": 4
"port-version": 5
},
"ignition-common3": {
"baseline": "3.16.0",
Expand Down Expand Up @@ -6578,7 +6578,7 @@
},
"ompl": {
"baseline": "1.6.0",
"port-version": 2
"port-version": 3
},
"omplapp": {
"baseline": "1.5.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/ignition-common1.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "00134cd3245b61790b8249239317ef7928943cba",
"version": "1.1.1",
"port-version": 5
},
{
"git-tree": "c41c38488af45c9721e56792886250ef144bc050",
"version": "1.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/ompl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ff05634f7ee0c70e57c5990ec909e49114542f19",
"version": "1.6.0",
"port-version": 3
},
{
"git-tree": "af59be72a074fcdfbfaf6500afca3442e0a2648b",
"version": "1.6.0",
Expand Down
Loading