* [gentoo-commits] repo/gentoo:master commit in: dev-ros/laser_filters/files/, dev-ros/laser_filters/
@ 2017-01-28 15:27 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-01-28 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 5969dcecd161e565567dc224f0c514af99ea446b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 14:12:41 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 15:26:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5969dcec
dev-ros/laser_filters: Backport upstream patch to fix build in C++11 mode.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ros/laser_filters/files/c11.patch | 36 ++++++++++++++++++++++++
dev-ros/laser_filters/laser_filters-1.8.3.ebuild | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/dev-ros/laser_filters/files/c11.patch b/dev-ros/laser_filters/files/c11.patch
new file mode 100644
index 00000000..11850d4
--- /dev/null
+++ b/dev-ros/laser_filters/files/c11.patch
@@ -0,0 +1,36 @@
+commit a185bb6d0b61cbf8283467770e646241f7cac03e
+Author: Mike Purvis <mpurvis@clearpathrobotics.com>
+Date: Fri Jul 15 23:47:45 2016 -0400
+
+ Use std:: namespace for c++11 compat.
+
+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);
diff --git a/dev-ros/laser_filters/laser_filters-1.8.3.ebuild b/dev-ros/laser_filters/laser_filters-1.8.3.ebuild
index 4ad3561..9d8b331 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.3.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -25,3 +25,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/c11.patch" )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/laser_filters/files/, dev-ros/laser_filters/
@ 2017-09-12 11:49 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-09-12 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 22755f24532e92563adf3a7adc4f48d6ce7db036
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 11:44:09 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 11:49:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22755f24
dev-ros/laser_filters: Remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-ros/laser_filters/Manifest | 2 --
dev-ros/laser_filters/files/c11.patch | 36 ------------------------
dev-ros/laser_filters/laser_filters-1.8.3.ebuild | 27 ------------------
dev-ros/laser_filters/laser_filters-1.8.4.ebuild | 26 -----------------
4 files changed, 91 deletions(-)
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index 7e0c92f6668..845efad5afd 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,3 +1 @@
-DIST laser_filters-1.8.3.tar.gz 27803 SHA256 3e124b474c0c0da419366fa21a101874cc7e4c83b352a2da5a21e1967c68555f SHA512 61580135ce6014be48ebcca4b786da7b2f06c2c1554bc8099361c0fdb5ff590ba85e42c3fe32d4a901f0c54ec8834af6488d0729cccbc5ef4eb0f5348e7badc2 WHIRLPOOL da036de83dc222302809405f7a64bba80338e7083de595b6ef8ce16a058ef2fa3e53ec9025b5fb450ff60e1a4e16d9f5ff2323c5c610df6d26b2e267a7abed3a
-DIST laser_filters-1.8.4.tar.gz 27862 SHA256 5822b4f72c5c6d768ccbc3cc1e8977b92a348ecdbbfe2dd09c9ffa17fd8395f7 SHA512 4fd222a4562e04ba4cbc51ee84fffd047442ada303167534333e6d448e0943fd91a174db1e3f7ad717ad33e245a9b427f976fe7b18bfa1e70296921a9264ae62 WHIRLPOOL 0aa2fca235884c358c094063db3a5c239f3dc96103354528b7df6e959a63a3b1f250734dc671870d75de4743b608df051111e0b7f365f2bb45609f62b1ab1277
DIST laser_filters-1.8.5.tar.gz 29485 SHA256 ec7157eefb087a9785736973f93afaf0f5ff340b8c826a775125368c63515c88 SHA512 dc43aaa3c06f64328f9e744866ded854ffc36609f0d91b0bb0a2be736038b34690b9b819257c41b18ef01d1810e67e21d6cebf1e8bd7190fd4eaa2ddbe8723d2 WHIRLPOOL 7db566b96f89097bb059afbc10652462331a6e1d8c76526bd6ddb503ce9bf70c92e8a752c2997601cd76b25ec7b5a5606f504b7483e7f043bd46f938a34b0ec9
diff --git a/dev-ros/laser_filters/files/c11.patch b/dev-ros/laser_filters/files/c11.patch
deleted file mode 100644
index 11850d48db9..00000000000
--- a/dev-ros/laser_filters/files/c11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a185bb6d0b61cbf8283467770e646241f7cac03e
-Author: Mike Purvis <mpurvis@clearpathrobotics.com>
-Date: Fri Jul 15 23:47:45 2016 -0400
-
- Use std:: namespace for c++11 compat.
-
-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);
diff --git a/dev-ros/laser_filters/laser_filters-1.8.3.ebuild b/dev-ros/laser_filters/laser_filters-1.8.3.ebuild
deleted file mode 100644
index 4734f30cb02..00000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-libs/boost:=
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-ros/angles
- dev-ros/filters
- dev-ros/laser_geometry
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
-PATCHES=( "${FILESDIR}/c11.patch" )
diff --git a/dev-ros/laser_filters/laser_filters-1.8.4.ebuild b/dev-ros/laser_filters/laser_filters-1.8.4.ebuild
deleted file mode 100644
index d4c0837f023..00000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/roscpp
- dev-libs/boost:=
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf
- dev-ros/angles
- dev-ros/filters
- dev-ros/laser_geometry
-"
-DEPEND="${RDEPEND}
- test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-12 11:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-12 11:49 [gentoo-commits] repo/gentoo:master commit in: dev-ros/laser_filters/files/, dev-ros/laser_filters/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-01-28 15:27 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox