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

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

diff --git a/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc b/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
index 5e19a24..2516165 100644
--- a/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
+++ b/recipes-core/packagegroups/packagegroup-ros-world-crystal.inc
@@ -9,3 +9,15 @@ 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)}"
+
+# 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)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-common', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-default-plugins', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-ogre-vendor', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-rendering', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-rendering', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-rendering-tests', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz-visual-testing-framework', d)}"
+RDEPENDS_${PN}_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'ros-rviz opengl', '', 'rviz2', d)}"