From 9df46ca3f4ec3bd05984e5668218630c52ea302a Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 20 Feb 2025 10:05:44 +0200 Subject: [PATCH] [ignition-*, dartsim] delist ignition-* ports, fix dartsim (#43865) --- ports/dartsim/portfile.cmake | 1 - ports/dartsim/vcpkg.json | 3 +- ports/gazebo/0001-Fix-deps.patch | 242 ------------------ ports/gazebo/portfile.cmake | 59 ----- ports/gazebo/vcpkg.json | 126 --------- .../do-not-compile-gtest.patch | 14 - ports/ignition-cmake0/fix-find-ign-curl.patch | 16 -- ports/ignition-cmake0/portfile.cmake | 24 -- ports/ignition-cmake0/support-arm64.patch | 17 -- ports/ignition-cmake0/usage | 3 - .../uuid-do-not-require-pkg-config.patch | 30 --- ports/ignition-cmake0/vcpkg.json | 14 - ...kgconfig-and-remove-privatefor-limit.patch | 48 ---- ports/ignition-cmake2/portfile.cmake | 10 - ports/ignition-cmake2/usage | 3 - ports/ignition-cmake2/vcpkg.json | 13 - .../ignition-common1/add-include-chrono.patch | 36 --- ports/ignition-common1/portfile.cmake | 6 - ports/ignition-common1/vcpkg.json | 36 --- ports/ignition-common3/fix-dependencies.patch | 81 ------ ports/ignition-common3/portfile.cmake | 20 -- ports/ignition-common3/vcpkg.json | 27 -- .../link-correct-yaml-target.patch | 24 -- ports/ignition-fuel-tools1/portfile.cmake | 9 - ports/ignition-fuel-tools1/vcpkg.json | 19 -- ports/ignition-fuel-tools4/portfile.cmake | 5 - ports/ignition-fuel-tools4/vcpkg.json | 22 -- ports/ignition-math4/portfile.cmake | 3 - ports/ignition-math4/vcpkg.json | 15 -- ports/ignition-math6/portfile.cmake | 4 - ports/ignition-math6/vcpkg.json | 15 -- ports/ignition-msgs1/fix-Add_std_string.patch | 29 --- .../fix-protobuf-static-link-order.patch | 14 - .../ignition-msgs1/fix-protobuf-version.patch | 12 - ports/ignition-msgs1/portfile.cmake | 24 -- ports/ignition-msgs1/vcpkg.json | 16 -- ports/ignition-msgs5/01-protobuf.patch | 13 - ports/ignition-msgs5/02-Add_std_string.patch | 29 --- .../ignition-msgs5/03-protobuf-version.patch | 12 - ports/ignition-msgs5/portfile.cmake | 10 - ports/ignition-msgs5/vcpkg.json | 18 -- ports/ignition-msgs6/01-Add_std_string.patch | 29 --- .../ignition-msgs6/02-protobuf-version.patch | 12 - ports/ignition-msgs6/portfile.cmake | 7 - ports/ignition-msgs6/vcpkg.json | 18 -- ports/ignition-plugin1/portfile.cmake | 5 - ports/ignition-plugin1/vcpkg.json | 18 -- ports/ignition-tools/portfile.cmake | 45 ---- ports/ignition-tools/vcpkg.json | 20 -- ports/ignition-transport4/fix-protobuf.patch | 62 ----- ports/ignition-transport4/portfile.cmake | 9 - ports/ignition-transport4/uuid-osx.patch | 26 -- ports/ignition-transport4/vcpkg.json | 22 -- ports/ignition-transport8/fix-protobuf.patch | 62 ----- ports/ignition-transport8/portfile.cmake | 6 - ports/ignition-transport8/vcpkg.json | 23 -- ports/ignition-transport9/fix-protobuf.patch | 62 ----- ports/ignition-transport9/portfile.cmake | 9 - ports/ignition-transport9/uuid-osx.patch | 26 -- ports/ignition-transport9/vcpkg.json | 23 -- ports/ignition-utils1/portfile.cmake | 6 - ports/ignition-utils1/vcpkg.json | 14 - ports/sdformat10/fix-quote.patch | 85 ------ ports/sdformat10/no-absolute.patch | 38 --- ports/sdformat10/portfile.cmake | 43 ---- ports/sdformat10/vcpkg.json | 21 -- ports/sdformat6/disable-test.patch | 34 --- .../disable-unneeded-include-findboost.patch | 12 - ports/sdformat6/fix-dependency-urdfdom.patch | 34 --- ports/sdformat6/portfile.cmake | 61 ----- ports/sdformat6/vcpkg.json | 24 -- ports/sdformat9/fix-dependency-urdfdom.patch | 35 --- ports/sdformat9/fix-quote.patch | 85 ------ ports/sdformat9/no-absolute.patch | 38 --- ports/sdformat9/portfile.cmake | 44 ---- .../use-external-tinyxml-windows.patch | 26 -- ports/sdformat9/vcpkg.json | 23 -- scripts/ci.baseline.txt | 23 -- versions/baseline.json | 82 +----- versions/d-/dartsim.json | 5 + 80 files changed, 8 insertions(+), 2331 deletions(-) delete mode 100644 ports/gazebo/0001-Fix-deps.patch delete mode 100644 ports/gazebo/portfile.cmake delete mode 100644 ports/gazebo/vcpkg.json delete mode 100644 ports/ignition-cmake0/do-not-compile-gtest.patch delete mode 100644 ports/ignition-cmake0/fix-find-ign-curl.patch delete mode 100644 ports/ignition-cmake0/portfile.cmake delete mode 100644 ports/ignition-cmake0/support-arm64.patch delete mode 100644 ports/ignition-cmake0/usage delete mode 100644 ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch delete mode 100644 ports/ignition-cmake0/vcpkg.json delete mode 100644 ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch delete mode 100644 ports/ignition-cmake2/portfile.cmake delete mode 100644 ports/ignition-cmake2/usage delete mode 100644 ports/ignition-cmake2/vcpkg.json delete mode 100644 ports/ignition-common1/add-include-chrono.patch delete mode 100644 ports/ignition-common1/portfile.cmake delete mode 100644 ports/ignition-common1/vcpkg.json delete mode 100644 ports/ignition-common3/fix-dependencies.patch delete mode 100644 ports/ignition-common3/portfile.cmake delete mode 100644 ports/ignition-common3/vcpkg.json delete mode 100644 ports/ignition-fuel-tools1/link-correct-yaml-target.patch delete mode 100644 ports/ignition-fuel-tools1/portfile.cmake delete mode 100644 ports/ignition-fuel-tools1/vcpkg.json delete mode 100644 ports/ignition-fuel-tools4/portfile.cmake delete mode 100644 ports/ignition-fuel-tools4/vcpkg.json delete mode 100644 ports/ignition-math4/portfile.cmake delete mode 100644 ports/ignition-math4/vcpkg.json delete mode 100644 ports/ignition-math6/portfile.cmake delete mode 100644 ports/ignition-math6/vcpkg.json delete mode 100644 ports/ignition-msgs1/fix-Add_std_string.patch delete mode 100644 ports/ignition-msgs1/fix-protobuf-static-link-order.patch delete mode 100644 ports/ignition-msgs1/fix-protobuf-version.patch delete mode 100644 ports/ignition-msgs1/portfile.cmake delete mode 100644 ports/ignition-msgs1/vcpkg.json delete mode 100644 ports/ignition-msgs5/01-protobuf.patch delete mode 100644 ports/ignition-msgs5/02-Add_std_string.patch delete mode 100644 ports/ignition-msgs5/03-protobuf-version.patch delete mode 100644 ports/ignition-msgs5/portfile.cmake delete mode 100644 ports/ignition-msgs5/vcpkg.json delete mode 100644 ports/ignition-msgs6/01-Add_std_string.patch delete mode 100644 ports/ignition-msgs6/02-protobuf-version.patch delete mode 100644 ports/ignition-msgs6/portfile.cmake delete mode 100644 ports/ignition-msgs6/vcpkg.json delete mode 100644 ports/ignition-plugin1/portfile.cmake delete mode 100644 ports/ignition-plugin1/vcpkg.json delete mode 100644 ports/ignition-tools/portfile.cmake delete mode 100644 ports/ignition-tools/vcpkg.json delete mode 100644 ports/ignition-transport4/fix-protobuf.patch delete mode 100644 ports/ignition-transport4/portfile.cmake delete mode 100644 ports/ignition-transport4/uuid-osx.patch delete mode 100644 ports/ignition-transport4/vcpkg.json delete mode 100644 ports/ignition-transport8/fix-protobuf.patch delete mode 100644 ports/ignition-transport8/portfile.cmake delete mode 100644 ports/ignition-transport8/vcpkg.json delete mode 100644 ports/ignition-transport9/fix-protobuf.patch delete mode 100644 ports/ignition-transport9/portfile.cmake delete mode 100644 ports/ignition-transport9/uuid-osx.patch delete mode 100644 ports/ignition-transport9/vcpkg.json delete mode 100644 ports/ignition-utils1/portfile.cmake delete mode 100644 ports/ignition-utils1/vcpkg.json delete mode 100644 ports/sdformat10/fix-quote.patch delete mode 100644 ports/sdformat10/no-absolute.patch delete mode 100644 ports/sdformat10/portfile.cmake delete mode 100644 ports/sdformat10/vcpkg.json delete mode 100644 ports/sdformat6/disable-test.patch delete mode 100644 ports/sdformat6/disable-unneeded-include-findboost.patch delete mode 100644 ports/sdformat6/fix-dependency-urdfdom.patch delete mode 100644 ports/sdformat6/portfile.cmake delete mode 100644 ports/sdformat6/vcpkg.json delete mode 100644 ports/sdformat9/fix-dependency-urdfdom.patch delete mode 100644 ports/sdformat9/fix-quote.patch delete mode 100644 ports/sdformat9/no-absolute.patch delete mode 100644 ports/sdformat9/portfile.cmake delete mode 100644 ports/sdformat9/use-external-tinyxml-windows.patch delete mode 100644 ports/sdformat9/vcpkg.json diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index f5a811e6f1ab5d..4519651239ed0f 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_cmake_configure( -DDART_SKIP_IPOPT=ON -DDART_SKIP_NLOPT=ON -DDART_SKIP_pagmo=ON - -DDART_SKIP_spdlog=ON -Durdfdom_headers_VERSION_MAJOR=1 # urdfdom-headers does not expose a header macro for its version. -Durdfdom_headers_VERSION_MINOR=0 # versions of at least 1.0.0 use std:: constructs in their ABI instead of boost:: ones. -Durdfdom_headers_VERSION_PATCH=0 diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 11be3fea4853b0..a84bf88c638b87 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dartsim", "version": "6.15.0", - "port-version": 1, + "port-version": 2, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "license": "BSD-2-Clause", @@ -26,6 +26,7 @@ "ode", "opengl", "osg", + "spdlog", "tinyxml2", "urdfdom", { diff --git a/ports/gazebo/0001-Fix-deps.patch b/ports/gazebo/0001-Fix-deps.patch deleted file mode 100644 index d06cf32d5a6da4..00000000000000 --- a/ports/gazebo/0001-Fix-deps.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 732cbb4..d9d4c0c 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -3,11 +3,9 @@ include (CheckCXXSourceCompiles) - - include (${gazebo_cmake_dir}/FindOS.cmake) - find_package(PkgConfig) --include (${gazebo_cmake_dir}/FindFreeimage.cmake) -- --execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --modversion protobuf -- OUTPUT_VARIABLE PROTOBUF_VERSION -- RESULT_VARIABLE protobuf_modversion_failed) -+find_package(freeimage CONFIG REQUIRED) -+set(freeimage_LIBRARIES freeimage::FreeImage) -+get_target_property(freeimage_INCLUDE_DIRS freeimage::FreeImage INTERFACE_INCLUDE_DIRECTORIES) - - ######################################## - # 1. can not use GAZEBO_BUILD_TYPE_PROFILE is defined after include this module -@@ -25,6 +23,8 @@ if (CMAKE_BUILD_TYPE) - endif() - - ######################################## -+find_package(Protobuf CONFIG REQUIRED) -+ - if (PROTOBUF_VERSION LESS 2.3.0) - BUILD_ERROR("Incorrect version: Gazebo requires protobuf version 2.3.0 or greater") - endif() -@@ -35,6 +35,7 @@ endif() - # Protobuf >= 22 requires to link abseil, so we are constrained to use - # find_package(Protobuf) and link to protobuf::libprotobuf, - # see https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/4075#issuecomment-1569242816 -+ - if (DEFINED PROTOBUF_VERSION AND PROTOBUF_VERSION GREATER_EQUAL 22.0) - set(GZ_PROTOBUF_USE_CMAKE_CONFIG_DEFAULT ON) - else() -@@ -62,7 +63,6 @@ if(NOT GZ_PROTOBUF_USE_CMAKE_CONFIG) - set (GZ_PROTOBUF_PROTOC_LIBRARY ${PROTOBUF_PROTOC_LIBRARY}) - endif() - else() -- find_package(Protobuf CONFIG REQUIRED) - set (GZ_PROTOBUF_LIBRARY protobuf::libprotobuf) - set (GZ_PROTOBUF_PROTOC_LIBRARY protobuf::libprotoc) - if(NOT DEFINED PROTOBUF_PROTOC_EXECUTABLE) -@@ -203,7 +203,7 @@ if (PKG_CONFIG_FOUND) - # (needed, at least, for MacOS) - - # Use system installation on UNIX and Apple, and internal copy on Windows -- if (UNIX OR APPLE) -+ if (true) - set (USE_EXTERNAL_TINYXML_DEFAULT_VALUE ON) - elseif(WIN32) - set (USE_EXTERNAL_TINYXML_DEFAULT_VALUE OFF) -@@ -252,7 +252,7 @@ if (PKG_CONFIG_FOUND) - # (needed, at least, for MacOS) - - # Use system installation on UNIX and Apple, and internal copy on Windows -- if (UNIX OR APPLE) -+ if (true) - set (USE_EXTERNAL_TINYXML2_DEFAULT_VALUE ON) - elseif(WIN32) - set (USE_EXTERNAL_TINYXML2_DEFAULT_VALUE OFF) -@@ -331,8 +331,7 @@ if (PKG_CONFIG_FOUND) - - ################################################# - # Find TBB -- pkg_check_modules(TBB tbb) -- set (TBB_PKG_CONFIG "tbb") -+ find_package(TBB CONFIG REQUIRED) - if (NOT TBB_FOUND) - message(STATUS "TBB not found, attempting to detect manually") - set (TBB_PKG_CONFIG "") -@@ -365,23 +364,20 @@ if (PKG_CONFIG_FOUND) - ################################################# - # Find OGRE - -- pkg_check_modules(OGRE-RTShaderSystem -- OGRE-RTShaderSystem>=${MIN_OGRE_VERSION}) -+ find_package(OGRE CONFIG REQUIRED) - -- if (OGRE-RTShaderSystem_FOUND) -- set(ogre_ldflags ${OGRE-RTShaderSystem_LDFLAGS}) -- set(ogre_include_dirs ${OGRE-RTShaderSystem_INCLUDE_DIRS}) -- set(ogre_libraries ${OGRE-RTShaderSystem_LIBRARIES}) -- set(ogre_library_dirs ${OGRE-RTShaderSystem_LIBRARY_DIRS}) -- set(ogre_cflags ${OGRE-RTShaderSystem_CFLAGS}) -+ if (OGRE_RTShaderSystem_FOUND) -+ set(ogre_ldflags ${OGRE_RTShaderSystem_LDFLAGS}) -+ set(ogre_include_dirs ${OGRE_RTShaderSystem_INCLUDE_DIRS}) -+ set(ogre_libraries ${OGRE_RTShaderSystem_LIBRARIES}) -+ set(ogre_library_dirs ${OGRE_RTShaderSystem_LIBRARY_DIRS}) -+ set(ogre_cflags ${OGRE_RTShaderSystem_CFLAGS}) - - set (INCLUDE_RTSHADER ON CACHE BOOL "Enable GPU shaders") - else () - set (INCLUDE_RTSHADER OFF CACHE BOOL "Enable GPU shaders") - endif () - -- pkg_check_modules(OGRE OGRE>=${MIN_OGRE_VERSION}) -- - if (PKG_CONFIG_EXECUTABLE AND OGRE_FOUND AND NOT DEFINED OGRE_VERSION) - execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --modversion OGRE - OUTPUT_VARIABLE OGRE_VERSION) -@@ -451,25 +447,22 @@ if (PKG_CONFIG_FOUND) - set(ogre_cflags ${ogre_cflags} ${OGRE_CFLAGS}) - endif () - -- pkg_check_modules(OGRE-Terrain OGRE-Terrain) -- if (OGRE-Terrain_FOUND) -- set(ogre_ldflags ${ogre_ldflags} ${OGRE-Terrain_LDFLAGS}) -- set(ogre_include_dirs ${ogre_include_dirs} ${OGRE-Terrain_INCLUDE_DIRS}) -- set(ogre_libraries ${ogre_libraries};${OGRE-Terrain_LIBRARIES}) -- set(ogre_library_dirs ${ogre_library_dirs} ${OGRE-Terrain_LIBRARY_DIRS}) -- set(ogre_cflags ${ogre_cflags} ${OGRE-Terrain_CFLAGS}) -+ if (OGRE_Terrain_FOUND) -+ set(ogre_ldflags ${ogre_ldflags} ${OGRE_Terrain_LDFLAGS}) -+ set(ogre_include_dirs ${ogre_include_dirs} ${OGRE_Terrain_INCLUDE_DIRS}) -+ set(ogre_libraries ${ogre_libraries};${OGRE_Terrain_LIBRARIES}) -+ set(ogre_library_dirs ${ogre_library_dirs} ${OGRE_Terrain_LIBRARY_DIRS}) -+ set(ogre_cflags ${ogre_cflags} ${OGRE_Terrain_CFLAGS}) - endif() - -- pkg_check_modules(OGRE-Overlay OGRE-Overlay) -- if (OGRE-Overlay_FOUND) -- set(ogre_ldflags ${ogre_ldflags} ${OGRE-Overlay_LDFLAGS}) -- set(ogre_include_dirs ${ogre_include_dirs} ${OGRE-Overlay_INCLUDE_DIRS}) -- set(ogre_libraries ${ogre_libraries};${OGRE-Overlay_LIBRARIES}) -- set(ogre_library_dirs ${ogre_library_dirs} ${OGRE-Overlay_LIBRARY_DIRS}) -- set(ogre_cflags ${ogre_cflags} ${OGRE-Overlay_CFLAGS}) -+ if (OGRE_Overlay_FOUND) -+ set(ogre_ldflags ${ogre_ldflags} ${OGRE_Overlay_LDFLAGS}) -+ set(ogre_include_dirs ${ogre_include_dirs} ${OGRE_Overlay_INCLUDE_DIRS}) -+ set(ogre_libraries ${ogre_libraries};${OGRE_Overlay_LIBRARIES}) -+ set(ogre_library_dirs ${ogre_library_dirs} ${OGRE_Overlay_LIBRARY_DIRS}) -+ set(ogre_cflags ${ogre_cflags} ${OGRE_Overlay_CFLAGS}) - endif() - -- - set (OGRE_INCLUDE_DIRS ${ogre_include_dirs} - CACHE INTERNAL "Ogre include path") - -@@ -549,7 +542,7 @@ if (PKG_CONFIG_FOUND) - endif () - - if (libavutil_FOUND AND libavformat_FOUND AND libavcodec_FOUND AND -- libswscale_FOUND) -+ libswscale_FOUND AND FFMPEG_FEATURE) - set (HAVE_FFMPEG TRUE) - else () - set (HAVE_FFMPEG FALSE) -@@ -574,7 +567,7 @@ if (PKG_CONFIG_FOUND) - ######################################## - # Find GNU Triangulation Surface Library - pkg_check_modules(gts gts) -- if (gts_FOUND) -+ if (GTS_FEATURE) - message (STATUS "Looking for GTS - found") - set (HAVE_GTS TRUE) - else () -@@ -587,7 +580,7 @@ if (PKG_CONFIG_FOUND) - # First and preferred option is to look for bullet standard pkgconfig, - # so check it first. if it is not present, check for the OSRF - # custom bullet2.82.pc file -- pkg_check_modules(BULLET bullet>=2.82) -+ find_package(BULLET CONFIG 2.82) - if (NOT BULLET_FOUND) - pkg_check_modules(BULLET bullet2.82>=2.82) - endif() -@@ -596,6 +589,7 @@ if (PKG_CONFIG_FOUND) - endif() - if (BULLET_FOUND) - set (HAVE_BULLET TRUE) -+ set(BULLET_VERSION ${BULLET_VERSION_STRING}) - if (${BULLET_VERSION} STREQUAL "") - set (BULLET_VERSION ${BULLET_VERSION_STRING}) - endif() -@@ -614,7 +608,7 @@ if (PKG_CONFIG_FOUND) - ######################################## - # Find libusb - pkg_check_modules(libusb-1.0 libusb-1.0) -- if (NOT libusb-1.0_FOUND) -+ if (NO_LIBUSB_FEATURE) - BUILD_WARNING ("libusb-1.0 not found. USB peripherals support will be disabled.") - set (HAVE_USB OFF CACHE BOOL "HAVE USB" FORCE) - else() -@@ -690,7 +684,7 @@ endif () - ######################################## - # Find gdal - include (FindGDAL) --if (NOT GDAL_FOUND) -+if (NO_GDAL_FEATURE) - message (STATUS "Looking for libgdal - not found") - BUILD_WARNING ("GDAL not found, Digital elevation terrains support will be disabled.") - set (HAVE_GDAL OFF CACHE BOOL "HAVE GDAL" FORCE) -@@ -774,7 +768,7 @@ endif() - ######################################## - # Find graphviz - include (${gazebo_cmake_dir}/FindGraphviz.cmake) --if (NOT GRAPHVIZ_FOUND) -+if (NO_GRAPHVIZ_FEATURE) - message (STATUS "Looking for libgraphviz-dev - not found") - BUILD_WARNING ("Graphviz not found, Model editor's schematic view will be disabled.") - set (HAVE_GRAPHVIZ OFF CACHE BOOL "HAVE GRAPHVIZ" FORCE) -diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in -index ac1de2c..05cdc02 100644 ---- a/cmake/gazebo-config.cmake.in -+++ b/cmake/gazebo-config.cmake.in -@@ -1,3 +1,6 @@ -+include(CMakeFindDependencyMacro) -+find_dependency(freeimage CONFIG) -+ - if (@PKG_NAME@_CONFIG_INCLUDED) - return() - endif() -@@ -99,12 +102,13 @@ list(APPEND @PKG_NAME@_CFLAGS -I${GAZEBO_INSTALL_INCLUDE_DIR}/gazebo-@GAZEBO_MAJ - - if (GAZEBO_HAS_BULLET) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(BULLET bullet>=2.82) -+ find_package(BULLET CONFIG 2.82) - if (NOT BULLET_FOUND) - pkg_check_modules(BULLET bullet2.82>=2.82) - endif() - - if (BULLET_FOUND) -+ set(BULLET_VERSION ${BULLET_VERSION_STRING}) - add_definitions(-DLIBBULLET_VERSION=${BULLET_VERSION}) - else() - message(FATAL_ERROR "Error: Bullet > 2.82 not found, please install libbullet2.82-dev.") -diff --git a/gazebo/rendering/ogre_gazebo.h b/gazebo/rendering/ogre_gazebo.h -index a171782..c390d14 100644 ---- a/gazebo/rendering/ogre_gazebo.h -+++ b/gazebo/rendering/ogre_gazebo.h -@@ -66,7 +66,7 @@ - #if OGRE_VERSION_MAJOR > 1 || OGRE_VERSION_MINOR >= 7 - #include - #include --#include -+#include - #include - #include - #include diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake deleted file mode 100644 index a2199e36213108..00000000000000 --- a/ports/gazebo/portfile.cmake +++ /dev/null @@ -1,59 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO gazebosim/gazebo-classic - REF "gazebo11_${VERSION}" - SHA512 0dede29618fc9d9a91d208a75b8ca1d3e6d3e8f4f60a80047b2d5806991f00f0bec46f6e2daca5931aed9c243f1e1d334e7a3eae9165b453cdedfb5b73b71186 - HEAD_REF gazebo11 - PATCHES - 0001-Fix-deps.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - openal HAVE_OPENAL - ffmpeg FFMPEG_FEATURE - gts GTS_FEATURE - INVERTED_FEATURES - simbody CMAKE_DISABLE_FIND_PACKAGE_Simbody - dart CMAKE_DISABLE_FIND_PACKAGE_DART - bullet CMAKE_DISABLE_FIND_PACKAGE_BULLET - libusb NO_LIBUSB_FEATURE - gdal NO_GDAL_FEATURE - graphviz NO_GRAPHVIZ_FEATURE -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON - "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" - ${FEATURE_OPTIONS} - -DBUILD_TESTING=OFF # Not enabled by default, but to be sure -) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gazebo-11/gazebo/test") - -foreach(postfix "" "-11") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${postfix}/setup.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") -endforeach() - -vcpkg_copy_tools( - TOOL_NAMES gazebo gz gzclient gzserver - AUTO_CLEAN -) -set(EXTRA_OGRE_LIBS Codec_EXR Codec_FreeImage Codec_STBI OgreBites OgreMain OgreMeshLodGenerator OgreOverlay OgrePaging OgreProperty OgreRTShaderSystem OgreTerrain OgreVolume Plugin_BSPSceneManager Plugin_DotScene Plugin_OctreeSceneManager Plugin_OctreeZone Plugin_ParticleFX Plugin_PCZSceneManager RenderSystem_Direct3D11 RenderSystem_GL RenderSystem_GL3Plus) -foreach(LIB IN LISTS EXTRA_OGRE_LIBS) - set(FILE_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}") - file(COPY "${CURRENT_INSTALLED_DIR}/bin/${FILE_NAME}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -endforeach() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json deleted file mode 100644 index bcb67be3148718..00000000000000 --- a/ports/gazebo/vcpkg.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "name": "gazebo", - "version": "11.15.1", - "description": "Open source robotics simulator.", - "homepage": "http://gazebosim.org", - "license": "Apache-2.0", - "dependencies": [ - "boost-asio", - "boost-date-time", - "boost-filesystem", - "boost-format", - "boost-interprocess", - "boost-iostreams", - "boost-program-options", - "boost-property-tree", - "boost-regex", - "boost-system", - "boost-thread", - "boost-uuid", - "ccd", - { - "name": "hdf5", - "features": [ - "cpp" - ] - }, - "ignition-common3", - "ignition-fuel-tools4", - "ignition-math6", - "ignition-msgs5", - "ignition-transport8", - "ogre", - { - "name": "pkgconf", - "host": true - }, - "protobuf", - "qt5", - "qwt", - "sdformat9", - "tbb", - "tiny-process-library", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "default-features": [ - "bullet", - "dart", - "ffmpeg", - "gdal", - "graphviz", - "gts", - "libusb", - "openal", - "simbody" - ], - "features": { - "bullet": { - "description": "Use the bullet physics engine", - "dependencies": [ - "bullet3" - ] - }, - "dart": { - "description": "Use the dart physics engine", - "dependencies": [ - "dartsim" - ] - }, - "ffmpeg": { - "description": "Enable audio-video capabilities", - "dependencies": [ - { - "name": "ffmpeg", - "features": [ - "avcodec", - "avformat", - "swscale" - ] - } - ] - }, - "gdal": { - "description": "Enable digital elevation terrains support", - "dependencies": [ - "gdal" - ] - }, - "graphviz": { - "description": "Enable model editor's schematic view", - "dependencies": [ - "graphviz" - ] - }, - "gts": { - "description": "Enable CSG support", - "dependencies": [ - "gts" - ] - }, - "libusb": { - "description": "Enable USB peripheral support", - "dependencies": [ - "libusb" - ] - }, - "openal": { - "description": "Enable audio support", - "dependencies": [ - "openal-soft" - ] - }, - "simbody": { - "description": "Use the simbody physics engine", - "dependencies": [ - "simbody" - ] - } - } -} diff --git a/ports/ignition-cmake0/do-not-compile-gtest.patch b/ports/ignition-cmake0/do-not-compile-gtest.patch deleted file mode 100644 index 7c20a0dbeacde9..00000000000000 --- a/ports/ignition-cmake0/do-not-compile-gtest.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake/IgnConfigureBuild.cmake b/cmake/IgnConfigureBuild.cmake ---- a/cmake/IgnConfigureBuild.cmake -+++ b/cmake/IgnConfigureBuild.cmake -@@ -109,7 +109,9 @@ - # Add all the source code directories - add_subdirectory(src) - add_subdirectory(include) -- add_subdirectory(test) -+ if(BUILD_TESTING) -+ add_subdirectory(test) -+ endif() - - - #-------------------------------------- diff --git a/ports/ignition-cmake0/fix-find-ign-curl.patch b/ports/ignition-cmake0/fix-find-ign-curl.patch deleted file mode 100644 index 9189712d278f83..00000000000000 --- a/ports/ignition-cmake0/fix-find-ign-curl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r 3276aecbcbb4 -r 33b5d95affd2 cmake/FindIgnCURL.cmake ---- a/cmake/FindIgnCURL.cmake -+++ b/cmake/FindIgnCURL.cmake -@@ -46,6 +46,12 @@ - - # Older versions of curl don't create imported targets, so we will create - # them here if they have not been provided. -+ if(TARGET CURL::libcurl AND NOT TARGET curl::curl) -+ add_library(curl::curl INTERFACE IMPORTED) -+ set_target_properties(curl::curl PROPERTIES -+ INTERFACE_LINK_LIBRARIES CURL::libcurl) -+ endif() -+ - include(IgnImportTarget) - - if(NOT TARGET curl::curl) diff --git a/ports/ignition-cmake0/portfile.cmake b/ports/ignition-cmake0/portfile.cmake deleted file mode 100644 index 4e2d7dbaadd45a..00000000000000 --- a/ports/ignition-cmake0/portfile.cmake +++ /dev/null @@ -1,24 +0,0 @@ -set(PACKAGE_VERSION "0.6.1") - -ignition_modular_library(NAME cmake - VERSION ${PACKAGE_VERSION} - REF "ignition-cmake_${PACKAGE_VERSION}" - SHA512 9414db04ef6ce0206aba4eb1c8192524249761976b82654da89222e0931d1e2bbd63dcc7f4e6c6fddbc71e54911e9bf9fcbd159f51862e89419e0686bfb035e9 - # Ensure that gtest is not compiled (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/163) - PATCHES do-not-compile-gtest.patch - # Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168) - support-arm64.patch - # Do not depend on pkg-config installed to find uuid - uuid-do-not-require-pkg-config.patch - # Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175) - fix-find-ign-curl.patch - ) - -# Permit empty include folder -set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) - -# Remove unneccessary directory, as ignition-cmake is a pure CMake package -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") - -# Install custom usage -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/ignition-cmake0/support-arm64.patch b/ports/ignition-cmake0/support-arm64.patch deleted file mode 100644 index aba99ba352a6ed..00000000000000 --- a/ports/ignition-cmake0/support-arm64.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r 8a976a308d77 -r 1bea7874cfec cmake/IgnSetCompilerFlags.cmake ---- a/cmake/IgnSetCompilerFlags.cmake -+++ b/cmake/IgnSetCompilerFlags.cmake -@@ -279,13 +279,6 @@ - # Don't pull in the Windows min/max macros - add_definitions(-DNOMINMAX) - -- if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) -- # Not needed if a proper cmake generator (-G "...Win64") is passed -- # to cmake. Enable as a second measure to work around bug -- # http://www.cmake.org/Bug/print_bug_page.php?bug_id=11240 -- set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64") -- endif() -- - if(USE_IGN_RECOMMENDED_FLAGS) - - # Gy: Prevent errors caused by multiply-defined symbols diff --git a/ports/ignition-cmake0/usage b/ports/ignition-cmake0/usage deleted file mode 100644 index 66da98102ec974..00000000000000 --- a/ports/ignition-cmake0/usage +++ /dev/null @@ -1,3 +0,0 @@ -The package ignition-cmake0 provides CMake integration: - - find_package(ignition-cmake0 CONFIG REQUIRED) diff --git a/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch b/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch deleted file mode 100644 index 6953391facae5c..00000000000000 --- a/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake -index bf055d4..15be822 100644 ---- a/cmake/FindUUID.cmake -+++ b/cmake/FindUUID.cmake -@@ -18,4 +18,25 @@ - if (UNIX) - include(IgnPkgConfig) - ign_pkg_check_modules(UUID uuid) -+ -+ # If pkg-config is not available in the system, -+ # it is neccessary to manually find uuid -+ if(NOT TARGET UUID::UUID) -+ find_path(UUID_INCLUDE_DIRS NAMES uuid.h PATH_SUFFIXES uuid) -+ mark_as_advanced(UUID_INCLUDE_DIRS) -+ -+ find_library(UUID_LIBRARIES NAMES uuid libuuid) -+ mark_as_advanced(UUID_LIBRARIES) -+ -+ if(NOT UUID_INCLUDE_DIRS OR NOT UUID_LIBRARIES) -+ set(UUID_FOUND false) -+ else() -+ set(UUID_FOUND true) -+ endif() -+ -+ if(UUID_FOUND) -+ include(IgnImportTarget) -+ ign_import_target(UUID) -+ endif() -+ endif() - endif() diff --git a/ports/ignition-cmake0/vcpkg.json b/ports/ignition-cmake0/vcpkg.json deleted file mode 100644 index 6d97e8a6e88e7d..00000000000000 --- a/ports/ignition-cmake0/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "ignition-cmake0", - "version": "0.6.2", - "port-version": 4, - "description": "CMake helper functions for building robotic applications", - "homepage": "https://ignitionrobotics.org/libs/cmake", - "license": null, - "dependencies": [ - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch b/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch deleted file mode 100644 index cb562df06d3b7c..00000000000000 --- a/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake -index bc6dbdc..1e8adbb 100644 ---- a/cmake/IgnUtils.cmake -+++ b/cmake/IgnUtils.cmake -@@ -142,7 +142,7 @@ macro(ign_find_package PACKAGE_NAME) - #------------------------------------ - # Define the expected arguments - set(options REQUIRED PRIVATE EXACT QUIET CONFIG BUILD_ONLY PKGCONFIG_IGNORE) -- set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON) -+ set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON BY_PKGCONFIG) - set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS) - - #------------------------------------ -@@ -191,9 +191,15 @@ macro(ign_find_package PACKAGE_NAME) - endif() - - -+ if (NOT ign_find_package_BY_PKGCONFIG) - #------------------------------------ - # Call find_package with the provided arguments - find_package(${${PACKAGE_NAME}_find_package_args}) -+ else() -+ find_package(PkgConfig REQUIRED) -+ include(FindPkgConfig) -+ pkg_check_modules(${PACKAGE_NAME} ${ign_find_package_BY_PKGCONFIG}) -+ endif() - - if(${PACKAGE_NAME}_FOUND) - -@@ -319,17 +325,11 @@ macro(ign_find_package PACKAGE_NAME) - endif() - - if(ign_find_package_REQUIRED_BY) -- -- # Identify which components are privately requiring this package -- foreach(component ${ign_find_package_PRIVATE_FOR}) -- set(${component}_${PACKAGE_NAME}_PRIVATE true) -- endforeach() -- - # If this is required by some components, add it to the - # ${component}_CMAKE_DEPENDENCIES variables that are specific to those - # componenets - foreach(component ${ign_find_package_REQUIRED_BY}) -- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) -+ if(NOT ign_find_package_BY_PKGCONFIG) - ign_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") - endif() - endforeach() diff --git a/ports/ignition-cmake2/portfile.cmake b/ports/ignition-cmake2/portfile.cmake deleted file mode 100644 index 39c3a29cebfeb4..00000000000000 --- a/ports/ignition-cmake2/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -set(PACKAGE_VERSION "2.17.1") - -ignition_modular_library(NAME cmake - VERSION ${PACKAGE_VERSION} - SHA512 871a32e9ca5314caa5f25b4135b430e7be829f7afd12ba98ea4524ee758c7ca7ebf64a9e567c6dbc285c497320cd0fe1e69f8d891343b869344726b32dbdc3ee - PATCHES - add-pkgconfig-and-remove-privatefor-limit.patch) - -# Install custom usage -configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/ignition-cmake2/usage b/ports/ignition-cmake2/usage deleted file mode 100644 index b62ba0c764719b..00000000000000 --- a/ports/ignition-cmake2/usage +++ /dev/null @@ -1,3 +0,0 @@ -The package ignition-cmake2 provides CMake integration: - - find_package(ignition-cmake2 CONFIG REQUIRED) diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json deleted file mode 100644 index dfacd4a592ca49..00000000000000 --- a/ports/ignition-cmake2/vcpkg.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "ignition-cmake2", - "version": "2.17.1", - "description": "CMake helper functions for building robotic applications", - "homepage": "https://ignitionrobotics.org/libs/cmake", - "license": null, - "dependencies": [ - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/ignition-common1/add-include-chrono.patch b/ports/ignition-common1/add-include-chrono.patch deleted file mode 100644 index 3fa049e0a6b249..00000000000000 --- a/ports/ignition-common1/add-include-chrono.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index a43745e301cc2a..00000000000000 --- a/ports/ignition-common1/portfile.cmake +++ /dev/null @@ -1,6 +0,0 @@ -ignition_modular_library(NAME common - VERSION "1.1.1" - REF ignition-common_1.1.1 - SHA512 3311a07fad8fdf809ff3f865de2493ec17c3dd157ee3297f283cf872090fb9e9f05b163416dca32f1bdf2bde02c9b4a9a7defc308344b747a8d113594f65f309 - PATCHES add-include-chrono.patch - ) diff --git a/ports/ignition-common1/vcpkg.json b/ports/ignition-common1/vcpkg.json deleted file mode 100644 index 503ea8972342ff..00000000000000 --- a/ports/ignition-common1/vcpkg.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "ignition-common1", - "version": "1.1.1", - "port-version": 5, - "description": "Deprecated: Use ignition-common3. Common libraries for robotics applications", - "license": null, - "supports": "windows", - "dependencies": [ - { - "name": "dlfcn-win32", - "platform": "windows | uwp" - }, - { - "name": "ffmpeg", - "platform": "!windows & !uwp" - }, - { - "name": "freeimage", - "platform": "!windows & !uwp" - }, - { - "name": "gts", - "platform": "!windows & !uwp" - }, - "ignition-cmake0", - "ignition-math4", - { - "name": "ignition-modularscripts", - "host": true - }, - { - "name": "tinyxml2", - "platform": "!windows & !uwp" - } - ] -} diff --git a/ports/ignition-common3/fix-dependencies.patch b/ports/ignition-common3/fix-dependencies.patch deleted file mode 100644 index 7908991df7af76..00000000000000 --- a/ports/ignition-common3/fix-dependencies.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73920fe..8bee7fe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,7 +52,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) - #-------------------------------------- - # Find Tinyxml2 - if(USE_EXTERNAL_TINYXML2) -- ign_find_package(TINYXML2 PRETTY tinyxml2 -+ ign_find_package(tinyxml2 EXTRA_ARGS CONFIG - REQUIRED_BY graphics - PRIVATE_FOR graphics) - else() -@@ -70,13 +70,13 @@ if(NOT MSVC) - - #------------------------------------ - # Find uuid -- ign_find_package(UUID REQUIRED PRETTY uuid) -+ ign_find_package(UUID REQUIRED PRETTY uuid REQUIRED_BY graphics) - - endif() - - #------------------------------------ - # Find Freeimage --ign_find_package(FreeImage VERSION 3.9 -+ign_find_package(freeimage EXTRA_ARGS CONFIG - REQUIRED_BY graphics - PRIVATE_FOR graphics) - -@@ -84,6 +84,7 @@ ign_find_package(FreeImage VERSION 3.9 - # Find GNU Triangulation Surface Library - ign_find_package( - GTS PRETTY gts PURPOSE "GNU Triangulation Surface library" -+ BY_PKGCONFIG gts - REQUIRED_BY graphics - PRIVATE_FOR graphics) - -diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt -index 000a0ce..f6e1831 100644 ---- a/graphics/src/CMakeLists.txt -+++ b/graphics/src/CMakeLists.txt -@@ -16,8 +16,10 @@ target_link_libraries(${graphics_target} - PUBLIC - ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER} - PRIVATE -- GTS::GTS -- FreeImage::FreeImage) -+ ${GTS_LINK_LIBRARIES} -+ freeimage::FreeImage) -+ -+target_include_directories(${graphics_target} PRIVATE ${GTS_INCLUDE_DIRS}) - - ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} - LIB_DEPS ${graphics_target}) -@@ -28,13 +30,13 @@ if(USE_EXTERNAL_TINYXML2) - # If we are using an external copy of tinyxml2, add its imported target - target_link_libraries(${graphics_target} - PRIVATE -- TINYXML2::TINYXML2) -+ tinyxml2::tinyxml2) - - # The collada exporter test uses tinyxml2, so we must link it if we're using - # an external copy. The graphics target considers tinyxml2 to be a private - # dependency, so it will not automatically get linked to this test. - if(TARGET UNIT_ColladaExporter_TEST) -- target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2) -+ target_link_libraries(UNIT_ColladaExporter_TEST tinyxml2::tinyxml2) - endif() - - else() -@@ -62,8 +64,8 @@ endif() - - # define of tinxml2 major version >= 6 - # https://github.com/ignitionrobotics/ign-common/issues/28 --if (NOT TINYXML2_VERSION VERSION_LESS "6.0.0") -- message(STATUS "TINYXML2_VERSION ${TINYXML2_VERSION} >= 6.0.0") -+if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") -+ message(STATUS "TINYXML2_VERSION ${tinyxml2_VERSION} >= 6.0.0") - target_compile_definitions(${graphics_target} - PRIVATE "TINYXML2_MAJOR_VERSION_GE_6") - endif() diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake deleted file mode 100644 index 7a659315f677ca..00000000000000 --- a/ports/ignition-common3/portfile.cmake +++ /dev/null @@ -1,20 +0,0 @@ -set(PACKAGE_NAME common) - -ignition_modular_library( - NAME ${PACKAGE_NAME} - REF ${PORT}_${VERSION} - VERSION ${VERSION} - SHA512 022f5f68cdc134fa84dc22b49dc43e5c62d6e987e7fd63630586716e43fb2aad57ab4fb470ea1c3884c79b910d403a94a4d47ac24ffbb6f3b89b36c5b0e708f8 - OPTIONS - -DUSE_EXTERNAL_TINYXML2=ON - PATCHES - fix-dependencies.patch -) - - -# Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json deleted file mode 100644 index 16b6c9ce1f2a13..00000000000000 --- a/ports/ignition-common3/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "ignition-common3", - "version": "3.16.0", - "description": "Common libraries for robotics applications", - "homepage": "https://ignitionrobotics.org/libs/common", - "license": null, - "dependencies": [ - { - "name": "dlfcn-win32", - "platform": "windows | uwp" - }, - "ffmpeg", - "freeimage", - "gts", - "ignition-cmake2", - "ignition-math6", - { - "name": "ignition-modularscripts", - "host": true - }, - { - "name": "libuuid", - "platform": "!windows & !uwp & !osx" - }, - "tinyxml2" - ] -} diff --git a/ports/ignition-fuel-tools1/link-correct-yaml-target.patch b/ports/ignition-fuel-tools1/link-correct-yaml-target.patch deleted file mode 100644 index 0ceab340670a51..00000000000000 --- a/ports/ignition-fuel-tools1/link-correct-yaml-target.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 29939b8a25be -r 8a0a85e63950 CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,7 @@ - # Find ignition-cmake - #============================================================================ - # If you get an error at this line, you need to install ignition-cmake --find_package(ignition-cmake0 REQUIRED) -+find_package(ignition-cmake0 0.4.1 REQUIRED) - - #============================================================================ - # Configure the project -diff -r 29939b8a25be -r 8a0a85e63950 src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -52,7 +52,7 @@ - curl::curl - ignition-common${IGN_COMMON_MAJOR_VER}::ignition-common${IGN_COMMON_MAJOR_VER} - ${JSONCPP_TARGET} -- YAML::YAML -+ ${YAML_TARGET} - ZIP::ZIP - ) - diff --git a/ports/ignition-fuel-tools1/portfile.cmake b/ports/ignition-fuel-tools1/portfile.cmake deleted file mode 100644 index 3911029ed13b91..00000000000000 --- a/ports/ignition-fuel-tools1/portfile.cmake +++ /dev/null @@ -1,9 +0,0 @@ -ignition_modular_library(NAME fuel-tools - VERSION "1.2.0" - CMAKE_PACKAGE_NAME ignition-fuel_tools1 - SHA512 44ce9215231981f393cf1f6f83071e3f1c5d29bef4fab8d6483eb136b6e2a2e4273e85845f8b2336c4d50ac5fdcc6eb028a972baa0950083c8fa700f85cc7078 - # Ensure yaml is correctly linked (backport of https://bitbucket.org/ignitionrobotics/ign-fuel-tools/pull-requests/103/use-yaml_target-instead-of-yaml-yaml/diff) - PATCHES link-correct-yaml-target.patch - # This can be removed when the pc file of curl is fixed - DISABLE_PKGCONFIG_INSTALL - ) diff --git a/ports/ignition-fuel-tools1/vcpkg.json b/ports/ignition-fuel-tools1/vcpkg.json deleted file mode 100644 index 1f4b69293731f3..00000000000000 --- a/ports/ignition-fuel-tools1/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "ignition-fuel-tools1", - "version": "1.2.0", - "port-version": 4, - "description": "Tools for using fuel API to download robot models", - "license": null, - "dependencies": [ - "curl", - "ignition-cmake0", - "ignition-common1", - { - "name": "ignition-modularscripts", - "host": true - }, - "jsoncpp", - "libyaml", - "libzip" - ] -} diff --git a/ports/ignition-fuel-tools4/portfile.cmake b/ports/ignition-fuel-tools4/portfile.cmake deleted file mode 100644 index f542987fff9968..00000000000000 --- a/ports/ignition-fuel-tools4/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -ignition_modular_library(NAME fuel-tools - VERSION "4.3.0" - CMAKE_PACKAGE_NAME ignition-fuel_tools4 - SHA512 1996e487bf8dcb29798064b1a12fe972931e84bcb19a4df2398d34cda9963bc9eef6dd14446c22c18f0de894dcdf35852669ce62b57562b1609045248f41ea0f - ) diff --git a/ports/ignition-fuel-tools4/vcpkg.json b/ports/ignition-fuel-tools4/vcpkg.json deleted file mode 100644 index 3b5b17a119c027..00000000000000 --- a/ports/ignition-fuel-tools4/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ignition-fuel-tools4", - "version": "4.3.0", - "port-version": 2, - "description": "Tools for using fuel API to download robot models", - "homepage": "https://ignitionrobotics.org/libs/fuel_tools", - "license": null, - "dependencies": [ - "curl", - "ignition-cmake2", - "ignition-common3", - { - "name": "ignition-modularscripts", - "host": true - }, - "ignition-msgs5", - "jsoncpp", - "libyaml", - "libzip", - "tinyxml2" - ] -} diff --git a/ports/ignition-math4/portfile.cmake b/ports/ignition-math4/portfile.cmake deleted file mode 100644 index 352330d67695b6..00000000000000 --- a/ports/ignition-math4/portfile.cmake +++ /dev/null @@ -1,3 +0,0 @@ -ignition_modular_library(NAME math - VERSION "4.0.0" - SHA512 b0559c691335d43e4cbb986ff13cdee9c65ce59d8e3a15808d9b052fc064263560fece71d670d5417b4b713fcd7ac32f5b808703ff472979a7226e0c1b2089aa) diff --git a/ports/ignition-math4/vcpkg.json b/ports/ignition-math4/vcpkg.json deleted file mode 100644 index 33466e29004dbf..00000000000000 --- a/ports/ignition-math4/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "ignition-math4", - "version": "4.0.0", - "port-version": 3, - "description": "Math API for robotic applications", - "homepage": "https://ignitionrobotics.org/libs/math", - "license": null, - "dependencies": [ - "ignition-cmake0", - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/ignition-math6/portfile.cmake b/ports/ignition-math6/portfile.cmake deleted file mode 100644 index 16fc40459dd1a2..00000000000000 --- a/ports/ignition-math6/portfile.cmake +++ /dev/null @@ -1,4 +0,0 @@ -ignition_modular_library(NAME math - VERSION "6.14.0" - SHA512 ad95160cc1cd137779b9da589c47994d04f829af10865071e9ead4d55c4399d04d5398287d3b294e3f67230205656e1fe243129673e1f8e73f62f3933c314802 - ) diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json deleted file mode 100644 index 7cd94d0e9a4955..00000000000000 --- a/ports/ignition-math6/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "ignition-math6", - "version": "6.14.0", - "description": "Math API for robotic applications", - "homepage": "https://ignitionrobotics.org/libs/math", - "license": null, - "dependencies": [ - "eigen3", - "ignition-cmake2", - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/ignition-msgs1/fix-Add_std_string.patch b/ports/ignition-msgs1/fix-Add_std_string.patch deleted file mode 100644 index 8b20e43376ddc5..00000000000000 --- a/ports/ignition-msgs1/fix-Add_std_string.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/include/ignition/msgs/Generator.hh b/include/ignition/msgs/Generator.hh -index 62d77c6..5785e51 100644 ---- a/include/ignition/msgs/Generator.hh -+++ b/include/ignition/msgs/Generator.hh -@@ -43,9 +43,9 @@ class Generator : public CodeGenerator - /// \param[in] _generatorContext Output directory. - /// \param[in] _error Unused string value - public: virtual bool Generate(const FileDescriptor *_file, -- const string &_parameter, -+ const std::string &_parameter, - OutputDirectory *_generatorContext, -- string *_error) const; -+ std::string *_error) const; - - // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); - }; -diff --git a/src/Generator.cc b/src/Generator.cc -index f703fb8..922d637 100644 ---- a/src/Generator.cc -+++ b/src/Generator.cc -@@ -67,7 +67,7 @@ Generator::~Generator() - - ///////////////////////////////////////////////// - bool Generator::Generate(const FileDescriptor *_file, -- const string &/*_parameter*/, -+ const std::string &/*_parameter*/, - OutputDirectory *_generatorContext, - std::string * /*_error*/) const - { diff --git a/ports/ignition-msgs1/fix-protobuf-static-link-order.patch b/ports/ignition-msgs1/fix-protobuf-static-link-order.patch deleted file mode 100644 index 9f3e674663640a..00000000000000 --- a/ports/ignition-msgs1/fix-protobuf-static-link-order.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -2,8 +2,8 @@ - # Build a custom protoc plugin - ign_add_executable(ign_msgs_gen Generator.cc generator_main.cc) - target_link_libraries(ign_msgs_gen -- protobuf::libprotobuf -- protobuf::libprotoc) -+ protobuf::libprotoc -+ protobuf::libprotobuf) - target_include_directories(ign_msgs_gen PRIVATE ${PROTOBUF_INCLUDE_DIR}) - target_compile_features(ign_msgs_gen PRIVATE ${IGN_CXX_11_FEATURES}) - diff --git a/ports/ignition-msgs1/fix-protobuf-version.patch b/ports/ignition-msgs1/fix-protobuf-version.patch deleted file mode 100644 index e902d1ea09f08f..00000000000000 --- a/ports/ignition-msgs1/fix-protobuf-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2eeb011..e8ffcc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,6 @@ else() - set(PROTOBUF_PURPOSE) - endif() - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - PKGCONFIG protobuf - PKGCONFIG_VER_COMPARISON >= - REQUIRED diff --git a/ports/ignition-msgs1/portfile.cmake b/ports/ignition-msgs1/portfile.cmake deleted file mode 100644 index d1cecc700c150e..00000000000000 --- a/ports/ignition-msgs1/portfile.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# Explicitly disable cross-compilation until the upstream discussion -# https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved -if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - set(ignition_msgs_CROSSCOMPILING ON) -elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME) - set(ignition_msgs_CROSSCOMPILING ON) -else() - set(ignition_msgs_CROSSCOMPILING OFF) -endif() - -if(ignition_msgs_CROSSCOMPILING) - message(FATAL_ERROR "This port does not currently support triplets that require cross-compilation.") -endif() - -ignition_modular_library(NAME msgs - VERSION "1.0.0" - # See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match - REF ignition-msgs_1.0.0 - SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945 - # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) - PATCHES - fix-protobuf-static-link-order.patch - fix-Add_std_string.patch - fix-protobuf-version.patch) diff --git a/ports/ignition-msgs1/vcpkg.json b/ports/ignition-msgs1/vcpkg.json deleted file mode 100644 index 7a507a65df2a24..00000000000000 --- a/ports/ignition-msgs1/vcpkg.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "ignition-msgs1", - "version": "1.0.0", - "port-version": 7, - "description": "Middleware protobuf messages for robotics", - "license": "Apache-2.0", - "dependencies": [ - "ignition-cmake0", - "ignition-math4", - { - "name": "ignition-modularscripts", - "host": true - }, - "protobuf" - ] -} diff --git a/ports/ignition-msgs5/01-protobuf.patch b/ports/ignition-msgs5/01-protobuf.patch deleted file mode 100644 index 71ea936b17fe63..00000000000000 --- a/ports/ignition-msgs5/01-protobuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index f68bf3d..d4d1372 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -135,6 +135,8 @@ if(MSVC) - # warning is not important since those members do not need to be interfaced - # with. - set_source_files_properties(${gen_sources} COMPILE_FLAGS "/wd4251 /wd4146") -+ # Fix for protobuf 3.12 - allow big object files -+ add_definitions(/bigobj) - endif() - - set_source_files_properties(${gen_headers} ${gen_sources} ${gen_ruby_scripts} diff --git a/ports/ignition-msgs5/02-Add_std_string.patch b/ports/ignition-msgs5/02-Add_std_string.patch deleted file mode 100644 index 1bf22e3dff1867..00000000000000 --- a/ports/ignition-msgs5/02-Add_std_string.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/Generator.cc b/src/Generator.cc -index 3729ad4..099a46b 100644 ---- a/src/Generator.cc -+++ b/src/Generator.cc -@@ -67,7 +67,7 @@ Generator::~Generator() - - ///////////////////////////////////////////////// - bool Generator::Generate(const FileDescriptor *_file, -- const string &/*_parameter*/, -+ const std::string &/*_parameter*/, - OutputDirectory *_generatorContext, - std::string * /*_error*/) const - { -diff --git a/src/Generator.hh b/src/Generator.hh -index c0f2336..6132274 100644 ---- a/src/Generator.hh -+++ b/src/Generator.hh -@@ -44,9 +44,9 @@ class Generator : public CodeGenerator - /// \param[in] _generatorContext Output directory. - /// \param[in] _error Unused string value - public: virtual bool Generate(const FileDescriptor *_file, -- const string &_parameter, -+ const std::string &_parameter, - OutputDirectory *_generatorContext, -- string *_error) const; -+ std::string *_error) const; - - // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); - }; diff --git a/ports/ignition-msgs5/03-protobuf-version.patch b/ports/ignition-msgs5/03-protobuf-version.patch deleted file mode 100644 index 41b61abc8e466f..00000000000000 --- a/ports/ignition-msgs5/03-protobuf-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62b56b1..5765fd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,7 +31,6 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") - # Find Protobuf - set(REQ_PROTOBUF_VER 3) - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - REQUIRED - COMPONENTS all - PRETTY Protobuf) diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake deleted file mode 100644 index eef76b8161c93b..00000000000000 --- a/ports/ignition-msgs5/portfile.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# Cross-compilation is disabled until the upstream discussion -# https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved - -ignition_modular_library(NAME msgs - VERSION "5.3.0" - SHA512 645ae5317fb4c3c1b452e98c3581363fc939b5b963dae8a2097bcee97584819bd80357397d88728c5917142dd4ac9beecc335862df44fc06a46d8aa62c54e389 - PATCHES - "01-protobuf.patch" - "02-Add_std_string.patch" - "03-protobuf-version.patch") diff --git a/ports/ignition-msgs5/vcpkg.json b/ports/ignition-msgs5/vcpkg.json deleted file mode 100644 index 36714db45e1adb..00000000000000 --- a/ports/ignition-msgs5/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "ignition-msgs5", - "version": "5.3.0", - "port-version": 7, - "description": "Middleware protobuf messages for robotics", - "license": "Apache-2.0", - "supports": "!(arm | uwp)", - "dependencies": [ - "ignition-cmake2", - "ignition-math6", - { - "name": "ignition-modularscripts", - "host": true - }, - "protobuf", - "tinyxml2" - ] -} diff --git a/ports/ignition-msgs6/01-Add_std_string.patch b/ports/ignition-msgs6/01-Add_std_string.patch deleted file mode 100644 index 609d4ce38ab8bf..00000000000000 --- a/ports/ignition-msgs6/01-Add_std_string.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/Generator.cc b/src/Generator.cc -index d490b5a..4265845 100644 ---- a/src/Generator.cc -+++ b/src/Generator.cc -@@ -67,7 +67,7 @@ Generator::~Generator() - - ///////////////////////////////////////////////// - bool Generator::Generate(const FileDescriptor *_file, -- const string &/*_parameter*/, -+ const std::string &/*_parameter*/, - OutputDirectory *_generatorContext, - std::string * /*_error*/) const - { -diff --git a/src/Generator.hh b/src/Generator.hh -index c0f2336..6132274 100644 ---- a/src/Generator.hh -+++ b/src/Generator.hh -@@ -44,9 +44,9 @@ class Generator : public CodeGenerator - /// \param[in] _generatorContext Output directory. - /// \param[in] _error Unused string value - public: virtual bool Generate(const FileDescriptor *_file, -- const string &_parameter, -+ const std::string &_parameter, - OutputDirectory *_generatorContext, -- string *_error) const; -+ std::string *_error) const; - - // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); - }; diff --git a/ports/ignition-msgs6/02-protobuf-version.patch b/ports/ignition-msgs6/02-protobuf-version.patch deleted file mode 100644 index 32d92c50de42d2..00000000000000 --- a/ports/ignition-msgs6/02-protobuf-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27f747a..a02d312 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,6 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") - # Find Protobuf - set(REQ_PROTOBUF_VER 3) - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - REQUIRED - COMPONENTS all - PRETTY Protobuf) diff --git a/ports/ignition-msgs6/portfile.cmake b/ports/ignition-msgs6/portfile.cmake deleted file mode 100644 index 4d340a19b458c0..00000000000000 --- a/ports/ignition-msgs6/portfile.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# Cross-compilation is explicitly disabled until the upstream discussion -# https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved - -ignition_modular_library(NAME msgs - VERSION "6.0.0" - SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46 - PATCHES 01-Add_std_string.patch 02-protobuf-version.patch) diff --git a/ports/ignition-msgs6/vcpkg.json b/ports/ignition-msgs6/vcpkg.json deleted file mode 100644 index c0814ef5b4f9f6..00000000000000 --- a/ports/ignition-msgs6/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "ignition-msgs6", - "version": "6.0.0", - "port-version": 6, - "description": "Middleware protobuf messages for robotics", - "license": "Apache-2.0", - "supports": "!(arm | uwp)", - "dependencies": [ - "ignition-cmake2", - "ignition-math6", - { - "name": "ignition-modularscripts", - "host": true - }, - "protobuf", - "tinyxml2" - ] -} diff --git a/ports/ignition-plugin1/portfile.cmake b/ports/ignition-plugin1/portfile.cmake deleted file mode 100644 index 5f5f5f1afd4c98..00000000000000 --- a/ports/ignition-plugin1/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -set(PACKAGE_VERSION "1.4.0") -ignition_modular_library(NAME plugin - VERSION ${PACKAGE_VERSION} - REF "ignition-plugin_${PACKAGE_VERSION}" - SHA512 bc8d8012ae2a5f4cee26560323f65e40873fb9d1d014a9946317bf941953a7e5018bc08763f87fc624792cb02aebe289286265796697559eeaf41e28e9b05abb) diff --git a/ports/ignition-plugin1/vcpkg.json b/ports/ignition-plugin1/vcpkg.json deleted file mode 100644 index b4c218852e8757..00000000000000 --- a/ports/ignition-plugin1/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "ignition-plugin1", - "version": "1.4.0", - "description": "Library for registering plugin libraries and dynamically loading them at runtime", - "homepage": "https://ignitionrobotics.org/libs/plugin", - "license": null, - "dependencies": [ - { - "name": "dlfcn-win32", - "platform": "windows | uwp" - }, - "ignition-cmake2", - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/ignition-tools/portfile.cmake b/ports/ignition-tools/portfile.cmake deleted file mode 100644 index db69f40b455904..00000000000000 --- a/ports/ignition-tools/portfile.cmake +++ /dev/null @@ -1,45 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO gazebosim/gz-tools - REF ignition-tools_1.5.0 - SHA512 3e8267fc16295e269a1fb4867235bca858fea0f5f048831b0dc5f087907897042edb0f4757aef1bad824f3f109959286a441ca5315b6815c557e7deba9f8d151 - HEAD_REF ign-tools1 -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DUSE_SYSTEM_BACKWARDCPP=ON -) - -vcpkg_cmake_install() - -# Fix cmake targets and pkg-config file location -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ignition-tools") -vcpkg_fixup_pkgconfig() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") - file(COPY ${DEBUG_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") -endif() - -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") - file(COPY ${RELEASE_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share" -) - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/bin" - "${CURRENT_PACKAGES_DIR}/debug/bin" -) - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ignition-tools/vcpkg.json b/ports/ignition-tools/vcpkg.json deleted file mode 100644 index b1c3d742fae1e0..00000000000000 --- a/ports/ignition-tools/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ignition-tools", - "version": "1.5.0", - "port-version": 1, - "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.", - "homepage": "https://gazebosim.org", - "license": "Apache-2.0", - "supports": "!(arm & windows) & !uwp", - "dependencies": [ - "backward-cpp", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/ignition-transport4/fix-protobuf.patch b/ports/ignition-transport4/fix-protobuf.patch deleted file mode 100644 index 6db3a459cae707..00000000000000 --- a/ports/ignition-transport4/fix-protobuf.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5453cd07..c00e7329 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,7 +39,6 @@ else() - set(PROTOBUF_PURPOSE) - endif() - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - REQUIRED - PRETTY Protobuf - PURPOSE ${PROTOBUF_PURPOSE}) -diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh -index 1163c3eb..e2cb5ca0 100644 ---- a/include/ignition/transport/RepHandler.hh -+++ b/include/ignition/transport/RepHandler.hh -@@ -26,7 +26,7 @@ - #pragma warning(pop) - #endif - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -127,7 +127,11 @@ namespace ignition - return false; - } - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgReq = -+ google::protobuf::internal::DownCast(&_msgReq); -+ auto msgRep = google::protobuf::internal::DownCast(&_msgRep); -+#elif GOOGLE_PROTOBUF_VERSION > 2999999 - auto msgReq = google::protobuf::down_cast(&_msgReq); - auto msgRep = google::protobuf::down_cast(&_msgRep); - #else -diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh -index d9fbd224..22486730 100644 ---- a/include/ignition/transport/SubscriptionHandler.hh -+++ b/include/ignition/transport/SubscriptionHandler.hh -@@ -28,7 +28,7 @@ - - #include - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -198,7 +198,9 @@ namespace ignition - if (!this->UpdateThrottling()) - return true; - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgPtr = google::protobuf::internal::DownCast(&_msg); -+#elif GOOGLE_PROTOBUF_VERSION >= 3000000 - auto msgPtr = google::protobuf::down_cast(&_msg); - #else - auto msgPtr = google::protobuf::internal::down_cast(&_msg); diff --git a/ports/ignition-transport4/portfile.cmake b/ports/ignition-transport4/portfile.cmake deleted file mode 100644 index bb951537a3ea53..00000000000000 --- a/ports/ignition-transport4/portfile.cmake +++ /dev/null @@ -1,9 +0,0 @@ -ignition_modular_library(NAME transport - VERSION "4.0.0" - SHA512 581dd4700aebc455f6d7c01d8be17c6c4c802fd74b1504b2bd6544a0246b161231305fd318352904e230c986dfe072fa0608fccea9066b076e7216dc507a8510 - # This can be removed when the pc file of libuuid on Windows is fixed - DISABLE_PKGCONFIG_INSTALL - PATCHES - uuid-osx.patch - fix-protobuf.patch - ) diff --git a/ports/ignition-transport4/uuid-osx.patch b/ports/ignition-transport4/uuid-osx.patch deleted file mode 100644 index c18d8caeaa3ce2..00000000000000 --- a/ports/ignition-transport4/uuid-osx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5453cd0..10c2ad4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,6 +58,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE - # Find uuid - if (MSVC) - message (STATUS "UUID: Using Windows RPC UuidCreate function\n") -+elseif (APPLE) -+ message (STATUS "Use system uuid header") - else() - ign_find_package(UUID REQUIRED) - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6683e64..33669ab 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,7 +18,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - ) - - # Windows system library provides UUID --if (NOT MSVC) -+if (NOT MSVC AND NOT APPLE) - target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - PUBLIC - UUID::UUID diff --git a/ports/ignition-transport4/vcpkg.json b/ports/ignition-transport4/vcpkg.json deleted file mode 100644 index a9a2cb21cd4411..00000000000000 --- a/ports/ignition-transport4/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "ignition-transport4", - "version": "4.0.0", - "port-version": 7, - "description": "Transport middleware for robotics", - "license": null, - "dependencies": [ - "cppzmq", - "ignition-cmake0", - { - "name": "ignition-modularscripts", - "host": true - }, - "ignition-msgs1", - { - "name": "libuuid", - "platform": "!windows & !uwp & !osx" - }, - "protobuf", - "zeromq" - ] -} diff --git a/ports/ignition-transport8/fix-protobuf.patch b/ports/ignition-transport8/fix-protobuf.patch deleted file mode 100644 index 4c82c33084fcf8..00000000000000 --- a/ports/ignition-transport8/fix-protobuf.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cbf24cba..f2ba7ae6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,7 +38,6 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") - # Find Protobuf - set(REQ_PROTOBUF_VER 3) - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - REQUIRED - PRETTY Protobuf) - -diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh -index e826fd6b..4719aa4b 100644 ---- a/include/ignition/transport/RepHandler.hh -+++ b/include/ignition/transport/RepHandler.hh -@@ -26,7 +26,7 @@ - #pragma warning(pop) - #endif - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -140,7 +140,11 @@ namespace ignition - return false; - } - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgReq = -+ google::protobuf::internal::DownCast(&_msgReq); -+ auto msgRep = google::protobuf::internal::DownCast(&_msgRep); -+#elif GOOGLE_PROTOBUF_VERSION > 2999999 - auto msgReq = google::protobuf::down_cast(&_msgReq); - auto msgRep = google::protobuf::down_cast(&_msgRep); - #else -diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh -index 96811afe..a8d7ebcd 100644 ---- a/include/ignition/transport/SubscriptionHandler.hh -+++ b/include/ignition/transport/SubscriptionHandler.hh -@@ -28,7 +28,7 @@ - - #include - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -211,7 +211,9 @@ namespace ignition - if (!this->UpdateThrottling()) - return true; - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgPtr = google::protobuf::internal::DownCast(&_msg); -+#elif GOOGLE_PROTOBUF_VERSION >= 3000000 - auto msgPtr = google::protobuf::down_cast(&_msg); - #else - auto msgPtr = google::protobuf::internal::down_cast(&_msg); diff --git a/ports/ignition-transport8/portfile.cmake b/ports/ignition-transport8/portfile.cmake deleted file mode 100644 index f0a71a2ce0cc46..00000000000000 --- a/ports/ignition-transport8/portfile.cmake +++ /dev/null @@ -1,6 +0,0 @@ -ignition_modular_library(NAME transport - VERSION "8.1.0" - SHA512 04b4cd954453505398da35b284e7db4b4691d9a705924c41e0082fd20e94176a3eaeae7329fd9992aaa50f90b2d8973c71daf763ccff58aa30d06be1da15189a - PATCHES - fix-protobuf.patch - ) diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json deleted file mode 100644 index d123372d9fa932..00000000000000 --- a/ports/ignition-transport8/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ignition-transport8", - "version": "8.1.0", - "port-version": 5, - "description": "Transport middleware for robotics", - "license": null, - "dependencies": [ - "cppzmq", - "ignition-cmake2", - { - "name": "ignition-modularscripts", - "host": true - }, - "ignition-msgs5", - { - "name": "libuuid", - "platform": "!windows & !uwp & !osx" - }, - "protobuf", - "sqlite3", - "zeromq" - ] -} diff --git a/ports/ignition-transport9/fix-protobuf.patch b/ports/ignition-transport9/fix-protobuf.patch deleted file mode 100644 index 13d49c3ea7540a..00000000000000 --- a/ports/ignition-transport9/fix-protobuf.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 084b6daf..a5501b5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,7 +38,6 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") - # Find Protobuf - set(REQ_PROTOBUF_VER 3) - ign_find_package(IgnProtobuf -- VERSION ${REQ_PROTOBUF_VER} - REQUIRED - PRETTY Protobuf) - -diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh -index e826fd6b..4719aa4b 100644 ---- a/include/ignition/transport/RepHandler.hh -+++ b/include/ignition/transport/RepHandler.hh -@@ -26,7 +26,7 @@ - #pragma warning(pop) - #endif - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION > 2999999 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -140,7 +140,11 @@ namespace ignition - return false; - } - --#if GOOGLE_PROTOBUF_VERSION > 2999999 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgReq = -+ google::protobuf::internal::DownCast(&_msgReq); -+ auto msgRep = google::protobuf::internal::DownCast(&_msgRep); -+#elif GOOGLE_PROTOBUF_VERSION > 2999999 - auto msgReq = google::protobuf::down_cast(&_msgReq); - auto msgRep = google::protobuf::down_cast(&_msgRep); - #else -diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh -index 96811afe..a8d7ebcd 100644 ---- a/include/ignition/transport/SubscriptionHandler.hh -+++ b/include/ignition/transport/SubscriptionHandler.hh -@@ -28,7 +28,7 @@ - - #include - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 3000000 && GOOGLE_PROTOBUF_VERSION < 4022000 - #include - #endif - -@@ -211,7 +211,9 @@ namespace ignition - if (!this->UpdateThrottling()) - return true; - --#if GOOGLE_PROTOBUF_VERSION >= 3000000 -+#if GOOGLE_PROTOBUF_VERSION >= 4022000 -+ auto msgPtr = google::protobuf::internal::DownCast(&_msg); -+#elif GOOGLE_PROTOBUF_VERSION >= 3000000 - auto msgPtr = google::protobuf::down_cast(&_msg); - #else - auto msgPtr = google::protobuf::internal::down_cast(&_msg); diff --git a/ports/ignition-transport9/portfile.cmake b/ports/ignition-transport9/portfile.cmake deleted file mode 100644 index 4eb81e5035f378..00000000000000 --- a/ports/ignition-transport9/portfile.cmake +++ /dev/null @@ -1,9 +0,0 @@ -ignition_modular_library(NAME transport - VERSION "9.0.0" - SHA512 9add7a8d3a43a17b1b71e7d7d9320909057c1f79880bd969baa99949709cdbb63f00f0735990891358bb29efd9c0ab8b6725b7c340c324b9266dcc9b73d767d4 - # This can be removed when the pc file of sqlite3 is available ( https://github.com/microsoft/vcpkg/issues/14327 ) - DISABLE_PKGCONFIG_INSTALL - PATCHES - uuid-osx.patch - fix-protobuf.patch - ) diff --git a/ports/ignition-transport9/uuid-osx.patch b/ports/ignition-transport9/uuid-osx.patch deleted file mode 100644 index 350a0b43daf064..00000000000000 --- a/ports/ignition-transport9/uuid-osx.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 084b6da..6fd212d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,8 @@ ign_find_package(CPPZMQ REQUIRED PRIVATE - # Find uuid - if (MSVC) - message (STATUS "UUID: Using Windows RPC UuidCreate function\n") -+elseif (APPLE) -+ message (STATUS "Use system uuid header") - else() - ign_find_package(UUID REQUIRED) - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9777240..9e860a9 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -31,7 +31,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - ) - - # Windows system library provides UUID --if (NOT MSVC) -+if (NOT MSVC AND NOT APPLE) - target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - PUBLIC - UUID::UUID diff --git a/ports/ignition-transport9/vcpkg.json b/ports/ignition-transport9/vcpkg.json deleted file mode 100644 index 42bcdcc477c748..00000000000000 --- a/ports/ignition-transport9/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "ignition-transport9", - "version": "9.0.0", - "port-version": 5, - "description": "Transport middleware for robotics", - "license": null, - "dependencies": [ - "cppzmq", - "ignition-cmake2", - { - "name": "ignition-modularscripts", - "host": true - }, - "ignition-msgs6", - { - "name": "libuuid", - "platform": "!windows & !uwp & !osx" - }, - "protobuf", - "sqlite3", - "zeromq" - ] -} diff --git a/ports/ignition-utils1/portfile.cmake b/ports/ignition-utils1/portfile.cmake deleted file mode 100644 index 7d8a55ff60b6f6..00000000000000 --- a/ports/ignition-utils1/portfile.cmake +++ /dev/null @@ -1,6 +0,0 @@ -set(PACKAGE_VERSION "1.5.1") -ignition_modular_library(NAME utils - VERSION ${PACKAGE_VERSION} - REF "ignition-utils1_${PACKAGE_VERSION}" - SHA512 ede208d98b0b4bc4bfe38e248e8eb89da8feaced547e968a2a733992d86c632a9fae724c7c97e4a962ba36e23663a5872017eeae0b818492fcd1eca9d9643653) - diff --git a/ports/ignition-utils1/vcpkg.json b/ports/ignition-utils1/vcpkg.json deleted file mode 100644 index 8d55782f6a3227..00000000000000 --- a/ports/ignition-utils1/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "ignition-utils1", - "version": "1.5.1", - "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.", - "homepage": "https://gazebosim.org", - "license": "Apache-2.0", - "dependencies": [ - "ignition-cmake2", - { - "name": "ignition-modularscripts", - "host": true - } - ] -} diff --git a/ports/sdformat10/fix-quote.patch b/ports/sdformat10/fix-quote.patch deleted file mode 100644 index 6a8495c179a840..00000000000000 --- a/ports/sdformat10/fix-quote.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake -index cdbcfcc..0339a17 100644 ---- a/cmake/FindSSE.cmake -+++ b/cmake/FindSSE.cmake -@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) - -- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) - IF (SSE2_TRUE) - set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") -@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - ENDIF (SSE2_TRUE) - - # /proc/cpuinfo apparently omits sse3 :( -- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) - IF (NOT SSE3_TRUE) -- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) - ENDIF (NOT SSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) - IF (SSE3_TRUE OR SSSE3_TRUE) - set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") -@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") - ENDIF (SSSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) - IF (SSE41_TRUE) - set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") -@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") - ENDIF (SSE41_TRUE) - -- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) - IF (SSE42_TRUE) - set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") -@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE - CPUINFO) - -- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) - IF (SSE2_TRUE) - set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") -@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") - ENDIF (SSE2_TRUE) - -- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) - IF (SSE3_TRUE) - set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") -@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") - ENDIF (SSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) - IF (SSSE3_TRUE) - set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") -@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") - ENDIF (SSSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) - IF (SSE41_TRUE) - set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/ports/sdformat10/no-absolute.patch b/ports/sdformat10/no-absolute.patch deleted file mode 100644 index 4b5315365c99b1..00000000000000 --- a/ports/sdformat10/no-absolute.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in -index 52408866..bd541701 100644 ---- a/cmake/sdf_config.h.in -+++ b/cmake/sdf_config.h.in -@@ -32,6 +32,3 @@ - #cmakedefine HAVE_URDFDOM 1 - #cmakedefine USE_INTERNAL_URDF 1 - #cmakedefine SDFORMAT_DISABLE_CONSOLE_LOGFILE 1 -- --#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" --#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" -diff --git a/src/SDF.cc b/src/SDF.cc -index 20dcd4c6..802cbde3 100644 ---- a/src/SDF.cc -+++ b/src/SDF.cc -@@ -98,22 +98,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, - filename = filename.substr(idx + sep.length()); - } - -- // Next check the install path. -- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); -- if (sdf::filesystem::exists(path)) -- { -- return path; -- } -- -- // Next check the versioned install path. -- path = sdf::filesystem::append(SDF_SHARE_PATH, -- "sdformat" SDF_MAJOR_VERSION_STR, -- sdf::SDF::Version(), filename); -- if (sdf::filesystem::exists(path)) -- { -- return path; -- } -- - // Next check to see if the given file exists. - path = filename; - if (sdf::filesystem::exists(path)) diff --git a/ports/sdformat10/portfile.cmake b/ports/sdformat10/portfile.cmake deleted file mode 100644 index 2f316d2201cfa9..00000000000000 --- a/ports/sdformat10/portfile.cmake +++ /dev/null @@ -1,43 +0,0 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO osrf/sdformat - REF sdformat10_10.0.0 - SHA512 1caf98427d25e7c17bfacaab20382c573fac0c965b40ad0c5e0efd32ddfdaa20250d8c79ecf574989ba10b1feb884a9df3927b18ec2cd88f7c66b4d8194bc731 - HEAD_REF sdf10 - PATCHES - fix-quote.patch - no-absolute.patch -) - -# Ruby is required by the sdformat build process -vcpkg_find_acquire_program(RUBY) -get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) -set(_path $ENV{PATH}) -vcpkg_add_to_path(${RUBY_PATH}) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DUSE_EXTERNAL_URDF=ON - -DUSE_EXTERNAL_TINYXML=ON -) - -vcpkg_cmake_install() - -# Restore original path -set(ENV{PATH} "${_path}") - -# Fix cmake targets and pkg-config file location -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat10") -vcpkg_fixup_pkgconfig() - -# Remove debug files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json deleted file mode 100644 index 4fd12c04519ca4..00000000000000 --- a/ports/sdformat10/vcpkg.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "sdformat10", - "version": "10.0.0", - "port-version": 5, - "description": "Simulation Description Format (SDF) parser and description files.", - "homepage": "http://sdformat.org/", - "supports": "!uwp & !(arm & osx)", - "dependencies": [ - "ignition-math6", - "tinyxml2", - "urdfdom", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/sdformat6/disable-test.patch b/ports/sdformat6/disable-test.patch deleted file mode 100644 index 6861e3448b684f..00000000000000 --- a/ports/sdformat6/disable-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78e72e6..8f97304 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -252,7 +252,9 @@ else (buid_errors) - - link_directories(${PROJECT_BINARY_DIR}/src) - -+ if (BUILD_TESTING) - add_subdirectory(test) -+ endif() - add_subdirectory(src) - add_subdirectory(include/sdf) - add_subdirectory(sdf) -diff --git a/cmake/SDFUtils.cmake b/cmake/SDFUtils.cmake -index acd57f8..3626e68 100644 ---- a/cmake/SDFUtils.cmake -+++ b/cmake/SDFUtils.cmake -@@ -119,6 +119,7 @@ endmacro() - include_directories(${PROJECT_SOURCE_DIR}/test/gtest/include) - macro (sdf_build_tests) - # Build all the tests -+ if (BUILD_TESTING) - foreach(GTEST_SOURCE_file ${ARGN}) - string(REGEX REPLACE ".cc" "" BINARY_NAME ${GTEST_SOURCE_file}) - set(BINARY_NAME ${TEST_TYPE}_${BINARY_NAME}) -@@ -205,6 +206,7 @@ macro (sdf_build_tests) - --error-exitcode=1 --show-leak-kinds=all ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}) - endif() - endforeach() -+ endif() - endmacro() - - ################################################# diff --git a/ports/sdformat6/disable-unneeded-include-findboost.patch b/ports/sdformat6/disable-unneeded-include-findboost.patch deleted file mode 100644 index 6a922029272899..00000000000000 --- a/ports/sdformat6/disable-unneeded-include-findboost.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index c2a0ee4..2735a07 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -13,7 +13,6 @@ if (WIN32) - set(Boost_USE_STATIC_RUNTIME OFF) - endif() - --include(FindBoost) - find_package(Boost ${MIN_BOOST_VERSION}) - - if (NOT Boost_FOUND) diff --git a/ports/sdformat6/fix-dependency-urdfdom.patch b/ports/sdformat6/fix-dependency-urdfdom.patch deleted file mode 100644 index dad6fc106dc28b..00000000000000 --- a/ports/sdformat6/fix-dependency-urdfdom.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 2735a07..6721de4 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -62,16 +62,16 @@ if (NOT PKG_CONFIG_FOUND) - if (NOT DEFINED USE_INTERNAL_URDF) - BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") - set(USE_INTERNAL_URDF true) -- elseif(NOT USE_INTERNAL_URDF) -+ elseif(0) - BUILD_ERROR("Couldn't find pkg-config for urdfdom") - endif() - 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) -@@ -80,8 +80,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) - endif() - else() - # what am I doing here? pkg-config and cmake -- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) -- set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) -+ set(URDF_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) - endif() - endif() - diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake deleted file mode 100644 index c9346f1440e1fe..00000000000000 --- a/ports/sdformat6/portfile.cmake +++ /dev/null @@ -1,61 +0,0 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO osrf/sdformat - REF sdformat6_6.2.0 - SHA512 3d139ec4b4c9fbfd547ed8bfca0adb5cdca92c1b7cc4d4b554a7c51ccf755b9079c26a006ebfedc5bc5b1ba5e16ad950bb38c47ea97bf97e59a2fd7d12d60620 - HEAD_REF sdf6 - PATCHES - disable-unneeded-include-findboost.patch - fix-dependency-urdfdom.patch - disable-test.patch -) - -# Ruby is required by the sdformat build process -vcpkg_find_acquire_program(RUBY) -get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) -set(_path $ENV{PATH}) -vcpkg_add_to_path(${RUBY_PATH}) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DUSE_INTERNAL_URDF=OFF - -DUSE_EXTERNAL_TINYXML=ON -) - -vcpkg_cmake_install() - -# Restore original path -set(ENV{PATH} "${_path}") - -# Move location of sdformat.dll from lib to bin -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll" - "${CURRENT_PACKAGES_DIR}/bin/sdformat.dll") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll" - "${CURRENT_PACKAGES_DIR}/debug/bin/sdformat.dll") -endif() - -# Fix cmake targets location -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat") - -# Remove debug files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ignition/sdformat6.yaml" "${CURRENT_PACKAGES_DIR}" "../..") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_SHARE_PATH \"${CURRENT_PACKAGES_DIR}/share/\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "") -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") - -vcpkg_fixup_pkgconfig() diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json deleted file mode 100644 index 6b094d7e41d5be..00000000000000 --- a/ports/sdformat6/vcpkg.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "sdformat6", - "version": "6.2.0", - "port-version": 8, - "description": "Simulation Description Format (SDF) parser and description files.", - "homepage": "http://sdformat.org/", - "license": "Apache-2.0", - "supports": "!(arm | uwp)", - "dependencies": [ - "boost-any", - "boost-variant", - "ignition-math4", - "tinyxml", - "urdfdom", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/ports/sdformat9/fix-dependency-urdfdom.patch b/ports/sdformat9/fix-dependency-urdfdom.patch deleted file mode 100644 index d16cc831b2e7fd..00000000000000 --- a/ports/sdformat9/fix-dependency-urdfdom.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 427e5e7..af31df4 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -43,7 +43,7 @@ endif() - # 2. if USE_INTERNAL_URDF is set to True, use the internal copy - # 3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error - --if (NOT PKG_CONFIG_FOUND) -+if (0) - if (NOT DEFINED USE_INTERNAL_URDF) - BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy") - set(USE_INTERNAL_URDF true) -@@ -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) - find_package(urdfdom) - if (urdfdom_FOUND) - set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) -@@ -73,6 +72,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) - # what am I doing here? pkg-config and cmake -- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) - set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) -+ set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS}) -+ set(URDF_LIBRARIES ${urdfdom_LIBRARIES}) - endif() - endif() - diff --git a/ports/sdformat9/fix-quote.patch b/ports/sdformat9/fix-quote.patch deleted file mode 100644 index 6a8495c179a840..00000000000000 --- a/ports/sdformat9/fix-quote.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake -index cdbcfcc..0339a17 100644 ---- a/cmake/FindSSE.cmake -+++ b/cmake/FindSSE.cmake -@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) - -- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE) - IF (SSE2_TRUE) - set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") -@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - ENDIF (SSE2_TRUE) - - # /proc/cpuinfo apparently omits sse3 :( -- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE) - IF (NOT SSE3_TRUE) -- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE) - ENDIF (NOT SSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE) - IF (SSE3_TRUE OR SSSE3_TRUE) - set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") -@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") - ENDIF (SSSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE) - IF (SSE41_TRUE) - set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") -@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host") - ENDIF (SSE41_TRUE) - -- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE) - IF (SSE42_TRUE) - set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host") -@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE - CPUINFO) - -- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE) - IF (SSE2_TRUE) - set(SSE2_FOUND true CACHE BOOL "SSE2 available on host") -@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE2_FOUND false CACHE BOOL "SSE2 available on host") - ENDIF (SSE2_TRUE) - -- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE) - IF (SSE3_TRUE) - set(SSE3_FOUND true CACHE BOOL "SSE3 available on host") -@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSE3_FOUND false CACHE BOOL "SSE3 available on host") - ENDIF (SSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE) - IF (SSSE3_TRUE) - set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host") -@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64") - set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host") - ENDIF (SSSE3_TRUE) - -- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO}) -+ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}") - STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE) - IF (SSE41_TRUE) - set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host") diff --git a/ports/sdformat9/no-absolute.patch b/ports/sdformat9/no-absolute.patch deleted file mode 100644 index 40c99f26edca18..00000000000000 --- a/ports/sdformat9/no-absolute.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in -index c3ce2336..64ac9f5f 100644 ---- a/cmake/sdf_config.h.in -+++ b/cmake/sdf_config.h.in -@@ -31,6 +31,3 @@ - #cmakedefine BUILD_TYPE_RELEASE 1 - #cmakedefine HAVE_URDFDOM 1 - #cmakedefine USE_INTERNAL_URDF 1 -- --#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" --#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}" -diff --git a/src/SDF.cc b/src/SDF.cc -index 48c1943b..bd2c5b31 100644 ---- a/src/SDF.cc -+++ b/src/SDF.cc -@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, - filename = filename.substr(idx + sep.length()); - } - -- // Next check the install path. -- path = sdf::filesystem::append(SDF_SHARE_PATH, filename); -- if (sdf::filesystem::exists(path)) -- { -- return path; -- } -- -- // Next check the versioned install path. -- path = sdf::filesystem::append(SDF_SHARE_PATH, -- "sdformat" SDF_MAJOR_VERSION_STR, -- sdf::SDF::Version(), filename); -- if (sdf::filesystem::exists(path)) -- { -- return path; -- } -- - // Next check to see if the given file exists. - path = filename; - if (sdf::filesystem::exists(path)) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake deleted file mode 100644 index f50c223912c09e..00000000000000 --- a/ports/sdformat9/portfile.cmake +++ /dev/null @@ -1,44 +0,0 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO osrf/sdformat - REF a978ade73e7b3509d378667dca394681e55ca068 #9.8.0 - SHA512 958c0613da7c885f81cceee726da10574188e5edafb7d3aca680e40bbdca6ff1bc7b721ee1c56c53e3973960ae715912adfa6541cf3e35d32a5dc2ef2a997505 - HEAD_REF sdf9 - PATCHES - fix-dependency-urdfdom.patch - fix-quote.patch - no-absolute.patch - use-external-tinyxml-windows.patch -) - -# Ruby is required by the sdformat build process -vcpkg_find_acquire_program(RUBY) -get_filename_component(RUBY_PATH "${RUBY}" DIRECTORY) -set(_path $ENV{PATH}) -vcpkg_add_to_path("${RUBY_PATH}") - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DUSE_INTERNAL_URDF=OFF -) - -vcpkg_cmake_install() - -# Restore original path -set(ENV{PATH} "${_path}") - -# Fix cmake targets and pkg-config file location -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat9") -vcpkg_fixup_pkgconfig() - -# Remove debug files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" - "${CURRENT_PACKAGES_DIR}/debug/share") - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/sdformat9/use-external-tinyxml-windows.patch b/ports/sdformat9/use-external-tinyxml-windows.patch deleted file mode 100644 index 1f48617bc04c36..00000000000000 --- a/ports/sdformat9/use-external-tinyxml-windows.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3dad12e5..e290a3be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake) - - message (STATUS "\n\n====== Finding 3rd Party Packages ======") - # Use of tinyxml. System installation on UNIX. Internal copy on WIN --if (UNIX) -+if (true) - message (STATUS "Using system tinyxml") - set (USE_EXTERNAL_TINYXML True) - elseif(WIN32) -diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake -index 427e5e7a..655fafc0 100644 ---- a/cmake/SearchForStuff.cmake -+++ b/cmake/SearchForStuff.cmake -@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML) - ################################################# - # Find tinyxml. Only debian distributions package tinyxml with a pkg-config - # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) -- pkg_check_modules(tinyxml tinyxml) -+ find_package(tinyxml CONFIG REQUIRED) - if (NOT tinyxml_FOUND) - find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH) - find_library(tinyxml_LIBRARIES NAMES tinyxml) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json deleted file mode 100644 index 88037c6454f216..00000000000000 --- a/ports/sdformat9/vcpkg.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "sdformat9", - "version": "9.8.0", - "port-version": 3, - "description": "Simulation Description Format (SDF) parser and description files.", - "homepage": "http://sdformat.org/", - "license": "Apache-2.0", - "supports": "!uwp & !(arm & osx)", - "dependencies": [ - "ignition-math6", - "tinyxml", - "urdfdom", - "urdfdom-headers", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 46233d6057f088..f8cdb98fe74bab 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -383,14 +383,6 @@ gainput:x64-android=fail gamenetworkingsockets:arm-neon-android=fail gamenetworkingsockets:arm64-android=fail gamenetworkingsockets:x64-android=fail -# VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 -# gazebo is broken due it depend on old ports that already in the new versions. -# There is an open PR that try to fix that. -gazebo:x64-linux=fail -gazebo:x64-windows-release=fail -gazebo:x64-windows-static-md=fail -gazebo:x64-windows=fail -gazebo:x86-windows=skip gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm64-android=fail gdk-pixbuf:x64-android=fail @@ -441,7 +433,6 @@ gstreamer:x64-windows-static-md = skip gul14:arm-neon-android=fail gul14:arm64-android=fail gul14:x64-android=fail -# see ignition skips below gz-tools2:arm-neon-android=fail gz-tools2:x64-android=fail gz-tools2:arm64-android=fail @@ -459,20 +450,6 @@ hyperscan:x64-android=fail iceoryx:x64-android=fail iceoryx:arm64-android=fail iceoryx:arm-neon-android=fail -ignition-msgs1:arm-neon-android=fail -ignition-msgs1:arm64-android=fail -ignition-msgs1:arm64-windows=fail -ignition-msgs1:arm64-windows-static-md=fail -ignition-msgs1:arm64-uwp=fail -ignition-msgs1:x64-android=fail -ignition-msgs1:x64-uwp=fail -ignition-msgs5:x64-android=fail -ignition-msgs5:x64-osx=skip -# Conflicts with libjpeg-turbo, mozjpeg -ignition-msgs6:x64-android=fail -ignition-tools:arm-neon-android=fail -ignition-tools:arm64-android=fail -ignition-tools:x64-android=fail ijg-libjpeg:arm-neon-android=skip ijg-libjpeg:arm64-android=skip ijg-libjpeg:arm64-osx= skip diff --git a/versions/baseline.json b/versions/baseline.json index 6f2fdda76c97b0..5addebad719855 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2198,7 +2198,7 @@ }, "dartsim": { "baseline": "6.15.0", - "port-version": 1 + "port-version": 2 }, "dataframe": { "baseline": "3.4.0", @@ -3596,78 +3596,10 @@ "baseline": "1.1.1", "port-version": 2 }, - "ignition-cmake0": { - "baseline": "0.6.2", - "port-version": 4 - }, - "ignition-cmake2": { - "baseline": "2.17.1", - "port-version": 0 - }, - "ignition-common1": { - "baseline": "1.1.1", - "port-version": 5 - }, - "ignition-common3": { - "baseline": "3.16.0", - "port-version": 0 - }, - "ignition-fuel-tools1": { - "baseline": "1.2.0", - "port-version": 4 - }, - "ignition-fuel-tools4": { - "baseline": "4.3.0", - "port-version": 2 - }, - "ignition-math4": { - "baseline": "4.0.0", - "port-version": 3 - }, - "ignition-math6": { - "baseline": "6.14.0", - "port-version": 0 - }, "ignition-modularscripts": { "baseline": "2023-05-05", "port-version": 0 }, - "ignition-msgs1": { - "baseline": "1.0.0", - "port-version": 7 - }, - "ignition-msgs5": { - "baseline": "5.3.0", - "port-version": 7 - }, - "ignition-msgs6": { - "baseline": "6.0.0", - "port-version": 6 - }, - "ignition-plugin1": { - "baseline": "1.4.0", - "port-version": 0 - }, - "ignition-tools": { - "baseline": "1.5.0", - "port-version": 1 - }, - "ignition-transport4": { - "baseline": "4.0.0", - "port-version": 7 - }, - "ignition-transport8": { - "baseline": "8.1.0", - "port-version": 5 - }, - "ignition-transport9": { - "baseline": "9.0.0", - "port-version": 5 - }, - "ignition-utils1": { - "baseline": "1.5.1", - "port-version": 0 - }, "igraph": { "baseline": "0.10.15", "port-version": 1 @@ -8264,22 +8196,10 @@ "baseline": "2025-01-25", "port-version": 0 }, - "sdformat10": { - "baseline": "10.0.0", - "port-version": 5 - }, "sdformat13": { "baseline": "13.6.0", "port-version": 0 }, - "sdformat6": { - "baseline": "6.2.0", - "port-version": 8 - }, - "sdformat9": { - "baseline": "9.8.0", - "port-version": 3 - }, "sdl1": { "baseline": "1.2.15", "port-version": 20 diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index 290391040c4c0c..95191a48089e27 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1e0262b55b11765e4fe739691fbd4d9650e3dad", + "version": "6.15.0", + "port-version": 2 + }, { "git-tree": "60fa91b5b2ee9ae9185c5e0de85ab771fb917dd4", "version": "6.15.0",