diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/laser_assembler | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/laser_assembler')
-rw-r--r-- | dev-ros/laser_assembler/Manifest | 9 | ||||
-rw-r--r-- | dev-ros/laser_assembler/files/eigen.patch | 15 | ||||
-rw-r--r-- | dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild | 31 | ||||
-rw-r--r-- | dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild (renamed from dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild) | 13 | ||||
-rw-r--r-- | dev-ros/laser_assembler/laser_assembler-9999.ebuild | 13 |
5 files changed, 33 insertions, 48 deletions
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest index b4ffa268ad19..0ba0b8bb82a6 100644 --- a/dev-ros/laser_assembler/Manifest +++ b/dev-ros/laser_assembler/Manifest @@ -1,6 +1,5 @@ -DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb -DIST laser_assembler-1.7.7.tar.gz 22199 BLAKE2B 5ae26ef567149e6f3015cd3188bcc1adb72c09a33f6594658a20f954a500a76ca44f0f87e47dd9ae9a195df120752c4b35564264a1530b75808d8544f9b9162b SHA512 b7eb6f875209f4a692d1a16934196548a607730dd861806cda8a2f4c6a46722a56590148267b635e2bd5ee31e5490d6c533868bed7328a22a365cb1b8c63ddef -EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49 -EBUILD laser_assembler-1.7.7.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49 -EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e +AUX eigen.patch 710 BLAKE2B 8738ab211cd7bb105174fc4eccff6f9a4146addb0b3b814368b15fa81a13d1015889630ff6040e4376ea1440e61570c7a17cf1d65c7ad98076a10691ce6ca5f8 SHA512 8e5c7360ba01aa751b108fe0536d780cfe10ff7a4417b2aab8840dac445e227cf00b2a59e336e4f0a473a12150df719b94c12128ed47870fb5b9ab55aff40a65 +DIST laser_assembler-1.7.8.tar.gz 22255 BLAKE2B dd01153a6fecf649793f180f651f84c790218a34755e367c51994699e928e6ce39486ea6a93ae47136dcd0c66499946570064af8062bef0345f66c7659b4a0ef SHA512 bd13512bc7cacef7e7bb2107390e57538cb701c9593f5cdb3501729b7c38b922470038e6e85c44803051deb04b74e9f677b5707b0441ab21824485fcf1e60942 +EBUILD laser_assembler-1.7.8.ebuild 821 BLAKE2B 85678f81a16e2f034b4897c82f909c1955638550339f0be3f87437dbba2477120447ebb9a7b5ca8fb1dc93c3235419f7aeb3be4f63c07ef6312cfb04cf01e04c SHA512 702bb89f147512dc9487e7646a1af1db6bb24c698316f5adf9a77ffc949083909f0b48d880306285d3eca35791e81e8d495e19cc8f702c024812337770f9878e +EBUILD laser_assembler-9999.ebuild 821 BLAKE2B 85678f81a16e2f034b4897c82f909c1955638550339f0be3f87437dbba2477120447ebb9a7b5ca8fb1dc93c3235419f7aeb3be4f63c07ef6312cfb04cf01e04c SHA512 702bb89f147512dc9487e7646a1af1db6bb24c698316f5adf9a77ffc949083909f0b48d880306285d3eca35791e81e8d495e19cc8f702c024812337770f9878e MISC metadata.xml 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45 diff --git a/dev-ros/laser_assembler/files/eigen.patch b/dev-ros/laser_assembler/files/eigen.patch new file mode 100644 index 000000000000..95c8c58bcdb3 --- /dev/null +++ b/dev-ros/laser_assembler/files/eigen.patch @@ -0,0 +1,15 @@ +Index: laser_assembler-1.7.8/CMakeLists.txt +=================================================================== +--- laser_assembler-1.7.8.orig/CMakeLists.txt ++++ laser_assembler-1.7.8/CMakeLists.txt +@@ -12,7 +12,9 @@ find_package(catkin REQUIRED COMPONENTS + ${THIS_PACKAGE_ROS_DEPS} + message_generation) + find_package(Boost REQUIRED COMPONENTS system) +-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) ++find_package(Eigen3 REQUIRED) ++add_definitions(${EIGEN3_DEFINITIONS}) ++include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR}) + + ############################################################################## + # Build service definitions diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild deleted file mode 100644 index 903bdb286b20..000000000000 --- a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -ROS_REPO_URI="https://github.com/ros-perception/laser_assembler" -CATKIN_HAS_MESSAGES=yes -KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs" - -inherit ros-catkin - -DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/roscpp - dev-libs/boost:= - dev-ros/tf - dev-ros/laser_geometry[${PYTHON_USEDEP}] - dev-ros/pluginlib - dev-libs/tinyxml2:= - dev-libs/console_bridge:= - dev-ros/message_filters[${PYTHON_USEDEP}] - dev-ros/filters -" -DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest ) -" diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild index 903bdb286b20..799f5939b8ef 100644 --- a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild +++ b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros-perception/laser_assembler" CATKIN_HAS_MESSAGES=yes KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs" inherit ros-catkin @@ -19,13 +18,15 @@ RDEPEND=" dev-ros/roscpp dev-libs/boost:= dev-ros/tf - dev-ros/laser_geometry[${PYTHON_USEDEP}] + dev-ros/laser_geometry[${PYTHON_SINGLE_USEDEP}] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= - dev-ros/message_filters[${PYTHON_USEDEP}] + dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}] dev-ros/filters " DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest ) + dev-cpp/eigen:3 + test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest ) " +PATCHES=( "${FILESDIR}/eigen.patch" ) diff --git a/dev-ros/laser_assembler/laser_assembler-9999.ebuild b/dev-ros/laser_assembler/laser_assembler-9999.ebuild index b81ead0f3d81..799f5939b8ef 100644 --- a/dev-ros/laser_assembler/laser_assembler-9999.ebuild +++ b/dev-ros/laser_assembler/laser_assembler-9999.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros-perception/laser_assembler" CATKIN_HAS_MESSAGES=yes KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs" inherit ros-catkin @@ -19,13 +18,15 @@ RDEPEND=" dev-ros/roscpp dev-libs/boost:= dev-ros/tf - dev-ros/laser_geometry[${PYTHON_USEDEP}] + dev-ros/laser_geometry[${PYTHON_SINGLE_USEDEP}] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= - dev-ros/message_filters[${PYTHON_USEDEP}] + dev-ros/message_filters[${PYTHON_SINGLE_USEDEP}] dev-ros/filters " DEPEND="${RDEPEND} - test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest ) + dev-cpp/eigen:3 + test? ( dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] dev-cpp/gtest ) " +PATCHES=( "${FILESDIR}/eigen.patch" ) |