Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7343e37
Reduce diff wrt upstream yaml
diegoferigo-rai May 26, 2026
0c23afc
Update pinnings
diegoferigo-rai May 26, 2026
ab1e05f
Bump build number and mutex version
diegoferigo-rai May 26, 2026
ceacd3a
Update diagnostic packages to version 4.3.7
Tobias-Fischer May 27, 2026
d8386d2
Add rosidl-generator-py osx patch
Tobias-Fischer Jun 11, 2026
8045f51
Delete patch/ros-kilted-rosidl-generator-py.patch
Tobias-Fischer Jun 11, 2026
06513b6
Modify target link libraries for macOS
Tobias-Fischer Jun 11, 2026
3717d05
Refactor conda_build_config.yaml dependencies
Tobias-Fischer Jun 15, 2026
3b6ef76
Enable full rebuild by ignoring cache
Tobias-Fischer Jun 15, 2026
c01be80
Set IGNORE_CACHE_AND_DO_FULL_REBUILD to 'false'
Tobias-Fischer Jun 15, 2026
31a15d7
Update vtk version from 9.6.0 to 9.6.1
Tobias-Fischer Jun 15, 2026
e80ecaa
Enable full rebuild by setting IGNORE_CACHE to true
Tobias-Fischer Jun 15, 2026
7a4e1df
Change eigen_abi_devel version to 5.0.1
Tobias-Fischer Jun 16, 2026
7b24d11
Change full rebuild flag to false in testpr.yml
Tobias-Fischer Jun 16, 2026
9d2d5d5
Update vtk version from 9.6.1 to 9.6.2
Tobias-Fischer Jun 17, 2026
327fbb7
Update urdfdom and add vtk versions in config
Tobias-Fischer Jun 17, 2026
823f4bf
Enable full rebuild by setting IGNORE_CACHE to true
Tobias-Fischer Jun 17, 2026
d221ceb
Change IGNORE_CACHE_AND_DO_FULL_REBUILD to 'false'
Tobias-Fischer Jun 17, 2026
5376c8b
Add urdfdom_headers to conda build config
Tobias-Fischer Jun 17, 2026
f7baa0f
Update override versions for urdfdom_headers and urdf
Tobias-Fischer Jun 17, 2026
faacd57
Enable full rebuild by setting IGNORE_CACHE to true
Tobias-Fischer Jun 17, 2026
a9bf245
Update libboost version in vinca.yaml
Tobias-Fischer Jun 18, 2026
c7a169a
Update testpr.yml
Tobias-Fischer Jun 18, 2026
cde082c
Update CMake modules and YAML configuration
Tobias-Fischer Jun 18, 2026
30793e7
Boost 1.90 patches
Tobias-Fischer Jun 18, 2026
7883bb7
Fix patch
Tobias-Fischer Jun 18, 2026
c5da2b3
Some progress
Tobias-Fischer Jun 19, 2026
dbc4bf4
Enable full rebuild by setting IGNORE_CACHE to true
Tobias-Fischer Jun 20, 2026
cec931d
More fixes
Tobias-Fischer Jun 21, 2026
83709d5
More fixes
Tobias-Fischer Jun 21, 2026
2bfc2ef
Fixes
Tobias-Fischer Jun 21, 2026
580b751
complete local osx-arm64 rebuild
Tobias-Fischer Jun 21, 2026
2d44d7a
Change IGNORE_CACHE_AND_DO_FULL_REBUILD to 'false'
Tobias-Fischer Jun 21, 2026
fc91368
Update cache deletion for motion planner
Tobias-Fischer Jun 22, 2026
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 .github/workflows/testpr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Delete specific outdated cache entries
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-kilted-rosx* 2>/dev/null || true
rm -rf ${{ matrix.folder_cache }}/ros-kilted-chomp-motion-planner* 2>/dev/null || true
mkdir -p ${{ matrix.folder_cache }}
pixi run rattler-index fs ${{ matrix.folder_cache }}/.. --force

Expand Down
2 changes: 1 addition & 1 deletion build_gap_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def main() -> int:
print()
missing = recipes - built
print(
f"Recipe directories without built artifact on this platform: "
f"Recipe directories without built artifact on {platform} platform: "
f"{len(missing)} out of {len(recipes)}"
)
if missing:
Expand Down
64 changes: 34 additions & 30 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,40 +1,56 @@
numpy:
- 2

assimp:
- 5
- 6
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
cmake:
- 3.*
eigen_abi_devel:
- '5.0.1'
libprotobuf:
- 6.33.5
protobuf:
- 6.33.5
spdlog:
- '1.17'
pugixml:
- '1.15'
libopencv:
- 4.13.0
libxml2:
- '2.14'
fmt:
- '12.1'
graphviz:
- '14'
jsoncpp:
- 1.9.7
libopencv:
- 4.13.0
# Mitigation for
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
libcap:
- '2.77'
fmt:
- '12.1'
libhwloc:
- 2.13.0
libxml2:
- '2.14'
libzenohc:
- 1.7.2
libzenohcxx:
- 1.7.2
lua:
- 5.4
pugixml:
- '1.15'
shaderc:
- '2026.2'
spdlog:
- '1.17'
tbb:
- '2022'
tbb_devel:
- '2022'
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
cmake:
- 3.*
# as of early April 2026 key robotics packages like pinocchio still required eigen 3.4.0.*,
# see https://github.com/conda-forge/eigenpy-feedstock/pull/184
eigen_abi_devel:
- '3.4.0'
urdfdom:
- '6.0'
urdfdom_headers:
- '3.0'
vtk:
- 9.6.2

cdt_name: # [linux]
- conda # [linux]
python:
Expand Down Expand Up @@ -65,15 +81,3 @@ cxx_compiler_version: # [unix]
- 14 # [linux]
- 18 # [osx]
- 14 # [linux and not ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
libzenohc:
- 1.7.2
libzenohcxx:
- 1.7.2
libhwloc:
- 2.12.2
urdfdom:
- 4.0.1
urdfdom-headers:
- 1.1.2
shaderc:
- 2026.2
8 changes: 8 additions & 0 deletions patch/ros-kilted-hls-lfcd-lds-driver.patch
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,11 @@ index 9185961..eedc6f7 100644
hls_lfcd_lds::LFCDLaser laser(io);

while (ros::ok())
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,4 +24,4 @@ find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED)
-find_package(Boost REQUIRED system)
+find_package(Boost REQUIRED)
9 changes: 9 additions & 0 deletions patch/ros-kilted-moveit-core.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ index 608babbeb..a006b45fc 100644
find_package(octomap_msgs REQUIRED)
find_package(osqp REQUIRED)
find_package(pluginlib REQUIRED)
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -10,5 +10,4 @@ find_package(
program_options
regex
serialization
- system
thread)
diff --git a/collision_detection/include/moveit/collision_detection/collision_common.hpp b/collision_detection/include/moveit/collision_detection/collision_common.hpp
index 19777a044..af3a89442 100644
--- a/collision_detection/include/moveit/collision_detection/collision_common.hpp
Expand Down
8 changes: 8 additions & 0 deletions patch/ros-kilted-moveit-kinematics.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,11 @@ index 173471c7e..47e47e2db 100644
// first center is picked randomly
centers.push_back(std::uniform_int_distribution<size_t>{ 0, data.size() - 1 }(rsl::rng()));
for (unsigned i = 1; i < k; ++i)
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -1,3 +1,3 @@
# Extras module needed for dependencies to find boost components

-find_package(Boost REQUIRED program_options system)
+find_package(Boost REQUIRED program_options)
12 changes: 12 additions & 0 deletions patch/ros-kilted-moveit-planners-ompl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91329a1e8..5b4c45bc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ moveit_package()
find_package(
Boost
REQUIRED
- system
filesystem
date_time
thread
8 changes: 8 additions & 0 deletions patch/ros-kilted-moveit-ros-control-interface.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -1,3 +1,3 @@
# Extras module needed for dependencies to find boost components

-find_package(Boost REQUIRED COMPONENTS system thread)
+find_package(Boost REQUIRED COMPONENTS thread)
17 changes: 14 additions & 3 deletions patch/ros-kilted-moveit-ros-move-group.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/moveit_ros/move_group/CMakeLists.txt b/moveit_ros/move_group/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7389985043..86bca8785d 100644
--- a/moveit_ros/move_group/CMakeLists.txt
+++ b/moveit_ros/move_group/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ add_executable(list_move_group_capabilities src/list_capabilities.cpp)
ament_target_dependencies(list_move_group_capabilities
${THIS_PACKAGE_INCLUDE_DEPENDS})
Expand All @@ -11,3 +11,14 @@ index 7389985043..86bca8785d 100644

install(TARGETS move_group list_move_group_capabilities
RUNTIME DESTINATION lib/moveit_ros_move_group)
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -3,7 +3,6 @@ find_package(
find_package(
Boost
REQUIRED
- system
filesystem
date_time
program_options
9 changes: 9 additions & 0 deletions patch/ros-kilted-moveit-ros-planning-interface.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -8,4 +8,4 @@ find_package(
Boost REQUIRED
COMPONENTS date_time filesystem program_options
# ${BOOST_PYTHON_COMPONENT}
- system thread)
+ thread)
11 changes: 11 additions & 0 deletions patch/ros-kilted-moveit-ros-planning.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -3,7 +3,6 @@ find_package(
find_package(
Boost
REQUIRED
- system
filesystem
date_time
program_options
8 changes: 8 additions & 0 deletions patch/ros-kilted-moveit-ros-visualization.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -1,3 +1,3 @@
# Extras module needed for dependencies to find boost components

-find_package(Boost REQUIRED thread date_time system filesystem)
+find_package(Boost REQUIRED thread date_time filesystem)
11 changes: 11 additions & 0 deletions patch/ros-kilted-moveit-ros-warehouse.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/ConfigExtras.cmake b/ConfigExtras.cmake
--- a/ConfigExtras.cmake
+++ b/ConfigExtras.cmake
@@ -4,7 +4,6 @@ find_package(
Boost
REQUIRED
thread
- system
filesystem
regex
date_time
13 changes: 13 additions & 0 deletions patch/ros-kilted-moveit-visual-tools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e08aa6..49bdf1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(moveit_common REQUIRED)
moveit_package()

# Load all dependencies required for this package
-find_package(Boost REQUIRED system)
+find_package(Boost REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(graph_msgs REQUIRED)
13 changes: 13 additions & 0 deletions patch/ros-kilted-mrt-cmake-modules.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,16 @@ index aa99d8d..8327d4e 100644
find_package(catkin REQUIRED)
catkin_package(CFG_EXTRAS mrt_cmake_modules-extras.cmake)
else()
diff --git a/yaml/cmake.yaml b/yaml/cmake.yaml
index 6a2a6dc..1846d27 100644
--- a/yaml/cmake.yaml
+++ b/yaml/cmake.yaml
@@ -19,7 +19,7 @@ benchmark:
targets: ['benchmark::benchmark']
boost:
components: [wserialization thread random serialization log_setup prg_exec_monitor
- wave system chrono filesystem locale timer date_time regex graph program_options
+ wave chrono filesystem locale timer date_time regex graph program_options
unit_test_framework log atomic iostreams]
include_dirs: [Boost_INCLUDE_DIRS]
libraries: [Boost_LIBRARIES]
79 changes: 62 additions & 17 deletions patch/ros-kilted-ouster-ros.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,65 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa0f0b2..0724118 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,13 +24,20 @@ find_package(tf2_eigen REQUIRED)
find_package(OpenCV REQUIRED)

# ==== Options ====
-add_compile_options(-Wall -Wextra)
+if(MSVC)
+ add_compile_options(/W2)
+ add_compile_definitions(NOMINMAX _USE_MATH_DEFINES WIN32_LEAN_AND_MEAN)
+else()
+ add_compile_options(-Wall -Wextra)
+endif()
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
option(CMAKE_POSITION_INDEPENDENT_CODE "Build position independent code." ON)

+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
set(_ouster_ros_INCLUDE_DIRS
"include;"
"ouster-sdk/ouster_sensor/include;"
diff --git a/ouster-sdk/CMakeLists.txt b/ouster-sdk/CMakeLists.txt
index 4c6e3ac..5d17a19 100644
--- a/ouster-sdk/CMakeLists.txt
+++ b/ouster-sdk/CMakeLists.txt
@@ -53,0 +54 @@ option(BUILD_DEBIAN_FOR_GITHUB "Build debian for github ci" OFF)
+option(OUSTER_USE_VCPKG_IF_AVAILABLE "Use VCPKG_ROOT env variable if available" ON)
diff --git a/ouster-sdk/cmake/Findlibzip.cmake b/ouster-sdk/cmake/Findlibzip.cmake
index 0de2ad5..388f145 100644
--- a/ouster-sdk/cmake/Findlibzip.cmake
+++ b/ouster-sdk/cmake/Findlibzip.cmake
@@ -42 +42 @@ find_library(libzip_LIBRARIES NAMES
- libzip libzip.so libzip.dylib
+ libzip libzip.so libzip.dylib zip
diff --git a/ouster-sdk/cmake/VcpkgEnv.cmake b/ouster-sdk/cmake/VcpkgEnv.cmake
index c46f0f0..9d3741b 100644
--- a/ouster-sdk/cmake/VcpkgEnv.cmake
+++ b/ouster-sdk/cmake/VcpkgEnv.cmake
@@ -5,2 +5,2 @@
-# set toolchain file if VCPKG_ROOT is defind
-if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+# set toolchain file if VCPKG_ROOT is defined, and OUSTER_USE_VCPKG_IF_AVAILABLE is ON
+if(OUSTER_USE_VCPKG_IF_AVAILABLE AND DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
@@ -13 +13 @@ endif()
-if(DEFINED ENV{VCPKG_TARGET_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
+if(OUSTER_USE_VCPKG_IF_AVAILABLE AND DEFINED ENV{VCPKG_TARGET_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
diff --git a/ouster-sdk/ouster_client/CMakeLists.txt b/ouster-sdk/ouster_client/CMakeLists.txt
index f17eeb4..d0bf100 100644
--- a/ouster-sdk/ouster_client/CMakeLists.txt
+++ b/ouster-sdk/ouster_client/CMakeLists.txt
@@ -51 +51 @@ target_link_libraries(ouster_client
-target_compile_definitions(ouster_client PRIVATE EIGEN_MPL2_ONLY)
+target_compile_definitions(ouster_client PRIVATE EIGEN_MPL2_ONLY FMT_HEADER_ONLY)
diff --git a/ouster-sdk/ouster_client/include/ouster/version.h b/ouster-sdk/ouster_client/include/ouster/version.h
index 7867e3a..ef4539f 100644
--- a/ouster-sdk/ouster_client/include/ouster/version.h
+++ b/ouster-sdk/ouster_client/include/ouster/version.h
@@ -13,6 +13,15 @@
#include "ouster/deprecation.h"
#include "ouster/visibility.h"

+// glibc may expose major/minor macros through sys/types.h, which breaks
+// Version's field names when this header is included after libc headers.
+#ifdef major
+#undef major
+#endif
+
+#ifdef minor
+#undef minor
+#endif
+
namespace ouster {
namespace sdk {
namespace core {
@@ -47 +47 @@ struct OUSTER_API_CLASS Version {
- : major(maj), minor(min), patch(pat) {}
+ : major{maj}, minor{min}, patch{pat} {}
27 changes: 0 additions & 27 deletions patch/ros-kilted-ouster-ros.win.patch

This file was deleted.

Loading