Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/hector_pose_estimation_core/files/, dev-ros/hector_pose_estimation_core/
Date: Fri, 27 Jan 2017 12:41:30
Message-Id: 1485520881.eae3a6da0446dcdc271e3c9db48902af48e101b4.aballier@gentoo
1 commit: eae3a6da0446dcdc271e3c9db48902af48e101b4
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 27 12:37:46 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 27 12:41:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae3a6da
7
8 dev-ros/hector_pose_estimation_core: Fix build with latest eigen
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-ros/hector_pose_estimation_core/files/eigen.patch | 13 +++++++++++++
13 .../hector_pose_estimation_core-0.3.0-r1.ebuild | 4 ++--
14 2 files changed, 15 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-ros/hector_pose_estimation_core/files/eigen.patch b/dev-ros/hector_pose_estimation_core/files/eigen.patch
17 new file mode 100644
18 index 00000000..b58bb9e
19 --- /dev/null
20 +++ b/dev-ros/hector_pose_estimation_core/files/eigen.patch
21 @@ -0,0 +1,13 @@
22 +Index: hector_pose_estimation_core/src/measurements/poseupdate.cpp
23 +===================================================================
24 +--- hector_pose_estimation_core.orig/src/measurements/poseupdate.cpp
25 ++++ hector_pose_estimation_core/src/measurements/poseupdate.cpp
26 +@@ -382,7 +382,7 @@ double PoseUpdate::updateInternal(State
27 + ROS_DEBUG_STREAM_NAMED("poseupdate", "alpha = " << alpha << ", beta = " << beta);
28 +
29 + if (max_error > 0.0) {
30 +- double error2 = error.transpose() * Ix * (Ix + Iy).inverse() * Iy * error;
31 ++ double error2 = error.transpose().dot( Ix * (Ix + Iy).inverse() * Iy * error);
32 + if (error2 > max_error * max_error) {
33 + if (!jump_on_max_error_ || !jump_function) {
34 + ROS_WARN_STREAM_NAMED("poseupdate", "Ignoring poseupdate for " << text << " as the error [ " << error.transpose() << " ], |error| = " << sqrt(error2) << " sigma exceeds max_error!");
35
36 diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
37 index 63064ba..99bccdf 100644
38 --- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
39 +++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2016 Gentoo Foundation
42 +# Copyright 1999-2017 Gentoo Foundation
43 # Distributed under the terms of the GNU General Public License v2
44 # $Id$
45
46 @@ -27,4 +27,4 @@ RDEPEND="
47 "
48 DEPEND="${RDEPEND}
49 dev-cpp/eigen:3"
50 -PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" )
51 +PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" "${FILESDIR}/eigen.patch" )