From 81d4e9de7a2219a55fb8d6484bff4e176f5734dd Mon Sep 17 00:00:00 2001
From: Rob Woolley <rob.woolley@windriver.com>
Date: Mon, 8 Apr 2024 15:30:40 -0700
Subject: [PATCH] {rolling} packagegroup-ros-world-rolling: Update skip groups

Signed-off-by: Rob Woolley <rob.woolley@windriver.com>
---
 .../packagegroup-ros-world-rolling.bb             | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/meta-ros2-rolling/recipes-core/packagegroups/packagegroup-ros-world-rolling.bb b/meta-ros2-rolling/recipes-core/packagegroups/packagegroup-ros-world-rolling.bb
index 44f45d4ecb9..981c9f615f3 100644
--- a/meta-ros2-rolling/recipes-core/packagegroups/packagegroup-ros-world-rolling.bb
+++ b/meta-ros2-rolling/recipes-core/packagegroups/packagegroup-ros-world-rolling.bb
@@ -57,11 +57,6 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CARGO = " \
     zenoh-bridge-dds \
 "
 
-RDEPENDS:${PN}:remove = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'clang', '${ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CLANG}', '', d)}"
-ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CLANG = " \
-    zenoh-bridge-dds \
-"
-
 # alternative not yet supported implementation for fastrtps
 RDEPENDS:${PN}:remove = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'connext', '${ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CONNEXT}', '', d)}"
 ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CONNEXT = " \
@@ -102,10 +97,13 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_CLANG = " \
     ament-clang-tidy \
     ament-cmake-clang-format \
     ament-cmake-clang-tidy \
+    ffmpeg-image-transport \
     ouxt-lint-common \
     pinocchio \
+    zenoh-bridge-dds \
 "
 
+
 RDEPENDS:${PN}:remove = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'openni', '${ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_OPENNI}', '', d)}"
 ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_OPENNI = " \
     mrpt2 \
@@ -311,6 +309,7 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_OPENGL = " \
     freeglut \
     fuse \
     fuse-tutorials \
+    glew \
     glfw \
     libg2o \
     librealsense2 \
@@ -325,6 +324,7 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_OPENGL = " \
     openni2 \
     openni2-camera \
     openvslam \
+    pangolin \
     plotjuggler-ros \
     plotjuggler \
     pose-cov-ops \
@@ -438,6 +438,7 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_META_QT5 = " \
     rqt-common-plugins \
     rqt-console \
     rqt-controller-manager \
+    rqt-gauges \
     rqt-gui \
     rqt-gui-py \
     rqt-gui-cpp \
@@ -657,6 +658,7 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_PYQT5 = " \
     rqt-console \
     rqt-common-plugins \
     rqt-controller-manager \
+    rqt-gauges \
     rqt-graph \
     rqt-gui-cpp \
     rqt-gui-py \
@@ -703,6 +705,7 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_SELF_TEST = " \
 
 RDEPENDS:${PN}:remove = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'x11', '${ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_X11}', '', d)}"
 ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_X11 = " \
+    adwaita-icon-theme \
     color-names \
     desktop \
     dolly-gazebo \
@@ -738,10 +741,12 @@ ROS_SUPERFLORE_GENERATED_WORLD_PACKAGES_DEPENDING_ON_X11 = " \
     rviz-rendering \
     rviz-visual-tools \
     slam-toolbox \
+    tango-icons-vendor \
     tiago-bringup \
     tiago-robot \
     turtlebot3-gazebo \
     turtlebot3-simulations \
+    visp \
     webots-ros2-epuck \
     webots-ros2-tiago \
     webots-ros2-universal-robot \