Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distros/humble/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ vtk_base:
wcslib:
- '8'
wxwidgets:
- 3.3.3
- 3.3.1
x264:
- 1!164.*
x265:
Expand Down
3 changes: 3 additions & 0 deletions distros/humble/distro.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ channel_name: robostack-humble
upload_to: [anaconda]
read_from: anaconda
pinning_overrides:
# wxwidgets >= 3.3.2 (and the newest 3.3.1 builds) need gst-plugins-base 1.28 on Linux,
# which no qt-main 5.15 accepts; mrpt_gui links both
wxwidgets: [3.3.1]
# nav2_mppi_controller lists xsimd before xtensor: unpinned, the solver takes the newest
# xsimd (14), which no xtensor >= 0.25 accepts, and falls back to xtensor 0.23.9, whose
# xtensor_simd.hpp doesn't build with it. 0.25 brings a matching xsimd (as in jazzy).
Expand Down
2 changes: 2 additions & 0 deletions distros/humble/pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ ament_cmake_gtest: # uses conda-forge's gtest instead of gtest_vendor's sources
build_number: 23
aruco_ros: # its recipe test stops the node for sure (package tests hung on macOS)
build_number: 23
mrpt_gui:
build_number: 24
rtabmap_slam: # its recipe test stops the node for sure (package tests hung on macOS)
build_number: 23
spatio_temporal_voxel_layer:
Expand Down
2 changes: 1 addition & 1 deletion distros/jazzy/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@ vtk_base:
wcslib:
- '8'
wxwidgets:
- 3.3.3
- 3.3.1
x264:
- 1!164.*
x265:
Expand Down
3 changes: 3 additions & 0 deletions distros/jazzy/distro.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ channel_name: robostack-jazzy
upload_to: [anaconda]
read_from: anaconda
pinning_overrides:
# wxwidgets >= 3.3.2 (and the newest 3.3.1 builds) need gst-plugins-base 1.28 on Linux,
# which no qt-main 5.15 accepts; mrpt_gui links both
wxwidgets: [3.3.1]
# nav2_mppi_controller lists xsimd before xtensor: unpinned, the solver takes the newest
# xsimd (14), which no xtensor >= 0.25 accepts, and falls back to xtensor 0.23.9, whose
# xtensor_simd.hpp doesn't build with it. 0.25 brings a matching xsimd. (lyrical and
Expand Down
2 changes: 2 additions & 0 deletions distros/jazzy/pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ moveit_ros_visualization:
build_number: 28
moveit_task_constructor_visualization:
build_number: 28
mrpt_gui:
build_number: 30
nav2_rviz_plugins:
build_number: 28
octomap_rviz_plugins:
Expand Down
2 changes: 2 additions & 0 deletions distros/lyrical/pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ 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:
Expand Down
2 changes: 2 additions & 0 deletions distros/rolling/pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ moveit_ros_visualization:
build_number: 33
moveit_task_constructor_visualization:
build_number: 33
mrpt_gui:
build_number: 35
rviz_2d_overlay_plugins:
build_number: 33
rviz_common:
Expand Down
4 changes: 1 addition & 3 deletions shared/patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,8 @@ mrpt_common:
# but package.xml (build_type cmake) does not declare it
add_host: ["ros2-ament-cmake"]
mrpt_gui:
# links libwx_*; the wxwidgets/wx-common keys map to wxpython, so wxwidgets is only a
# transitive host dep and its (weak) run_exports never reach the run requirements
# Windows: nanogui links conda-forge's glad instead of its bundled copy (ros2-mrpt-gui.win.patch)
add_host: ["wxwidgets", "${{ 'glad' if win }}"]
add_host: ["${{ 'glad' if win }}"]
mrpt_imgui:
# Windows: links conda-forge's GLEW like mrpt_opengl, also for its users (ros2-mrpt-imgui.win.patch)
add_host: ["${{ 'glew' if win }}"]
Expand Down
4 changes: 2 additions & 2 deletions shared/robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1311,11 +1311,11 @@ virtualenv:
wget:
robostack: [wget]
wx-common:
robostack: [wxpython]
robostack: [wxwidgets]
wxpython:
robostack: [wxpython]
wxwidgets:
robostack: [wxpython]
robostack: [wxwidgets]
x11-dev:
robostack:
linux: [xorg-libx11, libopengl-devel, libgl-devel]
Expand Down
Loading