diff --git a/recipes-ros/actionlib/actionlib_1.10.1.bb b/recipes-ros/actionlib/actionlib_1.10.1.bb new file mode 100644 index 0000000..01eae00 --- /dev/null +++ b/recipes-ros/actionlib/actionlib_1.10.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "The actionlib stack provides a standardized interface for \ + interfacing with preemptable tasks." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5" + +SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz;name=archive" +SRC_URI[archive.md5sum] = "8da88314483b1330906b0ecf89c33494" +SRC_URI[archive.sha256sum] = "c76317f60afec9e4cdcce28e0b88b9aef7e355ba8295228e759aa914ed10aae4" + +SRC_URI += "https://github.com/ros/actionlib/commit/f066ff531ecdea3b859881aa1f4b4b34cba910c1.patch;name=patch" +SRC_URI[patch.md5sum] = "ba32239ddb0c6837a4296119dda5f08a" +SRC_URI[patch.sha256sum] = "d07e4cd0982fee417f574acac4e2e2a0387188bf254c6f49f7ab0f8c206082b8" + +DEPENDS = "actionlib-msgs roscpp rostest" + +inherit catkin diff --git a/recipes-ros/angles/angles_1.9.9.bb b/recipes-ros/angles/angles_1.9.9.bb deleted file mode 100644 index 6359d9b..0000000 --- a/recipes-ros/angles/angles_1.9.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "This package provides a set of simple math utilities to work with angles." -SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" - -SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "c2a841dbeb1f3036449919773ac70876" -SRC_URI[sha256sum] = "5e690bf611bead83c2fdcab5a9617b622a9869e55fd1742c00b4015ddf4f8cfc" - -S = "${WORKDIR}/${BP}/${BPN}" - -inherit catkin diff --git a/recipes-ros/bond-core/bond-core.inc b/recipes-ros/bond-core/bond-core.inc index f2ecc26..24f2f42 100644 --- a/recipes-ros/bond-core/bond-core.inc +++ b/recipes-ros/bond-core/bond-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/bond_core/archive/${PV}.tar.gz;downloadfilename=bond_core-${PV}.tar.gz" -SRC_URI[md5sum] = "ce18d722353318f1a6e360a271529abb" -SRC_URI[sha256sum] = "4fc2019acc136768dafc3e7422dac622cc58038aaf8a41302e45cc9510c1c723" +SRC_URI[md5sum] = "1bb6c5dd1148c67d2759e665d7ae75b3" +SRC_URI[sha256sum] = "1145db3800591e585325131cb6322366e82e634c97dd3cbb4ab43e1c1f4ec415" S = "${WORKDIR}/bond_core-${PV}/${PN}" diff --git a/recipes-ros/bond-core/bond_1.7.11.bb b/recipes-ros/bond-core/bond_1.7.12.bb similarity index 100% rename from recipes-ros/bond-core/bond_1.7.11.bb rename to recipes-ros/bond-core/bond_1.7.12.bb diff --git a/recipes-ros/bond-core/bondcpp_1.7.11.bb b/recipes-ros/bond-core/bondcpp_1.7.12.bb similarity index 100% rename from recipes-ros/bond-core/bondcpp_1.7.11.bb rename to recipes-ros/bond-core/bondcpp_1.7.12.bb diff --git a/recipes-ros/bond-core/bondpy_1.7.11.bb b/recipes-ros/bond-core/bondpy_1.7.12.bb similarity index 100% rename from recipes-ros/bond-core/bondpy_1.7.11.bb rename to recipes-ros/bond-core/bondpy_1.7.12.bb diff --git a/recipes-ros/bond-core/smclib_1.7.11.bb b/recipes-ros/bond-core/smclib_1.7.12.bb similarity index 100% rename from recipes-ros/bond-core/smclib_1.7.11.bb rename to recipes-ros/bond-core/smclib_1.7.12.bb diff --git a/recipes-ros/catkin/catkin_git.bb b/recipes-ros/catkin/catkin_0.5.71.bb similarity index 78% rename from recipes-ros/catkin/catkin_git.bb rename to recipes-ros/catkin/catkin_0.5.71.bb index 79751a1..0e878c8 100644 --- a/recipes-ros/catkin/catkin_git.bb +++ b/recipes-ros/catkin/catkin_0.5.71.bb @@ -10,14 +10,11 @@ RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++ python-catkin-pkg python-argparse python-misc python-multiprocessing \ python-shell python-subprocess python-xml" -SRC_URI = "git://github.com/ros/${BPN}.git \ +SRC_URI = "https://github.com/ros/catkin/archive/${PV}.tar.gz;downloadfilename={ROS_BP}.tar.gz \ file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch \ " - -SRCREV = "041f6fc530b56cb6664824db399416f17c1961dd" -PV = "0.5.64+gitr${SRCPV}" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "1c30ac4fcc82ce2aedf610ea972ab4d2" +SRC_URI[sha256sum] = "2494dbe3446fe94a55f57c74260e072f97d72944d89610fe4994dbc79cf1a561" inherit catkin diff --git a/recipes-ros/class-loader/class-loader_0.2.1.bb b/recipes-ros/class-loader/class-loader_0.2.2.bb similarity index 61% rename from recipes-ros/class-loader/class-loader_0.2.1.bb rename to recipes-ros/class-loader/class-loader_0.2.2.bb index 74769fd..bfbd03b 100644 --- a/recipes-ros/class-loader/class-loader_0.2.1.bb +++ b/recipes-ros/class-loader/class-loader_0.2.2.bb @@ -11,14 +11,9 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" -SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz;name=archive" -SRC_URI[archive.md5sum] = "e844b2f708946c6245093b30f9f7f3b4" -SRC_URI[archive.sha256sum] = "93347aca95be80e78253b964f363cd5486fbf17cf939d224b46ed1de8287679d" - -SRC_URI += "https://github.com/ros/class_loader/commit/384a880d2dcf1bc51fe62d5c4648756b4575dba3.patch;name=patch" -SRC_URI[patch.md5sum] = "c95550a5b8197338e57be732b9fa2225" -SRC_URI[patch.sha256sum] = "9029530d2a62c44e1614483ec312572d7cfa47298c4392b066f802c0454a97bf" - +SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz" +SRC_URI[md5sum] = "c3bbc15c580dbf3b814b8af84218a777" +SRC_URI[sha256sum] = "afaa155be9e34d905396c96eac040007e23b4ba90d2b2677ab67a1b32086fe13" DEPENDS = "console-bridge libpoco" diff --git a/recipes-ros/common-msgs/actionlib-msgs_1.9.16.bb b/recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/actionlib-msgs_1.9.16.bb rename to recipes-ros/common-msgs/actionlib-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/common-msgs.inc b/recipes-ros/common-msgs/common-msgs.inc index 27b60a7..01b915f 100644 --- a/recipes-ros/common-msgs/common-msgs.inc +++ b/recipes-ros/common-msgs/common-msgs.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/common_msgs/archive/${PV}.tar.gz;downloadfilename=common_msgs-${PV}.tar.gz" -SRC_URI[md5sum] = "84fb70d6ba4c796903bb4b95b551e19a" -SRC_URI[sha256sum] = "a4a02bce606c3468dcc93abdc49fc855f0d81c90a56f24594f8fa691f9a6b776" +SRC_URI[md5sum] = "6259ec362103ed96abbcf7d67703aed5" +SRC_URI[sha256sum] = "54864270e973cec64f9315aed9e07f8d3837c409602dd18653c843c7a35690d0" inherit catkin diff --git a/recipes-ros/common-msgs/diagnostic-msgs_1.9.16.bb b/recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/diagnostic-msgs_1.9.16.bb rename to recipes-ros/common-msgs/diagnostic-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/geometry-msgs_1.9.16.bb b/recipes-ros/common-msgs/geometry-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/geometry-msgs_1.9.16.bb rename to recipes-ros/common-msgs/geometry-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/nav-msgs_1.9.16.bb b/recipes-ros/common-msgs/nav-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/nav-msgs_1.9.16.bb rename to recipes-ros/common-msgs/nav-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/sensor-msgs_1.9.16.bb b/recipes-ros/common-msgs/sensor-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/sensor-msgs_1.9.16.bb rename to recipes-ros/common-msgs/sensor-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/shape-msgs_1.9.16.bb b/recipes-ros/common-msgs/shape-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/shape-msgs_1.9.16.bb rename to recipes-ros/common-msgs/shape-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/stereo-msgs_1.9.16.bb b/recipes-ros/common-msgs/stereo-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/stereo-msgs_1.9.16.bb rename to recipes-ros/common-msgs/stereo-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/trajectory-msgs_1.9.16.bb b/recipes-ros/common-msgs/trajectory-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/trajectory-msgs_1.9.16.bb rename to recipes-ros/common-msgs/trajectory-msgs_1.10.0.bb diff --git a/recipes-ros/common-msgs/visualization-msgs_1.9.16.bb b/recipes-ros/common-msgs/visualization-msgs_1.10.0.bb similarity index 100% rename from recipes-ros/common-msgs/visualization-msgs_1.9.16.bb rename to recipes-ros/common-msgs/visualization-msgs_1.10.0.bb diff --git a/recipes-ros/console-bridge/console-bridge_0.2.2.bb b/recipes-ros/console-bridge/console-bridge_0.2.4.bb similarity index 83% rename from recipes-ros/console-bridge/console-bridge_0.2.2.bb rename to recipes-ros/console-bridge/console-bridge_0.2.4.bb index 8eab02b..0df8ba8 100644 --- a/recipes-ros/console-bridge/console-bridge_0.2.2.bb +++ b/recipes-ros/console-bridge/console-bridge_0.2.4.bb @@ -15,8 +15,8 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "boost" SRC_URI = "https://github.com/ros/console_bridge/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "82c24b68ffaacee540055571669dcdd7" -SRC_URI[sha256sum] = "69c3efa4ef86b2c3ffb37d29a9c6169853975a3bc362815c9cffc40f74b25f18" +SRC_URI[md5sum] = "e484d34bf0170ee12311d0fc6dd5f4fe" +SRC_URI[sha256sum] = "d4bdd0b6bce0c6fa9ff18b8926d4953161451bc49dd11497211eb1a62cfe72b7" S = "${WORKDIR}/console_bridge-${PV}" diff --git a/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch b/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch index 3c76482..8eef126 100644 --- a/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch +++ b/recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch @@ -1,29 +1,33 @@ -From 93cb4ebe5c4063d3ed5c0baf0b696476a90306cb Mon Sep 17 00:00:00 2001 -From: Stefan Herbrechtsmeier -Date: Tue, 4 Jun 2013 17:53:08 +0200 +From 4e51c828b27eb1d67a3199c692aac1783f853493 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Fri, 12 Jul 2013 09:59:13 +0200 Subject: [PATCH] gencpp-extras.cmake.em: Use find_program for GENCPP_BIN -Signed-off-by: Stefan Herbrechtsmeier +This patch was originally created by +Stefan Herbrechtsmeier . +I only adjusted it to the current version. + +Signed-off-by: Lukas Bulwahn --- cmake/gencpp-extras.cmake.em | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em -index a77a5f1..1d4bf10 100644 +index 87f46fd..4fc5284 100644 --- a/cmake/gencpp-extras.cmake.em +++ b/cmake/gencpp-extras.cmake.em @@ -1,13 +1,17 @@ @[if DEVELSPACE]@ # bin and template dir variables in develspace --set(GENCPP_BIN @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py) -+set(GENCPP_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts) - set(GENCPP_TEMPLATE_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts) +-set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py") ++set(GENCPP_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") + set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH) @[else]@ # bin and template dir variables in installspace --set(GENCPP_BIN @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py) --set(GENCPP_TEMPLATE_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)) -+set(GENCPP_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)) +-set(GENCPP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py") +-set(GENCPP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)") ++set(GENCPP_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)") +set(GENCPP_TEMPLATE_DIR "${CMAKE_CURRENT_LIST_DIR}/..") +set(CATKIN_FIND_ROOT_PATH_MODE "") @[end if]@ @@ -34,5 +38,5 @@ index a77a5f1..1d4bf10 100644 # The generated .h files should be added ALL_GEN_OUTPUT_FILES_cpp macro(_generate_msg_cpp ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR) -- -1.7.0.4 +1.7.9.5 diff --git a/recipes-ros/gencpp/gencpp_0.4.11.bb b/recipes-ros/gencpp/gencpp_0.4.13.bb similarity index 74% rename from recipes-ros/gencpp/gencpp_0.4.11.bb rename to recipes-ros/gencpp/gencpp_0.4.13.bb index b9a728f..7b74c68 100644 --- a/recipes-ros/gencpp/gencpp_0.4.11.bb +++ b/recipes-ros/gencpp/gencpp_0.4.13.bb @@ -9,7 +9,7 @@ PR = "r1" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ file://0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch" -SRC_URI[md5sum] = "be0b3986e98f3370fef4c1fffe3a69f4" -SRC_URI[sha256sum] = "c68b4518dbc5d65fd19d43724e5c9b0e66c769ef6066e3d511a6ffce2623f3c7" +SRC_URI[md5sum] = "801b40dcfab468f761dbdae33f848782" +SRC_URI[sha256sum] = "d1dcd6655c8c4d4325ab067c25284032d40e00aa3409a5a5cf069d310a60d485" inherit catkin diff --git a/recipes-ros/genlisp/genlisp/0001-genlisp-extras.cmake.em-Use-find_program-for-GENLISP.patch b/recipes-ros/genlisp/genlisp/0001-genlisp-extras.cmake.em-Use-find_program-for-GENLISP.patch index cba1cff..dc5507f 100644 --- a/recipes-ros/genlisp/genlisp/0001-genlisp-extras.cmake.em-Use-find_program-for-GENLISP.patch +++ b/recipes-ros/genlisp/genlisp/0001-genlisp-extras.cmake.em-Use-find_program-for-GENLISP.patch @@ -15,15 +15,15 @@ index 0d135d0..db52d54 100644 @@ -1,13 +1,17 @@ @[if DEVELSPACE]@ # bin and template dir variables in develspace --set(GENLISP_BIN @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_lisp.py) -+set(GENLISP_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_lisp.py) - set(GENLISP_TEMPLATE_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts) +-set(GENLISP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_lisp.py") ++set(GENLISP_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_lisp.py") + set(GENLISP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH) @[else]@ # bin and template dir variables in installspace --set(GENLISP_BIN @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_lisp.py) --set(GENLISP_TEMPLATE_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)) -+set(GENLISP_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/) +-set(GENLISP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_lisp.py") +-set(GENLISP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)") ++set(GENLISP_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/") +set(GENLISP_TEMPLATE_DIR "${CMAKE_CURRENT_LIST_DIR}/..") +set(CATKIN_FIND_ROOT_PATH_MODE "") @[end if]@ diff --git a/recipes-ros/genlisp/genlisp_0.4.10.bb b/recipes-ros/genlisp/genlisp_0.4.11.bb similarity index 75% rename from recipes-ros/genlisp/genlisp_0.4.10.bb rename to recipes-ros/genlisp/genlisp_0.4.11.bb index bc1715b..13f19a3 100644 --- a/recipes-ros/genlisp/genlisp_0.4.10.bb +++ b/recipes-ros/genlisp/genlisp_0.4.11.bb @@ -9,7 +9,7 @@ PR = "r1" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ file://0001-genlisp-extras.cmake.em-Use-find_program-for-GENLISP.patch" -SRC_URI[md5sum] = "ae3026fd36a31d286f79a9111450adfa" -SRC_URI[sha256sum] = "13f606f23eec18c0f653a259d972d9bdb13251111e4af280830a961a4858c475" +SRC_URI[md5sum] = "b9be0a57abf76187a1057fb62cdc31e1" +SRC_URI[sha256sum] = "cc373440fcbf57cafb758795cb50045fdd96de717b93d3d5956b7a1a2af4d3e2" inherit catkin diff --git a/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch b/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch index 2827d95..e32f6d2 100644 --- a/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch +++ b/recipes-ros/genmsg/genmsg/0001-modify-msg-file-handling-to-reference-them-relatively.patch @@ -1,21 +1,21 @@ diff -Naur a/cmake/genmsg-extras.cmake.em b/cmake/genmsg-extras.cmake.em ---- a/cmake/genmsg-extras.cmake.em 2013-05-23 09:45:59.000000000 +0200 -+++ b/cmake/genmsg-extras.cmake.em 2013-05-23 09:48:56.000000000 +0200 -@@ -172,8 +172,7 @@ +--- a/cmake/genmsg-extras.cmake.em 2013-07-12 09:10:43.810555389 +0200 ++++ b/cmake/genmsg-extras.cmake.em 2013-07-12 09:14:17.122564232 +0200 +@@ -202,8 +202,7 @@ ${CATKIN_DEVEL_PREFIX}/share/${PROJECT_NAME}/cmake/${PROJECT_NAME}-msg-paths.cmake @@ONLY) # generate and install config of message include dirs for project -- _prepend_path(${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}" INCLUDE_DIRS_W_PATH) +- _prepend_path(${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}" INCLUDE_DIRS_W_PATH UNIQUE) - set(PKG_MSG_INCLUDE_DIRS "${INCLUDE_DIRS_W_PATH}") + set(PKG_MSG_INCLUDE_DIRS "${${PROJECT_NAME}_MSG_INCLUDE_DIRS_INSTALLSPACE}") configure_file( ${genmsg_CMAKE_DIR}/pkg-msg-paths.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}-msg-paths.cmake diff -Naur a/cmake/pkg-msg-paths.cmake.in b/cmake/pkg-msg-paths.cmake.in ---- a/cmake/pkg-msg-paths.cmake.in 2013-05-23 09:45:59.000000000 +0200 -+++ b/cmake/pkg-msg-paths.cmake.in 2013-05-23 11:03:04.000000000 +0200 +--- a/cmake/pkg-msg-paths.cmake.in 2013-07-12 09:10:43.814555390 +0200 ++++ b/cmake/pkg-msg-paths.cmake.in 2013-07-12 09:15:35.818567495 +0200 @@ -1,2 +1,7 @@ --set(@PROJECT_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_INCLUDE_DIRS@) +-set(@PROJECT_NAME@_MSG_INCLUDE_DIRS "@PKG_MSG_INCLUDE_DIRS@") +if(@DEVELSPACE@) + set(@PROJECT_NAME@_MSG_INCLUDE_DIRS @PKG_MSG_INCLUDE_DIRS@) +else() diff --git a/recipes-ros/genmsg/genmsg_0.4.17.bb b/recipes-ros/genmsg/genmsg_0.4.21.bb similarity index 79% rename from recipes-ros/genmsg/genmsg_0.4.17.bb rename to recipes-ros/genmsg/genmsg_0.4.21.bb index b45e2f9..c7d59d0 100644 --- a/recipes-ros/genmsg/genmsg_0.4.17.bb +++ b/recipes-ros/genmsg/genmsg_0.4.21.bb @@ -12,7 +12,7 @@ SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=$ RDEPENDS_${PN} = "python-stringold python-pprint" RDEPENDS_${PN}_class-native = "" -SRC_URI[md5sum] = "de385f1796bf025915ed7b20e1e1acc4" -SRC_URI[sha256sum] = "e510caa7692a4b0a0948688b9d2d8f6ff2f329980d7f78787276afec030806b7" +SRC_URI[md5sum] = "03ff82b1efa75552d4a5a000e0576cc4" +SRC_URI[sha256sum] = "e7e4b23eadb97b0deca53874532c0b42f10f406a9db2affd7d6f04101a4a2901" inherit catkin diff --git a/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch b/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch index eb87087..99216a7 100644 --- a/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch +++ b/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch @@ -4,11 +4,11 @@ diff -Naur a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em @@ -1,13 +1,15 @@ @[if DEVELSPACE]@ # bin dir variables in develspace - set(GENPY_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts) + set(GENPY_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH) @[else]@ # bin dir variables in installspace - set(GENPY_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)) + set(GENPY_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)") +set(CATKIN_FIND_ROOT_PATH_MODE "") @[end if]@ diff --git a/recipes-ros/genpy/genpy_0.4.10.bb b/recipes-ros/genpy/genpy_0.4.13.bb similarity index 78% rename from recipes-ros/genpy/genpy_0.4.10.bb rename to recipes-ros/genpy/genpy_0.4.13.bb index 2082ec8..0828b2d 100644 --- a/recipes-ros/genpy/genpy_0.4.10.bb +++ b/recipes-ros/genpy/genpy_0.4.13.bb @@ -11,7 +11,7 @@ PR = "r2" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ file://0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch" -SRC_URI[md5sum] = "23915e68167ba6d58c65920bfabd2fad" -SRC_URI[sha256sum] = "6c77bde606c9637b0fa9e6f4ed85882e98547500a7472d2643bcc52b6c8a8b78" +SRC_URI[md5sum] = "201e3f1aa5e12ccc09159b1a3d9272f7" +SRC_URI[sha256sum] = "9dae768e9350c835ae8a40f19d230e3fe023bfc1e259a14be8b3ae7c4c632d3c" inherit catkin diff --git a/recipes-ros/geometry-angles-utils/angles_1.9.9.bb b/recipes-ros/geometry-angles-utils/angles_1.9.9.bb new file mode 100644 index 0000000..8c5dd73 --- /dev/null +++ b/recipes-ros/geometry-angles-utils/angles_1.9.9.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "This package provides a set of simple math utilities to work with angles." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" + +SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz;name=archive" +SRC_URI[archive.md5sum] = "c2a841dbeb1f3036449919773ac70876" +SRC_URI[archive.sha256sum] = "5e690bf611bead83c2fdcab5a9617b622a9869e55fd1742c00b4015ddf4f8cfc" + +SRC_URI += "https://github.com/bulwahn/angles/commit/8b1879e93b8ae2f89df345edaf688521e5c0ab97.patch;striplevel=2;name=patch" +SRC_URI[patch.md5sum] = "d55c70b7328ed6e9d00d3185ddf4b0bf" +SRC_URI[patch.sha256sum] = "2b7303ca01e355680adadd18c3b97dfb1071715375c14a3759ad96f807fc09e5" + +S = "${WORKDIR}/${BP}/${BPN}" + +inherit catkin diff --git a/recipes-ros/geometry-experimental/geometry-experimental.inc b/recipes-ros/geometry-experimental/geometry-experimental.inc new file mode 100644 index 0000000..b5aaab5 --- /dev/null +++ b/recipes-ros/geometry-experimental/geometry-experimental.inc @@ -0,0 +1,7 @@ +SRC_URI = "https://github.com/ros/geometry_experimental/archive/${PV}.tar.gz;downloadfilename=geometry_experimental-${PV}.tar.gz" +SRC_URI[md5sum] = "530cbf52308427e15a0568f5226313aa" +SRC_URI[sha256sum] = "10a95045136510c1db5743481930ced6d164c6990d9e1a7c2afd9d6fa5062d02" + +inherit catkin + +S = "${WORKDIR}/geometry_experimental-${PV}/${ROS_BPN}" diff --git a/recipes-ros/geometry-experimental/tf2-msgs_0.4.5.bb b/recipes-ros/geometry-experimental/tf2-msgs_0.4.5.bb new file mode 100644 index 0000000..61eef2d --- /dev/null +++ b/recipes-ros/geometry-experimental/tf2-msgs_0.4.5.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "tf2_msgs" +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "actionlib-msgs geometry-msgs" + +require geometry-experimental.inc diff --git a/recipes-ros/geometry-experimental/tf2-py_0.4.5.bb b/recipes-ros/geometry-experimental/tf2-py_0.4.5.bb new file mode 100644 index 0000000..52d2a6d --- /dev/null +++ b/recipes-ros/geometry-experimental/tf2-py_0.4.5.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "The tf2_py package" +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "rospy tf2" + +require geometry-experimental.inc diff --git a/recipes-ros/geometry-experimental/tf2-ros_0.4.5.bb b/recipes-ros/geometry-experimental/tf2-ros_0.4.5.bb new file mode 100644 index 0000000..4753d13 --- /dev/null +++ b/recipes-ros/geometry-experimental/tf2-ros_0.4.5.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "This package contains the ROS bindings for the tf2 library, for both Python and C++." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "actionlib rosgraph tf2 tf2-py" + +require geometry-experimental.inc diff --git a/recipes-ros/geometry-experimental/tf2_0.4.5.bb b/recipes-ros/geometry-experimental/tf2_0.4.5.bb new file mode 100644 index 0000000..e85a338 --- /dev/null +++ b/recipes-ros/geometry-experimental/tf2_0.4.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "tf2 is the second generation of the transform library, which lets \ + the user keep track of multiple coordinate frames over time." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "tf2-msgs geometry-msgs console-bridge rospy" + +require geometry-experimental.inc diff --git a/recipes-ros/geometry/geometry.inc b/recipes-ros/geometry/geometry.inc index 94572ee..c94353d 100644 --- a/recipes-ros/geometry/geometry.inc +++ b/recipes-ros/geometry/geometry.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/geometry/archive/${PV}.tar.gz;downloadfilename=geometry-${PV}.tar.gz" -SRC_URI[md5sum] = "e7df8e2b209881c3cf262c8ccf7598d5" -SRC_URI[sha256sum] = "862918e3997b90570c282f29b03a9f70b4a354f1447fdce8c8940666e1811239" +SRC_URI[md5sum] = "ccaadd38c183c2c257e75ac907868c87" +SRC_URI[sha256sum] = "30527d91f182478b7819a947237c92ce1effe61cd11d2d710e0408c971f2bc74" inherit catkin diff --git a/recipes-ros/geometry/tf/0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch b/recipes-ros/geometry/tf/0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch deleted file mode 100644 index 2c2d0e4..0000000 --- a/recipes-ros/geometry/tf/0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 57ad3092284903295e24931adc46af837cef02a2 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn -Date: Wed, 3 Jul 2013 08:44:00 +0200 -Subject: [PATCH] using CATKIN_ENABLE_TESTING to optionally configure tests in - tf - -Since ff60599b8077b86a6d75d510da72e69899d16008 in the catkin -repository, catkin provides to optionally configure tests. This -commit adjusts the CMakeLists.txt to opt-in the tests. -Furthermore, it groups static_transformer_publisher to the other -debug tools and adds some structuring comments in CMakeLists.txt. - -This commit is currently needed for cross-compiling tf (without -tests) in the meta-ros project (github.com/bmwcarit/meta-ros) -without requiring gtest. - -Signed-off-by: Lukas Bulwahn ---- - tf/CMakeLists.txt | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt -index 771257a..1d36679 100644 ---- a/tf/CMakeLists.txt -+++ b/tf/CMakeLists.txt -@@ -42,6 +42,12 @@ target_link_libraries(tf_change_notifier ${PROJECT_NAME}) - add_executable(tf_monitor src/tf_monitor.cpp) - target_link_libraries(tf_monitor ${PROJECT_NAME}) - -+add_executable(static_transform_publisher src/static_transform_publisher.cpp) -+target_link_libraries(static_transform_publisher ${PROJECT_NAME}) -+ -+# Tests -+if(CATKIN_ENABLE_TESTING) -+ - catkin_add_gtest(tf_unittest test/tf_unittest.cpp) - target_link_libraries(tf_unittest ${PROJECT_NAME}) - -@@ -85,10 +91,11 @@ add_rostest(test/test_broadcaster.launch) - - add_executable(testBroadcaster test/testBroadcaster.cpp) - target_link_libraries(testBroadcaster ${PROJECT_NAME}) --add_executable(static_transform_publisher src/static_transform_publisher.cpp) --target_link_libraries(static_transform_publisher ${PROJECT_NAME}) -+ -+endif() - - -+#Python setup - set(Python_ADDITIONAL_VERSIONS 2.7) - find_package(PythonLibs REQUIRED) - include_directories(${PYTHON_INCLUDE_PATH}) -@@ -126,8 +133,10 @@ set_target_properties(pytf_py PROPERTIES OUTPUT_NAME tf PREFIX "_" SUFFIX ".so" - # DOES PYUNIT WORK IN CATKIN? - target_link_libraries(pytf_py ${Boost_LIBRARIES} ${catkin_LIBRARIES}) - -+if(CATKIN_ENABLE_TESTING) - add_executable(tf_speed_test EXCLUDE_FROM_ALL test/speed_test.cpp) - target_link_libraries(tf_speed_test ${PROJECT_NAME}) -+endif() - - - install(DIRECTORY include/${PROJECT_NAME}/ --- -1.7.9.5 - diff --git a/recipes-ros/geometry/tf_1.9.29.bb b/recipes-ros/geometry/tf_1.10.5.bb similarity index 62% rename from recipes-ros/geometry/tf_1.9.29.bb rename to recipes-ros/geometry/tf_1.10.5.bb index 0b7f5d2..1d12e6a 100644 --- a/recipes-ros/geometry/tf_1.9.29.bb +++ b/recipes-ros/geometry/tf_1.10.5.bb @@ -3,8 +3,6 @@ SECTION = "devel" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://package.xml;beginline=18;endline=18;md5=d566ef916e9dedc494f5f793a6690ba5" -DEPENDS = "angles geometry-msgs message-filters sensor-msgs" +DEPENDS = "angles geometry-msgs message-filters sensor-msgs tf2-ros" require geometry.inc - -SRC_URI += "file://0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch;striplevel=2" diff --git a/recipes-ros/image-common/image-common.inc b/recipes-ros/image-common/image-common.inc index 4c9452d..7997af1 100644 --- a/recipes-ros/image-common/image-common.inc +++ b/recipes-ros/image-common/image-common.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros-perception/image_common/archive/${PV}.tar.gz;downloadfilename=image_common-${PV}.tar.gz" -SRC_URI[md5sum] = "1831f995e72eeeb143b0d3f072a2c153" -SRC_URI[sha256sum] = "e111bb72da8df67efb742c05742d774a337266e0b2a70073e283c157b4ab7029" +SRC_URI[md5sum] = "72dc5897c021987cca04756cbf3ddc27" +SRC_URI[sha256sum] = "022f3c81ade13e644cf7f3c96712a362dc668f2edf37c125f3b9411818eb294a" inherit catkin diff --git a/recipes-ros/image-common/image-transport_1.10.3.bb b/recipes-ros/image-common/image-transport_1.11.0.bb similarity index 80% rename from recipes-ros/image-common/image-transport_1.10.3.bb rename to recipes-ros/image-common/image-transport_1.11.0.bb index b3c194a..2665674 100644 --- a/recipes-ros/image-common/image-transport_1.10.3.bb +++ b/recipes-ros/image-common/image-transport_1.11.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "image_transport should always be used to subscribe to and publish images." SECTION = "devel" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9dedc494f5f793a6690ba5" +LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5" DEPENDS = "message-filters pluginlib rosconsole roscpp roslib sensor-msgs" diff --git a/recipes-ros/nodelet-core/nodelet-core.inc b/recipes-ros/nodelet-core/nodelet-core.inc index e387a99..6e98fda 100644 --- a/recipes-ros/nodelet-core/nodelet-core.inc +++ b/recipes-ros/nodelet-core/nodelet-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/nodelet_core/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "840b98ace89034029569f20a2a41af05" -SRC_URI[sha256sum] = "4cc5a76ec90b0610b794128509923beba9b6dee2cb18fdeb6fd3ecc409051262" +SRC_URI[md5sum] = "b4ec524761d1d2494f5901b77ad35f9b" +SRC_URI[sha256sum] = "ad79f48e0916490d2095ea9ea81a796a060553d4e60ba5b148b96a95369b8124" S = "${WORKDIR}/nodelet_core-${PV}/${ROS_BPN}" diff --git a/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb b/recipes-ros/nodelet-core/nodelet-topic-tools_1.8.0.bb similarity index 100% rename from recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb rename to recipes-ros/nodelet-core/nodelet-topic-tools_1.8.0.bb diff --git a/recipes-ros/nodelet-core/nodelet_1.7.15.bb b/recipes-ros/nodelet-core/nodelet_1.8.0.bb similarity index 100% rename from recipes-ros/nodelet-core/nodelet_1.7.15.bb rename to recipes-ros/nodelet-core/nodelet_1.8.0.bb diff --git a/recipes-ros/pluginlib/pluginlib_1.9.20.bb b/recipes-ros/pluginlib/pluginlib_1.9.21.bb similarity index 53% rename from recipes-ros/pluginlib/pluginlib_1.9.20.bb rename to recipes-ros/pluginlib/pluginlib_1.9.21.bb index 333972d..94a1447 100644 --- a/recipes-ros/pluginlib/pluginlib_1.9.20.bb +++ b/recipes-ros/pluginlib/pluginlib_1.9.21.bb @@ -7,13 +7,9 @@ SECTION = "devel" LICENSE = "BSD & BSL-1.0" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=10;md5=bbbb6ab628b1f3daee74dd9c62bee312" -SRC_URI = "https://github.com/ros/${PN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz;name=archive" -SRC_URI[archive.md5sum] = "64682c8e49434c333915fd0906fb4d84" -SRC_URI[archive.sha256sum] = "532d9358a8559effb3fabe57ac97ced8b5a61226251973f08f8901709d9591f7" - -SRC_URI += "https://github.com/ros/pluginlib/commit/e71b89e00fbf56813266552b4d75fefe95e048f8.patch;name=patch" -SRC_URI[patch.md5sum] = "b9dcbfd4883edb947112b3a184c7a49b" -SRC_URI[patch.sha256sum] = "19c3d35de402309ed23b252db8493fb8a6d6abb34be6d88cbfd28b0e3e171016" +SRC_URI = "https://github.com/ros/${PN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" +SRC_URI[md5sum] = "c506945693bc53e60600a849275e4a98" +SRC_URI[sha256sum] = "a8c5aa266a27810c39a2ced76d531358880c7728a948f7e7a8972b70ed42a425" DEPENDS = "boost class-loader rosconsole roslib libtinyxml" diff --git a/recipes-ros/ros-comm/message-filters_1.9.41.bb b/recipes-ros/ros-comm/message-filters_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/message-filters_1.9.41.bb rename to recipes-ros/ros-comm/message-filters_1.9.47.bb diff --git a/recipes-ros/ros-comm/ros-comm.inc b/recipes-ros/ros-comm/ros-comm.inc index 66f280d..3ddfa24 100644 --- a/recipes-ros/ros-comm/ros-comm.inc +++ b/recipes-ros/ros-comm/ros-comm.inc @@ -1,5 +1,5 @@ SRC_URI = "https://github.com/ros/ros_comm/archive/${PV}.tar.gz;downloadfilename=ros_comm-${PV}.tar.gz" -SRC_URI[md5sum] = "80b68959b8e6d5162c50a361a55d9b1a" -SRC_URI[sha256sum] = "b0422f914ca27f928e5acacf25353cb44bd7e3be8ba8942253013fe85cc355f8" +SRC_URI[md5sum] = "2d4b8083abc6598857e01b698f4b0d20" +SRC_URI[sha256sum] = "44c5a076a604134e44d044e08b2c15b185aefac277b8632b5ca2d011ec8d3da6" inherit catkin diff --git a/recipes-ros/ros-comm/rosbag_1.9.41.bb b/recipes-ros/ros-comm/rosbag_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosbag_1.9.41.bb rename to recipes-ros/ros-comm/rosbag_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosconsole_1.9.41.bb b/recipes-ros/ros-comm/rosconsole_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosconsole_1.9.41.bb rename to recipes-ros/ros-comm/rosconsole_1.9.47.bb diff --git a/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch b/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch new file mode 100644 index 0000000..29be494 --- /dev/null +++ b/recipes-ros/ros-comm/roscpp/0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch @@ -0,0 +1,42 @@ +From a392a5e614883c18bf64568b1ebffe95d7efcf15 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Tue, 23 Jul 2013 15:18:07 +0200 +Subject: [PATCH] roscpp: do not try to find pthread by own methods + +This commit partially reverts c5dfa6305e883f76dc2aa52d27d2977e3d66ea2e +in the ros/ros_comm repository. +--- + clients/roscpp/CMakeLists.txt | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/clients/roscpp/CMakeLists.txt b/clients/roscpp/CMakeLists.txt +index 4545073..872f3f6 100644 +--- a/clients/roscpp/CMakeLists.txt ++++ b/clients/roscpp/CMakeLists.txt +@@ -34,22 +34,9 @@ add_service_files( + + generate_messages() + +-set(PTHREAD_LIB "") +-find_package(Threads) +-if(CMAKE_THREAD_LIBS_INIT) +- string(LENGTH ${CMAKE_THREAD_LIBS_INIT} _length) +- if(_length GREATER 2) +- string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 0 2 _prefix) +- if(${_prefix} STREQUAL "-l") +- math(EXPR _rest_len "${_length} - 2") +- string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 2 ${_rest_len} PTHREAD_LIB) +- endif() +- endif() +-endif() +- + catkin_package( + INCLUDE_DIRS include ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_INCLUDE_DESTINATION}/ros +- LIBRARIES roscpp ${PTHREAD_LIB} ++ LIBRARIES roscpp + CATKIN_DEPENDS cpp_common message_runtime rosconsole roscpp_serialization roscpp_traits rosgraph_msgs rostime std_msgs xmlrpcpp + DEPENDS Boost + ) +-- +1.7.9.5 + diff --git a/recipes-ros/ros-comm/roscpp_1.9.41.bb b/recipes-ros/ros-comm/roscpp_1.9.47.bb similarity index 88% rename from recipes-ros/ros-comm/roscpp_1.9.41.bb rename to recipes-ros/ros-comm/roscpp_1.9.47.bb index b82669c..9033388 100644 --- a/recipes-ros/ros-comm/roscpp_1.9.41.bb +++ b/recipes-ros/ros-comm/roscpp_1.9.47.bb @@ -13,6 +13,8 @@ DEPENDS = "\ require ros-comm.inc +SRC_URI += "file://0001-roscpp-do-not-try-to-find-pthread-by-own-methods.patch;striplevel=3" + S = "${WORKDIR}/ros_comm-${PV}/clients/${BPN}" CXXFLAGS_append = " -I${OECMAKE_BUILDPATH}/devel/include" diff --git a/recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb b/recipes-ros/ros-comm/rosgraph-msgs_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosgraph-msgs_1.9.41.bb rename to recipes-ros/ros-comm/rosgraph-msgs_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosgraph_1.9.41.bb b/recipes-ros/ros-comm/rosgraph_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosgraph_1.9.41.bb rename to recipes-ros/ros-comm/rosgraph_1.9.47.bb diff --git a/recipes-ros/ros-comm/roslaunch_1.9.41.bb b/recipes-ros/ros-comm/roslaunch_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/roslaunch_1.9.41.bb rename to recipes-ros/ros-comm/roslaunch_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosmaster_1.9.41.bb b/recipes-ros/ros-comm/rosmaster_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosmaster_1.9.41.bb rename to recipes-ros/ros-comm/rosmaster_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosmsg_1.9.41.bb b/recipes-ros/ros-comm/rosmsg_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosmsg_1.9.41.bb rename to recipes-ros/ros-comm/rosmsg_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosnode_1.9.41.bb b/recipes-ros/ros-comm/rosnode_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosnode_1.9.41.bb rename to recipes-ros/ros-comm/rosnode_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosout_1.9.41.bb b/recipes-ros/ros-comm/rosout_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosout_1.9.41.bb rename to recipes-ros/ros-comm/rosout_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosparam_1.9.41.bb b/recipes-ros/ros-comm/rosparam_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosparam_1.9.41.bb rename to recipes-ros/ros-comm/rosparam_1.9.47.bb diff --git a/recipes-ros/ros-comm/rospy_1.9.41.bb b/recipes-ros/ros-comm/rospy_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rospy_1.9.41.bb rename to recipes-ros/ros-comm/rospy_1.9.47.bb diff --git a/recipes-ros/ros-comm/rosservice_1.9.41.bb b/recipes-ros/ros-comm/rosservice_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rosservice_1.9.41.bb rename to recipes-ros/ros-comm/rosservice_1.9.47.bb diff --git a/recipes-ros/ros-comm/rostest_1.9.41.bb b/recipes-ros/ros-comm/rostest_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rostest_1.9.41.bb rename to recipes-ros/ros-comm/rostest_1.9.47.bb diff --git a/recipes-ros/ros-comm/rostopic_1.9.41.bb b/recipes-ros/ros-comm/rostopic_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/rostopic_1.9.41.bb rename to recipes-ros/ros-comm/rostopic_1.9.47.bb diff --git a/recipes-ros/ros-comm/roswtf_1.9.41.bb b/recipes-ros/ros-comm/roswtf_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/roswtf_1.9.41.bb rename to recipes-ros/ros-comm/roswtf_1.9.47.bb diff --git a/recipes-ros/ros-comm/std-srvs_1.9.41.bb b/recipes-ros/ros-comm/std-srvs_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/std-srvs_1.9.41.bb rename to recipes-ros/ros-comm/std-srvs_1.9.47.bb diff --git a/recipes-ros/ros-comm/topic-tools_1.9.41.bb b/recipes-ros/ros-comm/topic-tools_1.9.47.bb similarity index 100% rename from recipes-ros/ros-comm/topic-tools_1.9.41.bb rename to recipes-ros/ros-comm/topic-tools_1.9.47.bb diff --git a/recipes-ros/ros-comm/xmlrpcpp_1.9.41.bb b/recipes-ros/ros-comm/xmlrpcpp_1.9.47.bb similarity index 88% rename from recipes-ros/ros-comm/xmlrpcpp_1.9.41.bb rename to recipes-ros/ros-comm/xmlrpcpp_1.9.47.bb index 1be06ac..423e556 100644 --- a/recipes-ros/ros-comm/xmlrpcpp_1.9.41.bb +++ b/recipes-ros/ros-comm/xmlrpcpp_1.9.47.bb @@ -4,8 +4,8 @@ DESCRIPTION = \ support roscpp's threading model. As such, we are maintaining our \ own fork." SECTION = "devel" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=46ee8693f40a89a31023e97ae17ecf19" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=184dd1523b9a109aead3fbbe0b4262e0" DEPENDS = "cpp-common" diff --git a/recipes-ros/ros/mk_1.9.42.bb b/recipes-ros/ros/mk_1.10.4.bb similarity index 100% rename from recipes-ros/ros/mk_1.9.42.bb rename to recipes-ros/ros/mk_1.10.4.bb diff --git a/recipes-ros/ros/ros.inc b/recipes-ros/ros/ros.inc index ac46f06..5c421c5 100644 --- a/recipes-ros/ros/ros.inc +++ b/recipes-ros/ros/ros.inc @@ -1,5 +1,5 @@ SRC_URI = "https://github.com/ros/ros/archive/${PV}.tar.gz;downloadfilename=ros_${PV}.tar.gz" -SRC_URI[md5sum] = "e38f95785dc6dcbb8f8620c9298c2752" -SRC_URI[sha256sum] = "2d8997e1f6980c9cea85a27f39e17beb58db924283fc337c8df11fd79bcb3cb2" +SRC_URI[md5sum] = "26ad8652a18bc11b530b0054bbb204b3" +SRC_URI[sha256sum] = "ae3b8db6bf26867c38b1215e1e014616f00a396847fea31df64da63d2eac6ef2" inherit catkin diff --git a/recipes-ros/ros/rosbash_1.9.42.bb b/recipes-ros/ros/rosbash_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosbash_1.9.42.bb rename to recipes-ros/ros/rosbash_1.10.4.bb diff --git a/recipes-ros/ros/rosboost-cfg_1.9.42.bb b/recipes-ros/ros/rosboost-cfg_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosboost-cfg_1.9.42.bb rename to recipes-ros/ros/rosboost-cfg_1.10.4.bb diff --git a/recipes-ros/ros/rosbuild_1.9.42.bb b/recipes-ros/ros/rosbuild_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosbuild_1.9.42.bb rename to recipes-ros/ros/rosbuild_1.10.4.bb diff --git a/recipes-ros/ros/rosclean_1.9.42.bb b/recipes-ros/ros/rosclean_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosclean_1.9.42.bb rename to recipes-ros/ros/rosclean_1.10.4.bb diff --git a/recipes-ros/ros/roscreate_1.9.42.bb b/recipes-ros/ros/roscreate_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roscreate_1.9.42.bb rename to recipes-ros/ros/roscreate_1.10.4.bb diff --git a/recipes-ros/ros/roslang_1.9.42.bb b/recipes-ros/ros/roslang_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roslang_1.9.42.bb rename to recipes-ros/ros/roslang_1.10.4.bb diff --git a/recipes-ros/ros/roslib_1.9.42.bb b/recipes-ros/ros/roslib_1.10.4.bb similarity index 100% rename from recipes-ros/ros/roslib_1.9.42.bb rename to recipes-ros/ros/roslib_1.10.4.bb diff --git a/recipes-ros/ros/rosmake_1.9.42.bb b/recipes-ros/ros/rosmake_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosmake_1.9.42.bb rename to recipes-ros/ros/rosmake_1.10.4.bb diff --git a/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch index 176a072..1f5cd27 100644 --- a/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch +++ b/recipes-ros/ros/rosunit/0001-rosunit-extras.cmake.em-remove-NO_CMAKE_FIND_ROOT_PA.patch @@ -14,7 +14,7 @@ index 4b9bb0d..30db4d1 100644 @@ -14,7 +14,7 @@ macro(rosunit_initialize_tests) # find binary and scripts in installspace find_program(ROSUNIT_EXE rosunit - PATHS @(CMAKE_INSTALL_PREFIX)/bin + PATHS "@(CMAKE_INSTALL_PREFIX)/bin" - NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) + NO_DEFAULT_PATH) if(NOT ROSUNIT_EXE) diff --git a/recipes-ros/ros/rosunit_1.9.42.bb b/recipes-ros/ros/rosunit_1.10.4.bb similarity index 100% rename from recipes-ros/ros/rosunit_1.9.42.bb rename to recipes-ros/ros/rosunit_1.10.4.bb diff --git a/recipes-ros/roscpp-core/cpp-common_0.3.12.bb b/recipes-ros/roscpp-core/cpp-common_0.3.16.bb similarity index 100% rename from recipes-ros/roscpp-core/cpp-common_0.3.12.bb rename to recipes-ros/roscpp-core/cpp-common_0.3.16.bb diff --git a/recipes-ros/roscpp-core/roscpp-core.inc b/recipes-ros/roscpp-core/roscpp-core.inc index 78b38e3..71a19cf 100644 --- a/recipes-ros/roscpp-core/roscpp-core.inc +++ b/recipes-ros/roscpp-core/roscpp-core.inc @@ -1,6 +1,6 @@ SRC_URI = "https://github.com/ros/roscpp_core/archive/${PV}.tar.gz;downloadfilename=rosscpp_core-${PV}.tar.gz" -SRC_URI[md5sum] = "ddbed4b9c97e406ecf104915eb31319c" -SRC_URI[sha256sum] = "662595304df7ba932906aa30774dfd4c3074cc4b7773620fc80de2d724769ef8" +SRC_URI[md5sum] = "d02c9d1270d1f68487944fb0e76adcb7" +SRC_URI[sha256sum] = "805b08c5b7044dd93bfaf4a0dd5807b391d1d86db9f6d143f9946b5528500eda" S = "${WORKDIR}/roscpp_core-${PV}/${BPN}" diff --git a/recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb b/recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb similarity index 100% rename from recipes-ros/roscpp-core/roscpp-serialization_0.3.12.bb rename to recipes-ros/roscpp-core/roscpp-serialization_0.3.16.bb diff --git a/recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb b/recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb similarity index 100% rename from recipes-ros/roscpp-core/roscpp-traits_0.3.12.bb rename to recipes-ros/roscpp-core/roscpp-traits_0.3.16.bb diff --git a/recipes-ros/roscpp-core/rostime_0.3.12.bb b/recipes-ros/roscpp-core/rostime_0.3.16.bb similarity index 100% rename from recipes-ros/roscpp-core/rostime_0.3.12.bb rename to recipes-ros/roscpp-core/rostime_0.3.16.bb diff --git a/recipes-ros/rospack/rospack_2.1.16.bb b/recipes-ros/rospack/rospack_2.1.21.bb similarity index 69% rename from recipes-ros/rospack/rospack_2.1.16.bb rename to recipes-ros/rospack/rospack_2.1.21.bb index 3a5478a..b172acb 100644 --- a/recipes-ros/rospack/rospack_2.1.16.bb +++ b/recipes-ros/rospack/rospack_2.1.21.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc DEPENDS = "boost python-rospkg-native libtinyxml" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz" -SRC_URI[md5sum] = "1383bdce36fe6319884e7b158c22d8b4" -SRC_URI[sha256sum] = "5bfdcc93db555fe23dead5d471f8bba25dc72c2f0f928bd2319e06bf42f9d117" +SRC_URI[md5sum] = "0bb1d12a115b7902d5b1f8546d63cdf8" +SRC_URI[sha256sum] = "43a7e64015c4e28fbfda071dcb9451a6ac0443df75242a32c23cfda68d230f93" inherit catkin