Merge pull request #237 from traversaro/fix236

Enable some missing packages that were built in the past
RoboStack · Jan 8, 2025 · 14263bb · 14263bb
2 parents 6b3353c + 9d3001c
commit 14263bb
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 41 deletions.
diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
@@ -143,29 +143,29 @@ jobs:
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.platform == 'linux-64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe additional_recipes/ros2-distro-mutex/ --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
         env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform linux-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
     - name: Build recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.platform == 'linux-aarch64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe additional_recipes/ros2-distro-mutex/ --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
         env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform linux-aarch64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
     - name: Build recipes for osx-64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.platform == 'osx-64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe additional_recipes/ros2-distro-mutex/ --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
         env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform osx-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
     - name: Build recipes for osx-arm64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.platform == 'osx-arm64'
       run: |
-        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe additional_recipes/ros2-distro-mutex/ --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
+        env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
         env -i $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes --target-platform osx-arm64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
     - name: Build recipes for win-64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.platform == 'win-64'
       run: |
-        $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe additional_recipes/ros2-distro-mutex/ --target-platform win-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
+        $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir additional_recipes --target-platform win-64 -m ./conda_build_config.yaml -c robostack-staging -c conda-forge --skip-existing
         $HOME/.pixi/bin/pixi run -e beta rattler-build build --recipe-dir recipes -m ./conda_build_config.yaml --target-platform win-64 -c robostack-staging -c conda-forge --skip-existing
diff --git a/patch/ros-humble-plotjuggler.patch b/patch/ros-humble-plotjuggler.patch
@@ -59,12 +59,13 @@ diff --git a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt b/3rdparty/Qt-Advanced-
 index 6b650f1b..82c58edb 100644
 --- a/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
 +++ b/3rdparty/Qt-Advanced-Docking/CMakeLists.txt
-@@ -67,7 +67,8 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets
+@@ -67,7 +67,9 @@ target_link_libraries(qt_advanced_docking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets
 
  if(UNIX AND NOT APPLE)
      target_link_libraries(qt_advanced_docking PUBLIC Qt5::X11Extras)
 -        target_link_libraries(qt_advanced_docking PRIVATE xcb)
-+    target_link_libraries(qt_advanced_docking PRIVATE ${XCB_LIBRARIES})
++    find_package(XCB REQUIRED)
++    target_link_libraries(qt_advanced_docking PUBLIC ${XCB_LIBRARIES})
 +    target_include_directories(qt_advanced_docking SYSTEM PUBLIC ${XCB_INCLUDE_DIRS})
  endif()
 
@@ -419,26 +420,6 @@ index cb27e058..cecdb1fd 100644
          , indent_char(ichar)
          , indent_string(512, indent_char)
          , error_handler(error_handler_)
-diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
-index 0bb68ebe..fe90262a 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.
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c6de4a98..d181ff43 100644
 --- a/CMakeLists.txt
@@ -623,3 +604,25 @@ index f70a881f..7afe1fea 100644
 
    const QStringList& errors()
    {
+diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
+index 0bb68ebe..d956d801 100644
+--- a/3rdparty/sol/sol.hpp
++++ b/3rdparty/sol/sol.hpp
+@@ -6747,13 +6747,10 @@ 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.
+ 		///
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -25,7 +25,6 @@ packages_skip_by_deps:
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
   - warehouse_ros_mongo
   # - stage-ros
   # - python_qt_binding
@@ -66,6 +65,8 @@ packages_select_by_deps:
   - rqt-moveit
   # - moveit2_tutorials   # this does not exist anymore
   - pilz-industrial-motion-planner
+  - moveit_runtime
+  - moveit_ros_perception
 
   - topic_tools
 
@@ -102,6 +103,7 @@ packages_select_by_deps:
 
   # gazebo
   - gazebo-ros-pkgs
+  - ros_ign
   - ros_gz
 
   # *** Vendor packages ***
@@ -131,8 +133,7 @@ packages_select_by_deps:
   - velodyne
   - velodyne_simulator  # Dataspeed Inc.
 
-  # - visp # this does not exist in Humble anymore
-
+  - visp
   - bno055              # flynneva
   - aws_robomaker_small_warehouse_world # AWS Robotics
   - avt_vimba_camera    #  Allied Vision Technologies
@@ -145,8 +146,9 @@ packages_select_by_deps:
   - marker-msgs         # TUW Robotics
   - librealsense2       # IntelRealSense
   - realsense2-camera   # IntelRealSense
+  - realsense2-description # IntelRealSense
   - webots_ros2         # Cyberbotics
-  # - libg2o      # this does not exist anymore
+  - libg2o
   - gtsam               # Borglab
   - motion_capture_tracking # IMRC Lab
   - moveit_resources
@@ -158,13 +160,20 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/pull/205
   - rosbag2_storage_mcap
 
+  - plotjuggler
+  - plotjuggler_ros
+  - plotjuggler_msgs
+
+  - visp
+
+  - turtle_tf2_py
+  - turtle_tf2_cpp
+
   # ----- end of package support -----
 
   # - rtabmap
   # - control-box-rst
 
-  # - plotjuggler
-  # - plotjuggler_ros
 
   # - zmqpp_vendor
 

diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -27,11 +27,6 @@ packages_skip_by_deps:
 packages_remove_from_deps:
   - cartographer
   - warehouse_ros_mongo
-  - octomap
-  # - stage-ros
-  # - python_qt_binding
-  # - joint_state_publisher_gui
-  # - stage
 
 skip_existing:
   - https://conda.anaconda.org/robostack-staging/

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -26,7 +26,6 @@ packages_skip_by_deps:
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
   - tlsf
   - tlsf_cpp
   - pendulum_control
@@ -93,6 +92,7 @@ packages_select_by_deps:
   - turtlebot3_gazebo
   - plotjuggler-ros
   - plotjuggler
+  - plotjuggler-msgs
 
   - apriltag
   - apriltag_ros

diff --git a/vinca_osx_arm64.yaml b/vinca_osx_arm64.yaml
@@ -26,7 +26,6 @@ packages_skip_by_deps:
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
   - tlsf
   - tlsf_cpp
   - pendulum_control
@@ -78,6 +77,7 @@ packages_select_by_deps:
 
   - plotjuggler-ros
   - plotjuggler
+  - plotjuggler-msgs
 
   - ament_cmake_catch2
 

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -23,7 +23,6 @@ packages_skip_by_deps:
 
 packages_remove_from_deps:
   - cartographer
-  - octomap
   - tlsf
   - tlsf_cpp
   - pendulum_control
@@ -233,4 +232,6 @@ packages_select_by_deps:
   # requested in https://github.com/RoboStack/ros-humble/pull/205
   - rosbag2_storage_mcap
 
+  - plotjuggler_msgs
+
 patch_dir: patch