diff --git a/recipes-ros/control-toolbox/control-toolbox_1.13.2.bb b/recipes-ros/control-toolbox/control-toolbox_1.13.3.bb similarity index 78% rename from recipes-ros/control-toolbox/control-toolbox_1.13.2.bb rename to recipes-ros/control-toolbox/control-toolbox_1.13.3.bb index 3cadefb..f3558e6 100644 --- a/recipes-ros/control-toolbox/control-toolbox_1.13.2.bb +++ b/recipes-ros/control-toolbox/control-toolbox_1.13.3.bb @@ -7,8 +7,8 @@ DEPENDS = "rosconsole tf roscpp angles message-generation dynamic-reconfigure li realtime-tools message-filters ${PYTHON_PN}-rospkg" SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "40bc1f04e5936b7fee824f6717702a62" -SRC_URI[sha256sum] = "270f9df4c8f64b629b873ada6dec202c90da24f3060c8e0e337e9e2528c29064" +SRC_URI[md5sum] = "3df0a768373bdf0b6297a4246ef4885b" +SRC_URI[sha256sum] = "36d5df7dfc205be97672ed29dca80acf10c3a156966ce4d5ea84069ec6d5823f" S = "${WORKDIR}/${ROS_SP}" diff --git a/recipes-ros/ros-canopen/can-msgs_0.6.8.bb b/recipes-ros/ros-canopen/can-msgs_0.6.9.bb similarity index 100% rename from recipes-ros/ros-canopen/can-msgs_0.6.8.bb rename to recipes-ros/ros-canopen/can-msgs_0.6.9.bb diff --git a/recipes-ros/ros-canopen/ros-canopen.inc b/recipes-ros/ros-canopen/ros-canopen.inc index bcf6e83..71bc27c 100644 --- a/recipes-ros/ros-canopen/ros-canopen.inc +++ b/recipes-ros/ros-canopen/ros-canopen.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-industrial/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "dfee31155f203178be7a7d537a75f162" -SRC_URI[sha256sum] = "ea66ce536c2f64c0bb3642d7c91df8e3f2e9b54e6ca102c97d6c7429becc8b85" +SRC_URI[md5sum] = "d1627c81221dfd88bfcf960914856e7b" +SRC_URI[sha256sum] = "d91b854d3cfed6d996a44c79d6978e335459d97dd5b467516839df5c71dc510d" S = "${WORKDIR}/${ROS_SPN}-${PV}/${ROS_BPN}" diff --git a/recipes-ros/ros-canopen/socketcan-bridge_0.6.8.bb b/recipes-ros/ros-canopen/socketcan-bridge_0.6.9.bb similarity index 100% rename from recipes-ros/ros-canopen/socketcan-bridge_0.6.8.bb rename to recipes-ros/ros-canopen/socketcan-bridge_0.6.9.bb diff --git a/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch b/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch deleted file mode 100644 index bd46789..0000000 --- a/recipes-ros/ros-canopen/socketcan-interface/0001-explicitly-include-iostream-to-compile-with-boost-1..patch +++ /dev/null @@ -1,58 +0,0 @@ -From 221747309d445a38412c2bb97c4b06e301ea7136 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Sat, 2 Dec 2017 09:17:02 +0100 -Subject: [PATCH] explicitly include iostream to compile with boost >= 1.65.0 - -When compiling with boost version >= 1.65.0, it fails with: -``` -In file included from /[...]/include/socketcan_interface/asio_base.h:4:0, - from /[...]/include/socketcan_interface/socketcan.h:4, - from /[...]/src/socketcan_interface_plugin.cpp:2: -/[...]/include/socketcan_interface/socketcan.h: In member function 'virtual bool can::SocketCANInterface::enqueue(const can::Frame&)': -/[...]/include/socketcan_interface/interface.h:202:96: error: 'cout' is not a member of 'std' - #define LOG(log) { boost::mutex::scoped_lock _cout_lock(_cout_wrapper::get_cout_mutex()); std::cout << log << std::endl; } - ^ -/[...]/include/socketcan_interface/socketcan.h:183:13: note: in expansion of macro 'LOG' - LOG("FAILED " << ec); - ^ -/[...]/include/socketcan_interface/interface.h:202:96: note: suggested alternative: 'count' -``` - -With boost version < 1.65.0, iostream is probably included by the -boost dependencies in the header files; with boost version >= 1.65.0, -it is not included anymore and hence leads to this compile error. - -The issue was identified by the work on meta-ros, the OpenEmbedded -layer for ROS [1,2]. It provides a cross-compilation tool chain for -ROS packages and its current master version already uses boost -version 1.65.1. - -[1] https://github.com/bmwcarit/meta-ros -[2] https://github.com/bulwahn/meta-ros/pull/8 - -Signed-off-by: Lukas Bulwahn - -Upstream-Status: Accepted [https://github.com/ros-industrial/ros_canopen/commit/3bf9d9726b278b000a829f639af21d423a38798a] - -This patch has been generated with: - `git format-patch -1 3bf9d9726b278b000a829f639af21d423a38798a` -in the ros_canopen repository. - -Signed-off-by: Lukas Bulwahn - ---- - socketcan_interface/include/socketcan_interface/interface.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/socketcan_interface/include/socketcan_interface/interface.h b/socketcan_interface/include/socketcan_interface/interface.h -index a78a392..0912bc7 100644 ---- a/socketcan_interface/include/socketcan_interface/interface.h -+++ b/socketcan_interface/include/socketcan_interface/interface.h -@@ -190,6 +190,7 @@ public: - - } // namespace can - -+#include - #include - - struct _cout_wrapper{ diff --git a/recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb b/recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb similarity index 89% rename from recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb rename to recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb index 34a9e0c..2ca45f3 100644 --- a/recipes-ros/ros-canopen/socketcan-interface_0.6.8.bb +++ b/recipes-ros/ros-canopen/socketcan-interface_0.6.9.bb @@ -7,7 +7,6 @@ DEPENDS = "boost class-loader virtual/kernel" require ros-canopen.inc -SRC_URI += "file://0001-explicitly-include-iostream-to-compile-with-boost-1..patch;striplevel=2" SRC_URI += "file://0001-find-and-link-the-thread-library-properly.patch;striplevel=2" SRC_URI += "file://0001-compile-also-with-boost-1.66.0.patch;striplevel=2" diff --git a/recipes-ros/ros-control/controller-interface_0.9.6.bb b/recipes-ros/ros-control/controller-interface_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/controller-interface_0.9.6.bb rename to recipes-ros/ros-control/controller-interface_0.9.7.bb diff --git a/recipes-ros/ros-control/controller-manager-msgs_0.9.6.bb b/recipes-ros/ros-control/controller-manager-msgs_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/controller-manager-msgs_0.9.6.bb rename to recipes-ros/ros-control/controller-manager-msgs_0.9.7.bb diff --git a/recipes-ros/ros-control/controller-manager-tests_0.9.6.bb b/recipes-ros/ros-control/controller-manager-tests_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/controller-manager-tests_0.9.6.bb rename to recipes-ros/ros-control/controller-manager-tests_0.9.7.bb diff --git a/recipes-ros/ros-control/controller-manager_0.9.6.bb b/recipes-ros/ros-control/controller-manager_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/controller-manager_0.9.6.bb rename to recipes-ros/ros-control/controller-manager_0.9.7.bb diff --git a/recipes-ros/ros-control/hardware-interface_0.9.6.bb b/recipes-ros/ros-control/hardware-interface_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/hardware-interface_0.9.6.bb rename to recipes-ros/ros-control/hardware-interface_0.9.7.bb diff --git a/recipes-ros/ros-control/joint-limits-interface_0.9.6.bb b/recipes-ros/ros-control/joint-limits-interface_0.9.7.bb similarity index 80% rename from recipes-ros/ros-control/joint-limits-interface_0.9.6.bb rename to recipes-ros/ros-control/joint-limits-interface_0.9.7.bb index 3fd2274..9ede5a7 100644 --- a/recipes-ros/ros-control/joint-limits-interface_0.9.6.bb +++ b/recipes-ros/ros-control/joint-limits-interface_0.9.7.bb @@ -3,6 +3,6 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "roscpp hardware-interface urdfdom" +DEPENDS = "roscpp hardware-interface urdf urdfdom" require ros-control.inc diff --git a/recipes-ros/ros-control/ros-control.inc b/recipes-ros/ros-control/ros-control.inc index d70c43c..e54e0e1 100644 --- a/recipes-ros/ros-control/ros-control.inc +++ b/recipes-ros/ros-control/ros-control.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "72796ec08f77fc581b4e5c7d5578d807" -SRC_URI[sha256sum] = "b0f0e7d605342b841dec1b2ce53a4d57900b96d8d6bb837093e5c2327af1141e" +SRC_URI[md5sum] = "e971e992075229c73427df703b59d298" +SRC_URI[sha256sum] = "e00d185f377a9ceec964c475954c6f701179e6f9014b21fc74df8a88258afc3f" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/ros-control/transmission-interface_0.9.6.bb b/recipes-ros/ros-control/transmission-interface_0.9.7.bb similarity index 100% rename from recipes-ros/ros-control/transmission-interface_0.9.6.bb rename to recipes-ros/ros-control/transmission-interface_0.9.7.bb