[ros-robot-model] 03/05: Rebase patches
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Tue Sep 20 17:15:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to annotated tag debian/1.12.4-1
in repository ros-robot-model.
commit 9e038011f4959e01f54413fe4fed9feca4bdd6ca
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Tue Sep 20 18:20:22 2016 +0200
Rebase patches
---
.../0002-Add-Debian-specific-SOVERSION.patch | 4 ++--
...urdf-ShredPtr-instead-of-boost-shared_ptr.patch | 28 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index 0ead51c..379f507 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -22,10 +22,10 @@ index 43ed0c8..2ff275e 100644
# build the plugin for the parser
add_library(${PROJECT_NAME}_plugin src/collada_parser_plugin.cpp)
diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
-index 524f2e9..756c39c 100644
+index 113dee0..cedede0 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
-@@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} $
+@@ -64,6 +64,7 @@ target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} $
${Boost_LIBRARIES} ${ASSIMP_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
diff --git a/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch b/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
index 8d3565c..87d55a7 100644
--- a/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
+++ b/debian/patches/0003-Use-urdf-ShredPtr-instead-of-boost-shared_ptr.patch
@@ -334,10 +334,10 @@ index 3a4d6e6..14e9741 100644
{
ROS_DEBUG("Parsing robot collada xml string");
diff --git a/collada_urdf/src/collada_urdf.cpp b/collada_urdf/src/collada_urdf.cpp
-index 712328e..4fe51d0 100644
+index e6bfebe..fc1a720 100644
--- a/collada_urdf/src/collada_urdf.cpp
+++ b/collada_urdf/src/collada_urdf.cpp
-@@ -538,7 +538,7 @@ private:
+@@ -544,7 +544,7 @@ private:
domInstance_with_extraRef piscene;
};
@@ -346,7 +346,7 @@ index 712328e..4fe51d0 100644
struct LINKOUTPUT
{
list<pair<int,string> > listusedlinks;
-@@ -562,7 +562,7 @@ private:
+@@ -568,7 +568,7 @@ private:
axis_output() : iaxis(0) {
}
string sid, nodesid;
@@ -355,7 +355,7 @@ index 712328e..4fe51d0 100644
int iaxis;
string jointnodesid;
};
-@@ -788,7 +788,7 @@ protected:
+@@ -794,7 +794,7 @@ protected:
for(size_t idof = 0; idof < _ikmout->vaxissids.size(); ++idof) {
string axis_infosid = _ComputeId(str(boost::format("axis_info_inst%d")%idof));
@@ -364,7 +364,7 @@ index 712328e..4fe51d0 100644
BOOST_ASSERT(_mapjointindices[pjoint] == (int)idof);
//int iaxis = _ikmout->kmout->vaxissids.at(idof).iaxis;
-@@ -966,7 +966,7 @@ protected:
+@@ -972,7 +972,7 @@ protected:
kmout->vlinksids.resize(_robot.links_.size());
FOREACHC(itjoint, _robot.joints_) {
@@ -373,7 +373,7 @@ index 712328e..4fe51d0 100644
int index = _mapjointindices[itjoint->second];
domJointRef pdomjoint = daeSafeCast<domJoint>(ktec->add(COLLADA_ELEMENT_JOINT));
string jointid = _ComputeId(pjoint->name); //str(boost::format("joint%d")%index);
-@@ -1039,7 +1039,7 @@ protected:
+@@ -1045,7 +1045,7 @@ protected:
// create the formulas for all mimic joints
FOREACHC(itjoint, _robot.joints_) {
string jointsid = _ComputeId(itjoint->second->name);
@@ -382,7 +382,7 @@ index 712328e..4fe51d0 100644
if( !pjoint->mimic ) {
continue;
}
-@@ -1125,7 +1125,7 @@ protected:
+@@ -1131,7 +1131,7 @@ protected:
/// \param pkinparent Kinbody parent
/// \param pnodeparent Node parent
/// \param strModelUri
@@ -391,7 +391,7 @@ index 712328e..4fe51d0 100644
{
LINKOUTPUT out;
int linkindex = _maplinkindices[plink];
-@@ -1141,8 +1141,8 @@ protected:
+@@ -1147,8 +1147,8 @@ protected:
pnode->setSid(nodesid.c_str());
pnode->setName(plink->name.c_str());
@@ -402,7 +402,7 @@ index 712328e..4fe51d0 100644
urdf::Pose geometry_origin;
if( !!plink->visual ) {
geometry = plink->visual->geometry;
-@@ -1161,7 +1161,7 @@ protected:
+@@ -1167,7 +1167,7 @@ protected:
if ( !!plink->visual ) {
if (plink->visual_array.size() > 1) {
int igeom = 0;
@@ -411,7 +411,7 @@ index 712328e..4fe51d0 100644
it != plink->visual_array.end(); it++) {
// geom
string geomid = _ComputeId(str(boost::format("g%s_%s_geom%d")%strModelUri%linksid%igeom));
-@@ -1208,7 +1208,7 @@ protected:
+@@ -1214,7 +1214,7 @@ protected:
// process all children
FOREACHC(itjoint, plink->child_joints) {
@@ -420,7 +420,7 @@ index 712328e..4fe51d0 100644
int index = _mapjointindices[pjoint];
// <attachment_full joint="k1/joint0">
-@@ -1269,7 +1269,7 @@ protected:
+@@ -1275,7 +1275,7 @@ protected:
return out;
}
@@ -429,7 +429,7 @@ index 712328e..4fe51d0 100644
{
domGeometryRef cgeometry = daeSafeCast<domGeometry>(_geometriesLib->add(COLLADA_ELEMENT_GEOMETRY));
cgeometry->setId(geometry_id.c_str());
-@@ -1308,7 +1308,7 @@ protected:
+@@ -1314,7 +1314,7 @@ protected:
return cgeometry;
}
@@ -438,7 +438,7 @@ index 712328e..4fe51d0 100644
{
string effid = geometry_id+string("_eff");
string matid = geometry_id+string("_mat");
-@@ -1386,7 +1386,7 @@ protected:
+@@ -1392,7 +1392,7 @@ protected:
rigid_body->setSid(rigidsid.c_str());
rigid_body->setName(itlink->second->name.c_str());
domRigid_body::domTechnique_commonRef ptec = daeSafeCast<domRigid_body::domTechnique_common>(rigid_body->add(COLLADA_ELEMENT_TECHNIQUE_COMMON));
@@ -447,7 +447,7 @@ index 712328e..4fe51d0 100644
if( !!inertial ) {
daeSafeCast<domRigid_body::domTechnique_common::domDynamic>(ptec->add(COLLADA_ELEMENT_DYNAMIC))->setValue(xsBoolean(true)); //!!inertial));
domTargetable_floatRef mass = daeSafeCast<domTargetable_float>(ptec->add(COLLADA_ELEMENT_MASS));
-@@ -1916,9 +1916,9 @@ private:
+@@ -1922,9 +1922,9 @@ private:
boost::shared_ptr<instance_kinematics_model_output> _ikmout;
boost::shared_ptr<instance_articulated_system_output> _iasout;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-robot-model.git
More information about the debian-science-commits
mailing list