* [gentoo-commits] repo/gentoo:master commit in: dev-ros/depth_image_proc/files/, dev-ros/depth_image_proc/
@ 2017-01-23 12:28 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-01-23 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 936e3970fb63022c10574112f6f85b0fea13f23d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 12:20:38 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 12:28:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936e3970
dev-ros/depth_image_proc: Fix build with gcc6.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../depth_image_proc-1.12.19.ebuild | 3 +-
dev-ros/depth_image_proc/files/gcc6.patch | 35 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild
index 99fb96f..f88651c 100644
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.12.19.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$
@@ -27,3 +27,4 @@ RDEPEND="
dev-ros/tf2_ros
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/depth_image_proc/files/gcc6.patch b/dev-ros/depth_image_proc/files/gcc6.patch
new file mode 100644
index 00000000..694e2a1
--- /dev/null
+++ b/dev-ros/depth_image_proc/files/gcc6.patch
@@ -0,0 +1,35 @@
+commit 6c2d65452bd5fe62723988a1a570789921900d59
+Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Fri Sep 30 15:39:47 2016 +0200
+
+ address gcc6 build error
+
+ With gcc6, compiling fails with `stdlib.h: No such file or directory`,
+ as including '-isystem /usr/include' breaks with gcc6, cf.,
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
+
+ This commit addresses this issue for this package in the same way
+ it was addressed in various other ROS packages. A list of related
+ commits and pull requests is at:
+
+ https://github.com/ros/rosdistro/issues/12783
+
+ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+
+diff --git a/depth_image_proc/CMakeLists.txt b/depth_image_proc/CMakeLists.txt
+index 0a7c7e2..6ceebfe 100644
+--- a/depth_image_proc/CMakeLists.txt
++++ b/depth_image_proc/CMakeLists.txt
+@@ -10,11 +10,7 @@ catkin_package(
+ find_package(Boost REQUIRED)
+ find_package(Eigen REQUIRED)
+ find_package(OpenCV REQUIRED)
+-include_directories(include
+- SYSTEM ${BOOST_INCLUDE_DIRS}
+- ${catkin_INCLUDE_DIRS}
+- ${EIGEN_INCLUDE_DIRS}
+-)
++include_directories(include ${BOOST_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS})
+
+ add_library(${PROJECT_NAME} src/nodelets/convert_metric.cpp
+ src/nodelets/crop_foremost.cpp
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/depth_image_proc/files/, dev-ros/depth_image_proc/
@ 2017-09-12 11:59 Alexis Ballier
0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2017-09-12 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 20db7107edd0406ffa4e419def8df391048fb9cb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 11:51:36 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 11:59:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20db7107
dev-ros/depth_image_proc: Remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-ros/depth_image_proc/Manifest | 1 -
.../depth_image_proc-1.12.19.ebuild | 30 -------------------
dev-ros/depth_image_proc/files/gcc6.patch | 35 ----------------------
3 files changed, 66 deletions(-)
diff --git a/dev-ros/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index b50ff7ba4d9..f6e12d8df50 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,2 +1 @@
-DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
DIST image_pipeline-1.12.20.tar.gz 137888 SHA256 b69307689c7fb4e62464254fc24ede26c85087b51519f0b43a33e995dabe1a53 SHA512 37a45cfcc8bdb8b40477860e29f72671d423d4531156f5901128c32a6c41d27f235cdac216502d614ab7ddab5e66c2f343baaa0fd22cf83cb38e667fbbc111c5 WHIRLPOOL 8dda5d84af0929a983e6a2cb54697ee50d3036399a05bff50ae711fb4e8638e8763de407b65beb14d65b2cd48e3b200c84af95cee7da48609448f102d0bfdadc
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild
deleted file mode 100644
index 09386f1f5f0..00000000000
--- a/dev-ros/depth_image_proc/depth_image_proc-1.12.19.ebuild
+++ /dev/null
@@ -1,30 +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/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/cv_bridge
- media-libs/opencv:=
- dev-ros/eigen_conversions
- dev-ros/image_geometry
- dev-ros/image_transport
- dev-ros/message_filters
- dev-ros/nodelet
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- dev-ros/tf2
- dev-ros/tf2_ros
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/depth_image_proc/files/gcc6.patch b/dev-ros/depth_image_proc/files/gcc6.patch
deleted file mode 100644
index 694e2a1b18f..00000000000
--- a/dev-ros/depth_image_proc/files/gcc6.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 6c2d65452bd5fe62723988a1a570789921900d59
-Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Fri Sep 30 15:39:47 2016 +0200
-
- address gcc6 build error
-
- With gcc6, compiling fails with `stdlib.h: No such file or directory`,
- as including '-isystem /usr/include' breaks with gcc6, cf.,
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
-
- This commit addresses this issue for this package in the same way
- it was addressed in various other ROS packages. A list of related
- commits and pull requests is at:
-
- https://github.com/ros/rosdistro/issues/12783
-
- Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-
-diff --git a/depth_image_proc/CMakeLists.txt b/depth_image_proc/CMakeLists.txt
-index 0a7c7e2..6ceebfe 100644
---- a/depth_image_proc/CMakeLists.txt
-+++ b/depth_image_proc/CMakeLists.txt
-@@ -10,11 +10,7 @@ catkin_package(
- find_package(Boost REQUIRED)
- find_package(Eigen REQUIRED)
- find_package(OpenCV REQUIRED)
--include_directories(include
-- SYSTEM ${BOOST_INCLUDE_DIRS}
-- ${catkin_INCLUDE_DIRS}
-- ${EIGEN_INCLUDE_DIRS}
--)
-+include_directories(include ${BOOST_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS})
-
- add_library(${PROJECT_NAME} src/nodelets/convert_metric.cpp
- src/nodelets/crop_foremost.cpp
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-12 11:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-23 12:28 [gentoo-commits] repo/gentoo:master commit in: dev-ros/depth_image_proc/files/, dev-ros/depth_image_proc/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2017-09-12 11:59 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox