[gentoo-commits] repo/gentoo:master commit in: dev-ros/depthimage_to_laserscan/files/, dev-ros/depthimage_to_laserscan/

[Alexis Ballier]

commit:     1e698bc6d1e4db57f8c3555cdb5b72f45db3b9a7
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 16:19:23 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 16:19:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e698bc6

dev-ros/depthimage_to_laserscan: Fix build with gcc 5, bug #608474

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../depthimage_to_laserscan-1.0.7-r1.ebuild                 |  3 ++-
 dev-ros/depthimage_to_laserscan/files/isnan.patch           | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
index 18325b4605..69d11c294c 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,3 +23,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/isnan.patch" )

diff --git a/dev-ros/depthimage_to_laserscan/files/isnan.patch b/dev-ros/depthimage_to_laserscan/files/isnan.patch
new file mode 100644
index 0000000000..11254904e9
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/files/isnan.patch
@@ -0,0 +1,13 @@
+Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
+===================================================================
+--- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScan.cpp
++++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScan.cpp
+@@ -59,7 +59,7 @@ bool DepthImageToLaserScan::use_point(co
+   
+   // Infs are preferable over NaNs (more information)
+   if(!new_finite && !old_finite){ // Both are not NaN or Inf.
+-    if(!isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
++    if(!std::isnan(new_value)){ // new is not NaN, so use it's +-Inf value.
+       return true;
+     }
+     return false; // Do not replace old_value