Skip to content
Open
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
6 changes: 5 additions & 1 deletion .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ jobs:
- name: Delete specific outdated cache entries
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-lyrical-pcl-conversions* 2>/dev/null || true
# Rebuild the split MRPT libraries on Linux so their run exports use
# the glibc-2.28-compatible libudev pin.
if [[ "${{ matrix.platform }}" == linux-* ]]; then
rm -rf ${{ matrix.folder_cache }}/ros-lyrical-mrpt-* 2>/dev/null || true
fi
mkdir -p ${{ matrix.folder_cache }}
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force

Expand Down
36 changes: 36 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,42 @@ mrpt2:
add_host: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-lyrical-octomap"]
add_run: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-lyrical-octomap"]
add_build: ["${{ cdt('libxcomposite-devel') if linux }}"]
mola_launcher:
add_host: ["ros-lyrical-mrpt-libtclap"]
add_run: ["ros-lyrical-mrpt-libtclap"]
mp2p_icp:
add_host: ["ros-lyrical-mola-common", "ros-lyrical-mola-imu-preintegration", "ros-lyrical-mrpt-libbase", "ros-lyrical-mrpt-libgui", "ros-lyrical-mrpt-libtclap", "ros-lyrical-mrpt-libmaps", "ros-lyrical-mrpt-libobs", "ros-lyrical-mrpt-libposes", "tbb"]
add_run: ["ros-lyrical-mola-common", "ros-lyrical-mola-imu-preintegration", "ros-lyrical-mrpt-libbase", "ros-lyrical-mrpt-libgui", "ros-lyrical-mrpt-libtclap", "ros-lyrical-mrpt-libmaps", "ros-lyrical-mrpt-libobs", "ros-lyrical-mrpt-libposes", "tbb"]
# XSens support is disabled in these split MRPT builds. Avoid pulling libudev
# (and a systemd build requiring a newer glibc than the ROS sysroot) into them.
mrpt_libbase:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libhwdrivers:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libgui:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libmaps:
add_host: ["octomap", "${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
add_run: ["octomap"]
remove_host: ["libudev"]
mrpt_libmath:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libobs:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libopengl:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libposes:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
mrpt_libslam:
add_host: ["${{ 'libsystemd0 <258' if linux }}", "${{ 'libudev1 <258' if linux }}"]
remove_host: ["libudev"]
ros1_rosbag_storage_vendor:
add_host: ["ros-noetic-roscpp", "ros-noetic-roslz4", "ros-noetic-rostest"]
add_run: ["ros-noetic-roscpp", "ros-noetic-roslz4"]
Expand Down
12 changes: 12 additions & 0 deletions patch/ros-lyrical-mrpt-libgui.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1249e6e..1154834 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,7 @@ ExternalProject_Add(
# Main settings:
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
# Disabled stuff:
-DDISABLE_JSONCPP=ON
-DMRPT_INSTALL_EXAMPLES=OFF
12 changes: 12 additions & 0 deletions patch/ros-lyrical-mrpt-libmath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40a5930..61a0f4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,7 @@ ExternalProject_Add(
# Main settings:
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+ "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
# Disabled stuff:
-DDISABLE_JSONCPP=ON
-DMRPT_INSTALL_EXAMPLES=OFF
4 changes: 4 additions & 0 deletions pkg_additional_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ magic_enum:
max_pin: 'x.x'
moveit_ros_visualization:
additional_cmake_args: "-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
mrpt_libgui:
additional_cmake_args: "-DCMAKE_CXX_FLAGS=-includecassert"
mrpt_libmath:
additional_cmake_args: "-DCMAKE_CXX_FLAGS=-I$PREFIX/include/suitesparse"
octomap:
generate_dummy_package_with_run_deps:
dep_name: octomap
Expand Down
2 changes: 2 additions & 0 deletions vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,8 @@ packages_select_by_deps:
- camera_ros # Depends on libcamera that is only available on linux
- livox_ros_driver2
- mavros
- mola
- mrpt_libtclap
- py_binding_tools
- swri_serial_util # Serial communication only implemented for linux
- v4l2_camera # Depends on v4l that is only available on linux
Expand Down