Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
463d6f7
Full rebuild (to update stale simulation interface packages)
ayushgnv May 8, 2026
a8c632b
Patch io_context for asio 1.36 (drop io_service)
ayushgnv May 8, 2026
4ed9a38
Applied additional patches
ayushgnv May 9, 2026
fb56bcb
Added some more fixes
ayushgnv May 11, 2026
21c5308
Added macos patch
ayushgnv May 11, 2026
9b525c3
apply qt_gui_cpp patch
ayushgnv May 11, 2026
0decdd3
Update vinca.yaml
ayushgnv May 12, 2026
98d6d4e
Applied review changes
ayushgnv May 12, 2026
7d26f8b
Refresh conda_build_config.yaml
traversaro May 12, 2026
3005ae4
Remove vtk package from mutex package
traversaro May 12, 2026
a550e3a
Update cache rebuild setting and clean up comments
traversaro May 12, 2026
6e7e118
Update package override versions in YAML config
traversaro May 12, 2026
a0a5c3f
Update CMakeLists.txt for urdfdom_headers package
traversaro May 13, 2026
642f022
Fix sdformat-urdf patch
traversaro May 13, 2026
32d6482
updated sdformat-urdf patches
ayushgnv May 13, 2026
cccbea1
clearpath diagnostics and ublox gps patches
ayushgnv May 14, 2026
40805ad
Added to ros-jazzy-ublox-gps
ayushgnv May 19, 2026
5468096
Applied foxglove bridge patch
ayushgnv May 20, 2026
0bbf917
Try bumping timeout from 1.5 → 5 for osx
ayushgnv May 21, 2026
bf1f5a5
Disable full rebuild by default in testpr.yml
Tobias-Fischer May 21, 2026
17c2613
Merge branch 'main' into ayushg/full_rebuild_v18
Tobias-Fischer May 21, 2026
65a608c
Fix Windows foxglove-bridge build; sync robot-state-publisher
ayushgnv May 21, 2026
a6558f0
Drop stale clang <19 pin from nav2_mppi_controller
ayushgnv May 22, 2026
7ca3a13
Fixup mppi-controller with newer clang
Tobias-Fischer May 23, 2026
312b63f
Update ros-jazzy-tinyxml2-vendor.patch
Tobias-Fischer May 23, 2026
65d9ab7
Remove outdated cache for ros-jazzy-tinyxml2-vendor
Tobias-Fischer May 23, 2026
22e80c0
Add patch to unvendor mujoco_vendor
traversaro May 23, 2026
3eda699
Add patch for rviz overlay plugins
traversaro May 23, 2026
182b5e9
Remove outdated cache entries from workflow
traversaro May 24, 2026
bfcdfc8
- Fix ros-jazzy-bonxai-ros build on macOS
ayushgnv May 25, 2026
d04c809
Update CMakeLists.txt for Windows compatibility
Tobias-Fischer May 25, 2026
dcb122a
Update CMakeLists.txt for Windows compatibility
Tobias-Fischer May 25, 2026
26c600a
Add compile options and definitions in CMakeLists.txt
Tobias-Fischer May 25, 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 @@ -108,7 +108,7 @@ jobs:
shell: bash -l {0}
run: |
# rm -rf ${{ matrix.folder_cache }}/ros-jazzy-<pkg>* || true
pixi run rattler-index fs output --force
pixi run rattler-index fs ${CONDA_BLD_PATH:-output} --force
exit 0
- name: See packages restored by cache
Expand Down
26 changes: 13 additions & 13 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
numpy:
- 2
assimp:
- 5
- 6
libprotobuf:
- 6.31.1
- 6.33.5
protobuf:
- 6.31.1
- 6.33.5
spdlog:
- 1.17
pugixml:
- '1.15'
libopencv:
- 4.12.0
- 4.13.0
libxml2:
- 2.14.*
graphviz:
- 14.*
# Mitigation for
# https://github.com/RoboStack/ros-jazzy/pull/126#issuecomment-3515455380
libcap:
- 2.77
fmt:
Expand Down Expand Up @@ -47,7 +45,7 @@ c_compiler:
- vs2022 # [win]
c_compiler_version: # [unix]
- 14 # [linux]
- 18 # [osx]
- 19 # [osx]
c_stdlib:
- sysroot # [linux]
- macosx_deployment_target # [osx]
Expand All @@ -62,7 +60,7 @@ cxx_compiler:
- vs2022 # [win]
cxx_compiler_version: # [unix]
- 14 # [linux]
- 18 # [osx]
- 19 # [osx]

lbr_fri_client_sdk:
- '1.11'
Expand All @@ -72,18 +70,20 @@ lbr_fri_client_sdk:
- '1.17'

libzenohc:
- 1.7.2
- 1.9.0
libzenohcxx:
- 1.7.2

- 1.9.0
libhwloc:
- 2.12.2

eigen_abi_devel:
- '3.4.0'

urdfdom:
- '4.0'
- '5.1'

libmujoco:
- 3.5.0
- 3.8.1

vtk:
- 9.6.0
2 changes: 0 additions & 2 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ nav2_util:
add_host: ["libboost-devel"]
nav2_constrained_smoother:
add_host: ["${{ 'openblas' if win }}"]
nav2_mppi_controller:
add_build: ["${{ 'clang <19' if osx }}"]
ompl:
add_host: ["ompl"]
pybind11_vendor:
Expand Down
42 changes: 42 additions & 0 deletions patch/ros-jazzy-bonxai-ros.patch
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,48 @@ index 34a3231..5bb8938 100644

#include "mask.hpp"

diff --git a/bonxai_core/include/bonxai/mask.hpp b/bonxai_core/include/bonxai/mask.hpp
index 0000000..0000001 100644
--- a/bonxai_core/include/bonxai/mask.hpp
+++ b/bonxai_core/include/bonxai/mask.hpp
@@ -30,6 +30,7 @@ class Mask {

Mask(const Mask& other);
Mask(Mask&& other);
+ Mask& operator=(Mask&& other);

~Mask();

@@ -294,6 +295,27 @@ inline Mask::Mask(Mask&& other)
} else {
std::swap(words_, other.words_);
}
}

+inline Mask& Mask::operator=(Mask&& other) {
+ if (this == &other) {
+ return *this;
+ }
+ if (WORD_COUNT > 8) {
+ delete[] words_;
+ }
+ SIZE = other.SIZE;
+ WORD_COUNT = other.WORD_COUNT;
+ if (WORD_COUNT <= 8) {
+ words_ = static_words_;
+ for (uint32_t i = 0; i < WORD_COUNT; ++i) {
+ words_[i] = other.words_[i];
+ }
+ } else {
+ words_ = other.words_;
+ other.words_ = nullptr;
+ }
+ return *this;
+}
+
inline Mask::~Mask() {
if (WORD_COUNT > 8) {
delete[] words_;
diff --git a/bonxai_core/include/bonxai/grid_coord.hpp b/bonxai_core/include/bonxai/grid_coord.hpp
index da8fb7d..1f9727b 100644
--- a/bonxai_core/include/bonxai/grid_coord.hpp
Expand Down
28 changes: 28 additions & 0 deletions patch/ros-jazzy-clearpath-diagnostics.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: RoboStack <maintainers@robostack.org>
Date: Wed, 13 May 2026 23:30:00 +0000
Subject: [PATCH] Undef glibc major/minor macros before Version class

glibc's <sys/sysmacros.h> (pulled in transitively on aarch64) defines
major()/minor() as macros that expand to gnu_dev_major/gnu_dev_minor,
colliding with clearpath::Version's int members.
---
--- a/include/clearpath_diagnostics/clearpath_diagnostic_updater.hpp 2026-05-13 23:40:50.389941101 -0700
+++ b/include/clearpath_diagnostics/clearpath_diagnostic_updater.hpp 2026-05-13 23:43:40.451520115 -0700
@@ -47,6 +47,16 @@
#include "clearpath_platform_msgs/msg/status.hpp"
#include "clearpath_platform_msgs/msg/stop_status.hpp"

+// glibc's <sys/sysmacros.h> defines major/minor as macros that expand to
+// gnu_dev_major/gnu_dev_minor, which collides with clearpath::Version's
+// member names. Undefine them before declaring the class.
+#ifdef major
+#undef major
+#endif
+#ifdef minor
+#undef minor
+#endif
+
namespace clearpath
{

Loading
Loading