diff --git a/distros/lyrical/rosdistro_additional_recipes.yaml b/distros/lyrical/rosdistro_additional_recipes.yaml index 32943aa1..04afc7ec 100644 --- a/distros/lyrical/rosdistro_additional_recipes.yaml +++ b/distros/lyrical/rosdistro_additional_recipes.yaml @@ -346,6 +346,18 @@ autoware_velocity_smoother: tag: release/humble/autoware_velocity_smoother/1.7.0-1 url: https://github.com/ros2-gbp/autoware_core-release.git version: 1.7.0 +beluga: # Until: https://github.com/Ekumen-OS/beluga/issues/587 + tag: release/jazzy/beluga/2.1.1-1 + url: https://github.com/ros2-gbp/beluga-release.git + version: 2.1.1 +beluga_amcl: # Until: https://github.com/Ekumen-OS/beluga/issues/587 + tag: release/jazzy/beluga_amcl/2.1.1-1 + url: https://github.com/ros2-gbp/beluga-release.git + version: 2.1.1 +beluga_ros: # Until: https://github.com/Ekumen-OS/beluga/issues/587 + tag: release/jazzy/beluga_ros/2.1.1-1 + url: https://github.com/ros2-gbp/beluga-release.git + version: 2.1.1 better_launch: tag: 1.3.0 url: https://github.com/dfki-ric/better_launch.git diff --git a/shared/patch/ros2-beluga.osx.patch b/shared/patch/ros2-beluga.osx.patch index fbba71b6..30ac1f23 100644 --- a/shared/patch/ros2-beluga.osx.patch +++ b/shared/patch/ros2-beluga.osx.patch @@ -1,14 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b94a7f1..cacf183 100644 +index b94a7f1..2d3f68d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,6 +72,9 @@ target_include_directories( +@@ -72,6 +72,12 @@ target_include_directories( "$") target_link_libraries(${PROJECT_NAME} INTERFACE ${_deps}) target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17) +# libc++ only has the execution policies with -fexperimental-library +target_compile_options(${PROJECT_NAME} INTERFACE $<$:-fexperimental-library>) +target_link_options(${PROJECT_NAME} INTERFACE $<$:-fexperimental-library>) ++# which in C++20 also brings in 's tzdb, unavailable for the system libc++; conda-forge's ++# libc++ is the one used at runtime ++target_compile_definitions(${PROJECT_NAME} INTERFACE $<$:_LIBCPP_DISABLE_AVAILABILITY>) target_compile_definitions(${PROJECT_NAME} INTERFACE EIGEN_NO_DEBUG SOPHUS_USE_BASIC_LOGGING) diff --git a/shared/patch/ros2-beluga.patch b/shared/patch/ros2-beluga.patch index 77942956..1a500866 100644 --- a/shared/patch/ros2-beluga.patch +++ b/shared/patch/ros2-beluga.patch @@ -11,6 +11,19 @@ index 5c08a64..b94a7f1 100644 if(BUILD_TESTING) message(STATUS "Build testing enabled.") enable_testing() +diff --git a/include/beluga/algorithm/unscented_transform.hpp b/include/beluga/algorithm/unscented_transform.hpp +index c7ebd13..170738c 100644 +--- a/include/beluga/algorithm/unscented_transform.hpp ++++ b/include/beluga/algorithm/unscented_transform.hpp +@@ -80,7 +80,7 @@ template < + typename MeanDerived, + typename CovarianceDerived, + typename TransferFn, +- typename TransformedT = std::result_of_t, ++ typename TransformedT = std::invoke_result_t, + typename MeanFn = detail::default_weighted_mean_fn, + typename ResidualFn = std::minus> + auto unscented_transform( diff --git a/include/beluga/policies/on_motion.hpp b/include/beluga/policies/on_motion.hpp index 9d7ad43..5cb6d95 100644 --- a/include/beluga/policies/on_motion.hpp @@ -63,4 +76,4 @@ index 21d4d6f..35aff49 100644 + const H5::H5File file(path_to_hdf5_file.string(), H5F_ACC_RDONLY); const H5::DataSet means_dataset = file.openDataSet("means"); const H5::DataSet covariances_dataset = file.openDataSet("covariances"); - const H5::DataSet resolution_dataset = file.openDataSet("resolution"); \ No newline at end of file + const H5::DataSet resolution_dataset = file.openDataSet("resolution");