Merge pull request #321 from bulwahn/master-next

changes to create version 0.2-rc3

recipes-ros/ar-track-alvar/ar-track-alvar/0001-used-cmake_modules-to-find-TinyXML.patch

@@ -1,81 +0,0 @@
-From 3f0419f9d890e8c0ffe745bfd1e0290911598645 Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Thu, 15 May 2014 07:55:45 +0200
-Subject: [PATCH] used cmake_modules to find TinyXML
-
-This commit follows the pattern from the ROS core developers to
-use cmake_modules to find TinyXML. E.g., This pattern is found in
-the pluginlib package, commit 2e0860ca [1], and this commit here
-bluntly copies the steps of that commit.
-
-This commit is needed to find tinyxml when cross-compiling
-the ar_track_alvar package with the OpenEmbedded/Yocto build
-environment and the ROS layer for OpenEmbedded [2].
-
-[1] https://github.com/ros/pluginlib/commit/2e0860ca42138f837b2e34921a207d40a095d996
-[2] https://github.com/bmwcarit/meta-ros
-
-Upstream-Status: Accepted
-
-Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
----
- CMakeLists.txt | 10 ++++------
- package.xml    |  1 +
- 2 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 933f57a..6986a0d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,13 +20,12 @@ find_package(catkin COMPONENTS
-         message_generation
-         ${MSG_DEPS}
-         dynamic_reconfigure
-+        cmake_modules
-         REQUIRED)
- 
- find_package(Eigen REQUIRED)
- find_package(OpenCV REQUIRED)
--
--find_package(PkgConfig)
--pkg_check_modules(PC_TINYXML REQUIRED tinyxml)
-+find_package(TinyXML REQUIRED)
- 
- # generate messages
- set(MSG_FILES AlvarMarker.msg AlvarMarkers.msg)
-@@ -57,10 +56,9 @@ catkin_package(
- )
- 
- include_directories(include 
--                    ${PC_TINYXML_INCLUDE_DIRS}
-                     ${catkin_INCLUDE_DIRS}
-                     ${OpenCV_INCLUDE_DIRS}
--                    ${PC_TINYXML_INCLUDE_DIRS}
-+                    ${TinyXML_INCLUDE_DIRS}
- 
- )
- 
-@@ -97,7 +95,7 @@ add_library(ar_track_alvar
-     src/MultiMarker.cpp
-     src/MultiMarkerBundle.cpp
-     src/MultiMarkerInitializer.cpp)
--target_link_libraries(ar_track_alvar ${OpenCV_LIBS} tinyxml ${catkin_LIBRARIES})
-+target_link_libraries(ar_track_alvar ${OpenCV_LIBS} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES})
- add_dependencies(ar_track_alvar ${GENCPP_DEPS})
- 
- # Kinect filtering code
-diff --git a/package.xml b/package.xml
-index ed9a560..a18ec5c 100644
---- a/package.xml
-+++ b/package.xml
-@@ -10,6 +10,7 @@ This package is a ROS wrapper for Alvar, an open source AR tag tracking library.
- 
-  <buildtool_depend>catkin</buildtool_depend>
- 
-+ <build_depend>cmake_modules</build_depend>
-  <build_depend>cv_bridge</build_depend>
-  <build_depend>geometry_msgs</build_depend>
-  <build_depend>image_transport</build_depend>
--- 
-1.8.5.3
-

recipes-ros/ar-track-alvar/ar-track-alvar_0.4.2.bb

@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=f62de161dc7a8f8
 
 DEPENDS = "cmake-modules cv-bridge image-transport libtinyxml pcl-ros resource-retriever roscpp tf visualization-msgs"
 
-SRC_URI = "https://github.com/sniekum/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "2786829c43437da2aa93eff77a4c862f"
-SRC_URI[sha256sum] = "f87759a0a4decbf0da3ff9341e1aa6fcfdcaf302f0844d6ace371c7e5dc9e53e"
+SRC_URI = "git://github.com/sniekum/${ROS_SPN}.git;protocol=https;branch=hydro-devel"
+# commit df56a7429 is intended to be version 0.4.2
+SRCREV = "df56a742976712a1de7212039de8056c93b39375"
 
-SRC_URI += "file://0001-used-cmake_modules-to-find-TinyXML.patch"
-
-S = "${WORKDIR}/${ROS_SP}"
+S = "${WORKDIR}/git"
 
 inherit catkin

recipes-ros/catkin/catkin_0.5.90.bb

@@ -1,6 +1,5 @@
 require catkin.inc
 
-
 DEPENDS_virtclass-native += "catkin-runtime"
 
 RDEPENDS_${PN}_class-native = ""

recipes-ros/freenect-stack/freenect-stack.inc

@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "5599c0d4f1846de30072836bc8279001"
-SRC_URI[sha256sum] = "e46805ee5daa301e42028007b49e19a11846769dce5718f88a576eb7755eba38"
+SRC_URI[md5sum] = "6a360b208435b23ec1f55ffcfa5ec6b8"
+SRC_URI[sha256sum] = "2e62ca45afacc1d0129bee3f2672f7b677315fc98317d1380cb74842025e0811"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 

recipes-ros/frontier-exploration/frontier-exploration_0.2.5.bb

@@ -1,14 +1,14 @@
 DESCRIPTION = "Frontier exploration implementation in ROS, \
 accepts exploration goals via actionlib, sends movement commands to move_base"
 SECTION = "devel"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=982a0c0253535646914c5d3dde650928"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=1e7b3bcc2e271699c77c769685058cbe"
 
 DEPENDS = "geometry-msgs roscpp pcl costmap-2d actionlib move-base-msgs visualization-msgs tf"
 
 SRC_URI = "https://github.com/paulbovbel/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "dbb1ec9af662a412d18b18827d30757c"
-SRC_URI[sha256sum] = "d4b17acdfb6e532df2894a361e5f6636932a05a27f0bdd6052943c27c1371a7d"
+SRC_URI[md5sum] = "05c1be2938dcb998deba340012b5b91a"
+SRC_URI[sha256sum] = "a26149014a5ded055f5424d97d3621bcfd7f472fc0664ef61f76ed2f114a6e20"
 
 S = "${WORKDIR}/${ROS_SP}"
 

recipes-ros/geometric-shapes/geometric-shapes_0.3.9.bb

@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=5ee5b8b046ae48a
 DEPENDS = "boost shape-msgs shape-tools octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever"
 
 SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "53d43fd2d624c18d47789d1fcca26047"
-SRC_URI[sha256sum] = "90dd882471147c981bf6395997d2b5318b970565cf5045c15bd0a5a4f465638c"
+SRC_URI[md5sum] = "c8e43ebaa2bcb0a12a006ed61b265b74"
+SRC_URI[sha256sum] = "fa16bd0a8311ebe9e0cd11fcb5a4f41039275cd7f1aeb88b0e8d4f983a2d13f7"
 
 S = "${WORKDIR}/${ROS_SP}"
 

recipes-ros/laser-assembler/laser-assembler/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch

@@ -1,36 +0,0 @@
-From a4404ea5ee0f4fb192c5765ee4dce6a265a70ec9 Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Sun, 27 Jul 2014 09:58:36 +0200
-Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
-
-Upstream-Status: Accepted
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ad9dbc..7309f3d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,8 +10,7 @@ tf sensor_msgs message_filters roscpp laser_geometry filters)
- 
- find_package(catkin REQUIRED COMPONENTS 
-   ${THIS_PACKAGE_ROS_DEPS} 
--  message_generation
--  rostest)
-+  message_generation)
- find_package(Boost REQUIRED COMPONENTS system signals)
- include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
- 
-@@ -68,6 +67,8 @@ add_dependencies(point_cloud2_assembler ${PROJECT_NAME}_gencpp)
- ## unit testing
- 
- if(CATKIN_ENABLE_TESTING)
-+  find_package(rostest)
-+
-   add_executable(periodic_snapshotter examples/periodic_snapshotter.cpp)
-   target_link_libraries(periodic_snapshotter ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-   add_dependencies(periodic_snapshotter ${PROJECT_NAME}_gencpp)
--- 
-1.9.1
-

recipes-ros/laser-assembler/laser-assembler_1.7.3.bb

@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=13;endline=13;md5=d566ef916e9de
 DEPENDS = "message-generation sensor-msgs message-filters tf roscpp filters laser-geometry pluginlib"
 
 SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "1e0fe2d0b5fb26eca1e9137d64767419"
-SRC_URI[sha256sum] = "de6637a229d84d6215dc0176ea05bc40c2eb2d8dec8ca520c4a29822f089e74a"
-
-SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch"
+SRC_URI[md5sum] = "f9a368c1ec64c47c3539ad2eb58e95e2"
+SRC_URI[sha256sum] = "11c01b45917f9b9f24d19b38e8d32046da4f6deae479812b2326b7deb2a624f4"
 
 S = "${WORKDIR}/${ROS_SP}"
 

recipes-ros/navigation/navigation.inc

@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "441a198ab3223e1cd65df1a74a2520ef"
-SRC_URI[sha256sum] = "747c527c0f7ce880548be81203eab3cb5022e928ca57f672a7a39107cb249c01"
+SRC_URI[md5sum] = "06ff1b7ec7cf4d0a7292f7ceec1a923b"
+SRC_URI[sha256sum] = "df843e2b2d9515c8615d04450a5f238e8aeecc9ab3de2b095cbe4314ae8f6408"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"