{kilted} fixes for Kilted sync

meta-ros-common/conf/layer.conf

@@ -22,6 +22,6 @@ LAYERDEPENDS_ros-common-layer = " \
     openembedded-layer \
 "
 
-LAYERSERIES_COMPAT_ros-common-layer = "walnascar styhead"
+LAYERSERIES_COMPAT_ros-common-layer = "walnascar styhead whinlatter"
 
 require conf/ros-distro/ros-distro.conf

meta-ros-common/recipes-core/images/ros-image-desktop.bb

@@ -0,0 +1,12 @@
+require ${COREBASE}/meta/recipes-graphics/images/core-image-x11.bb
+
+SUMMARY = "Full desktop image of ROS 2"
+DESCRIPTION = "${SUMMARY}"
+
+inherit ros_distro_${ROS_DISTRO}
+inherit ${ROS_DISTRO_TYPE}_image
+
+IMAGE_INSTALL:append = " \
+    ros-core \
+    desktop-full \
+"

meta-ros-common/recipes-devtools/dartsim/dartsim_6.13.2.bb

@@ -46,7 +46,7 @@ EXTRA_OECMAKE:prepend = "\
     -DDART_ENABLE_SIMD=OFF \
 "
 
-CXXFLAGS += "-Wno-error=deprecated-copy -Wno-error=reorder"
+CXXFLAGS += "-Wno-error=deprecated-copy -Wno-error=reorder -Wno-error=cpp"
 
 FILES:${PN} += "${datadir}/dart"
 

meta-ros-common/recipes-devtools/gazebo/gz-common6/0001-Added-missing-includes-672.patch

@@ -0,0 +1,40 @@
+From 8f235cb2cb7ae9c2251c8ef155a2980ba4f0e764 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
+Date: Tue, 29 Apr 2025 19:59:57 +0200
+Subject: [PATCH] Added missing includes (#672)
+
+Upstream-Status: Backport [https://github.com/gazebosim/gz-common/commit/8f235cb2cb7ae9c2251c8ef155a2980ba4f0e764]
+
+Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
+---
+ include/gz/common/Battery.hh           | 1 +
+ profiler/include/gz/common/Profiler.hh | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/include/gz/common/Battery.hh b/include/gz/common/Battery.hh
+index fa24ae6..024fc56 100644
+--- a/include/gz/common/Battery.hh
++++ b/include/gz/common/Battery.hh
+@@ -17,6 +17,7 @@
+ #ifndef GZ_COMMON_BATTERY_HH_
+ #define GZ_COMMON_BATTERY_HH_
+
++#include <cstdint>
+ #include <functional>
+ #include <map>
+ #include <memory>
+diff --git a/profiler/include/gz/common/Profiler.hh b/profiler/include/gz/common/Profiler.hh
+index 4ac856c..db0ad12 100644
+--- a/profiler/include/gz/common/Profiler.hh
++++ b/profiler/include/gz/common/Profiler.hh
+@@ -18,6 +18,7 @@
+ #ifndef GZ_COMMON_PROFILER_HH_
+ #define GZ_COMMON_PROFILER_HH_
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+
+-- 
+2.39.5
+

meta-ros-common/recipes-devtools/gazebo/gz-common6_6.0.2.bb

@@ -1,9 +1,12 @@
 # Copyright (c) 2024 Wind River Systems, Inc.
+SUMMARY = "Gazebo Common : AV, Graphics, Events, and much more"
+HOMEPAGE = "https://gazebosim.org"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2a461be67a1edf991251f85f3aadd1d0 \
                     file://profiler/src/Remotery/LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
-SRC_URI = "git://github.com/gazebosim/gz-common.git;protocol=https;branch=gz-common6"
+SRC_URI = "git://github.com/gazebosim/gz-common.git;protocol=https;branch=gz-common6 \
+           file://0001-Added-missing-includes-672.patch"
 
 SRCREV = "86b3b3dd57773a2bf7dbe8bae07bd92beb03f8f6"
 
@@ -14,25 +17,25 @@ inherit cmake pkgconfig
 # CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the following cache variables appropriately:
 #    FREEIMAGE_RUNS (advanced)
 #    FREEIMAGE_RUNS__TRYRUN_OUTPUT (advanced)
-EXTRA_OECMAKE += " -DFREEIMAGE_RUNS=1 -DFREEIMAGE_RUNS__TRYRUN_OUTPUT=0"
+EXTRA_OECMAKE += "-DFREEIMAGE_RUNS=1 -DFREEIMAGE_RUNS__TRYRUN_OUTPUT=0"
 
-DEPENDS = " \
+DEPENDS = "\
     assimp \
     cppcheck-native \
     doxygen-native \
+    ffmpeg \
+    freeimage \
     gdal \
     graphviz-native \
+    gts \
     gz-cmake4 \
     gz-math8 \
     gz-utils3 \
-    gts \
-    ffmpeg \
-    freeimage \
     libtinyxml2 \
     util-linux \
 "
 
-FILES:${PN} += " \
+FILES:${PN} += "\
     ${datadir}/gz/gz-common6/profiler_vis/* \
 "
 

meta-ros-common/recipes-devtools/ogre/ogre_1.12.12.bb

@@ -8,8 +8,13 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=41bb7e40692720ea7d7b034dc4afd191"
 
 # matches with tag v1.12.12
-SRCREV = "be8c2a225ecae636c8e669a12129b603db6b0e3c"
-SRC_URI = "git://github.com/OGRECave/ogre;protocol=https;branch=master \
+SRCREV_ogre = "be8c2a225ecae636c8e669a12129b603db6b0e3c"
+# matches with tag v1.79
+SRCREV_imgui = "e5cb04b132cba94f902beb6186cb58b864777012"
+SRCREV_FORMAT = "ogre_imgui"
+
+SRC_URI = "git://github.com/OGRECave/ogre;protocol=https;branch=master;name=ogre \
+    git://github.com/ocornut/imgui.git;name=imgui;destsuffix=imgui-1.79;branch=master;protocol=https \
     file://0001-CMakeLists.txt-don-t-set-RPATH.patch \
     file://use-opengl-cmake-targets.patch \
     file://find-assimp-package.patch \
@@ -63,5 +68,9 @@ EXTRA_OECMAKE_RVIZ_OGRE_VENDOR = " \
 
 EXTRA_OECMAKE += "${EXTRA_OECMAKE_RVIZ_OGRE_VENDOR}"
 
+do_configure:prepend() {
+  cp -r ${UNPACKDIR}/imgui-1.79 ${B}/
+}
+
 FILES:${PN}-dev += "${libdir}/OGRE/cmake ${libdir}/OGRE/*${SOLIBSDEV}"
 FILES:${PN} += "${datadir}/OGRE ${libdir}/OGRE"

meta-ros-common/recipes-devtools/python/python3-pygraphviz_1.14.bb

@@ -1,3 +1,14 @@
-require python-pygraphviz.inc
+DESCRIPTION = "PyGraphviz is a Python interface to the Graphviz graph layout and visualization package"
+HOMEPAGE = "https://pygraphviz.github.io"
+SECTION = "devel/python"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=09d1f41013f91e294baad78b57be0746"
 
-inherit setuptools3
+SRC_URI[sha256sum] = "c10df02377f4e39b00ae17c862f4ee7e5767317f1c6b2dfd04cea6acc7fc2bea"
+
+DEPENDS = "graphviz"
+
+PYPI_PACKAGE_EXT = "tar.gz"
+inherit pypi pkgconfig python_setuptools_build_meta
+
+BBCLASSEXTEND = "native"

meta-ros-common/recipes-extended/pcl/pcl.inc

@@ -1,6 +1,7 @@
 # Copyright (c) 2021 LG Electronics, Inc.
 
 DESCRIPTION = "The Point Cloud Library (or PCL) for point cloud processing."
+HOMEPAGE = "https://pointclouds.org/"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5b8a2a1aa14e6de44b4273134946a34c"

meta-ros-common/recipes-extended/pcl/pcl_1.15.0.bb

@@ -0,0 +1,6 @@
+# Copyright (c) 2021 LG Electronics, Inc.
+# Copyright (c) 2024 Wind River Systems, Inc.
+
+require pcl.inc
+
+SRCREV = "605cdd5b1b971d3e90c737aaae947bbba41b66e7"

meta-ros-common/recipes-graphics/assimp/assimp_5.4.0.bb

@@ -26,5 +26,7 @@ EXTRA_OECMAKE = " \
 
 # types.h:347:54: error: '<anonymous>' may be used uninitialized [-Werror=maybe-uninitialized]
 CXXFLAGS += " -Wno-error=maybe-uninitialized"
+# code/AssetLib/X3D/X3DGeoHelper.cpp:194:20: error: array subscript -1 is outside array bounds of 'int [2305843009213693951]' [-Werror=array-bounds=]
+CXXFLAGS += "-Wno-error=array-bounds"
 
 BBCLASSEXTEND = "native nativesdk"

meta-ros-common/recipes-support/ipopt/ipopt_3.14.16.bb

@@ -13,5 +13,5 @@ DEPENDS = "coinor-buildtools-native lapack"
 
 do_configure:prepend () {
     mkdir -p ${S}/coinor-m4
-    cp ${STAGING_DIR_NATIVE}/${datadir}/coinor/* ${S}/coinor-m4
+    cp ${STAGING_DIR_NATIVE}/${datadir}/coinor/* ${STAGING_DATADIR_NATIVE}/aclocal
 }

meta-ros-common/recipes-support/octomap/octomap_1.10.0.bb

@@ -14,6 +14,13 @@ S = "${WORKDIR}/git/octomap"
 
 inherit cmake
 
+# Ignore
+#  error: #warning "<ciso646> is deprecated in C++17, use <version> to detect implementation-specific macros" [-Werror=cpp]
+
+EXTRA_OECMAKE += " \
+    -DCMAKE_CXX_FLAGS='${CXXFLAGS} -Wno-cpp' \
+"
+
 FILES:${PN}:prepend = " \
     ${datadir}/ament_index \
 "

meta-ros2-kilted/conf/layer.conf

@@ -21,7 +21,7 @@ LAYERDEPENDS_ros2-kilted-layer = " \
     ros2-layer \
 "
 
-LAYERSERIES_COMPAT_ros2-kilted-layer = "walnascar styhead"
+LAYERSERIES_COMPAT_ros2-kilted-layer = "walnascar styhead whinlatter"
 
 require conf/ros-distro/include/kilted/ros-distro.inc
 require conf/ros-distro/include/kilted/ros-sdk.inc

meta-ros2-kilted/conf/ros-distro/include/kilted/ros-distro-preferred-versions.inc

@@ -10,7 +10,7 @@
 # REP-2000 specifies 1.14.0 for jazzy and kilted
 # This is necessary as with ROS1 many recipes fail to build
 # as documented in https://github.com/ros/meta-ros/pull/936
-PREFERRED_VERSION_pcl = "1.14.1"
+PREFERRED_VERSION_pcl = "1.15.0"
 
 PREFERRED_VERSION_sdformat = "15.2.0"
 

meta-ros2-kilted/recipes-bbappends/bond-core/bond_4.1.2-2.bbappend

@@ -1,7 +1,5 @@
 # Copyright (c) 2023 Wind River Systems, Inc.
 
-LICENSE = "BSD-3-Clause"
-
 ROS_BUILDTOOL_DEPENDS += " \
     rosidl-default-runtime-native \
 "

meta-ros2-kilted/recipes-bbappends/control-msgs/control-msgs_6.1.0-1.bbappend

@@ -1,8 +1,6 @@
 # Copyright (c) 2019 LG Electronics, Inc.
 # Copyright (C) 2023 Advanced Micro Devices, Inc.  All rights reserved.
 
-LICENSE = "BSD-3-Clause"
-
 ROS_BUILDTOOL_DEPENDS += " \
     rosidl-parser-native \
     rosidl-adapter-native \

meta-ros2-kilted/recipes-bbappends/fastdds/fastdds/0003_5796.patch

@@ -0,0 +1,83 @@
+From c24121f1f572d31b0365d61c35aaf1d580ad4245 Mon Sep 17 00:00:00 2001
+From: Mario Dominguez <mariodominguez@eprosima.com>
+Date: Mon, 5 May 2025 10:04:55 +0200
+Subject: [PATCH 1/3] Refs #23110: Add cstdint header for uint8_t
+
+Upstream-Status: Backport [https://github.com/eProsima/Fast-DDS/pull/5796]
+
+Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
+---
+ .../fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp    | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
+index d4759dec719..9f30bde460e 100644
+--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
++++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterCompoundCondition.hpp
+@@ -19,6 +19,7 @@
+ #ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERCOMPOUNDCONDITION_HPP_
+ #define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERCOMPOUNDCONDITION_HPP_
+
++#include <cstdint>
+ #include <memory>
+
+ #include "DDSFilterCondition.hpp"
+
+From d7496f2892dca8d6f8936946cc62672146162908 Mon Sep 17 00:00:00 2001
+From: Mario Dominguez <mariodominguez@eprosima.com>
+Date: Mon, 5 May 2025 10:05:08 +0200
+Subject: [PATCH 2/3] Refs #23110: Remove unused using
+
+Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
+---
+ src/cpp/rtps/reader/BaseReader.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cpp/rtps/reader/BaseReader.cpp b/src/cpp/rtps/reader/BaseReader.cpp
+index 40f634e50f9..d8fad36cb97 100644
+--- a/src/cpp/rtps/reader/BaseReader.cpp
++++ b/src/cpp/rtps/reader/BaseReader.cpp
+@@ -517,7 +517,6 @@ void BaseReader::setup_datasharing(
+
+     if (att.endpoint.data_sharing_configuration().kind() != fastdds::dds::DataSharingKind::OFF)
+     {
+-        using std::placeholders::_1;
+         std::shared_ptr<DataSharingNotification> notification = DataSharingNotification::create_notification(
+             getGuid(), att.endpoint.data_sharing_configuration().shm_directory());
+         if (notification)
+
+From c9c039bcbc125b27ae379503ac75d180d5124d3b Mon Sep 17 00:00:00 2001
+From: cferreiragonz <carlosferreira@eprosima.com>
+Date: Thu, 8 May 2025 09:07:24 +0200
+Subject: [PATCH 3/3] Refs #23110: Add missing cstdint to more headers
+
+Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
+---
+ src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp | 1 +
+ src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp
+index a4ac02ad320..7a53b807d3a 100644
+--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp
++++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterPredicate.hpp
+@@ -19,6 +19,7 @@
+ #ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERPREDICATE_HPP_
+ #define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERPREDICATE_HPP_
+
++#include <cstdint>
+ #include <memory>
+
+ #include "DDSFilterCondition.hpp"
+diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
+index 4ae70cb485e..bdb25584dfb 100644
+--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
++++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterValue.hpp
+@@ -21,6 +21,7 @@
+
+ #include <fastcdr/cdr/fixed_size_string.hpp>
+
++#include <cstdint>
+ #include <memory>
+ #include <regex>
+

meta-ros2-kilted/recipes-bbappends/fastdds/fastdds_3.2.2-1.bbappend

@@ -3,7 +3,8 @@
 # ERROR: fastdds-3.2.1-1-r0 do_package_qa: QA Issue: File /opt/ros/rolling/share/fastdds/cmake/fastdds-shared-targets.cmake in package fastdds-dev contains reference to TMPDIR [buildpaths]
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI += "file://0001-CMakeLists-use-tinyxml2-by-name.patch \
-            file://0001-FindTinyXML2.cmake-fix-find_library-libtinyxml2.patch"
+            file://0001-FindTinyXML2.cmake-fix-find_library-libtinyxml2.patch \
+	    file://0003_5796.patch"
 
 # ERROR: fastdds-3.2.1-1-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package fastdds contains symlink .so '/opt/ros/rolling/lib/libfastdds.so' [dev-so]
 FILES:${PN}-dev += "${ros_libdir}/libfastdds.so"

meta-ros2-kilted/recipes-bbappends/gz-plugin-vendor/gz-plugin-vendor_0.2.1-2.bbappend

@@ -1,6 +1,5 @@
-
 # Copyright (c) 2024 Wind River Systems, Inc.
 
-ROS_BUILD_DEPENDS += "gz-plugin2"
+ROS_BUILD_DEPENDS += "gz-plugin3"
 
 inherit ros_insane_dev_so