diff --git a/additional_recipes/ros2-distro-mutex/recipe.yaml b/additional_recipes/ros2-distro-mutex/recipe.yaml index e3a86b5e..227f8fe3 100644 --- a/additional_recipes/ros2-distro-mutex/recipe.yaml +++ b/additional_recipes/ros2-distro-mutex/recipe.yaml @@ -25,12 +25,12 @@ requirements: # values here should be applied from run_exports! # if the upstream package does not have run_exports # please change it in the conda_build_config.yaml! - run_constraints: - - libboost 1.84.* - - libboost-devel 1.84.* - - pcl 1.14.1.* - - gazebo 11.* - - libpqxx 7.* + # run_constraints: + # - libboost 1.86.* + # - libboost-devel 1.86.* + # - pcl 1.14.1.* + # - gazebo 11.* + # - libpqxx 7.* run_exports: weak: @@ -46,4 +46,3 @@ about: extra: recipe-maintainers: - ros-forge - diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 885efcb6..64d041e9 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -1,11 +1,11 @@ -gazebo: - - '11' -libpqxx: - - 7 +# gazebo: +# - '11' +# libpqxx: +# - 7 numpy: - 1.26 -ogre: - - 14.2.* +# ogre: +# - 14.2.* libprotobuf: - 4.25.3 protobuf: @@ -39,4 +39,4 @@ c_stdlib_version: # - 11.0 # [osx and arm64] # - 10.14 # [osx and x86_64] # CONDA_BUILD_SYSROOT: -# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64] \ No newline at end of file +# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64] diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 98ddb26e..d5e1c39c 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -185,14 +185,14 @@ gz_gui_vendor: add_host: ["gz-gui8"] add_run: ["gz-gui8"] gz_launch_vendor: - add_host: ["gz-launch8"] - add_run: ["gz-launch8"] + add_host: ["gz-launch7"] + add_run: ["gz-launch7"] gz_math_vendor: add_host: ["gz-math7"] add_run: ["gz-math7"] gz_msgs_vendor: - add_host: ["gz-msgs8"] - add_run: ["gz-msgs8"] + add_host: ["gz-msgs10"] + add_run: ["gz-msgs10"] gz_physics_vendor: add_host: ["gz-physics7"] add_run: ["gz-physics7"] @@ -200,8 +200,8 @@ gz_plugin_vendor: add_host: ["gz-plugin2"] add_run: ["gz-plugin2"] gz_rendering_vendor: - add_host: ["gz-rendering8"] - add_run: ["gz-rendering8"] + add_host: ["gz-rendering8", "swig"] + add_run: ["gz-rendering8", "swig"] gz_sensors_vendor: add_host: ["gz-sensors8"] add_run: ["gz-sensors8"] @@ -209,10 +209,11 @@ gz_tools_vendor: add_host: ["gz-tools2"] add_run: ["gz-tools2"] gz_transport_vendor: - add_host: ["gz-transport8"] - add_run: ["gz-transport8"] + add_host: ["gz-transport13"] + add_run: ["gz-transport13"] gz_utils_vendor: - add_build: ["vcstool"] + add_host: ["gz-utils2"] + add_run: ["gz-utils2"] sdformat_vendor: add_host: ["sdformat14"] add_run: ["sdformat14"] diff --git a/patch/ros-jazzy-gz-cmake-vendor.patch b/patch/ros-jazzy-gz-cmake-vendor.patch new file mode 100644 index 00000000..485b25d6 --- /dev/null +++ b/patch/ros-jazzy-gz-cmake-vendor.patch @@ -0,0 +1,12 @@ +diff --git a/gz-cmake-config.cmake.in b/gz-cmake-config.cmake.in +index 56d06dd..c77c0b0 100644 +--- a/gz-cmake-config.cmake.in ++++ b/gz-cmake-config.cmake.in +@@ -1,5 +1,7 @@ + cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) + ++set(ENV{GZ_RELAX_VERSION_MATCH} "True") ++ + find_package(@LIB_NAME@@LIB_VER_MAJOR@ ${@LIB_NAME@_FIND_VERSION} REQUIRED COMPONENTS ${@LIB_NAME@_FIND_COMPONENTS}) + + # Set up the core library and add it to the list of all components diff --git a/robostack.yaml b/robostack.yaml index c7d7a250..dca9230b 100644 --- a/robostack.yaml +++ b/robostack.yaml @@ -190,6 +190,8 @@ libabsl-dev: robostack: [libabseil] libblas-dev: robostack: [libblas, libcblas] +libboost: + robostack: [libboost] libboost-chrono-dev: robostack: [libboost-devel] libboost-date-time: