Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cd58f2e
jazzy: rosdistro sync 2026-11-16
Tobias-Fischer Nov 17, 2026
9eeaab4
jazzy: drop ogre from gz_rendering_vendor
Tobias-Fischer Nov 17, 2026
4791e5f
jazzy: mrpt_common: find the strip program for pybind11 modules
Tobias-Fischer Nov 17, 2026
a179810
jazzy: aruco_ros: use the shared patch again
Tobias-Fischer Nov 17, 2026
9c1a98b
jazzy: foxglove_bridge: refresh patch for 3.6.3 (SDK 0.30.2)
Tobias-Fischer Nov 17, 2026
332fdd6
jazzy: mola_launcher: patches for 3.4.0
Tobias-Fischer Nov 17, 2026
24844b7
jazzy: popf: refresh macOS patch for 1.0.1
Tobias-Fischer Nov 17, 2026
288016d
jazzy: sick_scan_xd: drop macOS patch, fixed upstream
Tobias-Fischer Nov 17, 2026
5cd0682
jazzy: mrpt_common: resolve every bare binutils name, not just strip
Tobias-Fischer Nov 17, 2026
57d689b
jazzy: evict the gz_rendering_vendor built before the ogre fix from t…
Tobias-Fischer Nov 18, 2026
d54a567
jazzy: mrpt_common: drop the binutils workaround again
Tobias-Fischer Nov 18, 2026
dca1674
jazzy: plansys2_pddl_parser: allow floating-point std::from_chars on …
Tobias-Fischer Nov 18, 2026
2779854
jazzy: opennav_docking_bt: build without -Werror
Tobias-Fischer Nov 18, 2026
4fcce53
jazzy: realsense2_camera: accept conda-forge's librealsense 2.58.3
Tobias-Fischer Nov 18, 2026
e3bfd4b
jazzy: plansys2_core, plansys2_popf_plan_solver: allow floating-point…
Tobias-Fischer Nov 18, 2026
e04332a
mrpt_imgui: build with GDI on Windows, as mrpt_gui
Tobias-Fischer Nov 18, 2026
5f6c866
jazzy: plansys2_core: create the planner pipe without pipe2 on macOS
Tobias-Fischer Nov 18, 2026
83c1fe9
jazzy: ur_controllers: link the twist_controller parameters
Tobias-Fischer Nov 19, 2026
9adcfcb
jazzy: kairos: allow floating-point std::from_chars on macOS
Tobias-Fischer Nov 19, 2026
b10e621
mp2p_icp_core: no C++ module scanning for mp2p_icp_filters on Windows
Tobias-Fischer Nov 19, 2026
d3d8c72
jazzy: toppra: package 0.6.10, which conda-forge's roboplan is built …
Tobias-Fischer Nov 19, 2026
dc26f77
jazzy: plansys2_popf_plan_solver: include unistd.h for mkdtemp on macOS
Tobias-Fischer Nov 19, 2026
2c0db59
jazzy: plansys2_kairos_plan_solver: include unistd.h for mkdtemp on m…
Tobias-Fischer Nov 19, 2026
bfceb8c
jazzy: turtlebot3_node: _USE_MATH_DEFINES on Windows
Tobias-Fischer Nov 19, 2026
909324d
ros2_pulse: st_mtimespec on macOS
Tobias-Fischer Nov 19, 2026
5b04833
jazzy: plansys2_bringup: pthread_setschedparam on macOS
Tobias-Fischer Nov 19, 2026
7ecbab3
jazzy: toppra: back to the snapshot's 0.6.11
Tobias-Fischer Nov 19, 2026
d54d9dd
jazzy: plansys2, kairos: _LIBCPP_DISABLE_AVAILABILITY as a CMake flag…
Tobias-Fischer Nov 19, 2026
afe9c1e
jazzy: evict the plansys2 packages and kairos instead of gz (temporary)
Tobias-Fischer Nov 19, 2026
3ea13f9
jazzy: reset evict_cache
Tobias-Fischer Nov 20, 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 distros/jazzy/distro.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ pinning_overrides:
# xtensor_simd.hpp doesn't build with it. 0.25 brings a matching xsimd. (lyrical and
# rolling's nav2_mppi_controller use Eigen instead.)
xtensor: [0.25.0]
rosdistro_sync: jazzy/2026-10-05
rosdistro_sync: jazzy/2026-11-16
5 changes: 5 additions & 0 deletions distros/jazzy/patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ gz_rendering_vendor:
add_host: ["gz-rendering8", "swig"]
# find_package(gz-rendering) requires find_package(OpenGL) to work
add_run: ["gz-rendering8", "swig", "${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
# libogre-dev is only needed to build gz-rendering from source; conda-forge's gz-rendering8
# no longer links OGRE 1 (8.2.2_1), so an unpinned ogre resolves to 14.x, which clashes
# with gz-gui8 (still built against ogre 1.10) in gz_gui_vendor.
remove_host: ["ogre"]
remove_run: ["ogre"]
gz_ros2_control:
add_host: ["${{ 'libgl-devel' if linux }}", "${{ 'libopengl-devel' if linux }}"]
gz_ros2_control_demos:
Expand Down
149 changes: 0 additions & 149 deletions distros/jazzy/patch/ros2-aruco-ros.patch

This file was deleted.

12 changes: 6 additions & 6 deletions distros/jazzy/patch/ros2-foxglove-bridge.patch
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64c1274..774140a 100644
index b15b6de..68b0154 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,18 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "aarc
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu")
set(FOXGLOVE_SDK_SHA "1a0d8e03a885f01ae7cfb08dc9076090ba2cf8a15b7f46dda11451e2e2758978")
set(FOXGLOVE_SDK_SHA "71bf8ded6907f2abb528b7844d9d441d82b93e0679c88724fc1144e6567be2d9")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin")
+ set(FOXGLOVE_SDK_SHA "7b7a86a659a86544f23bed793b7913ad71c3f6c595233bbdb20d3968a3ce5a3a")
+ set(FOXGLOVE_SDK_SHA "74454dcedac00fab8f1dd5308f88b101f87d15bf67e99e53def8d5dd11d05a81")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin")
+ set(FOXGLOVE_SDK_SHA "5bae49cac58fb423217e9214452c22faa95b51f5bda7c04469fb1649f8b74ce5")
+ set(FOXGLOVE_SDK_SHA "b3a521bdc2d2959dc1975b6f16b21472160544abb482a92a7597153c86e2a144")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+ set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc")
+ set(FOXGLOVE_SDK_SHA "8d067b5af329f808142a750e939799bfccb27926ff72b62da54e5280af002d3b")
+ set(FOXGLOVE_SDK_SHA "6d15cb73fac99dd3c6383ad7b926d040ada404fe7f9917828a3e9fdf96755915")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+ set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc")
+ set(FOXGLOVE_SDK_SHA "ea4db36121adb0ee61315442ea43603136c6910b4d82814688f507cd6f7fdd3b")
+ set(FOXGLOVE_SDK_SHA "1610c91833e7c9ee4cadf5d142df18ed458ac3053f0671fc758e7691c742e35b")
else()
message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
endif()
Expand Down
81 changes: 81 additions & 0 deletions distros/jazzy/patch/ros2-mola-launcher.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
diff --git a/src/MolaDLL_Loader.cpp b/src/MolaDLL_Loader.cpp
index a5ccf39..1cd163d 100644
--- a/src/MolaDLL_Loader.cpp
+++ b/src/MolaDLL_Loader.cpp
@@ -24,7 +24,7 @@

#include <map>

-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
#include <dlfcn.h>
#endif

@@ -59,7 +59,9 @@ void internal_load_lib_modules(
{
MRPT_TRY_START

-#if defined(__unix__)
+#if defined(__APPLE__)
+#define DLL_EXT "dylib"
+#elif defined(__unix__)
#define DLL_EXT "so"
#else
#define DLL_EXT "dll"
@@ -79,11 +81,14 @@ void internal_load_lib_modules(
for (const auto& lib : lst)
{
if (lib.name.find("mola") == std::string::npos) continue; // skip
+ // ROS interface libraries (e.g. mola_msgs) are never MOLA modules, and the
+ // Python ones cannot be dlopen()ed from a non-Python process:
+ if (lib.name.find("__rosidl_") != std::string::npos) continue; // skip

// Already loaded?
if (loaded_lib_handled.count(lib.name) != 0) continue; // skip

-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
// Check if already loaded?
{
void* handle = dlopen(lib.wholePath.c_str(), RTLD_NOLOAD);
@@ -103,7 +108,7 @@ void internal_load_lib_modules(
// Not fatal: the library may provide modules this system does not use
// (e.g. a GUI with missing system dependencies on a headless machine).
// If one of its modules is requested, that error lists this one.
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
const char* err = dlerror();
if (!err)
{
@@ -146,7 +151,7 @@ void internal_unload_lib_modules()
{
// printf("[mola-launcher] Unloading: %s\n",
// lib.second.lib_path.c_str());
-#if defined(__unix__)
+#if defined(__unix__) || defined(__APPLE__)
dlclose(lib.second.handle);
#else
FreeLibrary(lib.second.handle);
diff --git a/src/MolaLauncherApp.cpp b/src/MolaLauncherApp.cpp
index 841913c..85407a4 100644
--- a/src/MolaLauncherApp.cpp
+++ b/src/MolaLauncherApp.cpp
@@ -120,6 +120,18 @@ MolaLauncherApp::MolaLauncherApp() : mrpt::system::COutputLogger("MolaLauncherAp
// do not filter these ones by *directory* name, since *filenames* will be
// filtered later on:
from_env_var_to_list("LD_LIBRARY_PATH", lib_search_paths_);
+
+ // conda/RoboStack environments do not set LD_LIBRARY_PATH: also search
+ // <prefix>/lib (<prefix>/bin for Windows DLLs) for every prefix in AMENT_PREFIX_PATH.
+ {
+ std::vector<std::string> prefixes;
+ from_env_var_to_list("AMENT_PREFIX_PATH", prefixes);
+#if defined(_WIN32)
+ for (const auto& prefix : prefixes) safe_add_to_list(prefix + "/bin", lib_search_paths_);
+#else
+ for (const auto& prefix : prefixes) safe_add_to_list(prefix + "/lib", lib_search_paths_);
+#endif
+ }
}

MolaLauncherApp::~MolaLauncherApp()
105 changes: 105 additions & 0 deletions distros/jazzy/patch/ros2-mola-launcher.win.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
diff --git a/apps/mola-cli.cpp b/apps/mola-cli.cpp
index 5a04f80..37a7042 100644
--- a/apps/mola-cli.cpp
+++ b/apps/mola-cli.cpp
@@ -24,7 +24,11 @@
#include <mrpt/core/exceptions.h>
#include <mrpt/rtti/CObject.h>
#include <mrpt/system/filesystem.h>
+#if defined(_WIN32)
+#include <io.h> // _write()
+#else
#include <unistd.h> // write()
+#endif

#if defined(MOLA_CLI_HAS_TBB)
#include <tbb/global_control.h>
@@ -53,7 +57,11 @@ void mola_signal_handler([[maybe_unused]] int s)
// raw write() to stderr. The actual shutdown (which logs, sleeps and joins
// threads) is done by the main thread as soon as spin() returns.
static const char msg[] = "\nTermination signal caught. Shutting down...\n";
+#if defined(_WIN32)
+ [[maybe_unused]] const auto n = ::_write(2, msg, sizeof(msg) - 1);
+#else
[[maybe_unused]] const auto n = ::write(STDERR_FILENO, msg, sizeof(msg) - 1);
+#endif

if (auto* app = theApp.load())
{
@@ -63,6 +71,11 @@ void mola_signal_handler([[maybe_unused]] int s)

void mola_install_signal_handler()
{
+#if defined(_WIN32)
+ // No sigaction() on Windows:
+ std::signal(SIGINT, &mola_signal_handler);
+ std::signal(SIGTERM, &mola_signal_handler);
+#else
struct sigaction sigIntHandler;

sigIntHandler.sa_handler = &mola_signal_handler;
@@ -76,6 +89,7 @@ void mola_install_signal_handler()
// the main MOLA loop keeps running, so the process never exits and lingers
// with its ROS 2 endpoints still advertised but no longer served.
sigaction(SIGTERM, &sigIntHandler, nullptr);
+#endif
}

// Default task for mola-cli: launching a SLAM system
diff --git a/src/MolaDLL_Loader.cpp b/src/MolaDLL_Loader.cpp
index 1cd163d..ee34ae2 100644
--- a/src/MolaDLL_Loader.cpp
+++ b/src/MolaDLL_Loader.cpp
@@ -26,6 +26,11 @@

#if defined(__unix__) || defined(__APPLE__)
#include <dlfcn.h>
+#elif defined(_WIN32)
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h> // LoadLibraryA(), FreeLibrary()
#endif

/** From internal_load_lib_modules() */
@@ -101,7 +106,7 @@ void internal_load_lib_modules(

void* handle = dlopen(lib.wholePath.c_str(), RTLD_LAZY);
#else
- HMODULE handle = LoadLibrary(lib.wholePath.c_str());
+ void* handle = LoadLibraryA(lib.wholePath.c_str());
#endif
if (handle == nullptr)
{
@@ -116,7 +121,8 @@ void internal_load_lib_modules(
}
#else
const std::string err =
- mrpt::format("LoadLibrary() failed, error code %lu", ::GetLastError());
+ mrpt::format(
+ "LoadLibrary() failed, error code %lu", static_cast<unsigned long>(::GetLastError()));
#endif
failed_lib_errors[lib.wholePath] = err;
app.logStr(
@@ -154,7 +160,7 @@ void internal_unload_lib_modules()
#if defined(__unix__) || defined(__APPLE__)
dlclose(lib.second.handle);
#else
- FreeLibrary(lib.second.handle);
+ FreeLibrary(static_cast<HMODULE>(lib.second.handle));
#endif
}
loaded_lib_handled.clear();
diff --git a/src/MolaLauncherApp.cpp b/src/MolaLauncherApp.cpp
index 85407a4..96229f3 100644
--- a/src/MolaLauncherApp.cpp
+++ b/src/MolaLauncherApp.cpp
@@ -100,7 +100,7 @@ std::string relative_to_abs_path(
if (f.is_relative())
{
f = fs::path(*basePath) / f;
- return f;
+ return f.string(); // no implicit conversion on Windows (wchar_t paths)
}
else
return path;
Loading
Loading