diff options
| author | CoprDistGit <infra@openeuler.org> | 2026-04-06 15:35:21 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2026-04-06 15:35:21 +0000 |
| commit | 5ef2e3c5a0fa6589ec0794a35a74293e3b884cca (patch) | |
| tree | f3ed8a863cd5730139f01b07e5f11d23d10c24ae | |
| parent | be2abb6f9dd80872309c75a8f238657efe283213 (diff) | |
automatic import of rtabmap-vizopeneuler24.03_LTS
| -rw-r--r-- | ros-humble-rtabmap-viz-0.22.1-fix-cmake-paths.patch | 42 | ||||
| -rw-r--r-- | rtabmap-viz.spec | 6 |
2 files changed, 47 insertions, 1 deletions
diff --git a/ros-humble-rtabmap-viz-0.22.1-fix-cmake-paths.patch b/ros-humble-rtabmap-viz-0.22.1-fix-cmake-paths.patch new file mode 100644 index 0000000..33a5e9f --- /dev/null +++ b/ros-humble-rtabmap-viz-0.22.1-fix-cmake-paths.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a7707f2..38ba5a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,21 +7,22 @@ endif() + + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") + # issues #1285 #1288 +- find_library( +- builtin_interfaces__rosidl_generator_c_LIB NAMES builtin_interfaces__rosidl_generator_c +- PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED +- ) +- find_library( +- rcutils_LIB NAMES rcutils +- PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED +- ) +- find_library( +- crypto_LIB NAMES crypto +- PATHS "/usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" +- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED +- ) ++ # Note: Commented out for openEuler - hardcoded Ubuntu/Debian paths not applicable ++ # find_library( ++ # builtin_interfaces__rosidl_generator_c_LIB NAMES builtin_interfaces__rosidl_generator_c ++ # PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" ++ # NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED ++ # ) ++ # find_library( ++ # rcutils_LIB NAMES rcutils ++ # PATHS "/opt/ros/$ENV{ROS_DISTRO}/lib" ++ # NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED ++ # ) ++ # find_library( ++ # crypto_LIB NAMES crypto ++ # PATHS "/usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu" ++ # NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH REQUIRED ++ # ) + endif() + + find_package(ament_cmake REQUIRED) diff --git a/rtabmap-viz.spec b/rtabmap-viz.spec index d19923d..285b73d 100644 --- a/rtabmap-viz.spec +++ b/rtabmap-viz.spec @@ -11,11 +11,12 @@ Name: ros-%{ros_distro}-%{RosPkgName} Version: 0.22.1 -Release: 1%{?dist}%{?release_suffix} +Release: 2%{?dist}%{?release_suffix} Summary: RTAB-Map's visualization package. License: BSD Source0: %{RosPkgName}-%{version}.tar.gz +Patch0: ros-humble-rtabmap-viz-0.22.1-fix-cmake-paths.patch Requires: ros-%{ros_distro}-cv-bridge Requires: ros-%{ros_distro}-geometry-msgs @@ -111,5 +112,8 @@ else echo "RPM TESTS SKIPPED"; fi /opt/ros/%{ros_distro} %changelog +* Sun Apr 06 2026 openEuler ROS SIG - 0.22.1-2 +- Add patch to comment out Ubuntu-specific aarch64 find_library paths for crypto/rcutils + * Wed Mar 25 2026 Mathieu Labbe matlabbe@gmail.com - 0.22.1-1 - Autogenerated by ros-porting-tools |