From 0eafc0b574d8c412dbf04eee87014afd7c0cf8fa Mon Sep 17 00:00:00 2001
From: Herb Kuta <herb.kuta@lge.com>
Date: Wed, 3 Apr 2019 11:30:07 -0700
Subject: [PATCH] DRAFT pg-ros-world-crystal.inc: Support DISTRO_FEATURES
 "ros-desktop"

---
 recipes-core/packagegroups/packagegroup-ros-world-crystal.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc b/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
index 61feb26..7220393 100644
--- a/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
+++ b/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
@@ -12,6 +12,9 @@ RDEPENDS_${PN}_remove = "rcl-logging-log4cxx"
 # OE won't let us build ffmpeg unless LICENSE_FLAGS_WHITELIST contains "commerical".
 RDEPENDS_${PN}_remove = "${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', '', 'ffmpeg', d)}"
 
+# desktop RDEPENDS on rviz packages.
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-desktop ros-rviz', '', 'desktop', d)}"
+
 # RViz requires the "opengl" distro feature.
 RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'object-analytics-rviz', d)}"
 RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-assimp-vendor', d)}"