diff --git a/distros/lyrical/ci.yaml b/distros/lyrical/ci.yaml index 438535723..bf894ba59 100644 --- a/distros/lyrical/ci.yaml +++ b/distros/lyrical/ci.yaml @@ -7,7 +7,7 @@ # Ignore the PR build cache and rebuild everything, e.g. for a full rebuild PR # that bumps the build number of all packages. -full_rebuild: false +full_rebuild: true # Packages to drop from the PR build cache. Needed when a package changes without # a new build number, e.g. you fixed one of its patches in patch/: the cache diff --git a/distros/lyrical/conda_build_config.yaml b/distros/lyrical/conda_build_config.yaml index f95422a34..7d858dd92 100644 --- a/distros/lyrical/conda_build_config.yaml +++ b/distros/lyrical/conda_build_config.yaml @@ -919,6 +919,8 @@ openblas: - 0.3.* openexr: - '3.4' + # pyqt-builder 1.20 defaults to sip ABI 12.20 / 13.13, which needs sip >=6.16 + # (python_qt_binding / qt_gui_cpp keep sip <6.16); 1.18 targets 12.15 / 13.8. openh264: - 2.6.0 openjpeg: @@ -1198,12 +1200,6 @@ zlib_ng: - '2.3' zstd: - '1.5' -libzenohc: - - 1.10.1 -libzenohcxx: - - 1.10.1 - # pyqt-builder 1.20 defaults to sip ABI 12.20 / 13.13, which needs sip >=6.16 - # (python_qt_binding / qt_gui_cpp keep sip <6.16); 1.18 targets 12.15 / 13.8. pyqt_builder: - 1.18 # cartographer was built with lua 5.4.8, otherwise it pulls in 5.5 which leads to conflicts @@ -1222,3 +1218,7 @@ pyqt6: # until upstream fixes it. sip: - 6.15 +libzenohc: + - 1.10.2 +libzenohcxx: + - 1.10.2 diff --git a/distros/lyrical/distro.yaml b/distros/lyrical/distro.yaml index 33b9e0ddf..4bee684da 100644 --- a/distros/lyrical/distro.yaml +++ b/distros/lyrical/distro.yaml @@ -7,6 +7,9 @@ upload_to: [prefix, anaconda] read_from: prefix rosdistro_sync: lyrical/2026-10-05 pinning_overrides: + # Zenoh 1.10.2 includes the StartConditions deadlock fix (eclipse-zenoh/zenoh#2779). + libzenohc: [1.10.2] + libzenohcxx: [1.10.2] # build every python package for 3.14 (the shared default) and 3.12; # is_python_min is zipped with python, so it needs one entry per version python: [3.14.* *_cp314, 3.12.* *_cpython] diff --git a/distros/lyrical/pkg_additional_info.yaml b/distros/lyrical/pkg_additional_info.yaml index bd035c922..a66dc190b 100644 --- a/distros/lyrical/pkg_additional_info.yaml +++ b/distros/lyrical/pkg_additional_info.yaml @@ -94,6 +94,8 @@ roboplan_toppra: rtabmap: # its tests (corelib/test) don't build with MSVC (as in jazzy, same 0.23.13) additional_cmake_args: -DBUILD_TESTING=OFF +rviz_ogre_vendor: + additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON" toppra: generate_dummy_package_with_run_deps: dep_name: toppra-python @@ -112,47 +114,3 @@ urdfdom_headers: override_version: '3.0.0' zenoh_cpp_vendor: additional_cmake_args: "-DAMENT_VENDOR_POLICY=NEVER_VENDOR_IGNORE_SATISFIED_CHECK -DUSE_SYSTEM_ZENOH=ON" -# Remove build_number fields below on new full rebuild -aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS) - build_number: 31 -fuse_viz: - build_number: 31 -grid_map_rviz_plugin: - build_number: 31 -gz_gui_vendor: - build_number: 33 -gz_sensors_vendor: - build_number: 33 -gz_sim_vendor: - build_number: 33 -gz_transport_vendor: - build_number: 33 -moveit_ros_visualization: - build_number: 31 -moveit_task_constructor_visualization: - build_number: 31 -mrpt_gui: - build_number: 34 -nav2_rviz_plugins: - build_number: 31 -rtabmap_rviz_plugins: - build_number: 31 -rtabmap_slam: # its recipe test stops the node for sure (package tests hung on macOS) - build_number: 31 -rviz_2d_overlay_plugins: - build_number: 31 -rviz_common: - build_number: 31 -rviz_default_plugins: - build_number: 31 -rviz_imu_plugin: - build_number: 31 -rviz_ogre_vendor: - additional_cmake_args: "-DRVIZ_OGRE_VENDOR_MANGLE_NAME_OF_LIBRARIES_USED_BY_RVIZ=ON" - build_number: 32 # built without the EXR codec (ros2-rviz-ogre-vendor.patch), absolute install names on macOS (.osx.patch) -rviz_rendering: - build_number: 31 -rviz_satellite: - build_number: 31 -spatio_temporal_voxel_layer: - build_number: 31 diff --git a/distros/lyrical/vinca.yaml b/distros/lyrical/vinca.yaml index 15070a041..79d39a4de 100644 --- a/distros/lyrical/vinca.yaml +++ b/distros/lyrical/vinca.yaml @@ -3,7 +3,7 @@ ros_distro: lyrical patch_dir: patch rosdistro_snapshot: rosdistro_snapshot.yaml rosdistro_additional_recipes: rosdistro_additional_recipes.yaml -build_number: 30 +build_number: 35 mutex_package: - version: 0.22.0 + version: 0.23.0