diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 884e52f37..d9ca3d114 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -1,19 +1,23 @@ numpy: - - 1.26 + - 2 libprotobuf: - - 5.29.3 + - 6.31.1 protobuf: - - 5.29.3 + - 6.31.1 spdlog: - - 1.15 + - 1.16 pugixml: - '1.15' libopencv: - - 4.11.0 + - 4.12.0 libxml2: - 2.13.* graphviz: - 13.* +# Mitigation for +# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380 +libcap: + - 2.76 tbb: - '2021' @@ -56,9 +60,9 @@ cxx_compiler_version: # [unix] - 18 # [osx] libzenohc: - - 1.5.1 + - 1.6.2 libzenohcxx: - - 1.5.1 + - 1.6.2 libhwloc: - 2.11.2 diff --git a/patch/ros-jazzy-lanelet2-core.patch b/patch/ros-jazzy-lanelet2-core.patch new file mode 100644 index 000000000..517066ec4 --- /dev/null +++ b/patch/ros-jazzy-lanelet2-core.patch @@ -0,0 +1,31 @@ +From ab7d2f4dee299563c6313336c070ed99635aba3f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20=C5=A0koudlil?= +Date: Fri, 16 May 2025 14:40:54 +0200 +Subject: [PATCH] Fix compilation with Boost 1.87 + +Boost 1.87 removed deprecated rescaling code +which was deprecated since Boost 1.79. +--- + include/lanelet2_core/geometry/Point.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/lanelet2_core/geometry/Point.h b/include/lanelet2_core/geometry/Point.h +index 080539ed..a37da11f 100644 +--- a/include/lanelet2_core/geometry/Point.h ++++ b/include/lanelet2_core/geometry/Point.h +@@ -22,6 +22,7 @@ BOOST_GEOMETRY_REGISTER_POINT_2D_CONST(lanelet::ConstPoint2d, double, cs::cartes + BOOST_GEOMETRY_REGISTER_POINT_3D(lanelet::Point3d, double, cs::cartesian, x(), y(), z()) + BOOST_GEOMETRY_REGISTER_POINT_3D_CONST(lanelet::ConstPoint3d, double, cs::cartesian, x(), y(), z()) + ++#if BOOST_VERSION < 108700 + namespace boost { + namespace geometry { + // Help boost with type deduction for proxies +@@ -37,6 +38,7 @@ struct robust_point_type + + } // namespace geometry + } // namespace boost ++#endif + + namespace lanelet { + namespace geometry { diff --git a/tests/ros-jazzy-desktop-full.yaml b/tests/ros-jazzy-desktop-full.yaml new file mode 100644 index 000000000..8b7019add --- /dev/null +++ b/tests/ros-jazzy-desktop-full.yaml @@ -0,0 +1,7 @@ +tests: + # Regression test for https://github.com/RoboStack/ros-jazzy/issues/125 + - script: + - ros2 pkg prefix desktop_full + requirements: + run: + - ros-jazzy-ros2pkg \ No newline at end of file diff --git a/tests/ros-jazzy-desktop.yaml b/tests/ros-jazzy-desktop.yaml new file mode 100644 index 000000000..b96fe38ea --- /dev/null +++ b/tests/ros-jazzy-desktop.yaml @@ -0,0 +1,7 @@ +tests: + # Regression test for https://github.com/RoboStack/ros-jazzy/issues/125 + - script: + - ros2 pkg prefix desktop + requirements: + run: + - ros-jazzy-ros2pkg \ No newline at end of file diff --git a/tests/ros-jazzy-pcl-conversions.yaml b/tests/ros-jazzy-pcl-conversions.yaml new file mode 100644 index 000000000..b1a219ada --- /dev/null +++ b/tests/ros-jazzy-pcl-conversions.yaml @@ -0,0 +1,7 @@ +tests: + # Regression test for https://github.com/RoboStack/ros-jazzy/issues/125 + - script: + - ros2 pkg prefix pcl_conversions + requirements: + run: + - ros-jazzy-ros2pkg diff --git a/tests/ros-jazzy-turtlebot3.yaml b/tests/ros-jazzy-turtlebot3.yaml new file mode 100644 index 000000000..4c9a2fb8f --- /dev/null +++ b/tests/ros-jazzy-turtlebot3.yaml @@ -0,0 +1,4 @@ +tests: + # Regression test for https://github.com/RoboStack/ros-jazzy/issues/125 + - script: + - ros2 pkg prefix turtlebot3 diff --git a/vinca.yaml b/vinca.yaml index e2bfb735c..42b9ef496 100644 --- a/vinca.yaml +++ b/vinca.yaml @@ -5,21 +5,20 @@ conda_index: - robostack.yaml - packages-ignore.yaml -# Reminder for next full rebuild, the next build number should be 13 -build_number: 12 +# Reminder for next full rebuild, the next build number should be 14 +build_number: 13 mutex_package: name: "ros2-distro-mutex" - version: "0.12.0" + version: "0.13.0" upper_bound: "x.x" run_constraints: - - libboost 1.86.* - - libboost-devel 1.86.* - - pcl 1.15.0.* + - libboost 1.88.* + - libboost-devel 1.88.* + - pcl 1.15.1.* - gazebo 11.* - - libprotobuf 5.29.3.* - - libxml2 2.13.* - - vtk 9.4.2.* + - libprotobuf 6.31.1.* + - vtk 9.5.1.* packages_skip_by_deps: - if: not linux