diff options
Diffstat (limited to 'dev-ros/pcl_conversions')
| -rw-r--r-- | dev-ros/pcl_conversions/Manifest | 5 | ||||
| -rw-r--r-- | dev-ros/pcl_conversions/files/pcl.patch | 68 | ||||
| -rw-r--r-- | dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild (renamed from dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild) | 3 | ||||
| -rw-r--r-- | dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild | 25 |
4 files changed, 72 insertions, 29 deletions
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest index b4df79390c1a..74942491e811 100644 --- a/dev-ros/pcl_conversions/Manifest +++ b/dev-ros/pcl_conversions/Manifest @@ -1,6 +1,5 @@ -DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e +AUX pcl.patch 2427 BLAKE2B ec9099ea6b6c39054df19aba957c6503db864190b4704445440b5e0cc93065b269d070d21b3cdd18a392dbd4acc2380b924efae34f4e3d70f96da7733ef80979 SHA512 33fdf3284c4c34fe0e7f4f36e2c6328eba471b2f2d7a30bf9bf44c82b81ff4c68a522404eafea81546d7be0d07988fa6b94e2e6d5ec96278bb11ae68177bb741 DIST perception_pcl-1.7.2.tar.gz 81897 BLAKE2B 692f000337090c7a2354bf9626d391aa0fe390041042718e7dde7335c750137e7e1b6f939728ad1e2af3411e535ba63b42bc17f74b3535e38628f2b6c1c87036 SHA512 228b1d7d589bfd1460e8c58448b0d9257e86c1796b009853aeceeb1da20d8f46462d8c273a95804003ce3c43326c6575553d19b319aa9effcef4854347d5c3f9 -EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6 -EBUILD pcl_conversions-1.7.2.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6 +EBUILD pcl_conversions-1.7.2-r1.ebuild 636 BLAKE2B 41739024596fccb8ea978f74c4f7b57552766f23c05a556e6726b3aa78fc26d9dae54f7d469dc6ceb664325fd3f30a0f5b23910478847d8b80dd15de3ded8030 SHA512 b558b33311491e1fcc409c39c37640bae397de978a333654817a0ac6255a2a6d0545193cb908e3414b5681ccd5d93e62630eaf031d9fd30c2ca38a8581bb21ac EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585 diff --git a/dev-ros/pcl_conversions/files/pcl.patch b/dev-ros/pcl_conversions/files/pcl.patch new file mode 100644 index 000000000000..fc0ef8866863 --- /dev/null +++ b/dev-ros/pcl_conversions/files/pcl.patch @@ -0,0 +1,68 @@ +From 6900f7cf650e6c0df2aef45e0011833905b0ba9e Mon Sep 17 00:00:00 2001 +From: Markus Vieth <39675748+mvieth@users.noreply.github.com> +Date: Fri, 6 Nov 2020 19:13:16 +0100 +Subject: [PATCH] Change conversions of Vertices for new PCL versions (#313) + +In https://github.com/PointCloudLibrary/pcl/commit/ad00c7bee2fad0391649479d90eee4461a2e74e7, the vertices field of pcl::Vertices changed from std::vector<std::uint32_t> to std::vector<pcl::index_t>, where index_t is an index type with configurable size (currently by default int). This commit makes conversions from and to pcl_msgs::Vertices possible again, moving the vector contents if possible. +--- + .../include/pcl_conversions/pcl_conversions.h | 23 +++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/pcl_conversions/include/pcl_conversions/pcl_conversions.h b/pcl_conversions/include/pcl_conversions/pcl_conversions.h +index a5671c25..5ac0a41a 100644 +--- a/include/pcl_conversions/pcl_conversions.h ++++ b/include/pcl_conversions/pcl_conversions.h +@@ -350,10 +350,25 @@ namespace pcl_conversions { + + /** pcl::Vertices <=> pcl_msgs::Vertices **/ + ++ namespace internal ++ { ++ template <class T> ++ inline void move(std::vector<T> &a, std::vector<T> &b) ++ { ++ b.swap(a); ++ } ++ ++ template <class T1, class T2> ++ inline void move(std::vector<T1> &a, std::vector<T2> &b) ++ { ++ b.assign(a.cbegin(), a.cend()); ++ } ++ } ++ + inline + void fromPCL(const pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert) + { +- vert.vertices = pcl_vert.vertices; ++ vert.vertices.assign(pcl_vert.vertices.cbegin(), pcl_vert.vertices.cend()); + } + + inline +@@ -370,7 +385,7 @@ namespace pcl_conversions { + inline + void moveFromPCL(pcl::Vertices &pcl_vert, pcl_msgs::Vertices &vert) + { +- vert.vertices.swap(pcl_vert.vertices); ++ internal::move(pcl_vert.vertices, vert.vertices); + } + + inline +@@ -387,7 +402,7 @@ namespace pcl_conversions { + inline + void toPCL(const pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert) + { +- pcl_vert.vertices = vert.vertices; ++ pcl_vert.vertices.assign(vert.vertices.cbegin(), vert.vertices.cend()); + } + + inline +@@ -404,7 +419,7 @@ namespace pcl_conversions { + inline + void moveToPCL(pcl_msgs::Vertices &vert, pcl::Vertices &pcl_vert) + { +- pcl_vert.vertices.swap(vert.vertices); ++ internal::move(vert.vertices, pcl_vert.vertices); + } + + inline diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild index 2aa2de1919aa..ec80ff5fa28b 100644 --- a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild +++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,3 +23,4 @@ DEPEND="${RDEPEND} dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-cpp/eigen:3 test? ( dev-cpp/gtest )" +PATCHES=("${FILESDIR}/pcl.patch") diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild deleted file mode 100644 index 2aa2de1919aa..000000000000 --- a/dev-ros/pcl_conversions/pcl_conversions-1.7.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -ROS_REPO_URI="https://github.com/ros-perception/perception_pcl" -ROS_SUBDIR=${PN} -KEYWORDS="~amd64 ~arm" - -inherit ros-catkin - -DESCRIPTION="Provides conversions from PCL data types and ROS message types" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roscpp - sci-libs/pcl:= -" -DEPEND="${RDEPEND} - dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] - dev-cpp/eigen:3 - test? ( dev-cpp/gtest )" |