From 5495dbd72bfee07cf6c1df857d1e96fdafb549d4 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Thu, 4 May 2023 16:23:57 +0800 Subject: [PATCH 1/5] fix(cartographer-ros): fix compile error Signed-off-by: will_niutao --- ...er-ros-fix-multiple-definition-error.patch | 23 +++++++++++++++++++ package_fix/cartographer-ros/source.fix | 1 + spec_fix/pkg.remap | 1 + 3 files changed, 25 insertions(+) create mode 100644 package_fix/cartographer-ros/cartographer-ros-fix-multiple-definition-error.patch create mode 100644 package_fix/cartographer-ros/source.fix diff --git a/package_fix/cartographer-ros/cartographer-ros-fix-multiple-definition-error.patch b/package_fix/cartographer-ros/cartographer-ros-fix-multiple-definition-error.patch new file mode 100644 index 0000000..c5c91b3 --- /dev/null +++ b/package_fix/cartographer-ros/cartographer-ros-fix-multiple-definition-error.patch @@ -0,0 +1,23 @@ +--- ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt_org 2023-05-04 15:53:33.555572652 +0800 ++++ ros-humble-cartographer-ros-2.0.9000/CMakeLists.txt 2023-05-04 15:54:17.268212997 +0800 +@@ -59,20 +59,13 @@ + # Library + add_library(${PROJECT_NAME} + src/assets_writer.cpp +- src/assets_writer_main.cpp + src/map_builder_bridge.cpp + src/msg_conversion.cpp + src/node_constants.cpp + src/node.cpp +- src/node_main.cpp + src/node_options.cpp +- src/occupancy_grid_node_main.cpp + src/offline_node.cpp +- src/offline_node_main.cpp +- src/pbstream_map_publisher_main.cpp +- src/pbstream_to_ros_map_main.cpp + src/playable_bag.cpp +- src/rosbag_validate_main.cpp + src/ros_log_sink.cpp + src/ros_map.cpp + src/ros_map_writing_points_processor.cpp diff --git a/package_fix/cartographer-ros/source.fix b/package_fix/cartographer-ros/source.fix new file mode 100644 index 0000000..b371691 --- /dev/null +++ b/package_fix/cartographer-ros/source.fix @@ -0,0 +1 @@ +Patch0: cartographer-ros-fix-multiple-definition-error.patch diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 42b57ad..14a916d 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -79,3 +79,4 @@ opengl mesa-libGL-devel libpcl-all-dev pcl-devel libflann-dev flann-devel nlohmann-json-dev nlohmann-json-devel +clang-format clang -- Gitee From 3ecfcec0e1679ed04ca3dd5633902bbbbd1c5648 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Thu, 4 May 2023 16:25:43 +0800 Subject: [PATCH 2/5] chore: fix the change time for debug, it need restore later Signed-off-by: will_niutao --- gen-pkg-spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen-pkg-spec.sh b/gen-pkg-spec.sh index 9dc436d..dab5e3e 100755 --- a/gen-pkg-spec.sh +++ b/gen-pkg-spec.sh @@ -201,7 +201,7 @@ modify_spec() debug_log "gen changelog" maintainer=`grep maintainer: ${ROS_DEPS_BASE}/$pkg-PackageXml | awk -F"maintainer:" '{print $2}'` #changetime=`date +"%a %b %d %Y"` - changetime=`date +"%b %Y"` + changetime="Thu May 04 2023" changelog="$changetime $maintainer - $base_version-$release_version" sed -i "s#ROS_PACKAGE_CHANGELOG#$changelog#g" $spec -- Gitee From 0cc874f98e96c90b907fbcff37543262634e65a7 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Thu, 4 May 2023 17:56:45 +0800 Subject: [PATCH 3/5] refactor: rename the python3-catkin-pkg-modules to python3-catkin_pkg(same with fedora) Signed-off-by: will_niutao --- spec_fix/no-debuginfo | 1 + spec_fix/pkg.remap | 1 + 2 files changed, 2 insertions(+) diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo index 651ec14..25af5e5 100644 --- a/spec_fix/no-debuginfo +++ b/spec_fix/no-debuginfo @@ -3,3 +3,4 @@ mavlink sophus libnabo rviz-visual-testing-framework +magic-enum diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 14a916d..1325920 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -80,3 +80,4 @@ libpcl-all-dev pcl-devel libflann-dev flann-devel nlohmann-json-dev nlohmann-json-devel clang-format clang +python3-catkin-pkg-modules python3-catkin_pkg -- Gitee From ab503ccd399d1c0b746da86e17b63dbb711e5e06 Mon Sep 17 00:00:00 2001 From: NiuTao Date: Thu, 4 May 2023 11:13:41 +0000 Subject: [PATCH 4/5] feat: add new package Signed-off-by: NiuTao --- doc/ros_630.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/ros_630.txt b/doc/ros_630.txt index 3d6520c..e285935 100644 --- a/doc/ros_630.txt +++ b/doc/ros_630.txt @@ -278,4 +278,12 @@ vision-opencv visualization-msgs yaml-cpp-vendor ydlidar -zstd-vendor \ No newline at end of file +zstd-vendor +camera-calibration-parsers +camera-info-manager +v4l2-camera +image-transport +image-transport-plugins +compressed-depth-image-transport +compressed-image-transport +theora-image-transport \ No newline at end of file -- Gitee From 1fa97e748d308239f8529623676fe07d4305c073 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Thu, 4 May 2023 19:21:37 +0800 Subject: [PATCH 5/5] fix(theora-image-transport): fix build error Signed-off-by: will_niutao --- spec_fix/pkg.remap | 1 + 1 file changed, 1 insertion(+) diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 1325920..bce6d9a 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -81,3 +81,4 @@ libflann-dev flann-devel nlohmann-json-dev nlohmann-json-devel clang-format clang python3-catkin-pkg-modules python3-catkin_pkg +libopencv-imgproc-dev opencv -- Gitee