From 6631ed58e0fd384a80fdd893d140cb490184850b Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:30:32 -0800 Subject: [PATCH] [many ports 2] Include `` for `system_clock` and `high_resolution_clock` (#42404) --- ports/antlr4/add-include-chrono.patch | 12 +++++++ ports/antlr4/portfile.cmake | 1 + ports/antlr4/vcpkg.json | 1 + ports/avisynthplus/add-include-chrono.patch | 24 +++++++++++++ ports/avisynthplus/portfile.cmake | 4 ++- ports/avisynthplus/vcpkg.json | 1 + .../ignition-common1/add-include-chrono.patch | 36 +++++++++++++++++++ ports/ignition-common1/portfile.cmake | 4 ++- ports/ignition-common1/vcpkg.json | 2 +- ports/ompl/0004_include_chrono.patch | 12 +++++++ ports/ompl/portfile.cmake | 1 + ports/ompl/vcpkg.json | 2 +- versions/a-/antlr4.json | 5 +++ versions/a-/avisynthplus.json | 5 +++ versions/baseline.json | 8 ++--- versions/i-/ignition-common1.json | 5 +++ versions/o-/ompl.json | 5 +++ 17 files changed, 120 insertions(+), 8 deletions(-) create mode 100644 ports/antlr4/add-include-chrono.patch create mode 100644 ports/avisynthplus/add-include-chrono.patch create mode 100644 ports/ignition-common1/add-include-chrono.patch create mode 100644 ports/ompl/0004_include_chrono.patch diff --git a/ports/antlr4/add-include-chrono.patch b/ports/antlr4/add-include-chrono.patch new file mode 100644 index 0000000000..c36e8483d5 --- /dev/null +++ b/ports/antlr4/add-include-chrono.patch @@ -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 + + using namespace antlr4; + using namespace antlr4::atn; diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake index 367536e2cb..e0aa97fc7d 100644 --- a/ports/antlr4/portfile.cmake +++ b/ports/antlr4/portfile.cmake @@ -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") diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json index c985f70719..f93a9f3728 100644 --- a/ports/antlr4/vcpkg.json +++ b/ports/antlr4/vcpkg.json @@ -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", diff --git a/ports/avisynthplus/add-include-chrono.patch b/ports/avisynthplus/add-include-chrono.patch new file mode 100644 index 0000000000..6c24a91607 --- /dev/null +++ b/ports/avisynthplus/add-include-chrono.patch @@ -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 + #include + #include + #include +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 ++#include + #include + + #ifdef X86_32 diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index a3d8612511..91fa40ca6f 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -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 @@ -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") diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 209fea9a90..57d4e62e56 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,6 +1,7 @@ { "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", diff --git a/ports/ignition-common1/add-include-chrono.patch b/ports/ignition-common1/add-include-chrono.patch new file mode 100644 index 0000000000..3fa049e0a6 --- /dev/null +++ b/ports/ignition-common1/add-include-chrono.patch @@ -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 ++#include + #include + #include + #include +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 + #include + #include + +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 + #include + #include ++#include + + #include + #include diff --git a/ports/ignition-common1/portfile.cmake b/ports/ignition-common1/portfile.cmake index 6bea5e2e22..a43745e301 100644 --- a/ports/ignition-common1/portfile.cmake +++ b/ports/ignition-common1/portfile.cmake @@ -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 + ) diff --git a/ports/ignition-common1/vcpkg.json b/ports/ignition-common1/vcpkg.json index 29ee146150..503ea89723 100644 --- a/ports/ignition-common1/vcpkg.json +++ b/ports/ignition-common1/vcpkg.json @@ -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", diff --git a/ports/ompl/0004_include_chrono.patch b/ports/ompl/0004_include_chrono.patch new file mode 100644 index 0000000000..d78d62bb17 --- /dev/null +++ b/ports/ompl/0004_include_chrono.patch @@ -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 + #include + #include + #include diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index 85206fb067..4fe4d6f0fe 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -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. diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json index 1d88596746..3918cb522a 100644 --- a/ports/ompl/vcpkg.json +++ b/ports/ompl/vcpkg.json @@ -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": [ diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index ae97659bdd..9a5e96a45d 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419f0511764db2cbdf8f8c5c3aad4f984f1c8fe5", + "version": "4.13.2", + "port-version": 1 + }, { "git-tree": "f2803934714fc26ec4ef9d6df467e05b0f6c1096", "version": "4.13.2", diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index 966009bac7..8be326276e 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02aec32ec997a98d60fe28b529bc2ad132d4b5c7", + "version": "3.7.3", + "port-version": 1 + }, { "git-tree": "d6a5198252f84212548934db0f73184919283928", "version": "3.7.3", diff --git a/versions/baseline.json b/versions/baseline.json index 02063be294..00c1d33c90 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -146,7 +146,7 @@ }, "antlr4": { "baseline": "4.13.2", - "port-version": 0 + "port-version": 1 }, "any-lite": { "baseline": "0.4.0", @@ -374,7 +374,7 @@ }, "avisynthplus": { "baseline": "3.7.3", - "port-version": 0 + "port-version": 1 }, "avro-c": { "baseline": "1.11.3", @@ -3614,7 +3614,7 @@ }, "ignition-common1": { "baseline": "1.1.1", - "port-version": 4 + "port-version": 5 }, "ignition-common3": { "baseline": "3.16.0", @@ -6578,7 +6578,7 @@ }, "ompl": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "omplapp": { "baseline": "1.5.1", diff --git a/versions/i-/ignition-common1.json b/versions/i-/ignition-common1.json index 0543274dcf..04434f1db3 100644 --- a/versions/i-/ignition-common1.json +++ b/versions/i-/ignition-common1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00134cd3245b61790b8249239317ef7928943cba", + "version": "1.1.1", + "port-version": 5 + }, { "git-tree": "c41c38488af45c9721e56792886250ef144bc050", "version": "1.1.1", diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json index 7f6683f142..56c5b63e9a 100644 --- a/versions/o-/ompl.json +++ b/versions/o-/ompl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff05634f7ee0c70e57c5990ec909e49114542f19", + "version": "1.6.0", + "port-version": 3 + }, { "git-tree": "af59be72a074fcdfbfaf6500afca3442e0a2648b", "version": "1.6.0",