summaryrefslogtreecommitdiff
path: root/dev-ros/amcl
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/amcl
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/amcl')
-rw-r--r--dev-ros/amcl/Manifest9
-rw-r--r--dev-ros/amcl/amcl-1.16.2.ebuild33
-rw-r--r--dev-ros/amcl/amcl-1.16.3.ebuild (renamed from dev-ros/amcl/amcl-1.16.1.ebuild)4
-rw-r--r--dev-ros/amcl/amcl-9999.ebuild4
-rw-r--r--dev-ros/amcl/files/cmake.patch12
5 files changed, 22 insertions, 40 deletions
diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest
index 3241f16a24d7..84aa2afba572 100644
--- a/dev-ros/amcl/Manifest
+++ b/dev-ros/amcl/Manifest
@@ -1,6 +1,5 @@
-DIST navigation-1.16.1.tar.gz 336908 BLAKE2B 0f22db60352a0f50938ae18104ecad72c2e06eedeb2da8f6afe09bdc346868fcd71c90b0243c366b9fd0e7a26fef7551ab6a4febe87ab8d66af5ce3497c68770 SHA512 f6742f5afcaff2d1fc699e2695845b148bb16523e301f79577a8073fcc829541158b7c463f2e5bd9f69571f8b4042dbfacfe563de54b16193b5a31721c5f6faf
-DIST navigation-1.16.2.tar.gz 337389 BLAKE2B a21d014df02ebf8046245777bb42fe3bccaf65af4c607532c4fb72e0b2c43870d1ff1c32c882a0418363708c0fa0c74925943beca2110a5f19b77a65e0a871fc SHA512 890eb391a8a70b3b17aa870dfa79bf48199cf3dcf7a8703b0e005b22ffd404edf723d73e30a04f902f436899fe321894bf3da7610f374b1a95b247629f64256e
-EBUILD amcl-1.16.1.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
-EBUILD amcl-1.16.2.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
-EBUILD amcl-9999.ebuild 946 BLAKE2B 39816421ee2595d0e31dce41aabb7df12577f3e3023eb76369cdd76fdf9c6b2ebd07a865da38f3af6dd5e21ee14fa01164c6950e8fd0f2e8e2acbd9b286541a6 SHA512 7c08f6cc045f3b575dfdd6808266c7d46cabc32f24b0d9f3a2652b142c4227d105393b3f7a0e49539f613136331cfc81f4755124fce1a7ceb802bb15f0bf8db6
+AUX cmake.patch 331 BLAKE2B 473d4915af835a5f374eddf6d24d8bb003b02aaabc43119fa1d4eb53ecc640ca0225d0be0a03f811414b729344d1218b264231b27cb77480ec613283b03db6b8 SHA512 c2bd6bf44eedf69c03de172b88d9b9471a78b7176d6a5d4db18564986780c9c05ce9d74a65ded689fe1480d2094a2c16feffe27f7797224f6f43d019a806c327
+DIST navigation-1.16.3.tar.gz 342459 BLAKE2B 736414787adee9c7511b0d90276395d33b9b52207d55ddd53836c9d77cb6809bf1946443878ad83e4461d0febf05b616b93ec0a18b34ed402323eb9bbb100861 SHA512 2eddb27fd3eff143674cc518be520e6df4d24a965689441f710105977f4bbe307736df5e6303319dde99362187091ea4f90eaec9da5a4bc678250410af174a71
+EBUILD amcl-1.16.3.ebuild 1033 BLAKE2B 4ff3f9699e1a5c76b13e198816ce07d49da1c1bbd070f380d77e3d3a7277259e596565f8391cc29de42c4305fbefca42f7d9293764fdb0f3d8bdc95d1b6bfc10 SHA512 c1bde02d543e090c3a6605c9dddaf38619b110a1669313b56d1f24af73a84188f9b40f7891a670a00d12da07d96389ceb2b38e527767bb30b4a6f961ad3297ca
+EBUILD amcl-9999.ebuild 1033 BLAKE2B 4ff3f9699e1a5c76b13e198816ce07d49da1c1bbd070f380d77e3d3a7277259e596565f8391cc29de42c4305fbefca42f7d9293764fdb0f3d8bdc95d1b6bfc10 SHA512 c1bde02d543e090c3a6605c9dddaf38619b110a1669313b56d1f24af73a84188f9b40f7891a670a00d12da07d96389ceb2b38e527767bb30b4a6f961ad3297ca
MISC metadata.xml 337 BLAKE2B ecfbf3d0b63a1b876065d04b3d52daa0442e3bcaf060836731012a1e698b3aea06ff292d892035feb2fb0fc257d6d8462d013ccc67f2650177c9cdba4d051d44 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e
diff --git a/dev-ros/amcl/amcl-1.16.2.ebuild b/dev-ros/amcl/amcl-1.16.2.ebuild
deleted file mode 100644
index 2c9900308d7a..000000000000
--- a/dev-ros/amcl/amcl-1.16.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Probabilistic localization system for a robot moving in 2D"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/message_filters
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/rosbag
- dev-libs/boost:=
- dev-ros/roscpp
- dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/amcl/amcl-1.16.1.ebuild b/dev-ros/amcl/amcl-1.16.3.ebuild
index 2c9900308d7a..e2d2d799884a 100644
--- a/dev-ros/amcl/amcl-1.16.1.ebuild
+++ b/dev-ros/amcl/amcl-1.16.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
dev-ros/rosbag
dev-libs/boost:=
dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
@@ -31,3 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild
index 2c9900308d7a..e2d2d799884a 100644
--- a/dev-ros/amcl/amcl-9999.ebuild
+++ b/dev-ros/amcl/amcl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
dev-ros/rosbag
dev-libs/boost:=
dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/tf2
dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
@@ -31,3 +32,4 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/python_orocos_kdl[${PYTHON_USEDEP}] dev-ros/map_server[${PYTHON_USEDEP}] )
"
+PATCHES=( "${FILESDIR}/cmake.patch" )
diff --git a/dev-ros/amcl/files/cmake.patch b/dev-ros/amcl/files/cmake.patch
new file mode 100644
index 000000000000..da31fe79331d
--- /dev/null
+++ b/dev-ros/amcl/files/cmake.patch
@@ -0,0 +1,12 @@
+Index: amcl/CMakeLists.txt
+===================================================================
+--- amcl.orig/CMakeLists.txt
++++ amcl/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(amcl)
++include(CheckSymbolExists)
++include(CheckIncludeFile)
+
+ if(NOT CMAKE_CXX_STANDARD)
+ set(CMAKE_CXX_STANDARD 11)