From 48ff1fca6d27396d671a180bcbede664fd1332d6 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Date: Mon, 17 Apr 2017 14:41:01 +0200
Subject: [PATCH 1/2] image-view: improve build dependencies

With these improved build dependencies, the image-view recipe
configures successfully. However, compiling fails due to not
finding the gtk headers.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 recipes-ros/image-pipeline/image-view_1.12.19.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-ros/image-pipeline/image-view_1.12.19.bb b/recipes-ros/image-pipeline/image-view_1.12.19.bb
index 4b48b63..71a9ea7 100644
--- a/recipes-ros/image-pipeline/image-view_1.12.19.bb
+++ b/recipes-ros/image-pipeline/image-view_1.12.19.bb
@@ -3,6 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "camera-calibration-parsers cv-bridge image-transport message-filters nodelet opencv rosconsole roscpp sensor-msgs std-srvs stereo-msgs"
+DEPENDS = "camera-calibration-parsers cv-bridge dynamic-reconfigure image-transport message-filters nodelet opencv rosconsole roscpp sensor-msgs std-srvs stereo-msgs"
 
 require image-pipeline.inc

From 4250542cc58c58b0a1d53e90b68fe7df869139ef Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Date: Fri, 3 Feb 2017 05:58:20 +0100
Subject: [PATCH 2/2] include recently added recipes in packagegroups

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
 .../packagegroups/packagegroup-ros-comm.bb       |  4 +++-
 .../packagegroups/packagegroup-ros-world.bb      | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/recipes-ros/packagegroups/packagegroup-ros-comm.bb b/recipes-ros/packagegroups/packagegroup-ros-comm.bb
index c222f9e..585c2f0 100644
--- a/recipes-ros/packagegroups/packagegroup-ros-comm.bb
+++ b/recipes-ros/packagegroups/packagegroup-ros-comm.bb
@@ -9,6 +9,7 @@ RDEPENDS_${PN} = "\
     rosconsole \
     rosparam \
     catkin \
+    catkin-runtime \
     genmsg \
     rosgraph \
     genpy \
@@ -50,4 +51,5 @@ RDEPENDS_${PN} = "\
     message-runtime \
     rostime \
     gencpp \
-    "
+    roslz4 \
+"
diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb
index 78b5396..b0dd2b4 100644
--- a/recipes-ros/packagegroups/packagegroup-ros-world.bb
+++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb
@@ -37,6 +37,7 @@ RDEPENDS_${PN} = "\
     tf2-msgs \
     tf2-py \
     tf2-ros \
+    tf2-sensor-msgs \
     tf2-tools \
     eigen-conversions \
     kdl-conversions \
@@ -65,6 +66,8 @@ RDEPENDS_${PN} = "\
     hardware-interface \
     joint-limits-interface \
     transmission-interface \
+    collada-parser \
+    collada-urdf \
     kdl-parser \
     resource-retriever \
     urdf-parser-plugin \
@@ -171,11 +174,20 @@ RDEPENDS_${PN} = "\
     rosbridge-server \
     rosbridge-suite \
     ar-track-alvar \
+    ar-track-alvar-msgs \
+    moveit-core \
+    moveit-msgs \
+    moveit-ros-perception \
     moveit-ros-planning \
+    mavros-msgs \
+    cv-camera \
+    object-recognition-msgs \
+    srdfdom \
 "
 
-# collada-parser and collada-urdf require collada-dom, which does not compile with gcc6.
+# ros-mavlink fails while configuring; libmavconn, mavros, mavros-extras depend on ros-mavlink.
+# urdfdom-headers is an empty deploy package.
 # image-view requires gtk+, but it cannot be found by cmake for some reason.
 # sound-play requires python-gst (which is not available in any layers' master branch)
-# joint-state-publisher still has some issues.
+# joint-state-publisher requires opengl distro feature and has further issues building.
 # freenect-camera and freenect-launch requires opengl distro feature.