From a59ddd901ac35bc28bbcede79f7762188bcb9aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 5 Jun 2020 03:20:25 +0800 Subject: [PATCH] [vcpkg-baseline][manyport] Fix baseline error (#11742) * [fastrtps] Fix source hash * [cpp-taskflow] Update source hash * [eabase] Re-trigger CI test * Change repo * [sdformat9] Re-trigger CI test * update baseline * update baseline * [sdformat9] Fix find dependency urdfdom --- ports/cpp-taskflow/CONTROL | 3 ++- ports/cpp-taskflow/portfile.cmake | 9 +++------ ports/eabase/CONTROL | 2 +- ports/eabase/portfile.cmake | 2 +- ports/fastrtps/CONTROL | 2 +- ports/fastrtps/portfile.cmake | 8 +++----- ports/sdformat9/CONTROL | 2 +- ports/sdformat9/fix-dependency-urdfdom.patch | 17 +++++++++++++++++ ports/sdformat9/portfile.cmake | 5 +++-- scripts/ci.baseline.txt | 2 ++ 10 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 ports/sdformat9/fix-dependency-urdfdom.patch diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL index 69b58ea81..ee3e33ed0 100644 --- a/ports/cpp-taskflow/CONTROL +++ b/ports/cpp-taskflow/CONTROL @@ -1,3 +1,4 @@ Source: cpp-taskflow -Version: 2.2.0 +Version: 2.2.0-1 Description: Fast Parallel Tasking Programming Library using Modern C++. +Homepage: https://github.com/taskflow/taskflow diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake index 5160d02a2..8e2964337 100644 --- a/ports/cpp-taskflow/portfile.cmake +++ b/ports/cpp-taskflow/portfile.cmake @@ -1,12 +1,9 @@ # header-only library - -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO cpp-taskflow/cpp-taskflow + REPO taskflow/taskflow REF v2.2.0 - SHA512 c075f1b7e4dd6ed6d9561b860b660ee4b28eddb321d8aa8746fbec45b1039ab686700156e4273da5a4ac7af0707975331befd9bf3e51f18925ea3a9a60083549 + SHA512 1aa4e9d7324f56eb33cd4986d721035f0abf12e022da956bafc0b16cf6cb82d152334ae58edc4581ab2f6d44989ca21cdd590ad560d6f1a4f905710fe08d0091 HEAD_REF master ) @@ -26,4 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-taskflow/copyright COPYONLY) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file diff --git a/ports/eabase/CONTROL b/ports/eabase/CONTROL index 42fe96803..2855f5f2f 100644 --- a/ports/eabase/CONTROL +++ b/ports/eabase/CONTROL @@ -1,4 +1,4 @@ Source: eabase -Version: 2.09.12 +Version: 2.09.12-1 Homepage: https://github.com/electronicarts/EABase Description: Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros. diff --git a/ports/eabase/portfile.cmake b/ports/eabase/portfile.cmake index 8a5e57dac..8ebb2ab14 100644 --- a/ports/eabase/portfile.cmake +++ b/ports/eabase/portfile.cmake @@ -27,4 +27,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL index c80f7638c..f97ba46c7 100644 --- a/ports/fastrtps/CONTROL +++ b/ports/fastrtps/CONTROL @@ -1,4 +1,4 @@ Source: fastrtps -Version: 1.5.0-2 +Version: 1.5.0-3 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. Build-Depends: openssl, asio, tinyxml2 \ No newline at end of file diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 9aed75f5b..3dfbe87c9 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -1,10 +1,8 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO eProsima/Fast-RTPS + REPO eProsima/Fast-DDS REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release - SHA512 9ec4a1e41296df1c0bc00926d925e0947602fabb68e9b28311e92739b0e1909a2993b15fc05eb31aeb9842ed50127f8d56571d09e57dd64ac6f37d0fed6cea73 + SHA512 f316a71784cdac5379b1cf59cee4bf57304aa59a73563fcbdd141b0d1297302048ca73817adca68baf18472e74f200af9490d2d6fa6124863ec260546fb373e4 HEAD_REF master PATCHES fix-install.patch @@ -28,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/fastrtps) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/fastrtps) -file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/fastrtps/copyright) +file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/sdformat9/CONTROL b/ports/sdformat9/CONTROL index 2242dfcab..d9fba0d8f 100644 --- a/ports/sdformat9/CONTROL +++ b/ports/sdformat9/CONTROL @@ -1,5 +1,5 @@ Source: sdformat9 -Version: 9.2.0 +Version: 9.2.0-1 Homepage: http://sdformat.org/ Build-Depends: ignition-math6, urdfdom, tinyxml Description: Simulation Description Format (SDF) parser and description files. diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch new file mode 100644 index 000000000..d2b1a5947 --- /dev/null +++ b/ports/sdformat9/fix-dependency-urdfdom.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index 965f1ec..cf2acf4 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -53,10 +53,9 @@ if (NOT PKG_CONFIG_FOUND) + endif() + + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) +- # check for urdfdom with pkg-config +- pkg_check_modules(URDF urdfdom>=1.0) ++ find_package(urdfdom CONFIG REQUIRED) + +- if (NOT URDF_FOUND) ++ if (NOT urdfdom_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) + message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy") + set(USE_INTERNAL_URDF true) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index 828f04525..c1567efbc 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -6,8 +6,9 @@ vcpkg_from_github( REF sdformat9_9.2.0 SHA512 6fc7d0ce46d9a7d1cae4fd905ebe6a07bb4ba98faa267be92a32b3409d6d82a99d5082485008a15484f7b5be2c347b5b24bc472fb1a4be5eb8b678b105cae6af HEAD_REF sdf9 - # Backport of https://github.com/osrf/sdformat/pull/269 - PATCHES respect-build-testing.patch + PATCHES + respect-build-testing.patch # Backport of https://github.com/osrf/sdformat/pull/269 + fix-dependency-urdfdom.patch ) # Ruby is required by the sdformat build process diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 838958da7..13a6e9943 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -621,6 +621,7 @@ ignition-msgs5:x64-linux=fail ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail +ignition-msgs5:x64-osx=fail imgui-sfml:x64-linux=ignore intel-ipsec:arm64-windows=fail intel-ipsec:arm-uwp=fail @@ -1210,6 +1211,7 @@ netcdf-cxx4:x64-linux=ignore nethost:x64-uwp=fail nethost:arm-uwp=fail nettle:x64-windows=skip +nettle:x64-osx=fail networkdirect-sdk:arm64-windows=fail networkdirect-sdk:arm-uwp=fail networkdirect-sdk:x64-linux=fail