From 767185cf4f64a87abeb81e376141d31501c42279 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 19 Mar 2017 15:08:19 +0100 Subject: [PATCH] robot-model: updating to 1.11.12 Due to the update, this commit also drops the urdf patch, which is now included in the released version. Signed-off-by: Lukas Bulwahn --- ...r_1.11.11.bb => collada-parser_1.11.12.bb} | 0 ...rdf_1.11.11.bb => collada-urdf_1.11.12.bb} | 0 ...11.bb => joint-state-publisher_1.11.12.bb} | 0 recipes-ros/robot-model/robot-model.inc | 4 +- ...11.11.bb => urdf-parser-plugin_1.11.12.bb} | 0 ...ddress-gcc6-build-error-and-tune-156.patch | 56 ------------------- .../{urdf_1.11.11.bb => urdf_1.11.12.bb} | 2 - 7 files changed, 2 insertions(+), 60 deletions(-) rename recipes-ros/robot-model/{collada-parser_1.11.11.bb => collada-parser_1.11.12.bb} (100%) rename recipes-ros/robot-model/{collada-urdf_1.11.11.bb => collada-urdf_1.11.12.bb} (100%) rename recipes-ros/robot-model/{joint-state-publisher_1.11.11.bb => joint-state-publisher_1.11.12.bb} (100%) rename recipes-ros/robot-model/{urdf-parser-plugin_1.11.11.bb => urdf-parser-plugin_1.11.12.bb} (100%) delete mode 100644 recipes-ros/robot-model/urdf/0001-urdf-address-gcc6-build-error-and-tune-156.patch rename recipes-ros/robot-model/{urdf_1.11.11.bb => urdf_1.11.12.bb} (86%) diff --git a/recipes-ros/robot-model/collada-parser_1.11.11.bb b/recipes-ros/robot-model/collada-parser_1.11.12.bb similarity index 100% rename from recipes-ros/robot-model/collada-parser_1.11.11.bb rename to recipes-ros/robot-model/collada-parser_1.11.12.bb diff --git a/recipes-ros/robot-model/collada-urdf_1.11.11.bb b/recipes-ros/robot-model/collada-urdf_1.11.12.bb similarity index 100% rename from recipes-ros/robot-model/collada-urdf_1.11.11.bb rename to recipes-ros/robot-model/collada-urdf_1.11.12.bb diff --git a/recipes-ros/robot-model/joint-state-publisher_1.11.11.bb b/recipes-ros/robot-model/joint-state-publisher_1.11.12.bb similarity index 100% rename from recipes-ros/robot-model/joint-state-publisher_1.11.11.bb rename to recipes-ros/robot-model/joint-state-publisher_1.11.12.bb diff --git a/recipes-ros/robot-model/robot-model.inc b/recipes-ros/robot-model/robot-model.inc index 344eb10..d75e420 100644 --- a/recipes-ros/robot-model/robot-model.inc +++ b/recipes-ros/robot-model/robot-model.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "1cf720ba817ec0db2172d87030c9ad5e" -SRC_URI[sha256sum] = "29e9ea1c4f76188d369ebde8e94adcdf92260bd9f6d766ce533dbd91e40ee356" +SRC_URI[md5sum] = "feb4e2d49ba8e4607524d4e91aeec4c9" +SRC_URI[sha256sum] = "6313abe64e29fbbe87d8e108c13ccd075de4ff8f01b85f988716b9475d312112" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/robot-model/urdf-parser-plugin_1.11.11.bb b/recipes-ros/robot-model/urdf-parser-plugin_1.11.12.bb similarity index 100% rename from recipes-ros/robot-model/urdf-parser-plugin_1.11.11.bb rename to recipes-ros/robot-model/urdf-parser-plugin_1.11.12.bb diff --git a/recipes-ros/robot-model/urdf/0001-urdf-address-gcc6-build-error-and-tune-156.patch b/recipes-ros/robot-model/urdf/0001-urdf-address-gcc6-build-error-and-tune-156.patch deleted file mode 100644 index c9846bb..0000000 --- a/recipes-ros/robot-model/urdf/0001-urdf-address-gcc6-build-error-and-tune-156.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6b9e3cab6b09c9b65a7bef1374e079a87711a473 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Wed, 21 Sep 2016 21:22:30 +0200 -Subject: [PATCH] [urdf] address gcc6 build error and tune (#156) - -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 - -Upstream-Status: Accepted [https://github.com/ros/robot_model/commit/6b9e3cab6b09c9b65a7bef1374e079a87711a473] - -This patch has been generated with: - `git format-patch -1 6b9e3cab6b09c9b65a7bef1374e079a87711a473` -in the robot_model repository. - -Signed-off-by: Lukas Bulwahn ---- - urdf/CMakeLists.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt -index ae7437e..a0872e9 100644 ---- a/urdf/CMakeLists.txt -+++ b/urdf/CMakeLists.txt -@@ -20,17 +20,16 @@ catkin_package( - DEPENDS urdfdom_headers urdfdom Boost pcrecpp - ) - --include_directories(SYSTEM ${Boost_INCLUDE_DIR}) --link_directories(${Boost_LIBRARY_DIRS}) -- - include_directories( - include -+ ${Boost_INCLUDE_DIR} - ${catkin_INCLUDE_DIRS} - ${urdfdom_INCLUDE_DIRS} - ${urdfdom_headers_INCLUDE_DIRS} - ${TinyXML_INCLUDE_DIRS} - ) --link_directories(${catkin_LIBRARY_DIRS}) -+ -+link_directories(${Boost_LIBRARY_DIRS} ${catkin_LIBRARY_DIRS}) - - add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp) - target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES}) --- -2.5.5 - diff --git a/recipes-ros/robot-model/urdf_1.11.11.bb b/recipes-ros/robot-model/urdf_1.11.12.bb similarity index 86% rename from recipes-ros/robot-model/urdf_1.11.11.bb rename to recipes-ros/robot-model/urdf_1.11.12.bb index fe1504e..99d6b5a 100644 --- a/recipes-ros/robot-model/urdf_1.11.11.bb +++ b/recipes-ros/robot-model/urdf_1.11.12.bb @@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9de DEPENDS = "rosconsole-bridge roscpp urdfdom-headers urdf-parser-plugin pluginlib urdfdom cmake-modules libtinyxml class-loader" require robot-model.inc - -SRC_URI += "file://0001-urdf-address-gcc6-build-error-and-tune-156.patch;striplevel=2"