From 79ecc9267c23dc0c75837aa729bd2c0fa85b57ee Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sat, 1 Jul 2017 09:46:34 +0200 Subject: [PATCH] ecl-core: updating to 0.61.18 Due to the update, this commit drops the patch for ecl-containers that has been included in the current upstream version. Signed-off-by: Lukas Bulwahn --- ...0.61.17.bb => ecl-command-line_0.61.18.bb} | 0 ...pts_0.61.17.bb => ecl-concepts_0.61.18.bb} | 0 ...iners-Fix-gcc-v7.1-compilation-issue.patch | 34 ------------------- ...s_0.61.17.bb => ecl-containers_0.61.18.bb} | 2 -- ...s_0.61.17.bb => ecl-converters_0.61.18.bb} | 0 ...ps_0.61.17.bb => ecl-core-apps_0.61.18.bb} | 0 recipes-ros/ecl-core/ecl-core.inc | 4 +-- ...ices_0.61.17.bb => ecl-devices_0.61.18.bb} | 0 ...-eigen_0.61.17.bb => ecl-eigen_0.61.18.bb} | 0 ...s_0.61.17.bb => ecl-exceptions_0.61.18.bb} | 0 ...m_0.61.17.bb => ecl-filesystem_0.61.18.bb} | 0 ...s_0.61.17.bb => ecl-formatters_0.61.18.bb} | 0 ...try_0.61.17.bb => ecl-geometry_0.61.18.bb} | 0 ...{ecl-ipc_0.61.17.bb => ecl-ipc_0.61.18.bb} | 0 ...61.17.bb => ecl-linear-algebra_0.61.18.bb} | 0 ...cl-math_0.61.17.bb => ecl-math_0.61.18.bb} | 0 ...{ecl-mpl_0.61.17.bb => ecl-mpl_0.61.18.bb} | 0 ...ots_0.61.17.bb => ecl-sigslots_0.61.18.bb} | 0 ...s_0.61.17.bb => ecl-statistics_0.61.18.bb} | 0 ...eams_0.61.17.bb => ecl-streams_0.61.18.bb} | 0 ...eads_0.61.17.bb => ecl-threads_0.61.18.bb} | 0 ...cl-time_0.61.17.bb => ecl-time_0.61.18.bb} | 0 ..._0.61.17.bb => ecl-type-traits_0.61.18.bb} | 0 ...es_0.61.17.bb => ecl-utilities_0.61.18.bb} | 0 24 files changed, 2 insertions(+), 38 deletions(-) rename recipes-ros/ecl-core/{ecl-command-line_0.61.17.bb => ecl-command-line_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-concepts_0.61.17.bb => ecl-concepts_0.61.18.bb} (100%) delete mode 100644 recipes-ros/ecl-core/ecl-containers/0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch rename recipes-ros/ecl-core/{ecl-containers_0.61.17.bb => ecl-containers_0.61.18.bb} (80%) rename recipes-ros/ecl-core/{ecl-converters_0.61.17.bb => ecl-converters_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-core-apps_0.61.17.bb => ecl-core-apps_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-devices_0.61.17.bb => ecl-devices_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-eigen_0.61.17.bb => ecl-eigen_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-exceptions_0.61.17.bb => ecl-exceptions_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-filesystem_0.61.17.bb => ecl-filesystem_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-formatters_0.61.17.bb => ecl-formatters_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-geometry_0.61.17.bb => ecl-geometry_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-ipc_0.61.17.bb => ecl-ipc_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-linear-algebra_0.61.17.bb => ecl-linear-algebra_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-math_0.61.17.bb => ecl-math_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-mpl_0.61.17.bb => ecl-mpl_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-sigslots_0.61.17.bb => ecl-sigslots_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-statistics_0.61.17.bb => ecl-statistics_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-streams_0.61.17.bb => ecl-streams_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-threads_0.61.17.bb => ecl-threads_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-time_0.61.17.bb => ecl-time_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-type-traits_0.61.17.bb => ecl-type-traits_0.61.18.bb} (100%) rename recipes-ros/ecl-core/{ecl-utilities_0.61.17.bb => ecl-utilities_0.61.18.bb} (100%) diff --git a/recipes-ros/ecl-core/ecl-command-line_0.61.17.bb b/recipes-ros/ecl-core/ecl-command-line_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-command-line_0.61.17.bb rename to recipes-ros/ecl-core/ecl-command-line_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-concepts_0.61.17.bb b/recipes-ros/ecl-core/ecl-concepts_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-concepts_0.61.17.bb rename to recipes-ros/ecl-core/ecl-concepts_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-containers/0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch b/recipes-ros/ecl-core/ecl-containers/0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch deleted file mode 100644 index 90ce44a..0000000 --- a/recipes-ros/ecl-core/ecl-containers/0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f40c9b006c70326bcfca73daebb54187a65aa5e Mon Sep 17 00:00:00 2001 -From: Dmitry Rozhkov -Date: Mon, 26 Jun 2017 17:05:01 +0300 -Subject: [PATCH] [ecl_containers] Fix gcc v7.1 compilation issue - -When built with gcc v7.1 compilation fails with an error message -about using an expression as a function when updating -the private attribute FloatContainerFormatter.prm_width. - -The patch uses assignment to update the attribute. - -Upstream-Status: Accepted [https://github.com/stonier/ecl_core/pull/58] - -Signed-off-by: Dmitry Rozhkov ---- - ecl_containers/include/ecl/containers/common/formatters.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ecl_containers/include/ecl/containers/common/formatters.hpp b/ecl_containers/include/ecl/containers/common/formatters.hpp -index e26ec60..5f4c026 100644 ---- a/ecl_containers/include/ecl/containers/common/formatters.hpp -+++ b/ecl_containers/include/ecl/containers/common/formatters.hpp -@@ -123,7 +123,7 @@ class ECL_LOCAL FloatContainerFormatter { - * @param w : the width to use for the inserted float. - * @return FloatContainerFormatter& : this formatter readied for use with a stream. - */ -- FloatContainerFormatter& operator()(const unsigned int p, const int w) { format.precision(p); prm_width(w); return *this; } // Permanent -+ FloatContainerFormatter& operator()(const unsigned int p, const int w) { format.precision(p); prm_width = w; return *this; } // Permanent - /** - * Convenient stream formatter. This function directly readies the formatter - * with the specified container and the stored (permanent) settings. --- -2.9.3 - diff --git a/recipes-ros/ecl-core/ecl-containers_0.61.17.bb b/recipes-ros/ecl-core/ecl-containers_0.61.18.bb similarity index 80% rename from recipes-ros/ecl-core/ecl-containers_0.61.17.bb rename to recipes-ros/ecl-core/ecl-containers_0.61.18.bb index ff99a30..39f31cf 100644 --- a/recipes-ros/ecl-core/ecl-containers_0.61.17.bb +++ b/recipes-ros/ecl-core/ecl-containers_0.61.18.bb @@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de DEPENDS = "ecl-license ecl-config ecl-errors ecl-exceptions ecl-formatters ecl-converters ecl-mpl ecl-type-traits ecl-utilities" require ecl-core.inc - -SRC_URI += "file://0001-ecl_containers-Fix-gcc-v7.1-compilation-issue.patch;patchdir=.." diff --git a/recipes-ros/ecl-core/ecl-converters_0.61.17.bb b/recipes-ros/ecl-core/ecl-converters_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-converters_0.61.17.bb rename to recipes-ros/ecl-core/ecl-converters_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-core-apps_0.61.17.bb b/recipes-ros/ecl-core/ecl-core-apps_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-core-apps_0.61.17.bb rename to recipes-ros/ecl-core/ecl-core-apps_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-core.inc b/recipes-ros/ecl-core/ecl-core.inc index b2367ce..bb81e56 100644 --- a/recipes-ros/ecl-core/ecl-core.inc +++ b/recipes-ros/ecl-core/ecl-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/stonier/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "625fa08e6e23adb58d9de2caaaf2be08" -SRC_URI[sha256sum] = "ea2e3e8e7572d6e18374b8be3736ce4761ea1f18c6af046af3fe4fcaadfc5285" +SRC_URI[md5sum] = "78f4275f5c7cec759ca096e22d1570d2" +SRC_URI[sha256sum] = "358e9de2a31cf0df70e1b5d6e0d9dc5f00d042f1974c786eabbb7bcb48151477" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" diff --git a/recipes-ros/ecl-core/ecl-devices_0.61.17.bb b/recipes-ros/ecl-core/ecl-devices_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-devices_0.61.17.bb rename to recipes-ros/ecl-core/ecl-devices_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-eigen_0.61.17.bb b/recipes-ros/ecl-core/ecl-eigen_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-eigen_0.61.17.bb rename to recipes-ros/ecl-core/ecl-eigen_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-exceptions_0.61.17.bb b/recipes-ros/ecl-core/ecl-exceptions_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-exceptions_0.61.17.bb rename to recipes-ros/ecl-core/ecl-exceptions_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-filesystem_0.61.17.bb b/recipes-ros/ecl-core/ecl-filesystem_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-filesystem_0.61.17.bb rename to recipes-ros/ecl-core/ecl-filesystem_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-formatters_0.61.17.bb b/recipes-ros/ecl-core/ecl-formatters_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-formatters_0.61.17.bb rename to recipes-ros/ecl-core/ecl-formatters_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-geometry_0.61.17.bb b/recipes-ros/ecl-core/ecl-geometry_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-geometry_0.61.17.bb rename to recipes-ros/ecl-core/ecl-geometry_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-ipc_0.61.17.bb b/recipes-ros/ecl-core/ecl-ipc_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-ipc_0.61.17.bb rename to recipes-ros/ecl-core/ecl-ipc_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-linear-algebra_0.61.17.bb b/recipes-ros/ecl-core/ecl-linear-algebra_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-linear-algebra_0.61.17.bb rename to recipes-ros/ecl-core/ecl-linear-algebra_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-math_0.61.17.bb b/recipes-ros/ecl-core/ecl-math_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-math_0.61.17.bb rename to recipes-ros/ecl-core/ecl-math_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-mpl_0.61.17.bb b/recipes-ros/ecl-core/ecl-mpl_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-mpl_0.61.17.bb rename to recipes-ros/ecl-core/ecl-mpl_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-sigslots_0.61.17.bb b/recipes-ros/ecl-core/ecl-sigslots_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-sigslots_0.61.17.bb rename to recipes-ros/ecl-core/ecl-sigslots_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-statistics_0.61.17.bb b/recipes-ros/ecl-core/ecl-statistics_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-statistics_0.61.17.bb rename to recipes-ros/ecl-core/ecl-statistics_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-streams_0.61.17.bb b/recipes-ros/ecl-core/ecl-streams_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-streams_0.61.17.bb rename to recipes-ros/ecl-core/ecl-streams_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-threads_0.61.17.bb b/recipes-ros/ecl-core/ecl-threads_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-threads_0.61.17.bb rename to recipes-ros/ecl-core/ecl-threads_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-time_0.61.17.bb b/recipes-ros/ecl-core/ecl-time_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-time_0.61.17.bb rename to recipes-ros/ecl-core/ecl-time_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-type-traits_0.61.17.bb b/recipes-ros/ecl-core/ecl-type-traits_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-type-traits_0.61.17.bb rename to recipes-ros/ecl-core/ecl-type-traits_0.61.18.bb diff --git a/recipes-ros/ecl-core/ecl-utilities_0.61.17.bb b/recipes-ros/ecl-core/ecl-utilities_0.61.18.bb similarity index 100% rename from recipes-ros/ecl-core/ecl-utilities_0.61.17.bb rename to recipes-ros/ecl-core/ecl-utilities_0.61.18.bb