Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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/tf2/, dev-ros/tf2/files/
Date: Thu, 22 Mar 2018 10:03:01
Message-Id: 1521712666.dccd36167ab666ad7b8938aedc534ffe9b10f18b.aballier@gentoo
1 commit: dccd36167ab666ad7b8938aedc534ffe9b10f18b
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 22 09:57:46 2018 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 22 09:57:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccd3616
7
8 dev-ros/tf2: Remove old
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 dev-ros/tf2/Manifest | 2 -
13 dev-ros/tf2/files/logging.patch | 98 ----------------------------------------
14 dev-ros/tf2/files/logging2.patch | 98 ----------------------------------------
15 dev-ros/tf2/tf2-0.5.16-r1.ebuild | 26 -----------
16 dev-ros/tf2/tf2-0.5.17.ebuild | 26 -----------
17 5 files changed, 250 deletions(-)
18
19 diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
20 index 1a47dd9af38..91aa82a2172 100644
21 --- a/dev-ros/tf2/Manifest
22 +++ b/dev-ros/tf2/Manifest
23 @@ -1,3 +1 @@
24 -DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
25 -DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
26 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
27
28 diff --git a/dev-ros/tf2/files/logging.patch b/dev-ros/tf2/files/logging.patch
29 deleted file mode 100644
30 index 20ce562b1f3..00000000000
31 --- a/dev-ros/tf2/files/logging.patch
32 +++ /dev/null
33 @@ -1,98 +0,0 @@
34 -Index: tf2/src/buffer_core.cpp
35 -===================================================================
36 ---- tf2.orig/src/buffer_core.cpp
37 -+++ tf2/src/buffer_core.cpp
38 -@@ -123,7 +123,7 @@ bool BufferCore::warnFrameId(const char*
39 - {
40 - std::stringstream ss;
41 - ss << "Invalid argument passed to "<< function_name_arg <<" in tf2 frame_ids cannot be empty";
42 -- logWarn("%s",ss.str().c_str());
43 -+ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
44 - return true;
45 - }
46 -
47 -@@ -131,7 +131,7 @@ bool BufferCore::warnFrameId(const char*
48 - {
49 - std::stringstream ss;
50 - ss << "Invalid argument \"" << frame_id << "\" passed to "<< function_name_arg <<" in tf2 frame_ids cannot start with a '/' like: ";
51 -- logWarn("%s",ss.str().c_str());
52 -+ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
53 - return true;
54 - }
55 -
56 -@@ -218,26 +218,26 @@ bool BufferCore::setTransform(const geom
57 - bool error_exists = false;
58 - if (stripped.child_frame_id == stripped.header.frame_id)
59 - {
60 -- logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str());
61 -+ CONSOLE_BRIDGE_logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str());
62 - error_exists = true;
63 - }
64 -
65 - if (stripped.child_frame_id == "")
66 - {
67 -- logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
68 -+ CONSOLE_BRIDGE_logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
69 - error_exists = true;
70 - }
71 -
72 - if (stripped.header.frame_id == "")
73 - {
74 -- logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
75 -+ CONSOLE_BRIDGE_logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
76 - error_exists = true;
77 - }
78 -
79 - if (std::isnan(stripped.transform.translation.x) || std::isnan(stripped.transform.translation.y) || std::isnan(stripped.transform.translation.z)||
80 - std::isnan(stripped.transform.rotation.x) || std::isnan(stripped.transform.rotation.y) || std::isnan(stripped.transform.rotation.z) || std::isnan(stripped.transform.rotation.w))
81 - {
82 -- logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
83 -+ CONSOLE_BRIDGE_logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
84 - stripped.child_frame_id.c_str(), authority.c_str(),
85 - stripped.transform.translation.x, stripped.transform.translation.y, stripped.transform.translation.z,
86 - stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w
87 -@@ -252,7 +252,7 @@ bool BufferCore::setTransform(const geom
88 -
89 - if (!valid)
90 - {
91 -- logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
92 -+ CONSOLE_BRIDGE_logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
93 - stripped.child_frame_id.c_str(), authority.c_str(),
94 - stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w);
95 - error_exists = true;
96 -@@ -274,7 +274,7 @@ bool BufferCore::setTransform(const geom
97 - }
98 - else
99 - {
100 -- logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
101 -+ CONSOLE_BRIDGE_logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
102 - return false;
103 - }
104 - }
105 -@@ -622,7 +622,7 @@ geometry_msgs::TransformStamped BufferCo
106 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
107 - throw LookupException(error_string);
108 - default:
109 -- logError("Unknown error code: %d", retval);
110 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
111 - assert(0);
112 - }
113 - }
114 -@@ -1593,7 +1593,7 @@ void BufferCore::_chainAsVector(const st
115 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
116 - throw LookupException(error_string);
117 - default:
118 -- logError("Unknown error code: %d", retval);
119 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
120 - assert(0);
121 - }
122 - }
123 -@@ -1613,7 +1613,7 @@ void BufferCore::_chainAsVector(const st
124 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
125 - throw LookupException(error_string);
126 - default:
127 -- logError("Unknown error code: %d", retval);
128 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
129 - assert(0);
130 - }
131 - }
132
133 diff --git a/dev-ros/tf2/files/logging2.patch b/dev-ros/tf2/files/logging2.patch
134 deleted file mode 100644
135 index 38a3ee3c0bb..00000000000
136 --- a/dev-ros/tf2/files/logging2.patch
137 +++ /dev/null
138 @@ -1,98 +0,0 @@
139 -Index: tf2/src/buffer_core.cpp
140 -===================================================================
141 ---- tf2.orig/src/buffer_core.cpp
142 -+++ tf2/src/buffer_core.cpp
143 -@@ -123,7 +123,7 @@ bool BufferCore::warnFrameId(const char*
144 - {
145 - std::stringstream ss;
146 - ss << "Invalid argument passed to "<< function_name_arg <<" in tf2 frame_ids cannot be empty";
147 -- logWarn("%s",ss.str().c_str());
148 -+ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
149 - return true;
150 - }
151 -
152 -@@ -131,7 +131,7 @@ bool BufferCore::warnFrameId(const char*
153 - {
154 - std::stringstream ss;
155 - ss << "Invalid argument \"" << frame_id << "\" passed to "<< function_name_arg <<" in tf2 frame_ids cannot start with a '/' like: ";
156 -- logWarn("%s",ss.str().c_str());
157 -+ CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
158 - return true;
159 - }
160 -
161 -@@ -218,26 +218,26 @@ bool BufferCore::setTransform(const geom
162 - bool error_exists = false;
163 - if (stripped.child_frame_id == stripped.header.frame_id)
164 - {
165 -- logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str());
166 -+ CONSOLE_BRIDGE_logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id \"%s\" because they are the same", authority.c_str(), stripped.child_frame_id.c_str());
167 - error_exists = true;
168 - }
169 -
170 - if (stripped.child_frame_id == "")
171 - {
172 -- logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
173 -+ CONSOLE_BRIDGE_logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
174 - error_exists = true;
175 - }
176 -
177 - if (stripped.header.frame_id == "")
178 - {
179 -- logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
180 -+ CONSOLE_BRIDGE_logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\" from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
181 - error_exists = true;
182 - }
183 -
184 - if (std::isnan(stripped.transform.translation.x) || std::isnan(stripped.transform.translation.y) || std::isnan(stripped.transform.translation.z)||
185 - std::isnan(stripped.transform.rotation.x) || std::isnan(stripped.transform.rotation.y) || std::isnan(stripped.transform.rotation.z) || std::isnan(stripped.transform.rotation.w))
186 - {
187 -- logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
188 -+ CONSOLE_BRIDGE_logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
189 - stripped.child_frame_id.c_str(), authority.c_str(),
190 - stripped.transform.translation.x, stripped.transform.translation.y, stripped.transform.translation.z,
191 - stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w
192 -@@ -252,7 +252,7 @@ bool BufferCore::setTransform(const geom
193 -
194 - if (!valid)
195 - {
196 -- logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
197 -+ CONSOLE_BRIDGE_logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
198 - stripped.child_frame_id.c_str(), authority.c_str(),
199 - stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w);
200 - error_exists = true;
201 -@@ -274,7 +274,7 @@ bool BufferCore::setTransform(const geom
202 - }
203 - else
204 - {
205 -- logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
206 -+ CONSOLE_BRIDGE_logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
207 - return false;
208 - }
209 - }
210 -@@ -633,7 +633,7 @@ geometry_msgs::TransformStamped BufferCo
211 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
212 - throw LookupException(error_string);
213 - default:
214 -- logError("Unknown error code: %d", retval);
215 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
216 - assert(0);
217 - }
218 - }
219 -@@ -1604,7 +1604,7 @@ void BufferCore::_chainAsVector(const st
220 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
221 - throw LookupException(error_string);
222 - default:
223 -- logError("Unknown error code: %d", retval);
224 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
225 - assert(0);
226 - }
227 - }
228 -@@ -1623,7 +1623,7 @@ void BufferCore::_chainAsVector(const st
229 - case tf2_msgs::TF2Error::LOOKUP_ERROR:
230 - throw LookupException(error_string);
231 - default:
232 -- logError("Unknown error code: %d", retval);
233 -+ CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
234 - assert(0);
235 - }
236 - }
237
238 diff --git a/dev-ros/tf2/tf2-0.5.16-r1.ebuild b/dev-ros/tf2/tf2-0.5.16-r1.ebuild
239 deleted file mode 100644
240 index 55afc005d04..00000000000
241 --- a/dev-ros/tf2/tf2-0.5.16-r1.ebuild
242 +++ /dev/null
243 @@ -1,26 +0,0 @@
244 -# Copyright 1999-2017 Gentoo Foundation
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=5
248 -ROS_REPO_URI="https://github.com/ros/geometry2"
249 -KEYWORDS="~amd64 ~arm"
250 -ROS_SUBDIR=${PN}
251 -
252 -inherit ros-catkin
253 -
254 -DESCRIPTION="The second generation Transform Library in ROS"
255 -LICENSE="BSD"
256 -SLOT="0"
257 -IUSE=""
258 -
259 -RDEPEND="
260 - dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
261 - dev-libs/console_bridge:=
262 - dev-ros/rostime
263 - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
264 - dev-libs/boost:=[threads]
265 -"
266 -DEPEND="${RDEPEND}
267 - test? ( dev-ros/roscpp )
268 -"
269 -PATCHES=( "${FILESDIR}/logging.patch" )
270
271 diff --git a/dev-ros/tf2/tf2-0.5.17.ebuild b/dev-ros/tf2/tf2-0.5.17.ebuild
272 deleted file mode 100644
273 index 775ef1258bc..00000000000
274 --- a/dev-ros/tf2/tf2-0.5.17.ebuild
275 +++ /dev/null
276 @@ -1,26 +0,0 @@
277 -# Copyright 1999-2018 Gentoo Foundation
278 -# Distributed under the terms of the GNU General Public License v2
279 -
280 -EAPI=5
281 -ROS_REPO_URI="https://github.com/ros/geometry2"
282 -KEYWORDS="~amd64 ~arm"
283 -ROS_SUBDIR=${PN}
284 -
285 -inherit ros-catkin
286 -
287 -DESCRIPTION="The second generation Transform Library in ROS"
288 -LICENSE="BSD"
289 -SLOT="0"
290 -IUSE=""
291 -
292 -RDEPEND="
293 - dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
294 - dev-libs/console_bridge:=
295 - dev-ros/rostime
296 - dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
297 - dev-libs/boost:=[threads]
298 -"
299 -DEPEND="${RDEPEND}
300 - test? ( dev-ros/roscpp )
301 -"
302 -PATCHES=( "${FILESDIR}/logging2.patch" )
Report Message
Find on MARC Find on Google Groups