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/stereo_image_proc/files/, dev-ros/stereo_image_proc/
Date: Thu, 28 Dec 2017 19:11:38
Message-Id: 1514488249.eddf387a12f016bc030b2c906bfbc780eb0b346b.aballier@gentoo
1 commit: eddf387a12f016bc030b2c906bfbc780eb0b346b
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 28 18:53:45 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 28 19:10:49 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eddf387a
7
8 dev-ros/stereo_image_proc: Remove old
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 dev-ros/stereo_image_proc/Manifest | 3 --
13 dev-ros/stereo_image_proc/files/gcc6.patch | 33 ----------------------
14 .../stereo_image_proc-1.12.19-r1.ebuild | 31 --------------------
15 .../stereo_image_proc-1.12.20.ebuild | 30 --------------------
16 .../stereo_image_proc-1.12.21.ebuild | 30 --------------------
17 5 files changed, 127 deletions(-)
18
19 diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
20 index c825d78f9f4..1ff17e9b553 100644
21 --- a/dev-ros/stereo_image_proc/Manifest
22 +++ b/dev-ros/stereo_image_proc/Manifest
23 @@ -1,4 +1 @@
24 -DIST image_pipeline-1.12.19.tar.gz 130635 BLAKE2B 23709220248c86900c092a94a688cb428ceb58aba621e078cece903038345339e75706b0496aacd616e8a5e67522fff781d6a48022f8e6c231bb76eed9417b6e SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba
25 -DIST image_pipeline-1.12.20.tar.gz 137888 BLAKE2B 2fa362acf59e545c794136262bab98bd5bf5c9025306df5b3f46fd4f498a13c99ef902653f8725564e02f6d1178ba7b77f973d248e4229c80251ad8f5747fb56 SHA512 37a45cfcc8bdb8b40477860e29f72671d423d4531156f5901128c32a6c41d27f235cdac216502d614ab7ddab5e66c2f343baaa0fd22cf83cb38e667fbbc111c5
26 -DIST image_pipeline-1.12.21.tar.gz 139264 BLAKE2B 0b60057d35a250b0f4938ad79d893b922501d9416a6a7122c49023f632affd06c1c82bfddff0f10bbebe683d8dd50eb4d947d5086a8bb6935da98f8a2d146eed SHA512 76f06e7a1effb3098454496e01a8c14b34a37a3ea96ac51a0deb860b6891b37d354dcf7d9c06389476decaa90c3097c4495e34d04f70ad6a571fc5469eda2f6c
27 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
28
29 diff --git a/dev-ros/stereo_image_proc/files/gcc6.patch b/dev-ros/stereo_image_proc/files/gcc6.patch
30 deleted file mode 100644
31 index ee4dfdaa8d3..00000000000
32 --- a/dev-ros/stereo_image_proc/files/gcc6.patch
33 +++ /dev/null
34 @@ -1,33 +0,0 @@
35 -commit 6c2d65452bd5fe62723988a1a570789921900d59
36 -Author: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de>
37 -Date: Fri Sep 30 15:39:47 2016 +0200
38 -
39 - address gcc6 build error
40 -
41 - With gcc6, compiling fails with `stdlib.h: No such file or directory`,
42 - as including '-isystem /usr/include' breaks with gcc6, cf.,
43 - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
44 -
45 - This commit addresses this issue for this package in the same way
46 - it was addressed in various other ROS packages. A list of related
47 - commits and pull requests is at:
48 -
49 - https://github.com/ros/rosdistro/issues/12783
50 -
51 - Signed-off-by: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de>
52 -
53 -diff --git a/stereo_image_proc/CMakeLists.txt b/stereo_image_proc/CMakeLists.txt
54 -index b7127d2..e201436 100644
55 ---- a/stereo_image_proc/CMakeLists.txt
56 -+++ b/stereo_image_proc/CMakeLists.txt
57 -@@ -16,9 +16,7 @@ catkin_package(
58 - include_directories(include)
59 -
60 - find_package(OpenCV REQUIRED)
61 --include_directories(SYSTEM ${catkin_INCLUDE_DIRS}
62 -- ${OpenCV_INCLUDE_DIRS}
63 --)
64 -+include_directories(${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
65 -
66 - # Nodelet library
67 - add_library(${PROJECT_NAME} src/libstereo_image_proc/processor.cpp src/nodelets/disparity.cpp src/nodelets/point_cloud2.cpp)
68
69 diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
70 deleted file mode 100644
71 index 49052260f2c..00000000000
72 --- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
73 +++ /dev/null
74 @@ -1,31 +0,0 @@
75 -# Copyright 1999-2017 Gentoo Foundation
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=5
79 -ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
80 -KEYWORDS="~amd64 ~arm"
81 -PYTHON_COMPAT=( python2_7 )
82 -ROS_SUBDIR=${PN}
83 -
84 -inherit ros-catkin
85 -
86 -DESCRIPTION="Stereo and single image rectification and disparity processing"
87 -LICENSE="BSD"
88 -SLOT="0"
89 -IUSE=""
90 -
91 -RDEPEND="
92 - dev-ros/cv_bridge
93 - dev-ros/dynamic_reconfigure
94 - dev-ros/image_geometry
95 - dev-ros/image_proc
96 - dev-ros/image_transport
97 - dev-ros/message_filters
98 - dev-ros/nodelet
99 - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
100 - dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
101 - media-libs/opencv:=
102 - dev-libs/boost:=[threads]
103 -"
104 -DEPEND="${RDEPEND}"
105 -PATCHES=( "${FILESDIR}/gcc6.patch" )
106
107 diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.20.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.20.ebuild
108 deleted file mode 100644
109 index 825abc908cb..00000000000
110 --- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.20.ebuild
111 +++ /dev/null
112 @@ -1,30 +0,0 @@
113 -# Copyright 1999-2017 Gentoo Foundation
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=5
117 -ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
118 -KEYWORDS="~amd64 ~arm"
119 -PYTHON_COMPAT=( python2_7 )
120 -ROS_SUBDIR=${PN}
121 -
122 -inherit ros-catkin
123 -
124 -DESCRIPTION="Stereo and single image rectification and disparity processing"
125 -LICENSE="BSD"
126 -SLOT="0"
127 -IUSE=""
128 -
129 -RDEPEND="
130 - dev-ros/cv_bridge
131 - dev-ros/dynamic_reconfigure
132 - dev-ros/image_geometry
133 - dev-ros/image_proc
134 - dev-ros/image_transport
135 - dev-ros/message_filters
136 - dev-ros/nodelet
137 - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
138 - dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
139 - media-libs/opencv:=
140 - dev-libs/boost:=[threads]
141 -"
142 -DEPEND="${RDEPEND}"
143
144 diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.21.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.21.ebuild
145 deleted file mode 100644
146 index 825abc908cb..00000000000
147 --- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.21.ebuild
148 +++ /dev/null
149 @@ -1,30 +0,0 @@
150 -# Copyright 1999-2017 Gentoo Foundation
151 -# Distributed under the terms of the GNU General Public License v2
152 -
153 -EAPI=5
154 -ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
155 -KEYWORDS="~amd64 ~arm"
156 -PYTHON_COMPAT=( python2_7 )
157 -ROS_SUBDIR=${PN}
158 -
159 -inherit ros-catkin
160 -
161 -DESCRIPTION="Stereo and single image rectification and disparity processing"
162 -LICENSE="BSD"
163 -SLOT="0"
164 -IUSE=""
165 -
166 -RDEPEND="
167 - dev-ros/cv_bridge
168 - dev-ros/dynamic_reconfigure
169 - dev-ros/image_geometry
170 - dev-ros/image_proc
171 - dev-ros/image_transport
172 - dev-ros/message_filters
173 - dev-ros/nodelet
174 - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
175 - dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
176 - media-libs/opencv:=
177 - dev-libs/boost:=[threads]
178 -"
179 -DEPEND="${RDEPEND}"