Full successful local build on linux-64

RoboStack · Jan 6, 2025 · 3ab25a9 · 3ab25a9
1 parent f957597
commit 3ab25a9
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 19 deletions.
diff --git a/additional_recipes/ros-distro-mutex/recipe.yaml b/additional_recipes/ros-distro-mutex/recipe.yaml
@@ -34,11 +34,11 @@ requirements:
     - libboost-devel 1.86.*
     - pcl 1.14.1.*
     - gazebo 11.*
-    - libprotobuf 5.28.2.*
+    - libprotobuf 5.28.3.*
     - ogre 1.10.12.*
     - libpqxx 7.8.*
     - sip 6.7.*
-    - harfbuzz 9.*
+    - harfbuzz 10.*
 
   run_exports:
     weak:

diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -1,5 +1,5 @@
 harfbuzz:
-  - '9'
+  - '10'
 gazebo:
   - '11'
 libpqxx:
@@ -11,9 +11,9 @@ setuptools:
 numpy:
   - 1.26
 libprotobuf:
-  - 5.28.2
+  - 5.28.3
 protobuf:
-  - 5.28.2
+  - 5.28.3
 spdlog:
   - 1.14
 pyqt:

diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -8,6 +8,8 @@ python_qt_binding:
   add_build: ["pyqt-builder", "pyqt5-sip", "sip 6.7.*"]
   add_host: ["${{ 'setuptools 69.*' if win }}", "sip 6.7.*"]
   add_run: ["adwaita-icon-theme"]
+find_object_2d:
+  add_host: ["zlib"]
 ompl:
   add_host: ["ompl"]
   add_run: ["ompl"]

diff --git a/patch/ros-noetic-baldor.patch b/patch/ros-noetic-baldor.patch
@@ -13,4 +13,4 @@ index f42da9d..1245834 100644
 +_FLOAT_EPS = np.finfo(np.float64).eps
  _EPS = np.finfo(float).eps * 4.0
  # axis sequences for Euler angles
- _NEXT_AXIS = [1, 2, 0, 1]
+ _NEXT_AXIS = [1, 2, 0, 1]
diff --git a/patch/ros-noetic-rosmon-core.patch b/patch/ros-noetic-rosmon-core.patch
@@ -68,3 +68,31 @@ index 881339c..9d9fb5f 100644
  #include <cerrno>
  #include <cstdio>
  #include <cstring>
+diff --git a/src/main.cpp b/src/main.cpp
+index ae0e733..3422d76 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -45,7 +45,7 @@ static fs::path findFile(const fs::path& base, const std::string& name)
+ 			if(!p.empty())
+ 				return p;
+ 		}
+-		else if(it->path().leaf() == name)
++		else if(it->path().filename() == name)
+ 			return *it;
+ 	}
+
+@@ -373,12 +373,12 @@ int main(int argc, char** argv)
+ 			// Try systemd journal first
+ 			try
+ 			{
+-				logger.reset(new rosmon::SystemdLogger(fs::basename(launchFilePath)));
++				logger.reset(new rosmon::SystemdLogger(fs::path(launchFilePath).stem().string()));
+ 			}
+ 			catch(rosmon::SystemdLogger::NotAvailable& e)
+ 			{
+ 				fmt::print(stderr, "Systemd Journal not available: {}\n", e.what());
+-				logger.reset(new rosmon::SyslogLogger(fs::basename(launchFilePath)));
++				logger.reset(new rosmon::SyslogLogger(fs::path(launchFilePath).stem().string()));
+ 			}
+ 		}
+ 		else
diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -45,6 +45,16 @@ skip_existing:
 # For sure it will be uncommented and built with next full rebuild. Full rebuilds happen occasionally (few times a year).
 # The list of all maintained packages is at https://robostack.github.io/noetic.html .
 packages_select_by_deps:
+
+  # needs qt-main6 migration
+  # - robot_body_filter  # maintainer peci1
+  # - jsk-visualization
+  # - octomap-ros
+  # - octomap-mapping
+  # - octomap-server
+  # - rtabmap
+  # - rtabmap-ros
+
   - cras_cpp_common  # maintainer peci1
   - cras_py_common  # maintainer peci1
   - cras_docs_common  # maintainer peci1
@@ -63,7 +73,6 @@ packages_select_by_deps:
   - point_cloud_color  # maintainer peci1
   - rosmsg_cpp  # maintainer peci1
   - snmp_ros  # maintainer peci1
-  - robot_body_filter  # maintainer peci1
   - static_transform_mux  # maintainer peci1
   - tf_remapper_cpp  # maintainer peci1
   - roslint  # maintainer peci1
@@ -82,7 +91,6 @@ packages_select_by_deps:
   - navigation
   - ecl-core
   - ecl-threads
-  - jsk-visualization
   - actionlib
   - ros-babel-fish
   - ros-babel-fish-test-msgs
@@ -93,9 +101,6 @@ packages_select_by_deps:
   - microstrain-inertial-driver
   - microstrain-inertial-msgs
   - usb-cam
-  - octomap-ros
-  - octomap-mapping
-  - octomap-server
   - ackermann-msgs
   - fake-localization
   - realsense2-description
@@ -181,6 +186,7 @@ packages_select_by_deps:
   - depthimage-to-laserscan
   - joy
   - nmea-msgs
+  - rosmon
 
   - gazebo-ros-control
   - gazebo-plugins
@@ -225,7 +231,6 @@ packages_select_by_deps:
   - sound-play
   - pid
   - rosfmt
-  - rosmon
   - husky-simulator
   - lanelet2
 
@@ -254,10 +259,9 @@ packages_select_by_deps:
   - dbw-polaris-msgs
   - geodesy
   - aruco-ros
-
-  # Needs fixing in CI, uploaded manually
-  - rtabmap
-  # - rtabmap-ros
+  - pr2-teleop
+  - rqt-ez-publisher
+  - slam-gmapping
 
   ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED
   ## TODO AFTER REBUILD
@@ -663,7 +667,6 @@ packages_select_by_deps:
   # - pr2-power-drivers
   # - pr2-run-stop-auto-restart
   # - pr2-self-test-msgs
-  - pr2-teleop
   # - pr2-tilt-laser-interface
   # - pr2-tuckarm
   # - pr2-tuck-arms-action
@@ -1009,7 +1012,6 @@ packages_select_by_deps:
   # - ros-type-introspection
   # - rqt
   # - rqt-controller-manager
-  - rqt-ez-publisher
   # - rqt-joint-trajectory-controller
   # - rx-service-tools
   # - safety-limiter-msgs
@@ -1021,7 +1023,6 @@ packages_select_by_deps:
   # - service-tools
   # - sick-safetyscanners
   # - sick-scan
-  - slam-gmapping
   # - slam-toolbox-rviz
   # - slic
   # - slime-wrapper