Merge pull request #554 from bulwahn/indigo-updates

recipe updates for indigo distribution on 2017-09-14

recipes-ros/laser-filters/laser-filters/0001-Use-std-namespace-for-c-11-compat.patch

@@ -1,45 +0,0 @@
-From 9631aaabd65e10615baebd30273b57677ba4d49c Mon Sep 17 00:00:00 2001
-From: Mike Purvis <mpurvis@clearpathrobotics.com>
-Date: Fri, 15 Jul 2016 23:47:45 -0400
-Subject: [PATCH] Use std:: namespace for c++11 compat.
-
-Upstream-Status: Backported
-
----
- include/laser_filters/intensity_filter.h | 4 ++--
- test/test_scan_filter_chain.cpp          | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/laser_filters/intensity_filter.h b/include/laser_filters/intensity_filter.h
-index 3f175a0..4c9cfbc 100644
---- a/include/laser_filters/intensity_filter.h
-+++ b/include/laser_filters/intensity_filter.h
-@@ -99,8 +99,8 @@ public:
-       // Calculate histogram
-       if (disp_hist_enabled_){
-         // If intensity value is inf or NaN, skip voting histogram
--        if( isinf((double)filtered_scan.intensities[i]) ||
--            isnan((double)filtered_scan.intensities[i]) )
-+        if( std::isinf((double)filtered_scan.intensities[i]) ||
-+            std::isnan((double)filtered_scan.intensities[i]) )
-           continue;
- 
-         // Choose bucket to vote on histogram,
-diff --git a/test/test_scan_filter_chain.cpp b/test/test_scan_filter_chain.cpp
-index b661f5f..139da60 100644
---- a/test/test_scan_filter_chain.cpp
-+++ b/test/test_scan_filter_chain.cpp
-@@ -60,8 +60,8 @@ sensor_msgs::LaserScan gen_msg(){
-  */
- void expect_ranges_eq(const std::vector<float> &a, const std::vector<float> &b) {
-   for( int i=0; i<10; i++) {
--    if(isnan(a[i])) {
--      EXPECT_TRUE(isnan(a[i]));
-+    if(std::isnan(a[i])) {
-+      EXPECT_TRUE(std::isnan(a[i]));
-     }
-     else {
-       EXPECT_NEAR(a[i], b[i], 1e-6);
--- 
-2.7.4
-

recipes-ros/laser-filters/laser-filters_1.8.5.bb

@@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de
 
 DEPENDS = "angles filters laser-geometry message-filters pluginlib roscpp sensor-msgs tf"
 
-SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \
+SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-           file://0001-Use-std-namespace-for-c-11-compat.patch \
+SRC_URI[md5sum] = "a4e3aaf40b35a6ffeb60a3a64a11fdc8"
-           "
+SRC_URI[sha256sum] = "ec7157eefb087a9785736973f93afaf0f5ff340b8c826a775125368c63515c88"
-SRC_URI[md5sum] = "566b4a51d0d11522d7528ca437c42b0f"
-SRC_URI[sha256sum] = "3e124b474c0c0da419366fa21a101874cc7e4c83b352a2da5a21e1967c68555f"
 
 S = "${WORKDIR}/${ROS_SP}"
 

recipes-ros/robot-model/robot-model.inc

@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "5867e22cea9db638689102a544010974"
+SRC_URI[md5sum] = "d08fa124fb63eb93dedfdcb14e63425b"
-SRC_URI[sha256sum] = "da70be8a4d70737880c98402cc5beee008e617e1e60e46b2b59d598376525c48"
+SRC_URI[sha256sum] = "204c2779c707d8688dfe46c29664b5ee210313a5eac03815ddbfed1cfd2c594a"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"