Merge pull request #22 from wep21/update-snapshot

Full Rebuild February 2024: bump ros2-distro-mutex to 0.7.0 and build_number to 4

.github/workflows/testpr.yml

@@ -33,6 +33,7 @@ jobs:
 
     - uses: prefix-dev/setup-pixi@v0.8.1
       with:
+        pixi-version: v0.41.1
         environments: beta
         frozen: true
 

additional_recipes/ros2-distro-mutex/recipe.yaml

@@ -1,6 +1,6 @@
 package:
   name: ros2-distro-mutex
-  version: 0.6.0
+  version: 0.7.0
 
 build:
   number: 0
@@ -32,7 +32,7 @@ requirements:
     - libboost-devel 1.86.*
     - pcl 1.14.1.*
     - gazebo 11.*
-    - libprotobuf 5.28.2.*
+    - libprotobuf 5.28.3.*
 
   run_exports:
     weak:

conda_build_config.yaml

@@ -1,13 +1,15 @@
 numpy:
   - 1.26
 libprotobuf:
-  - 5.28.2
+  - 5.28.3
 protobuf:
-  - 5.28.2
+  - 5.28.3
 spdlog:
-  - 1.14
+  - 1.15
 pugixml:
-  - '1.14'
+  - '1.15'
+libopencv:
+  - 4.11.0
 
 cdt_name:  # [linux]
   - conda  # [linux]
@@ -43,6 +45,8 @@ cxx_compiler_version:          # [unix]
   - 18                         # [osx]
 
 libzenohc:
-  - 1.1.1
+  - 1.2.1
 libzenohcxx:
-  - 1.1.1
+  - 1.2.1
+libcap:
+  - 2.71

patch/ros-jazzy-generate-parameter-library.win.patch

@@ -0,0 +1,22 @@
+diff --git a/generate_parameter_library/cmake/generate_parameter_library.cmake b/generate_parameter_library/cmake/generate_parameter_library.cmake
+index 07bf3a2..1bf6d18 100644
+--- a/generate_parameter_library/cmake/generate_parameter_library.cmake
++++ b/generate_parameter_library/cmake/generate_parameter_library.cmake
+@@ -70,13 +70,12 @@ macro(generate_parameter_library LIB_NAME YAML_FILE)
+   )
+   # necessary so that #include <param_file.hpp> can be used in the local package (deprecated)
+   set(LOCAL_PARAM_HEADER_FILE ${CMAKE_CURRENT_BINARY_DIR}/include/${LIB_NAME}.hpp)
++  set(LOCAL_PARAM_HEADER_PRAGMA_WARNING_FILE ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}_pragma_warning)
++  file(WRITE ${LOCAL_PARAM_HEADER_PRAGMA_WARNING_FILE}
++    "#pragma message(\"#include \\\"${LIB_NAME}.hpp\\\" is deprecated. Use #include <${PROJECT_NAME}/${LIB_NAME}.hpp> instead.\")\n")
+   add_custom_command(
+     OUTPUT ${LOCAL_PARAM_HEADER_FILE}
+-    COMMAND ${CMAKE_COMMAND} -E echo "#pragma message(\"#include \\\"${LIB_NAME}.hpp\\\" is deprecated. \
+-Use #include <${PROJECT_NAME}/${LIB_NAME}.hpp> instead.\")" >> ${LOCAL_PARAM_HEADER_FILE}
+-    COMMAND ${CMAKE_COMMAND} -E cat ${LOCAL_PARAM_HEADER_FILE} ${PARAM_HEADER_FILE} > ${LOCAL_PARAM_HEADER_FILE}.tmp
+-    COMMAND ${CMAKE_COMMAND} -E copy ${LOCAL_PARAM_HEADER_FILE}.tmp ${LOCAL_PARAM_HEADER_FILE}
+-    COMMAND ${CMAKE_COMMAND} -E remove ${LOCAL_PARAM_HEADER_FILE}.tmp
++    COMMAND ${CMAKE_COMMAND} -E cat ${LOCAL_PARAM_HEADER_PRAGMA_WARNING_FILE} ${PARAM_HEADER_FILE} > ${LOCAL_PARAM_HEADER_FILE}
+     DEPENDS ${PARAM_HEADER_FILE}
+     COMMENT
+     "Creating deprecated header file ${LOCAL_PARAM_HEADER_FILE}"

patch/ros-jazzy-hardware-interface.unix.patch

@@ -14,14 +14,6 @@ index b4e0f6cab..896175fad 100644
  # using this instead of visibility macros
  # S1 from https://github.com/ros-controls/ros2_controllers/issues/1053
  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-@@ -54,6 +49,7 @@ target_include_directories(mock_components PUBLIC
-   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-   $<INSTALL_INTERFACE:include/hardware_interface>
- )
-+target_link_libraries(mock_components PUBLIC hardware_interface)
- ament_target_dependencies(mock_components PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
-
- pluginlib_export_plugin_description_file(
 diff --git a/include/hardware_interface/async_components.hpp b/include/hardware_interface/async_components.hpp
 index 052c4ba92..85efed01f 100644
 --- a/include/hardware_interface/async_components.hpp

patch/ros-jazzy-plotjuggler.unix.patch

@@ -604,23 +604,3 @@ index f399fdad..4c89c787 100644
 
  if( Protobuf_FOUND)
 
-diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
-index 0bb68ebe..20855338 100644
---- a/3rdparty/sol/sol.hpp
-+++ b/3rdparty/sol/sol.hpp
-@@ -6747,12 +6747,9 @@ namespace sol {
- 		/// one.
- 		///
- 		/// \group emplace
--		template <class... Args>
--		T& emplace(Args&&... args) noexcept {
--			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
--
--			*this = nullopt;
--			this->construct(std::forward<Args>(args)...);
-+		T& emplace(T& arg) noexcept {
-+				m_value = &arg;
-+				return **this;
- 		}
-
- 		/// Swaps this optional with the other.

patch/ros-jazzy-realtime-tools.osx.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5a9be70..9141953 100644
+index 9ccbe4c..5652dad 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -40,7 +40,7 @@ target_include_directories(realtime_tools PUBLIC
+@@ -48,7 +48,7 @@ target_include_directories(realtime_tools PUBLIC
    $<INSTALL_INTERFACE:include/realtime_tools>
  )
  ament_target_dependencies(realtime_tools PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
@@ -11,7 +11,7 @@ index 5a9be70..9141953 100644
    target_link_libraries(realtime_tools PUBLIC cap)
  endif()
 
-@@ -54,7 +54,7 @@ target_include_directories(thread_priority PUBLIC
+@@ -62,7 +62,7 @@ target_include_directories(thread_priority PUBLIC
    $<INSTALL_INTERFACE:include/realtime_tools>
  )
  ament_target_dependencies(thread_priority PUBLIC ${THIS_PACKAGE_INCLUDE_DEPENDS})
@@ -21,15 +21,16 @@ index 5a9be70..9141953 100644
  endif()
 
 diff --git a/src/realtime_helpers.cpp b/src/realtime_helpers.cpp
-index e55894c..e75e4c8 100644
+index 9dbbfdf..10c3066 100644
 --- a/src/realtime_helpers.cpp
 +++ b/src/realtime_helpers.cpp
-@@ -30,12 +30,15 @@
-
- #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+@@ -32,13 +32,16 @@
+ #include <windows.h>
+ #else
  #include <sched.h>
 -#include <sys/capability.h>
  #include <sys/mman.h>
+ #include <sys/utsname.h>
 
  #include <unistd.h>
  #endif
@@ -40,8 +41,8 @@ index e55894c..e75e4c8 100644
 +
  #include <cstring>
  #include <fstream>
-
-@@ -56,6 +59,19 @@ bool configure_sched_fifo(int priority)
+ #include <iostream>
+@@ -75,6 +78,19 @@ bool configure_sched_fifo(int priority)
  #ifdef _WIN32
    HANDLE thread = GetCurrentThread();
    return SetThreadPriority(thread, priority);
@@ -61,7 +62,7 @@ index e55894c..e75e4c8 100644
  #else
    struct sched_param schedp;
    memset(&schedp, 0, sizeof(schedp));
-@@ -75,6 +91,8 @@ std::pair<bool, std::string> lock_memory()
+@@ -94,6 +110,8 @@ std::pair<bool, std::string> lock_memory()
  {
  #ifdef _WIN32
    return {false, "Memory locking is not supported on Windows."};
@@ -70,7 +71,7 @@ index e55894c..e75e4c8 100644
  #else
    auto is_capable = [](cap_value_t v) -> bool {
      bool rc = false;
-@@ -127,6 +145,9 @@ std::pair<bool, std::string> set_thread_affinity(
+@@ -146,6 +164,9 @@ std::pair<bool, std::string> set_thread_affinity(
  #ifdef _WIN32
    message = "Thread affinity is not supported on Windows.";
    return std::make_pair(false, message);