diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-22 14:00:47 +0100 |
commit | 91c0ec2d7067f6ab1ef578bd9967b32ca07eb502 (patch) | |
tree | f4c7f54d0aeb344c21de9b9d1a3f1e9826d7a64c /dev-ros/geometric_shapes | |
parent | 2bacbb3374587799c77a999f56352233a353b19e (diff) |
gentoo resync : 22.05.2018
Diffstat (limited to 'dev-ros/geometric_shapes')
-rw-r--r-- | dev-ros/geometric_shapes/Manifest | 5 | ||||
-rw-r--r-- | dev-ros/geometric_shapes/files/logging.patch | 213 | ||||
-rw-r--r-- | dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild (renamed from dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild) | 3 |
3 files changed, 3 insertions, 218 deletions
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest index edd90106b06f..971ea8532a2d 100644 --- a/dev-ros/geometric_shapes/Manifest +++ b/dev-ros/geometric_shapes/Manifest @@ -1,7 +1,6 @@ -AUX logging.patch 8504 BLAKE2B 5d1efc6613a64084c3d927b7e9e026e063de21b3e211c7f12fa26f6bc882390de47bfe7a4491f6096dd73ed73c84c2e1d4f08da9b9083351c45d910b709f02e2 SHA512 747925609a4e029344c1ba0e50fb50caf637720824aa0d086d853f9c0f5ab2ca03c98d9f1b9d79240d5b3536637ac8d604607d63613c028d1e91df6247796b4e -DIST geometric_shapes-0.5.3.tar.gz 60799 BLAKE2B 77bfde8f7b1f3e11bd4bb12c82374e34ca0efc0f75125a1c5a58d4ce797feb70b70803526f4b8cbdf651d762082a4bbcb03df5e6ace2bdc69ed84be20a963731 SHA512 13c1b85cab4d0d5d35bd010927a5fd789312b4c11667ee73295722067968504054a8f24628db2f78782078ff3cbcd6878bd403979c29526b2183c3ae2414b2b1 DIST geometric_shapes-0.5.4.tar.gz 62028 BLAKE2B 6873019c54872077ec88ad6107bdf1a69092d73bd1f73b38dbbdcd88a3e5da9cfffd0782ec2e01f87fd90082ed856e3a2f5161dec606ba08c0510752a813359c SHA512 bd0909fb0feeddebf65793aa77a6803217e39e782767cd2d58b26266ff79018ebb352c77385e20043a069caaa7e00ba63366a703d52605562e8535f1d3af2dac -EBUILD geometric_shapes-0.5.3-r1.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571 +DIST geometric_shapes-0.6.0.tar.gz 62152 BLAKE2B ebd2b6260a212e1ba3513d064d69af91fe2141e2ee696b6781829c83a5df44c9de9a9ee68c0c9354adbfc954350cde6c339529955c506e3e2c45e7eaa2a54d52 SHA512 b580f2e2acf864d3d03dd67d088d5c0d04cf8f28c1db8ebb3f4155ff9cf77af92cc268aecc41ad3d983d9e021044404af03309fb94d99162ea84d2d16681b562 EBUILD geometric_shapes-0.5.4.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a +EBUILD geometric_shapes-0.6.0.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8 diff --git a/dev-ros/geometric_shapes/files/logging.patch b/dev-ros/geometric_shapes/files/logging.patch deleted file mode 100644 index 06036ad5dcee..000000000000 --- a/dev-ros/geometric_shapes/files/logging.patch +++ /dev/null @@ -1,213 +0,0 @@ -https://github.com/ros-planning/geometric_shapes/issues/71 - -Index: geometric_shapes-0.5.3/src/bodies.cpp -=================================================================== ---- geometric_shapes-0.5.3.orig/src/bodies.cpp -+++ geometric_shapes-0.5.3/src/bodies.cpp -@@ -788,7 +788,7 @@ void bodies::ConvexMesh::useDimensions(c - - if (exitcode != 0) - { -- logWarn("Convex hull creation failed"); -+ CONSOLE_BRIDGE_logWarn("Convex hull creation failed"); - qh_freeqhull (!qh_ALL); - int curlong, totlong; - qh_memfreeshort (&curlong, &totlong); -@@ -1174,7 +1174,7 @@ void bodies::BodyVector::setPose(unsigne - { - if (i >= bodies_.size()) - { -- logError("There is no body at index %u", i); -+ CONSOLE_BRIDGE_logError("There is no body at index %u", i); - return; - } - -@@ -1185,7 +1185,7 @@ const bodies::Body* bodies::BodyVector:: - { - if (i >= bodies_.size()) - { -- logError("There is no body at index %u", i); -+ CONSOLE_BRIDGE_logError("There is no body at index %u", i); - return NULL; - } - else -Index: geometric_shapes-0.5.3/src/body_operations.cpp -=================================================================== ---- geometric_shapes-0.5.3.orig/src/body_operations.cpp -+++ geometric_shapes-0.5.3/src/body_operations.cpp -@@ -59,7 +59,7 @@ bodies::Body* bodies::createBodyFromShap - body = new bodies::ConvexMesh(shape); - break; - default: -- logError("Creating body from shape: Unknown shape type %d", (int)shape->type); -+ CONSOLE_BRIDGE_logError("Creating body from shape: Unknown shape type %d", (int)shape->type); - break; - } - -@@ -112,7 +112,7 @@ Body* constructBodyFromMsgHelper(const T - Eigen::Quaterniond q(pose.orientation.w, pose.orientation.x, pose.orientation.y, pose.orientation.z); - if (fabs(q.squaredNorm() - 1.0) > 1e-3) - { -- logError("Quaternion is not normalized. Assuming identity."); -+ CONSOLE_BRIDGE_logError("Quaternion is not normalized. Assuming identity."); - q = Eigen::Quaterniond(1.0, 0.0, 0.0, 0.0); - } - Eigen::Affine3d af(Eigen::Translation3d(pose.position.x, pose.position.y, pose.position.z) * q.toRotationMatrix()); -Index: geometric_shapes-0.5.3/src/mesh_operations.cpp -=================================================================== ---- geometric_shapes-0.5.3.orig/src/mesh_operations.cpp -+++ geometric_shapes-0.5.3/src/mesh_operations.cpp -@@ -133,7 +133,7 @@ Mesh* createMeshFromVertices(const Eigen - return NULL; - - if (source.size() % 3 != 0) -- logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense."); -+ CONSOLE_BRIDGE_logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense."); - - std::set<detail::LocalVertexType, detail::ltLocalVertexValue> vertices; - std::vector<unsigned int> triangles; -@@ -220,7 +220,7 @@ Mesh* createMeshFromBinary(const char *b - { - if (!buffer || size < 1) - { -- logWarn("Cannot construct mesh from empty binary buffer"); -+ CONSOLE_BRIDGE_logWarn("Cannot construct mesh from empty binary buffer"); - return NULL; - } - -@@ -285,21 +285,21 @@ Mesh* createMeshFromResource(const std:: - } - catch (resource_retriever::Exception& e) - { -- logError("%s", e.what()); -+ CONSOLE_BRIDGE_logError("%s", e.what()); - return NULL; - } - - if (res.size == 0) - { -- logWarn("Retrieved empty mesh for resource '%s'", resource.c_str()); -+ CONSOLE_BRIDGE_logWarn("Retrieved empty mesh for resource '%s'", resource.c_str()); - return NULL; - } - - Mesh *m = createMeshFromBinary(reinterpret_cast<const char*>(res.data.get()), res.size, scale, resource); - if (!m) - { -- logWarn("Assimp reports no scene in %s.", resource.c_str()); -- logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path."); -+ CONSOLE_BRIDGE_logWarn("Assimp reports no scene in %s.", resource.c_str()); -+ CONSOLE_BRIDGE_logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path."); - } - return m; - } -@@ -344,7 +344,7 @@ Mesh* createMeshFromAsset(const aiScene* - { - if (!scene->HasMeshes()) - { -- logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str()); -+ CONSOLE_BRIDGE_logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str()); - return NULL; - } - EigenSTL::vector_Vector3d vertices; -@@ -352,12 +352,12 @@ Mesh* createMeshFromAsset(const aiScene* - extractMeshData(scene, scene->mRootNode, aiMatrix4x4(), scale, vertices, triangles); - if (vertices.empty()) - { -- logWarn("There are no vertices in the scene %s", resource_name.c_str()); -+ CONSOLE_BRIDGE_logWarn("There are no vertices in the scene %s", resource_name.c_str()); - return NULL; - } - if (triangles.empty()) - { -- logWarn("There are no triangles in the scene %s", resource_name.c_str()); -+ CONSOLE_BRIDGE_logWarn("There are no triangles in the scene %s", resource_name.c_str()); - return NULL; - } - -@@ -378,7 +378,7 @@ Mesh* createMeshFromShape(const Shape *s - if (shape->type == shapes::CONE) - return shapes::createMeshFromShape(static_cast<const shapes::Cone&>(*shape)); - else -- logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str()); -+ CONSOLE_BRIDGE_logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str()); - return NULL; - } - -Index: geometric_shapes-0.5.3/src/shape_operations.cpp -=================================================================== ---- geometric_shapes-0.5.3.orig/src/shape_operations.cpp -+++ geometric_shapes-0.5.3/src/shape_operations.cpp -@@ -62,7 +62,7 @@ Shape* constructShapeFromMsg(const shape - { - if (shape_msg.triangles.empty() || shape_msg.vertices.empty()) - { -- logWarn("Mesh definition is empty"); -+ CONSOLE_BRIDGE_logWarn("Mesh definition is empty"); - return NULL; - } - else -@@ -117,7 +117,7 @@ Shape* constructShapeFromMsg(const shape - shape_msg.dimensions[shape_msgs::SolidPrimitive::CONE_HEIGHT]); - } - if (shape == NULL) -- logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type); -+ CONSOLE_BRIDGE_logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type); - - return shape; - } -@@ -202,7 +202,7 @@ bool constructMarkerFromShape(const Shap - } - catch (std::runtime_error &ex) - { -- logError("%s", ex.what()); -+ CONSOLE_BRIDGE_logError("%s", ex.what()); - } - if (ok) - return true; -@@ -451,7 +451,7 @@ bool constructMsgFromShape(const Shape* - } - else - { -- logError("Unable to construct shape message for shape of type %d", (int)shape->type); -+ CONSOLE_BRIDGE_logError("Unable to construct shape message for shape of type %d", (int)shape->type); - return false; - } - -@@ -512,7 +512,7 @@ void saveAsText(const Shape *shape, std: - } - else - { -- logError("Unable to save shape of type %d", (int)shape->type); -+ CONSOLE_BRIDGE_logError("Unable to save shape of type %d", (int)shape->type); - } - } - -@@ -580,7 +580,7 @@ Shape* constructShapeFromText(std::istre - m->computeVertexNormals(); - } - else -- logError("Unknown shape type: '%s'", type.c_str()); -+ CONSOLE_BRIDGE_logError("Unknown shape type: '%s'", type.c_str()); - } - } - return result; -Index: geometric_shapes-0.5.3/src/shapes.cpp -=================================================================== ---- geometric_shapes-0.5.3.orig/src/shapes.cpp -+++ geometric_shapes-0.5.3/src/shapes.cpp -@@ -224,12 +224,12 @@ shapes::Shape* shapes::OcTree::clone() c - - void shapes::OcTree::scaleAndPadd(double scale, double padd) - { -- logWarn("OcTrees cannot be scaled or padded"); -+ CONSOLE_BRIDGE_logWarn("OcTrees cannot be scaled or padded"); - } - - void shapes::Plane::scaleAndPadd(double scale, double padding) - { -- logWarn("Planes cannot be scaled or padded"); -+ CONSOLE_BRIDGE_logWarn("Planes cannot be scaled or padded"); - } - - void shapes::Shape::scale(double scale) diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild index 54b4e296f9f0..80708cfa63ea 100644 --- a/dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild +++ b/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -28,4 +28,3 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-cpp/gtest dev-ros/rosunit ) " -PATCHES=( "${FILESDIR}/logging.patch" ) |