From 35a48360d20c757f1f22d74ac8d175cf200e0357 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Fri, 28 Feb 2025 05:04:57 +0200 Subject: [PATCH 1/6] Update gz ports --- ports/gz-cmake/dependencies.patch | 137 ++++++++++------------ ports/gz-cmake/portfile.cmake | 8 +- ports/gz-cmake/usage | 4 +- ports/gz-cmake/vcpkg.json | 2 +- ports/gz-common/detect_tinyxml.patch | 13 ++ ports/gz-common/portfile.cmake | 7 +- ports/gz-common/vcpkg.json | 3 +- ports/gz-fuel-tools/portfile.cmake | 10 +- ports/gz-fuel-tools/vcpkg.json | 2 +- ports/gz-gui/dependencies.patch | 22 ++-- ports/gz-gui/portfile.cmake | 10 +- ports/gz-gui/vcpkg.json | 3 +- ports/gz-math/portfile.cmake | 6 +- ports/gz-math/vcpkg.json | 2 +- ports/gz-msgs/move_bin_to_tools.patch | 24 ++++ ports/gz-msgs/portfile.cmake | 27 ++++- ports/gz-msgs/remove_ruby.patch | 37 +++--- ports/gz-msgs/vcpkg.json | 2 +- ports/gz-physics/dependencies.patch | 7 +- ports/gz-physics/portfile.cmake | 6 +- ports/gz-physics/vcpkg.json | 2 +- ports/gz-plugin/portfile.cmake | 6 +- ports/gz-plugin/vcpkg.json | 2 +- ports/gz-rendering/fix-dependencies.patch | 40 +++++-- ports/gz-rendering/portfile.cmake | 6 +- ports/gz-rendering/vcpkg.json | 2 +- ports/gz-sensors/portfile.cmake | 10 +- ports/gz-sensors/vcpkg.json | 2 +- ports/gz-tools/portfile.cmake | 6 +- ports/gz-tools/vcpkg.json | 2 +- ports/gz-transport/portfile.cmake | 10 +- ports/gz-transport/uuid-osx.patch | 12 +- ports/gz-transport/vcpkg.json | 2 +- ports/gz-utils/portfile.cmake | 23 ++-- ports/gz-utils/vcpkg.json | 5 +- ports/sdformat/cmake-config.patch | 33 +++--- ports/sdformat/fix-find-urdfdom.patch | 24 ---- ports/sdformat/no-absolute.patch | 28 +++-- ports/sdformat/portfile.cmake | 10 +- ports/sdformat/vcpkg.json | 4 +- versions/baseline.json | 28 ++--- versions/g-/gz-cmake.json | 5 + versions/g-/gz-common.json | 5 + versions/g-/gz-fuel-tools.json | 5 + versions/g-/gz-gui.json | 5 + versions/g-/gz-math.json | 5 + versions/g-/gz-msgs.json | 5 + versions/g-/gz-physics.json | 5 + versions/g-/gz-plugin.json | 5 + versions/g-/gz-rendering.json | 5 + versions/g-/gz-sensors.json | 5 + versions/g-/gz-tools.json | 5 + versions/g-/gz-transport.json | 5 + versions/g-/gz-utils.json | 5 + versions/s-/sdformat.json | 5 + 55 files changed, 407 insertions(+), 252 deletions(-) create mode 100644 ports/gz-common/detect_tinyxml.patch create mode 100644 ports/gz-msgs/move_bin_to_tools.patch delete mode 100644 ports/sdformat/fix-find-urdfdom.patch diff --git a/ports/gz-cmake/dependencies.patch b/ports/gz-cmake/dependencies.patch index 48d7c0e0a90f7b..1c0bf48d093b1d 100644 --- a/ports/gz-cmake/dependencies.patch +++ b/ports/gz-cmake/dependencies.patch @@ -35,7 +35,7 @@ index b400483..77f1247 100644 include(GzPkgConfig) gz_pkg_check_modules(GTS gts) diff --git a/cmake/FindGzBullet.cmake b/cmake/FindGzBullet.cmake -index 798d239..e7ee87c 100644 +index 70f7a76..4a334d9 100644 --- a/cmake/FindGzBullet.cmake +++ b/cmake/FindGzBullet.cmake @@ -31,7 +31,7 @@ endif() @@ -55,64 +55,11 @@ index 798d239..e7ee87c 100644 TARGET_NAME GzBullet::GzBullet LIB_VAR BULLET_LIBRARIES INCLUDE_VAR BULLET_INCLUDE_DIRS -diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake -index 5a5a147..68ba2a3 100644 ---- a/cmake/FindTINYXML2.cmake -+++ b/cmake/FindTINYXML2.cmake -@@ -18,11 +18,16 @@ - - include(GzPkgConfig) - --# Use pkg_check_modules to start --gz_pkg_check_modules_quiet(TINYXML2 tinyxml2) - - # If that failed, then fall back to manual detection (necessary for MacOS) - if(NOT TINYXML2_FOUND) -+ find_package(TINYXML2 NAMES tinyxml2) -+ if(TINYXML2_FOUND) -+ set(TINYXML2_LIBRARIES tinyxml2::tinyxml2) -+ include(GzImportTarget) -+ gz_import_target(TINYXML2 INTERFACE) -+ endif() -+elseif(0) - - if(NOT TINYXML2_FIND_QUIETLY) - message(STATUS "Attempting manual search for tinyxml2") -diff --git a/cmake/GzFindPackage.cmake b/cmake/GzFindPackage.cmake -index 4eb7a0d..11dae8a 100644 ---- a/cmake/GzFindPackage.cmake -+++ b/cmake/GzFindPackage.cmake -@@ -178,6 +178,7 @@ macro(gz_find_package PACKAGE_NAME_) - _gz_cmake_parse_arguments(gz_find_package "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - endif() - -+ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg/${PACKAGE_NAME}.cmake" OPTIONAL) - #------------------------------------ - # Construct the arguments to pass to find_package - set(${PACKAGE_NAME}_find_package_args ${PACKAGE_NAME}) -@@ -192,6 +193,8 @@ macro(gz_find_package PACKAGE_NAME_) - - if(gz_find_package_EXACT) - list(APPEND ${PACKAGE_NAME}_find_package_args EXACT) -+ elseif(gz_find_package_VERSION AND NOT gz_find_package_PKGCONFIG_VER_COMPARISON) -+ set(gz_find_package_PKGCONFIG_VER_COMPARISON >=) - endif() - - if(gz_find_package_CONFIG) -@@ -388,7 +391,7 @@ macro(gz_find_package PACKAGE_NAME_) - # ${component}_CMAKE_DEPENDENCIES variables that are specific to those - # componenets - foreach(component ${gz_find_package_REQUIRED_BY}) -- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) -+ if(NOT ${component}_${PACKAGE_NAME}_PRIVATE OR NOT BUILD_SHARED_LIBS) - gz_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") - endif() - endforeach() diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake +index 2decd84..3b71698 100644 --- a/cmake/FindGzOGRE2.cmake +++ b/cmake/FindGzOGRE2.cmake -@@ -143,11 +143,11 @@ - endif () +@@ -144,9 +144,9 @@ macro(get_preprocessor_entry CONTENTS KEYWORD VARIABLE) endmacro() find_package(PkgConfig QUIET) @@ -124,9 +71,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake message(STATUS "Looking for OGRE using the name: ${GZ_OGRE2_PROJECT_NAME}") if (GZ_OGRE2_PROJECT_NAME STREQUAL "OGRE2") set(OGRE2_INSTALL_PATH "OGRE-2.${GzOGRE2_FIND_VERSION_MINOR}") - # For OGRE 2.3 debs built via OpenRobotics buildfarms, we use OgreNext -@@ -172,8 +172,9 @@ - if (${GZ_OGRE2_PROJECT_NAME}_FOUND) +@@ -173,6 +173,7 @@ if (PkgConfig_FOUND) set(GZ_PKG_NAME ${OGRE2_INSTALL_PATH}) set(OGRE2_FOUND ${${GZ_OGRE2_PROJECT_NAME}_FOUND}) # sync possible OGRE-Next to OGRE2 fix_pkgconfig_prefix_jammy_bug("${${GZ_OGRE2_PROJECT_NAME}_LIBRARY_DIRS}" OGRE2_LIBRARY_DIRS) @@ -134,9 +79,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake set(OGRE2_LIBRARIES ${${GZ_OGRE2_PROJECT_NAME}_LIBRARIES}) # sync possible Ogre-Next ot OGRE2 else() # look for OGRE2 installed from source - set(PKG_CONFIG_PATH_TMP ${PKG_CONFIG_PATH_ORIGINAL}) -@@ -308,8 +309,10 @@ - "${OGRE2LIBNAME}${component}_d.${OGRE2_VERSION}" +@@ -309,6 +310,8 @@ if (PkgConfig_FOUND) "${OGRE2LIBNAME}${component}_d" "${OGRE2LIBNAME}${component}.${OGRE2_VERSION}" "${OGRE2LIBNAME}${component}" @@ -145,9 +88,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake HINTS ${OGRE2_LIBRARY_DIRS}) if (NOT "${OGRE2-${component}}" STREQUAL "OGRE2-${component}-NOTFOUND") message(STATUS " + component ${component}: found") - # create a new target for each component -@@ -403,15 +406,23 @@ - set(OGRE2_SEARCH_VER "OGRE-${GzOGRE2_FIND_VERSION_MAJOR}.${GzOGRE2_FIND_VERSION_MINOR}") +@@ -404,13 +407,21 @@ else() #PkgConfig_FOUND set(OGRE2_PATHS "") set(OGRE2_INC_PATHS "") foreach(_rootPath ${VCPKG_CMAKE_FIND_ROOT_PATH}) @@ -173,9 +114,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake HINTS ${OGRE2_PATHS} NO_DEFAULT_PATH) - find_path(OGRE2_INCLUDE -@@ -449,10 +460,13 @@ - ${PATH_HINTS} ${COMPONENT} ${OGRE2_SEARCH_VER}/${COMPONENT}) +@@ -450,8 +461,11 @@ else() #PkgConfig_FOUND find_library(${PREFIX}_LIBRARY NAMES @@ -189,9 +128,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake HINTS ${OGRE2_LIBRARY_DIRS} NO_DEFAULT_PATH) - -@@ -509,8 +522,9 @@ - +@@ -510,6 +524,7 @@ else() #PkgConfig_FOUND ogre_find_plugin(Plugin_ParticleFX OgreParticleFXPrerequisites.h PlugIns/ParticleFX/include) ogre_find_plugin(RenderSystem_GL3Plus OgreGL3PlusRenderSystem.h RenderSystems/GL3Plus/include) ogre_find_plugin(RenderSystem_Direct3D11 OgreD3D11RenderSystem.h RenderSystems/Direct3D11/include) @@ -199,9 +136,7 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake foreach(component ${GzOGRE2_FIND_COMPONENTS}) set(PREFIX OGRE2_${component}) - if(${PREFIX}_FOUND) -@@ -520,9 +534,9 @@ - string(FIND ${component} "Hlms" HLMS_POS) +@@ -521,7 +536,7 @@ else() #PkgConfig_FOUND if(${HLMS_POS} GREATER -1) foreach (dir ${OGRE2_INCLUDE_DIRS}) get_filename_component(dir_name "${dir}" NAME) @@ -210,4 +145,56 @@ diff --git a/cmake/FindGzOGRE2.cmake b/cmake/FindGzOGRE2.cmake set(dir_include "${dir}/Hlms/Common") if (EXISTS ${dir_include}) list(APPEND component_INCLUDE_DIRS ${dir_include}) - endif() +diff --git a/cmake/FindTINYXML2.cmake b/cmake/FindTINYXML2.cmake +index 5a5a147..68ba2a3 100644 +--- a/cmake/FindTINYXML2.cmake ++++ b/cmake/FindTINYXML2.cmake +@@ -18,11 +18,16 @@ + + include(GzPkgConfig) + +-# Use pkg_check_modules to start +-gz_pkg_check_modules_quiet(TINYXML2 tinyxml2) + + # If that failed, then fall back to manual detection (necessary for MacOS) + if(NOT TINYXML2_FOUND) ++ find_package(TINYXML2 NAMES tinyxml2) ++ if(TINYXML2_FOUND) ++ set(TINYXML2_LIBRARIES tinyxml2::tinyxml2) ++ include(GzImportTarget) ++ gz_import_target(TINYXML2 INTERFACE) ++ endif() ++elseif(0) + + if(NOT TINYXML2_FIND_QUIETLY) + message(STATUS "Attempting manual search for tinyxml2") +diff --git a/cmake/GzFindPackage.cmake b/cmake/GzFindPackage.cmake +index 93da803..22fdec8 100644 +--- a/cmake/GzFindPackage.cmake ++++ b/cmake/GzFindPackage.cmake +@@ -163,6 +163,7 @@ macro(gz_find_package PACKAGE_NAME_) + # Parse the arguments + _gz_cmake_parse_arguments(gz_find_package "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + ++ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg/${PACKAGE_NAME}.cmake" OPTIONAL) + #------------------------------------ + # Construct the arguments to pass to find_package + set(${PACKAGE_NAME}_find_package_args ${PACKAGE_NAME}) +@@ -177,6 +178,8 @@ macro(gz_find_package PACKAGE_NAME_) + + if(gz_find_package_EXACT) + list(APPEND ${PACKAGE_NAME}_find_package_args EXACT) ++ elseif(gz_find_package_VERSION AND NOT gz_find_package_PKGCONFIG_VER_COMPARISON) ++ set(gz_find_package_PKGCONFIG_VER_COMPARISON >=) + endif() + + if(gz_find_package_CONFIG) +@@ -344,7 +347,7 @@ macro(gz_find_package PACKAGE_NAME_) + # ${component}_CMAKE_DEPENDENCIES variables that are specific to those + # componenets + foreach(component ${gz_find_package_REQUIRED_BY}) +- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) ++ if(NOT ${component}_${PACKAGE_NAME}_PRIVATE OR NOT BUILD_SHARED_LIBS) + gz_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") + endif() + endforeach() diff --git a/ports/gz-cmake/portfile.cmake b/ports/gz-cmake/portfile.cmake index 65165a96c10a22..cdd1ddb58f06bc 100644 --- a/ports/gz-cmake/portfile.cmake +++ b/ports/gz-cmake/portfile.cmake @@ -1,17 +1,17 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 30cf5aa69674bdc1a99762fc45d134b99da5e2faf846749392697ae41463a5304a43022bb0c2ca1b373af4171135d686fdd736573fe6e1cc26dc2cecc8333e69 + SHA512 e348e49a19fa1db711df8f0d2d1426c72487f035a75b14cd4e37fa49ac6dad61e76f4488af07d589100d05411e3a0a92779e99bb024cb15a4aa91bb51f4b2f88 PATCHES dependencies.patch ) -file(COPY "${CURRENT_PORT_DIR}/vcpkg" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}/${PACKAGE_NAME}${VERSION_MAJOR}") +file(COPY "${CURRENT_PORT_DIR}/vcpkg/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}${VERSION_MAJOR}/${PACKAGE_NAME}${VERSION_MAJOR}") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake/usage b/ports/gz-cmake/usage index 58c1899f0db3f5..77e9a5f3970587 100644 --- a/ports/gz-cmake/usage +++ b/ports/gz-cmake/usage @@ -1,3 +1,3 @@ -The package gz-cmake3 provides CMake integration: +The package gz-cmake4 provides CMake integration: - find_package(gz-cmake3 CONFIG REQUIRED) + find_package(gz-cmake4 CONFIG REQUIRED) diff --git a/ports/gz-cmake/vcpkg.json b/ports/gz-cmake/vcpkg.json index 132876440f7338..ce4036ed80c965 100644 --- a/ports/gz-cmake/vcpkg.json +++ b/ports/gz-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-cmake", - "version": "3.4.1", + "version": "4.1.0", "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-common/detect_tinyxml.patch b/ports/gz-common/detect_tinyxml.patch new file mode 100644 index 00000000000000..ada05c511f6f68 --- /dev/null +++ b/ports/gz-common/detect_tinyxml.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,9 +49,8 @@ + + #-------------------------------------- + # Find Tinyxml2 + gz_find_package(TINYXML2 PRETTY tinyxml2 +- VERSION 6.0 + REQUIRED_BY graphics + PRIVATE_FOR graphics) + + #-------------------------------------- diff --git a/ports/gz-common/portfile.cmake b/ports/gz-common/portfile.cmake index c8c3d3bf103c41..7d232dcfc3f4cb 100644 --- a/ports/gz-common/portfile.cmake +++ b/ports/gz-common/portfile.cmake @@ -1,12 +1,12 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 40db4747db743005d7c43ca25cfe93cf68ee19201abcb165e72de37708b92fd88553b11520c420db33b37f4cab7e01e4d79c91c5dc0485146b7156284b8baaee + SHA512 32be36f3b2d6e34b58ec43af05463c0074f84091378ce521b88b3eb795c6ee31a3d3159817fb28aaaf8fce5660aa5278be0c480481517c1ef41cae0979b6c324 OPTIONS -DBUILD_TESTING=OFF -DUSE_EXTERNAL_TINYXML2=ON @@ -14,6 +14,7 @@ ignition_modular_library( PATCHES gz_remotery_vis.patch 003-include-chrono.patch + detect_tinyxml.patch ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-graphics/${PORT}${VERSION_MAJOR}-graphics-config.cmake" "find_package(GTS " diff --git a/ports/gz-common/vcpkg.json b/ports/gz-common/vcpkg.json index 61b0784ab5a1de..a2a81c02e41e87 100644 --- a/ports/gz-common/vcpkg.json +++ b/ports/gz-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-common", - "version": "5.4.1", + "version": "6.0.1", "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": "Apache-2.0", @@ -16,6 +16,7 @@ "gts", "gz-cmake", "gz-math", + "gz-utils", { "name": "ignition-modularscripts", "host": true diff --git a/ports/gz-fuel-tools/portfile.cmake b/ports/gz-fuel-tools/portfile.cmake index 47db410a456ff9..65b302ba5ef914 100644 --- a/ports/gz-fuel-tools/portfile.cmake +++ b/ports/gz-fuel-tools/portfile.cmake @@ -1,12 +1,16 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 6a31719441c7ea835007d82b6aea99b10fa124ebad71683b8c1c58c41b435d4801e016464dc30d760cc9464e642dab4ff910375f5244ebf7c565845174e65cbf + SHA512 a87bb313c17c9624e49cdf39399f90630256155fc410518aa03b340cc0b26e8955fa2d72623974aa4b474c270a25451989a293aaa015b43642f1018aeff8fdd4 OPTIONS PATCHES remove_docs.patch diff --git a/ports/gz-fuel-tools/vcpkg.json b/ports/gz-fuel-tools/vcpkg.json index 3a1e4899213546..7fa9718fb19686 100644 --- a/ports/gz-fuel-tools/vcpkg.json +++ b/ports/gz-fuel-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-fuel-tools", - "version": "8.1.0", + "version": "10.0.0", "description": "Tools for using fuel API to download robot models", "homepage": "https://gazebosim.org/libs/fuel_tools", "license": null, diff --git a/ports/gz-gui/dependencies.patch b/ports/gz-gui/dependencies.patch index 3d5d2f29375a5e..a1b11af16f4236 100644 --- a/ports/gz-gui/dependencies.patch +++ b/ports/gz-gui/dependencies.patch @@ -1,22 +1,30 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7c7f509..2f2265a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -80,13 +80,17 @@ - set(GZ_TOOLS_VER 2) +@@ -81,10 +81,11 @@ set(GZ_TOOLS_VER 2) #-------------------------------------- # Find QT +-set(QT_MAJOR_VERSION 5) +-set(QT_MINOR_VERSION 15) +-gz_find_package (Qt${QT_MAJOR_VERSION} +- VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION} +set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets") +if (WIN32) +set(qt_pkgconfig "") +endif() - gz_find_package (Qt5 ++gz_find_package (Qt5 COMPONENTS Core Quick - QuickControls2 +@@ -92,8 +93,7 @@ gz_find_package (Qt${QT_MAJOR_VERSION} Widgets + Test REQUIRED -- PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets" -+ PKGCONFIG ${qt_pkgconfig} - ) +- PKGCONFIG_VER_COMPARISON >= +- PKGCONFIG "Qt${QT_MAJOR_VERSION}Core Qt${QT_MAJOR_VERSION}Quick Qt${QT_MAJOR_VERSION}QuickControls2 Qt${QT_MAJOR_VERSION}Widgets") ++ PKGCONFIG ${qt_pkgconfig}) + add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00) + + set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR diff --git a/ports/gz-gui/portfile.cmake b/ports/gz-gui/portfile.cmake index ec9c19dfcb0ff9..685dcd5e5a624a 100644 --- a/ports/gz-gui/portfile.cmake +++ b/ports/gz-gui/portfile.cmake @@ -1,12 +1,16 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 29f37a31bbf90dd35f37e80053c1aff9fb404b7a09c8c10e640da505cc6261387e6ce77e3bf379a911e6131c684f866cf1ef8d83777112b3c7f148b1f95cc72f + SHA512 c90c72a700889289aec71582c6484c6c7a5d06cfa2d01f3634fa194b4271fc1723c6746ed82610dc8463c0f3eb146b46111ba90e2c30f44cafc63d1fa46b56f4 OPTIONS PATCHES dependencies.patch diff --git a/ports/gz-gui/vcpkg.json b/ports/gz-gui/vcpkg.json index 594bb371ad2201..5a95789a35bab3 100644 --- a/ports/gz-gui/vcpkg.json +++ b/ports/gz-gui/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gz-gui", - "version": "7.2.1", + "version": "9.0.0", "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.", "homepage": "https://gazebosim.org/libs/gui", "license": "Apache-2.0", + "supports": "!(windows & static & !staticcrt)", "dependencies": [ "gz-cmake", "gz-common", diff --git a/ports/gz-math/portfile.cmake b/ports/gz-math/portfile.cmake index 191111788b9dd5..c01f7071b6ece0 100644 --- a/ports/gz-math/portfile.cmake +++ b/ports/gz-math/portfile.cmake @@ -1,12 +1,12 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 6d6e7c298f927110060882457f4ea379292f013b577f83a3a6f1fd68fc9cd7ea0bbef82cc0b9279373ab7af6e66f6ea2d8995669fa7d6d1fff13f8b8c857a6ed + SHA512 73fd84ab4d8dea5cdd0fdc33479681cfe0125c6ad9d79ef1a53deb7c0592bc23f6d50984b111957cc0eb575b6e7f3f505b5b1810eb760ab839c16bdcebe45376 OPTIONS -DSKIP_SWIG=ON -DSKIP_PYBIND11=ON diff --git a/ports/gz-math/vcpkg.json b/ports/gz-math/vcpkg.json index dee63016c068dd..f5ad3b273c2731 100644 --- a/ports/gz-math/vcpkg.json +++ b/ports/gz-math/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-math", - "version": "7.3.0", + "version": "8.1.0", "description": "Math API for robotic applications", "homepage": "https://ignitionrobotics.org/libs/math", "license": null, diff --git a/ports/gz-msgs/move_bin_to_tools.patch b/ports/gz-msgs/move_bin_to_tools.patch new file mode 100644 index 00000000000000..91c039a1159559 --- /dev/null +++ b/ports/gz-msgs/move_bin_to_tools.patch @@ -0,0 +1,24 @@ +diff --git a/gz-msgs-extras.cmake.in b/gz-msgs-extras.cmake.in +index b70c04a..537a54e 100644 +--- a/gz-msgs-extras.cmake.in ++++ b/gz-msgs-extras.cmake.in +@@ -33,7 +33,7 @@ set(FACTORY_SCRIPT_NAME "@PROJECT_NAME@_generate_factory.py") + set(@PROJECT_NAME@_PROTO_PATH ${@PROJECT_NAME@_INSTALL_PATH}/share/protos) + # Provide support to override generator executable used during cross-compilation + if(NOT DEFINED @PROJECT_NAME@_PROTO_GENERATOR_PLUGIN) +- set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTOC_NAME}) ++ set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTOC_NAME}) + endif() + if(NOT DEFINED @PROJECT_NAME@_PROTOC_EXECUTABLE) + set(@PROJECT_NAME@_PROTOC_EXECUTABLE protobuf::protoc) +@@ -41,8 +41,8 @@ endif() + if(NOT DEFINED @PROJECT_NAME@_PYTHON_INTERPRETER) + set(@PROJECT_NAME@_PYTHON_INTERPRETER Python3::Interpreter) + endif() +-set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTO_SCRIPT_NAME}) +-set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${FACTORY_SCRIPT_NAME}) ++set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTO_SCRIPT_NAME}) ++set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${FACTORY_SCRIPT_NAME}) + + ################################################## + # A function to generate a target mesage library from a group of protobuf files . diff --git a/ports/gz-msgs/portfile.cmake b/ports/gz-msgs/portfile.cmake index dfc3d1493b5c1d..6184f8c5a8ca38 100644 --- a/ports/gz-msgs/portfile.cmake +++ b/ports/gz-msgs/portfile.cmake @@ -1,17 +1,36 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") +if(VCPKG_TARGET_IS_WINDOWS) + set(BIGOBJ_OPTION "/bigobj") +endif() + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 669e60fc35868e4d86695104a58aecaef9ad08861cba97ff91c7306caf66ec237da46c0a13f5f59907371fc7a4dd56d5506fabe4ba97c393889fc5a9c2a101ee - OPTIONS + SHA512 b96ec15d2ef46eebab6bebb6ffbd8f11b7bd9ed27156e753343603546d49db41afb3cf926b72de7eb9f702c40ad7e029dd3ddfe3e00d6d503cc45c1a0b8761d9 + OPTIONS + "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${BIGOBJ_OPTION}" PATCHES remove_ruby.patch + move_bin_to_tools.patch ) + +file(GLOB BIN_FILES "${CURRENT_PACKAGES_DIR}/bin/${PORT}${VERSION_MAJOR}_*") +file(COPY ${BIN_FILES} DESTINATION ${CURRENT_INSTALLED_DIR}/tools/${PORT}${VERSION_MAJOR}) +file(REMOVE_RECURSE ${BIN_FILES}) + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(GLOB BIN_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/${PORT}${VERSION_MAJOR}_*") + file(REMOVE_RECURSE ${BIN_FILES}) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() diff --git a/ports/gz-msgs/remove_ruby.patch b/ports/gz-msgs/remove_ruby.patch index d6b7634123346e..35d7b13a1b00fc 100644 --- a/ports/gz-msgs/remove_ruby.patch +++ b/ports/gz-msgs/remove_ruby.patch @@ -1,17 +1,20 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -102,5 +102,5 @@ -- if(gz_msgs_protoc_GENERATE_RUBY) -+ if(0) - file(MAKE_DIRECTORY ${gz_msgs_protoc_OUTPUT_RUBY_DIR}) - set(output_ruby "${gz_msgs_protoc_OUTPUT_RUBY_DIR}${proto_package_dir}/${FIL_WE}_pb.rb") - list(APPEND ${gz_msgs_protoc_OUTPUT_RUBY_VAR} ${output_ruby}) - list(APPEND output_files ${output_ruby}) -@@ -126,5 +126,5 @@ -- if(${gz_msgs_protoc_GENERATE_RUBY}) -+ if(0) - list(APPEND GENERATE_ARGS - --generate-ruby - --output-ruby-path "${gz_msgs_protoc_OUTPUT_RUBY_DIR}") - endif() +diff --git a/core/cmd/CMakeLists.txt b/core/cmd/CMakeLists.txt +index 736f537..ace3d77 100644 +--- a/core/cmd/CMakeLists.txt ++++ b/core/cmd/CMakeLists.txt +@@ -9,6 +9,7 @@ set(EXE_INSTALL_DIR ${CMAKE_INSTALL_LIBEXECDIR}/gz/${GZ_DESIGNATION}${PROJECT_VE + install(TARGETS ${msgs_executable} DESTINATION ${EXE_INSTALL_DIR}) + set(executable_location "../../../${EXE_INSTALL_DIR}/$") + ++if(0) + set(cmd_script_generated "${CMAKE_CURRENT_BINARY_DIR}/cmd${GZ_DESIGNATION}${PROJECT_VERSION_MAJOR}.rb") + set(cmd_script_configured "${cmd_script_generated}.configured") + +@@ -23,6 +24,7 @@ file(GENERATE + + install(FILES ${cmd_script_generated} DESTINATION lib/ruby/gz) + ++endif() + #=============================================================================== + # Bash completion + diff --git a/ports/gz-msgs/vcpkg.json b/ports/gz-msgs/vcpkg.json index 4ece0b773cb96b..91515994bd4e25 100644 --- a/ports/gz-msgs/vcpkg.json +++ b/ports/gz-msgs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-msgs", - "version": "9.5.0", + "version": "11.0.2", "description": "Middleware protobuf messages for robotics", "license": "Apache-2.0", "supports": "!(android | arm | uwp)", diff --git a/ports/gz-physics/dependencies.patch b/ports/gz-physics/dependencies.patch index 148ceb2b384e50..1739f5de88a64d 100644 --- a/ports/gz-physics/dependencies.patch +++ b/ports/gz-physics/dependencies.patch @@ -1,11 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index b16b4dd1..0f5e2771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -82,7 +82,6 @@ - #-------------------------------------- - # Find bullet for the bullet plugin wrapper +@@ -88,7 +88,6 @@ gz_find_package(DART gz_find_package(GzBullet VERSION 2.87 REQUIRED_BY bullet bullet-featherstone - PKGCONFIG bullet PKGCONFIG_VER_COMPARISON >=) + + message(STATUS "-------------------------------------------\n") diff --git a/ports/gz-physics/portfile.cmake b/ports/gz-physics/portfile.cmake index d6d00581bc3759..739c12e4a5c792 100644 --- a/ports/gz-physics/portfile.cmake +++ b/ports/gz-physics/portfile.cmake @@ -1,12 +1,12 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 c29594663509234e25c7d0a33848c0fe222c2b9471513978c18ea6873a17c66c43b4037c74e8849995fa6449c2dddc0f2ee669605893daf65119c277a17f39e1 + SHA512 8f62af3838e9189c3a93fea87991c390ddd4fa0d5c0ecb80f8347bfb2f5892ec73c4bca1ac05d083d2a5adcbbd698e76215d56498bd648834a46af7784e8ce57 OPTIONS PATCHES dependencies.patch diff --git a/ports/gz-physics/vcpkg.json b/ports/gz-physics/vcpkg.json index 8da7f434f50368..c24e91ea06d18a 100644 --- a/ports/gz-physics/vcpkg.json +++ b/ports/gz-physics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-physics", - "version": "6.5.1", + "version": "8.0.0", "description": "component of Gazebo, provides an abstract physics interface designed to support simulation and rapid development of robot applications.", "homepage": "https://gazebosim.org/libs/physics", "license": "Apache-2.0", diff --git a/ports/gz-plugin/portfile.cmake b/ports/gz-plugin/portfile.cmake index 47fea8a51033f6..58f6f28ed2da95 100644 --- a/ports/gz-plugin/portfile.cmake +++ b/ports/gz-plugin/portfile.cmake @@ -1,12 +1,12 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 4c497291f8e33aae3a5752607a7fd7b48912e209f0f424ea7b1e6d35f27d1e920d1dd97ee64b7b3846d7d433618742be5d19352cbce8f6f63eccc83a086520ea + SHA512 9355eb9ec7bb6dffaadcd37009d16db215b7def6a835ba4704d6c6831c9253b2abf40f6ad01fe70609e46c6f121adc80f809e80c8168c795511434c118c12b10 OPTIONS PATCHES ) diff --git a/ports/gz-plugin/vcpkg.json b/ports/gz-plugin/vcpkg.json index 408026cff6fa93..c24cbe4371f747 100644 --- a/ports/gz-plugin/vcpkg.json +++ b/ports/gz-plugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-plugin", - "version": "2.0.1", + "version": "3.0.0", "description": "Library for registering plugin libraries and dynamically loading them at runtime", "homepage": "https://ignitionrobotics.org/libs/plugin", "license": null, diff --git a/ports/gz-rendering/fix-dependencies.patch b/ports/gz-rendering/fix-dependencies.patch index e55f35e6742147..6bd8e154af71f6 100644 --- a/ports/gz-rendering/fix-dependencies.patch +++ b/ports/gz-rendering/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96ce8913..4ef6b63c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -65,12 +65,12 @@ - +@@ -55,13 +55,13 @@ set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) if (APPLE) gz_find_package(OpenGL REQUIRED_BY ogre ogre2 @@ -16,24 +16,36 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt - PKGCONFIG gl) + PKGCONFIG opengl) endif() -@@ -81,5 +81,6 @@ + + if (OpenGL_FOUND) +@@ -70,6 +70,7 @@ endif() #-------------------------------------- # Find OGRE +if(0) list(APPEND gz_ogre_components "RTShaderSystem" "Terrain" "Overlay" "Paging") -@@ -97,5 +98,6 @@ - "The software might compile and even work but support from upstream" + gz_find_package(GzOGRE VERSION 1.9.0 +@@ -87,6 +88,7 @@ if (NOT USE_UNOFFICIAL_OGRE_VERSIONS) "could be reduced to accepting patches for newer versions") endif() endif() +endif() + if (OGRE_FOUND) + # find boost - mainly needed on macOS and also by the terrain component diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CMakeLists.txt --- a/ogre2/src/terrain/Terra/CMakeLists.txt +++ b/ogre2/src/terrain/Terra/CMakeLists.txt -@@ -34,8 +34,10 @@ +@@ -1,6 +1,6 @@ + +-project(terra) ++project(terra9) + + file( GLOB_RECURSE TERRA_SOURCES + ${CMAKE_CURRENT_LIST_DIR}/include/*.h + ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp +@@ -32,8 +32,10 @@ # we must add this one manually for this to build correctly ${OGRE2_INCLUDE}/Hlms/Pbs ${OGRE2_INCLUDE}/Hlms/Common @@ -44,4 +56,18 @@ diff --git a/ogre2/src/terrain/Terra/CMakeLists.txt b/ogre2/src/terrain/Terra/CM ) target_link_libraries(${PROJECT_NAME} PRIVATE GzOGRE2::GzOGRE2) -+install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering7-ogre2) ++install(TARGETS ${PROJECT_NAME} EXPORT gz-rendering9-ogre2) +diff --git a/ogre2/src/CMakeLists.txt b/ogre2/src/CMakeLists.txt +--- a/ogre2/src/CMakeLists.txt ++++ b/ogre2/src/CMakeLists.txt +@@ -58,9 +58,9 @@ + gz-math${GZ_MATH_VER}::eigen3 + PRIVATE + gz-plugin${GZ_PLUGIN_VER}::register + ${OPENGL_LIBRARIES} +- terra ++ terra9 + GzOGRE2::GzOGRE2) + + + if (TARGET OpenGL::EGL) diff --git a/ports/gz-rendering/portfile.cmake b/ports/gz-rendering/portfile.cmake index 35a94e6397bc8c..f497d11ea88851 100644 --- a/ports/gz-rendering/portfile.cmake +++ b/ports/gz-rendering/portfile.cmake @@ -1,12 +1,12 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 7c14b268694600b8529fef21130b34f516b26baac771c019b4248a67f84420c40d655e0abedf0b36c53b7cdf19941b3f4f3494696c831a83070632d004b30678 + SHA512 0a0f20eadae0c2ac645f44fccc12842cefe01c07211466b1081abaf3a7390730467d0b8c1ecab9451e7e4e1cca30e3bd352a3e79b5c329323d8e70b7815f105a OPTIONS PATCHES fix-dependencies.patch diff --git a/ports/gz-rendering/vcpkg.json b/ports/gz-rendering/vcpkg.json index 2cd82fff55d548..5525d9320fe178 100644 --- a/ports/gz-rendering/vcpkg.json +++ b/ports/gz-rendering/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-rendering", - "version": "7.4.1", + "version": "9.0.0", "description": "Gazebo Rendering is a C++ library designed to provide an abstraction for different rendering engines. It offers unified APIs for creating 3D graphics applications.", "homepage": "https://gazebosim.org/libs/rendering", "license": "Apache-2.0", diff --git a/ports/gz-sensors/portfile.cmake b/ports/gz-sensors/portfile.cmake index 649325a59e3d29..e4fd306b7b867c 100644 --- a/ports/gz-sensors/portfile.cmake +++ b/ports/gz-sensors/portfile.cmake @@ -1,12 +1,16 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 968aab8d623c1716c4d0e164e70442e02ebe34f9277bcc48739c620124c80ba4896a846f9d052ac6d9b32b4d8805aee30b4f9c1248f75790de85718f659b6ff6 + SHA512 237235ecc5000e2785e293f7aad65cb72690e46ba06ca6649add9a8baa24e0f7777e21f59fa0a254a4a853fa8f172cc4e9e58770e227bb9b6797949bd8bc06f6 OPTIONS PATCHES ) diff --git a/ports/gz-sensors/vcpkg.json b/ports/gz-sensors/vcpkg.json index 4614509c12edd4..ba06b650c759f1 100644 --- a/ports/gz-sensors/vcpkg.json +++ b/ports/gz-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-sensors", - "version": "7.3.0", + "version": "9.0.0", "description": "Component of Gazebo, provides numerous sensor models designed to generate realistic data from simulation environments.", "homepage": "https://gazebosim.org/libs/sensors", "license": "Apache-2.0", diff --git a/ports/gz-tools/portfile.cmake b/ports/gz-tools/portfile.cmake index b309100a0e6608..121c531cbbba6b 100644 --- a/ports/gz-tools/portfile.cmake +++ b/ports/gz-tools/portfile.cmake @@ -1,12 +1,12 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) ignition_modular_library(NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 1b89048d09821db5a902758e133e6e73052941fdb9838daed5540267ef9203512170a031cf94a29564cac15133489609e83e965f31f930f7d7be477a8d9c2667 + SHA512 0dc78d30876f2091c5a545feb70e769d65967c6f77bca7bc17aec62a5069601657fd4bf03f7a913ef5ad8bb58ca8aba4b2b911c6d4de4d46f827edb609acd61c PATCHES ) diff --git a/ports/gz-tools/vcpkg.json b/ports/gz-tools/vcpkg.json index f18756d3da0e0c..487dd690894035 100644 --- a/ports/gz-tools/vcpkg.json +++ b/ports/gz-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-tools", - "version": "2.0.0", + "version": "2.0.1", "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.", "homepage": "https://gazebosim.org", "license": "Apache-2.0", diff --git a/ports/gz-transport/portfile.cmake b/ports/gz-transport/portfile.cmake index d0c75c06c1fd51..a22f0454325178 100644 --- a/ports/gz-transport/portfile.cmake +++ b/ports/gz-transport/portfile.cmake @@ -1,12 +1,16 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) set(PACKAGE_NAME ${CMAKE_MATCH_1}) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 734d4c2eccf42a3a5a665611c44ccb450bf290763bcf8dc169b16c0c5c5c7d7be6b3cb69c69a5ef64a502b411fdb1461f036c660d8d9188146e61cf8f4beead8 + SHA512 988d546044ab05efb1cd14c5dbd035e040a0a8cad631c99a330420676f882a16e9d6c2b23363b1e82e162fb2baa4f0a01eff84d1f1be0f6e92d69d0e168867a7 OPTIONS PATCHES uuid-osx.patch diff --git a/ports/gz-transport/uuid-osx.patch b/ports/gz-transport/uuid-osx.patch index 97af930960c91d..d51d9fe103a56a 100644 --- a/ports/gz-transport/uuid-osx.patch +++ b/ports/gz-transport/uuid-osx.patch @@ -1,22 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8c69aa0e..428bd0ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,8 +72,10 @@ - #-------------------------------------- - # Find uuid +@@ -111,6 +111,8 @@ gz_find_package(CPPZMQ REQUIRED PRIVATE if (MSVC) + set(skip_pybind11_default_value ON) message (STATUS "UUID: Using Windows RPC UuidCreate function\n") +elseif (APPLE) + message (STATUS "Use system uuid header") else() gz_find_package(UUID REQUIRED) endif() - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 13101c50..340e0e82 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -20,9 +20,9 @@ - $ +@@ -21,7 +21,7 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME} $) # Windows system library provides UUID @@ -25,4 +24,3 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} PUBLIC UUID::UUID - ) diff --git a/ports/gz-transport/vcpkg.json b/ports/gz-transport/vcpkg.json index 16dff598b35909..ab905cd634aa18 100644 --- a/ports/gz-transport/vcpkg.json +++ b/ports/gz-transport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-transport", - "version": "12.2.1", + "version": "14.0.0", "description": "Transport middleware for robotics", "license": null, "dependencies": [ diff --git a/ports/gz-utils/portfile.cmake b/ports/gz-utils/portfile.cmake index bfddbca13bb002..24f8ca01dd912d 100644 --- a/ports/gz-utils/portfile.cmake +++ b/ports/gz-utils/portfile.cmake @@ -1,13 +1,10 @@ -string(REGEX MATCH "^[1-9]+" VERSION_MAJOR ${VERSION}) -string(REGEX MATCH "^gz-([a-z]+)" MATCHED_VALUE ${PORT}) -set(PACKAGE_NAME ${CMAKE_MATCH_1}) - -ignition_modular_library(NAME ${PACKAGE_NAME} - REF ${PORT}${VERSION_MAJOR}_${VERSION} - VERSION ${VERSION} - SHA512 2e896e7106591a427fd5a732ba7dbfb329a3c0ec70601f5bf9b2390907e37b41837fd06696f4a93fb4ccc16a94a0221e4734e59f9fb1c7e5a016a076800d8214 - PATCHES - ) - -# preserve the original port behavior -file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}") +string(REGEX MATCH "^[0-9]+" VERSION_MAJOR ${VERSION}) +string(REGEX MATCH "^gz-([a-z-]+)" MATCHED_VALUE ${PORT}) +set(PACKAGE_NAME ${CMAKE_MATCH_1}) + +ignition_modular_library(NAME ${PACKAGE_NAME} + REF ${PORT}${VERSION_MAJOR}_${VERSION} + VERSION ${VERSION} + SHA512 abac6e68ccb9b036dab4a49e5c9c64045045311595ac5d7a96222f8368d8fe4b007fe274abe45b877df19dce12bb08350e6600a28f040bb09acc3f15a5851bd2 + PATCHES +) diff --git a/ports/gz-utils/vcpkg.json b/ports/gz-utils/vcpkg.json index f8208d81894872..9af644df020d17 100644 --- a/ports/gz-utils/vcpkg.json +++ b/ports/gz-utils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-utils", - "version": "2.0.0", + "version": "3.1.0", "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", @@ -9,6 +9,7 @@ { "name": "ignition-modularscripts", "host": true - } + }, + "spdlog" ] } diff --git a/ports/sdformat/cmake-config.patch b/ports/sdformat/cmake-config.patch index 34970b6dc6bd98..aa5923fef76dd7 100644 --- a/ports/sdformat/cmake-config.patch +++ b/ports/sdformat/cmake-config.patch @@ -1,23 +1,24 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3465a8f..2b57440 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,6 +26,7 @@ else() - target_link_libraries(using_parser_urdf INTERFACE - GzURDFDOM::GzURDFDOM) - endif() -+install(TARGETS using_parser_urdf EXPORT ${PROJECT_LIBRARY_TARGET_NAME} COMPONENT libraries) - - if (BUILD_TESTING) - # Build this test file only if Gazebo Tools is installed. - +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fedcd42..8b28fdcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -58,6 +58,6 @@ +@@ -63,7 +63,18 @@ if (BUILD_SDF) + # 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 DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) - gz_find_package(GzURDFDOM VERSION 1.0 QUIET) -+ gz_find_package(GzURDFDOM) ++ find_package(urdfdom CONFIG REQUIRED) ++ add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED) ++ target_link_libraries(GzURDFDOM::GzURDFDOM ++ INTERFACE ++ urdfdom::urdfdom_model ++ urdfdom::urdfdom_world ++ urdfdom::urdfdom_sensor ++ urdfdom::urdfdom_model_state ++ ) ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(GzURDFDOM DEFAULT_MSG) ++ if (NOT GzURDFDOM_FOUND) if (NOT DEFINED USE_INTERNAL_URDF) # fallback to internal urdf - set(USE_INTERNAL_URDF ON) diff --git a/ports/sdformat/fix-find-urdfdom.patch b/ports/sdformat/fix-find-urdfdom.patch deleted file mode 100644 index 4593b083d3b629..00000000000000 --- a/ports/sdformat/fix-find-urdfdom.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e797e8a..0f652d7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -56,7 +56,18 @@ if (BUILD_SDF) - # 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 DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) -- gz_find_package(GzURDFDOM) -+ find_package(urdfdom CONFIG REQUIRED) -+ add_library(GzURDFDOM::GzURDFDOM INTERFACE IMPORTED) -+ target_link_libraries(GzURDFDOM::GzURDFDOM -+ INTERFACE -+ urdfdom::urdfdom_model -+ urdfdom::urdfdom_world -+ urdfdom::urdfdom_sensor -+ urdfdom::urdfdom_model_state -+ ) -+ include(FindPackageHandleStandardArgs) -+ find_package_handle_standard_args(GzURDFDOM DEFAULT_MSG) -+ - if (NOT GzURDFDOM_FOUND) - if (NOT DEFINED USE_INTERNAL_URDF) - # fallback to internal urdf diff --git a/ports/sdformat/no-absolute.patch b/ports/sdformat/no-absolute.patch index d39403e86e8a1c..0a8620963d2650 100644 --- a/ports/sdformat/no-absolute.patch +++ b/ports/sdformat/no-absolute.patch @@ -1,32 +1,40 @@ diff --git a/include/sdf/config.hh.in b/include/sdf/config.hh.in -index d1b3db53..9a9ce91d 100644 +index 456eb12c..9a9ce91d 100644 --- a/include/sdf/config.hh.in +++ b/include/sdf/config.hh.in -@@ -48,5 +48,3 @@ +@@ -47,12 +47,5 @@ + #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}" +-#ifndef SDF_SHARE_PATH +-#define SDF_SHARE_PATH _Pragma ("GCC warning \"'SDF_SHARE_PATH' macro is deprecated, use sdf::getSharePath() function instead. \"") "${CMAKE_INSTALL_FULL_DATAROOTDIR}/" +-#endif +- +-#ifndef SDF_VERSION_PATH +-#define SDF_VERSION_PATH _Pragma ("GCC warning \"'SDF_VERSION_PATH' macro is deprecated and should not be used. \"") "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${PROJECT_VERSION_MAJOR}/${PROJECT_VERSION}" +-#endif + #endif // #ifndef SDF_CONFIG_HH_ diff --git a/src/SDF.cc b/src/SDF.cc -index 07056d7..57e8a2c 100644 +index 04fc5374..9cb98399 100644 --- a/src/SDF.cc +++ b/src/SDF.cc -@@ -108,24 +108,8 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath, +@@ -150,25 +150,8 @@ std::string findFile(sdf::Errors &_errors, const std::string &_filename, } } - // Next check the install path. -- std::string path = sdf::filesystem::append(SDF_SHARE_PATH, filename); +- std::string path = sdf::filesystem::append(sdfSharePath(), 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); +- path = sdf::filesystem::append(sdfSharePath(), +- "sdformat" + std::string(SDF_MAJOR_VERSION_STR), +- sdf::SDF::Version(), filename); +- - if (sdf::filesystem::exists(path)) - { - return path; diff --git a/ports/sdformat/portfile.cmake b/ports/sdformat/portfile.cmake index 5ae5a76364612d..29d541b4dd05bb 100644 --- a/ports/sdformat/portfile.cmake +++ b/ports/sdformat/portfile.cmake @@ -4,17 +4,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gazebosim/${PORT} REF ${PORT}${VERSION_MAJOR}_${VERSION} - SHA512 10c56fab3957fff759c3ff7db401e162c5d353221e3895617182031be41e10a5234607fb7d1afb0ec453f3e1f20ddcc36b8488ed3d1cc2d1d0e915fc3a74ddbd + SHA512 8e3bd85b5e567286110ed53ef4b800922a2c4df21aa61d4591141f6fb02d9629d8be0fb3e8bb9fb1e02c95e8064b381f1349d086e1e991aa91b512cff94cdf06 HEAD_REF sdf${VERSION_MAJOR} PATCHES no-absolute.patch cmake-config.patch - fix-find-urdfdom.patch ) # Ruby is required by the sdformat build process vcpkg_find_acquire_program(RUBY) +# Python is required to generate the EmbeddedSdf.cc file, which contains all the supported SDF +# descriptions in a map of strings. The parser.cc file uses EmbeddedSdf.hh. +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -23,7 +28,6 @@ vcpkg_cmake_configure( -DSKIP_PYBIND11=ON -DUSE_INTERNAL_URDF=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON ) vcpkg_cmake_install() diff --git a/ports/sdformat/vcpkg.json b/ports/sdformat/vcpkg.json index 1e6f8af5b4996d..b50607e666a641 100644 --- a/ports/sdformat/vcpkg.json +++ b/ports/sdformat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sdformat", - "version": "13.6.0", + "version": "15.1.1", "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", @@ -9,7 +9,7 @@ "gz-math", "gz-tools", "gz-utils", - "tinyxml", + "tinyxml2", "urdfdom", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 49ac1161c681a0..e52055a56e7ff3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3373,7 +3373,7 @@ "port-version": 0 }, "gz-cmake": { - "baseline": "3.4.1", + "baseline": "4.1.0", "port-version": 0 }, "gz-cmake3": { @@ -3381,7 +3381,7 @@ "port-version": 6 }, "gz-common": { - "baseline": "5.4.1", + "baseline": "6.0.1", "port-version": 0 }, "gz-common5": { @@ -3389,7 +3389,7 @@ "port-version": 4 }, "gz-fuel-tools": { - "baseline": "8.1.0", + "baseline": "10.0.0", "port-version": 0 }, "gz-fuel-tools8": { @@ -3397,7 +3397,7 @@ "port-version": 1 }, "gz-gui": { - "baseline": "7.2.1", + "baseline": "9.0.0", "port-version": 0 }, "gz-gui7": { @@ -3405,7 +3405,7 @@ "port-version": 1 }, "gz-math": { - "baseline": "7.3.0", + "baseline": "8.1.0", "port-version": 0 }, "gz-math7": { @@ -3413,7 +3413,7 @@ "port-version": 1 }, "gz-msgs": { - "baseline": "9.5.0", + "baseline": "11.0.2", "port-version": 0 }, "gz-msgs9": { @@ -3421,7 +3421,7 @@ "port-version": 1 }, "gz-physics": { - "baseline": "6.5.1", + "baseline": "8.0.0", "port-version": 0 }, "gz-physics6": { @@ -3429,7 +3429,7 @@ "port-version": 3 }, "gz-plugin": { - "baseline": "2.0.1", + "baseline": "3.0.0", "port-version": 0 }, "gz-plugin2": { @@ -3437,7 +3437,7 @@ "port-version": 1 }, "gz-rendering": { - "baseline": "7.4.1", + "baseline": "9.0.0", "port-version": 0 }, "gz-rendering7": { @@ -3445,7 +3445,7 @@ "port-version": 2 }, "gz-sensors": { - "baseline": "7.3.0", + "baseline": "9.0.0", "port-version": 0 }, "gz-sensors7": { @@ -3453,7 +3453,7 @@ "port-version": 1 }, "gz-tools": { - "baseline": "2.0.0", + "baseline": "2.0.1", "port-version": 0 }, "gz-tools2": { @@ -3461,7 +3461,7 @@ "port-version": 2 }, "gz-transport": { - "baseline": "12.2.1", + "baseline": "14.0.0", "port-version": 0 }, "gz-transport12": { @@ -3469,7 +3469,7 @@ "port-version": 1 }, "gz-utils": { - "baseline": "2.0.0", + "baseline": "3.1.0", "port-version": 0 }, "gz-utils2": { @@ -8293,7 +8293,7 @@ "port-version": 0 }, "sdformat": { - "baseline": "13.6.0", + "baseline": "15.1.1", "port-version": 0 }, "sdformat13": { diff --git a/versions/g-/gz-cmake.json b/versions/g-/gz-cmake.json index 1db07be56aacb9..ff16cb2e175053 100644 --- a/versions/g-/gz-cmake.json +++ b/versions/g-/gz-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1371b2d4dc1e362787996eff2789f9c95b0a3459", + "version": "4.1.0", + "port-version": 0 + }, { "git-tree": "f3beb01d626056f8cc0e223cced5f93728c93d78", "version": "3.4.1", diff --git a/versions/g-/gz-common.json b/versions/g-/gz-common.json index 8d205cde0e6ded..cf456a28231fb7 100644 --- a/versions/g-/gz-common.json +++ b/versions/g-/gz-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78e620ea39c8c42f53dfe4df62a8a386ce128d04", + "version": "6.0.1", + "port-version": 0 + }, { "git-tree": "77ad9232bc942cb683dc5d31c7d428dd0d7912ca", "version": "5.4.1", diff --git a/versions/g-/gz-fuel-tools.json b/versions/g-/gz-fuel-tools.json index 2477cbd238677f..c4237febd7cb3d 100644 --- a/versions/g-/gz-fuel-tools.json +++ b/versions/g-/gz-fuel-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "067e3af7a1a85fee2dbaebce37f55278b0dbd992", + "version": "10.0.0", + "port-version": 0 + }, { "git-tree": "ae31270d7849d3d7074d6bc3a8fcd05d672cf92b", "version": "8.1.0", diff --git a/versions/g-/gz-gui.json b/versions/g-/gz-gui.json index 0dd9f7763d01ee..50923987756337 100644 --- a/versions/g-/gz-gui.json +++ b/versions/g-/gz-gui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8584b411a953156caa3a5c78cc45048e9439c86", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "b9031cbef55535e0bbc0c4aaa67cbde8f7af56e7", "version": "7.2.1", diff --git a/versions/g-/gz-math.json b/versions/g-/gz-math.json index f343863dd4efa8..65625919082c59 100644 --- a/versions/g-/gz-math.json +++ b/versions/g-/gz-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f910ef75819bfa33a7ad9eb0a2df56291747b35", + "version": "8.1.0", + "port-version": 0 + }, { "git-tree": "95e663436fefe0edf35e3a1ffac32fa17215f9c9", "version": "7.3.0", diff --git a/versions/g-/gz-msgs.json b/versions/g-/gz-msgs.json index ca9efded5c948b..4f26ba8ac126cb 100644 --- a/versions/g-/gz-msgs.json +++ b/versions/g-/gz-msgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df851a9eb882c6f23674a07c30ad52a7114f51fb", + "version": "11.0.2", + "port-version": 0 + }, { "git-tree": "6bb633309ed7c2a6eb8fcefce3148ff698bb885d", "version": "9.5.0", diff --git a/versions/g-/gz-physics.json b/versions/g-/gz-physics.json index b589b02e181435..114786936710f9 100644 --- a/versions/g-/gz-physics.json +++ b/versions/g-/gz-physics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5ca21bcf78d4d0beea10b31b3f96d774b2db7ee", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "7e53c9a8e219308fc1055b5027124cb77bb0a6d6", "version": "6.5.1", diff --git a/versions/g-/gz-plugin.json b/versions/g-/gz-plugin.json index 61c5551db4d706..e34ac669bebaf9 100644 --- a/versions/g-/gz-plugin.json +++ b/versions/g-/gz-plugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67da847a296c1b88b76f5203be2e60f49e201f77", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "191b58ef8ef7aed3c899f755cf16c8f0433b31df", "version": "2.0.1", diff --git a/versions/g-/gz-rendering.json b/versions/g-/gz-rendering.json index 342390c040a9e6..14e34440a4cf67 100644 --- a/versions/g-/gz-rendering.json +++ b/versions/g-/gz-rendering.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7651382a17f484f80c2259c3fde3fc0dd49fa88", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "089e04ab0f30479d02690cbc5809998a936a1a1b", "version": "7.4.1", diff --git a/versions/g-/gz-sensors.json b/versions/g-/gz-sensors.json index a024f5e78016ce..d2d72e22799aa6 100644 --- a/versions/g-/gz-sensors.json +++ b/versions/g-/gz-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebf9b2acdb4d027ddb9878ce193dc8534eb7cf70", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "5484dd5ac7fbd76b45cf4e6ebcf7ffdbe274dfab", "version": "7.3.0", diff --git a/versions/g-/gz-tools.json b/versions/g-/gz-tools.json index 025031d719a289..58ee36f16d64a1 100644 --- a/versions/g-/gz-tools.json +++ b/versions/g-/gz-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc640ffbb5e16b4650c20a2ac443e8afe8f23b97", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "7790bc2956bb14c22f05cb91c6e2e746200522ef", "version": "2.0.0", diff --git a/versions/g-/gz-transport.json b/versions/g-/gz-transport.json index d340fd07823ecf..bf27298798ac99 100644 --- a/versions/g-/gz-transport.json +++ b/versions/g-/gz-transport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c141731fa834bac8cb3be05758eb3136e68ab35", + "version": "14.0.0", + "port-version": 0 + }, { "git-tree": "0038906526b1e7a306233c71e12d32ff3c75ae5e", "version": "12.2.1", diff --git a/versions/g-/gz-utils.json b/versions/g-/gz-utils.json index 88f5b4d42eb5f1..1bdded0b4e20fc 100644 --- a/versions/g-/gz-utils.json +++ b/versions/g-/gz-utils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dce6bcf517acce5a60d6ee31876ae0f12dc4645", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "7ed63499e175403ce7e1a558d99554534ffd95e2", "version": "2.0.0", diff --git a/versions/s-/sdformat.json b/versions/s-/sdformat.json index b7806b6ce87c62..4dc3fd3122df4e 100644 --- a/versions/s-/sdformat.json +++ b/versions/s-/sdformat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0f487e837716d50dec32e21e8a8c33a7269eb1", + "version": "15.1.1", + "port-version": 0 + }, { "git-tree": "e6e84ed4e3c11c958655f6a161a94af753f976f8", "version": "13.6.0", From b955f583826fddaac0962558f72132d0f32f3b3f Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Sun, 2 Mar 2025 22:50:59 +0200 Subject: [PATCH 2/6] Update gz-cmake, gz-common. Refactor. --- ports/gz-cmake/portfile.cmake | 2 +- ports/gz-cmake/usage | 4 ++-- ports/gz-cmake/vcpkg.json | 2 +- ports/gz-cmake/vcpkg/TINYXML2.cmake | 3 --- ports/gz-common/portfile.cmake | 2 +- ports/gz-common/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/g-/gz-cmake.json | 4 ++-- versions/g-/gz-common.json | 4 ++-- 9 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 ports/gz-cmake/vcpkg/TINYXML2.cmake diff --git a/ports/gz-cmake/portfile.cmake b/ports/gz-cmake/portfile.cmake index cdd1ddb58f06bc..e687716f4d5755 100644 --- a/ports/gz-cmake/portfile.cmake +++ b/ports/gz-cmake/portfile.cmake @@ -6,7 +6,7 @@ ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 e348e49a19fa1db711df8f0d2d1426c72487f035a75b14cd4e37fa49ac6dad61e76f4488af07d589100d05411e3a0a92779e99bb024cb15a4aa91bb51f4b2f88 + SHA512 d761aba28fc79af6bbb021215367e48e1b7449885d0410a0cabd09674a59b17132810ebb796fe0e1ddefc1510aba832fb192cc908156d8eae15e35c1afe464c7 PATCHES dependencies.patch ) diff --git a/ports/gz-cmake/usage b/ports/gz-cmake/usage index 77e9a5f3970587..aef7e08a93d01d 100644 --- a/ports/gz-cmake/usage +++ b/ports/gz-cmake/usage @@ -1,3 +1,3 @@ -The package gz-cmake4 provides CMake integration: +The package @PORT@@VERSION_MAJOR@ provides CMake integration: - find_package(gz-cmake4 CONFIG REQUIRED) + find_package(@PORT@@VERSION_MAJOR@ CONFIG REQUIRED) diff --git a/ports/gz-cmake/vcpkg.json b/ports/gz-cmake/vcpkg.json index ce4036ed80c965..ad510a668eb80c 100644 --- a/ports/gz-cmake/vcpkg.json +++ b/ports/gz-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-cmake", - "version": "4.1.0", + "version": "4.1.1", "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/gz-cmake/vcpkg/TINYXML2.cmake b/ports/gz-cmake/vcpkg/TINYXML2.cmake deleted file mode 100644 index 33b651e48f0c25..00000000000000 --- a/ports/gz-cmake/vcpkg/TINYXML2.cmake +++ /dev/null @@ -1,3 +0,0 @@ -if(NOT gz_find_package_PKGCONFIG) - set(gz_find_package_PKGCONFIG tinyxml2) -endif() diff --git a/ports/gz-common/portfile.cmake b/ports/gz-common/portfile.cmake index 7d232dcfc3f4cb..a82d8b0f16cb89 100644 --- a/ports/gz-common/portfile.cmake +++ b/ports/gz-common/portfile.cmake @@ -6,7 +6,7 @@ ignition_modular_library( NAME ${PACKAGE_NAME} REF ${PORT}${VERSION_MAJOR}_${VERSION} VERSION ${VERSION} - SHA512 32be36f3b2d6e34b58ec43af05463c0074f84091378ce521b88b3eb795c6ee31a3d3159817fb28aaaf8fce5660aa5278be0c480481517c1ef41cae0979b6c324 + SHA512 0c652285b32d2d2f781595416fd80d6e52a6b765ba968d0018accc3688f4ee9d6ce62dbea74b98fa43ea40641c47020246e13645eac7940aa483057c958d3807 OPTIONS -DBUILD_TESTING=OFF -DUSE_EXTERNAL_TINYXML2=ON diff --git a/ports/gz-common/vcpkg.json b/ports/gz-common/vcpkg.json index a2a81c02e41e87..8096241f25a143 100644 --- a/ports/gz-common/vcpkg.json +++ b/ports/gz-common/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gz-common", - "version": "6.0.1", + "version": "6.0.2", "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e52055a56e7ff3..e79f8dee6e8715 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3373,7 +3373,7 @@ "port-version": 0 }, "gz-cmake": { - "baseline": "4.1.0", + "baseline": "4.1.1", "port-version": 0 }, "gz-cmake3": { @@ -3381,7 +3381,7 @@ "port-version": 6 }, "gz-common": { - "baseline": "6.0.1", + "baseline": "6.0.2", "port-version": 0 }, "gz-common5": { diff --git a/versions/g-/gz-cmake.json b/versions/g-/gz-cmake.json index ff16cb2e175053..6086a5a4fd2641 100644 --- a/versions/g-/gz-cmake.json +++ b/versions/g-/gz-cmake.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "1371b2d4dc1e362787996eff2789f9c95b0a3459", - "version": "4.1.0", + "git-tree": "1066360146aa3e5a2ef9dff0892fab29a5002b0d", + "version": "4.1.1", "port-version": 0 }, { diff --git a/versions/g-/gz-common.json b/versions/g-/gz-common.json index cf456a28231fb7..a1039c68995d9e 100644 --- a/versions/g-/gz-common.json +++ b/versions/g-/gz-common.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "78e620ea39c8c42f53dfe4df62a8a386ce128d04", - "version": "6.0.1", + "git-tree": "0bd5013daf6e79af05d9341d309c3dcd951bea9d", + "version": "6.0.2", "port-version": 0 }, { From 64bf1c8677e3b188e29a7afe0903175db81b6957 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Mon, 3 Mar 2025 09:07:16 +0200 Subject: [PATCH 3/6] Patch ffmeg depends with interface. remove gts, it not needed anymore in gz-common and remove gts patch file from gz-cmake --- ports/gz-cmake/ffempg_depends_interface.patch | 70 +++++++++++++++++++ ports/gz-cmake/portfile.cmake | 4 +- ports/gz-cmake/vcpkg/GTS.cmake | 3 - ports/gz-common/portfile.cmake | 7 -- ports/gz-common/vcpkg.json | 1 - versions/g-/gz-cmake.json | 2 +- versions/g-/gz-common.json | 2 +- 7 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 ports/gz-cmake/ffempg_depends_interface.patch delete mode 100644 ports/gz-cmake/vcpkg/GTS.cmake diff --git a/ports/gz-cmake/ffempg_depends_interface.patch b/ports/gz-cmake/ffempg_depends_interface.patch new file mode 100644 index 00000000000000..093465e9fb4b4a --- /dev/null +++ b/ports/gz-cmake/ffempg_depends_interface.patch @@ -0,0 +1,70 @@ +diff --git a/cmake/FindAVCODEC.cmake b/cmake/FindAVCODEC.cmake +--- a/cmake/FindAVCODEC.cmake ++++ b/cmake/FindAVCODEC.cmake +@@ -15,9 +15,9 @@ + # + ######################################## + # Find avcodec + include(GzPkgConfig) +-gz_pkg_check_modules_quiet(AVCODEC libavcodec) ++gz_pkg_check_modules_quiet(AVCODEC libavcodec INTERFACE) + + if(NOT AVCODEC_FOUND) + include(GzManualSearch) + gz_manual_search(AVCODEC +diff --git a/cmake/FindAVDEVICE.cmake b/cmake/FindAVDEVICE.cmake +--- a/cmake/FindAVDEVICE.cmake ++++ b/cmake/FindAVDEVICE.cmake +@@ -19,9 +19,9 @@ + set(av_minor ${AVDEVICE_FIND_VERSION_MINOR}) + set(av_patch ${AVDEVICE_FIND_VERSION_PATCH}) + + include(GzPkgConfig) +-gz_pkg_check_modules_quiet(AVDEVICE "libavdevice >= ${av_major}.${av_minor}.${av_patch}") ++gz_pkg_check_modules_quiet(AVDEVICE "libavdevice >= ${av_major}.${av_minor}.${av_patch}" INTERFACE) + + if(NOT AVDEVICE_FOUND) + include(GzManualSearch) + gz_manual_search(AVDEVICE +diff --git a/cmake/FindAVFORMAT.cmake b/cmake/FindAVFORMAT.cmake +--- a/cmake/FindAVFORMAT.cmake ++++ b/cmake/FindAVFORMAT.cmake +@@ -15,9 +15,9 @@ + # + ######################################## + # Find AV format + include(GzPkgConfig) +-gz_pkg_check_modules_quiet(AVFORMAT libavformat) ++gz_pkg_check_modules_quiet(AVFORMAT libavformat INTERFACE) + + if(NOT AVFORMAT_FOUND) + include(GzManualSearch) + gz_manual_search(AVFORMAT +diff --git a/cmake/FindAVUTIL.cmake b/cmake/FindAVUTIL.cmake +--- a/cmake/FindAVUTIL.cmake ++++ b/cmake/FindAVUTIL.cmake +@@ -15,9 +15,9 @@ + # + ######################################## + # Find avutil + include(GzPkgConfig) +-gz_pkg_check_modules_quiet(AVUTIL libavutil) ++gz_pkg_check_modules_quiet(AVUTIL libavutil INTERFACE) + + if(NOT AVUTIL_FOUND) + include(GzManualSearch) + gz_manual_search(AVUTIL +diff --git a/cmake/FindSWSCALE.cmake b/cmake/FindSWSCALE.cmake +--- a/cmake/FindSWSCALE.cmake ++++ b/cmake/FindSWSCALE.cmake +@@ -15,9 +15,9 @@ + # + ######################################## + # Find libswscale format + include(GzPkgConfig) +-gz_pkg_check_modules_quiet(SWSCALE libswscale) ++gz_pkg_check_modules_quiet(SWSCALE libswscale INTERFACE) + + if(NOT SWSCALE_FOUND) + include(GzManualSearch) + gz_manual_search(SWSCALE diff --git a/ports/gz-cmake/portfile.cmake b/ports/gz-cmake/portfile.cmake index e687716f4d5755..91c42a1e9aa79d 100644 --- a/ports/gz-cmake/portfile.cmake +++ b/ports/gz-cmake/portfile.cmake @@ -9,9 +9,7 @@ ignition_modular_library( SHA512 d761aba28fc79af6bbb021215367e48e1b7449885d0410a0cabd09674a59b17132810ebb796fe0e1ddefc1510aba832fb192cc908156d8eae15e35c1afe464c7 PATCHES dependencies.patch + ffempg_depends_interface.patch ) - - -file(COPY "${CURRENT_PORT_DIR}/vcpkg/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}${VERSION_MAJOR}/${PACKAGE_NAME}${VERSION_MAJOR}") configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/gz-cmake/vcpkg/GTS.cmake b/ports/gz-cmake/vcpkg/GTS.cmake deleted file mode 100644 index d4c2f02b4889cf..00000000000000 --- a/ports/gz-cmake/vcpkg/GTS.cmake +++ /dev/null @@ -1,3 +0,0 @@ -if(NOT gz_find_package_PKGCONFIG) - set(gz_find_package_PKGCONFIG gts) -endif() diff --git a/ports/gz-common/portfile.cmake b/ports/gz-common/portfile.cmake index a82d8b0f16cb89..6838ec1cc66ab6 100644 --- a/ports/gz-common/portfile.cmake +++ b/ports/gz-common/portfile.cmake @@ -9,7 +9,6 @@ ignition_modular_library( SHA512 0c652285b32d2d2f781595416fd80d6e52a6b765ba968d0018accc3688f4ee9d6ce62dbea74b98fa43ea40641c47020246e13645eac7940aa483057c958d3807 OPTIONS -DBUILD_TESTING=OFF - -DUSE_EXTERNAL_TINYXML2=ON "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATCHES gz_remotery_vis.patch @@ -17,12 +16,6 @@ ignition_modular_library( detect_tinyxml.patch ) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-graphics/${PORT}${VERSION_MAJOR}-graphics-config.cmake" "find_package(GTS " -"# Ensure that consumers get a pkg-config tool which is needed for GTS -set(PKG_CONFIG_EXECUTABLE \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}\" CACHE STRING vcpkg) -find_package(GTS " -IGNORE_UNCHANGED) - foreach(component IN ITEMS av events geospatial graphics io profiler testing) if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}${VERSION_MAJOR}-${component}/${PORT}${VERSION_MAJOR}-${component}-config.cmake") message(FATAL_ERROR "Failed to install component ${component}. Check configuration logs for missing dependencies.") diff --git a/ports/gz-common/vcpkg.json b/ports/gz-common/vcpkg.json index 8096241f25a143..ef8a6091f7c96b 100644 --- a/ports/gz-common/vcpkg.json +++ b/ports/gz-common/vcpkg.json @@ -13,7 +13,6 @@ "ffmpeg", "freeimage", "gdal", - "gts", "gz-cmake", "gz-math", "gz-utils", diff --git a/versions/g-/gz-cmake.json b/versions/g-/gz-cmake.json index 6086a5a4fd2641..6e65a2b0745083 100644 --- a/versions/g-/gz-cmake.json +++ b/versions/g-/gz-cmake.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1066360146aa3e5a2ef9dff0892fab29a5002b0d", + "git-tree": "d24fcae6f5ec151961b1d1c5d51a052ea1a4819a", "version": "4.1.1", "port-version": 0 }, diff --git a/versions/g-/gz-common.json b/versions/g-/gz-common.json index a1039c68995d9e..f4397a4e8e86db 100644 --- a/versions/g-/gz-common.json +++ b/versions/g-/gz-common.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0bd5013daf6e79af05d9341d309c3dcd951bea9d", + "git-tree": "dae3f816596200c7cf0075dedf823028c0f458a2", "version": "6.0.2", "port-version": 0 }, From bddf9d5f0660e3e304745381e9620d1dabd4a7be Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Mon, 3 Mar 2025 09:37:33 +0200 Subject: [PATCH 4/6] gz-msgs -fPIC flag for non windows --- ports/gz-gui/dependencies.patch | 2 +- ports/gz-msgs/portfile.cmake | 6 ++++-- scripts/ci.baseline.txt | 1 - versions/g-/gz-gui.json | 2 +- versions/g-/gz-msgs.json | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/gz-gui/dependencies.patch b/ports/gz-gui/dependencies.patch index a1b11af16f4236..ec0be2fa26eb29 100644 --- a/ports/gz-gui/dependencies.patch +++ b/ports/gz-gui/dependencies.patch @@ -11,7 +11,7 @@ index c7c7f509..2f2265a0 100644 -gz_find_package (Qt${QT_MAJOR_VERSION} - VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION} +set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets") -+if (WIN32) ++if(WIN32 OR APPLE) +set(qt_pkgconfig "") +endif() +gz_find_package (Qt5 diff --git a/ports/gz-msgs/portfile.cmake b/ports/gz-msgs/portfile.cmake index 6184f8c5a8ca38..68434855e9d36e 100644 --- a/ports/gz-msgs/portfile.cmake +++ b/ports/gz-msgs/portfile.cmake @@ -7,7 +7,9 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") if(VCPKG_TARGET_IS_WINDOWS) - set(BIGOBJ_OPTION "/bigobj") + set(CXXFLAGS "/bigobj") +else() + set(CXXFLAGS "-fPIC") endif() ignition_modular_library( @@ -16,7 +18,7 @@ ignition_modular_library( VERSION ${VERSION} SHA512 b96ec15d2ef46eebab6bebb6ffbd8f11b7bd9ed27156e753343603546d49db41afb3cf926b72de7eb9f702c40ad7e029dd3ddfe3e00d6d503cc45c1a0b8761d9 OPTIONS - "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${BIGOBJ_OPTION}" + "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${CXXFLAGS}" PATCHES remove_ruby.patch move_bin_to_tools.patch diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 73e43366c60973..136947d18c2f21 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -439,7 +439,6 @@ gstreamer:x64-windows-static=skip gul14:arm-neon-android=fail gul14:arm64-android=fail gul14:x64-android=fail -gz-gui:x64-osx=fail gz-tools:arm-neon-android=fail gz-tools:arm64-android=fail gz-tools:x64-android=fail diff --git a/versions/g-/gz-gui.json b/versions/g-/gz-gui.json index 50923987756337..d286710b85aafa 100644 --- a/versions/g-/gz-gui.json +++ b/versions/g-/gz-gui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c8584b411a953156caa3a5c78cc45048e9439c86", + "git-tree": "7bb3371b280c885fd6f3fb4af7c2cb59e89fd67b", "version": "9.0.0", "port-version": 0 }, diff --git a/versions/g-/gz-msgs.json b/versions/g-/gz-msgs.json index 4f26ba8ac126cb..b49e2ce11dd893 100644 --- a/versions/g-/gz-msgs.json +++ b/versions/g-/gz-msgs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "df851a9eb882c6f23674a07c30ad52a7114f51fb", + "git-tree": "c96fc05f31071a3e5e519e723251010b4a5f7710", "version": "11.0.2", "port-version": 0 }, From 761deb7eb0f7396caaeed3e0ff4c78a09eacb9a4 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Mon, 3 Mar 2025 17:51:50 +0200 Subject: [PATCH 5/6] support gz-gui for all --- ports/gz-gui/vcpkg.json | 1 - versions/g-/gz-gui.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/gz-gui/vcpkg.json b/ports/gz-gui/vcpkg.json index 5a95789a35bab3..9f829998207f34 100644 --- a/ports/gz-gui/vcpkg.json +++ b/ports/gz-gui/vcpkg.json @@ -4,7 +4,6 @@ "description": "Gazebo GUI builds on top of Qt to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, and can be used together in a convenient unified interface.", "homepage": "https://gazebosim.org/libs/gui", "license": "Apache-2.0", - "supports": "!(windows & static & !staticcrt)", "dependencies": [ "gz-cmake", "gz-common", diff --git a/versions/g-/gz-gui.json b/versions/g-/gz-gui.json index d286710b85aafa..4c62608aae4ceb 100644 --- a/versions/g-/gz-gui.json +++ b/versions/g-/gz-gui.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7bb3371b280c885fd6f3fb4af7c2cb59e89fd67b", + "git-tree": "41832e3622c06b574473bf4d9355d2fd3429205c", "version": "9.0.0", "port-version": 0 }, From 74b26b27fe16b0ac4c56c3b40d094f651c0bb5b4 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Thu, 6 Mar 2025 09:59:33 +0200 Subject: [PATCH 6/6] Refactor CMAKE_CXX_FLAGS --- ports/gz-msgs/portfile.cmake | 6 ++---- versions/g-/gz-msgs.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ports/gz-msgs/portfile.cmake b/ports/gz-msgs/portfile.cmake index 68434855e9d36e..ece56e9335ae8c 100644 --- a/ports/gz-msgs/portfile.cmake +++ b/ports/gz-msgs/portfile.cmake @@ -7,9 +7,7 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") if(VCPKG_TARGET_IS_WINDOWS) - set(CXXFLAGS "/bigobj") -else() - set(CXXFLAGS "-fPIC") + set(WINDOWS_OPTIONS "-DCMAKE_CXX_FLAGS=/bigobj") endif() ignition_modular_library( @@ -18,7 +16,7 @@ ignition_modular_library( VERSION ${VERSION} SHA512 b96ec15d2ef46eebab6bebb6ffbd8f11b7bd9ed27156e753343603546d49db41afb3cf926b72de7eb9f702c40ad7e029dd3ddfe3e00d6d503cc45c1a0b8761d9 OPTIONS - "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} ${CXXFLAGS}" + ${WINDOWS_OPTIONS} PATCHES remove_ruby.patch move_bin_to_tools.patch diff --git a/versions/g-/gz-msgs.json b/versions/g-/gz-msgs.json index b49e2ce11dd893..1a7f5f5e16c498 100644 --- a/versions/g-/gz-msgs.json +++ b/versions/g-/gz-msgs.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c96fc05f31071a3e5e519e723251010b4a5f7710", + "git-tree": "6403c9d8c36bb22e31b70805fc0b47feae67f12f", "version": "11.0.2", "port-version": 0 },