ros · chkohn · Dec 13, 2025 · Feb 3, 2026 · Dec 12, 2025 · Dec 12, 2025
diff --git a/meta-ros-common/licenses/OSGPL-1.0 b/meta-ros-common/licenses/OSGPL-1.0
diff --git a/meta-ros-common/recipes-devtools/ogre-next/ogre-next_2.2.7.bb b/meta-ros-common/recipes-devtools/ogre-next/ogre-next_2.2.7.bb
@@ -78,7 +78,7 @@ do_configure:append() {
     #   git/RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXWindow.cpp:720:9: error: 'PFNGLXSWAPINTERVALMESAPROC' 
     #       was not declared in this scope; did you mean 'PFNGLXSWAPINTERVALEXTPROC'?
     #   git/RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXWindow.cpp:721:9: error: '_glXSwapInterval
-    rm ${S}/RenderSystems/GL3Plus/include/GL/glxext.h
+    rm -f ${S}/RenderSystems/GL3Plus/include/GL/glxext.h
 }
 
 FILES:${PN}-dev += "${libdir}/OGRE-Next/cmake ${libdir}/OGRE-Next/*${SOLIBSDEV}"

diff --git a/meta-ros-common/recipes-devtools/ogre-next/ogre-next_2.3.3.bb b/meta-ros-common/recipes-devtools/ogre-next/ogre-next_2.3.3.bb
@@ -37,7 +37,7 @@ DEPENDS = " \
     libxrandr \
     rapidjson \
     renderdoc \
-    mesa \
+    virtual/mesa \
     poco \
     shaderc \
     tbb \
@@ -72,7 +72,7 @@ do_configure:append() {
     #   git/RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXWindow.cpp:720:9: error: 'PFNGLXSWAPINTERVALMESAPROC'
     #       was not declared in this scope; did you mean 'PFNGLXSWAPINTERVALEXTPROC'?
     #   git/RenderSystems/GL3Plus/src/windowing/GLX/OgreGLXWindow.cpp:721:9: error: '_glXSwapInterval
-    rm ${S}/RenderSystems/GL3Plus/include/GL/glxext.h
+    rm -f ${S}/RenderSystems/GL3Plus/include/GL/glxext.h
 }
 
 FILES:${PN}-dev += "${libdir}/OGRE-Next/cmake ${libdir}/OGRE-Next/*${SOLIBSDEV}"

diff --git a/meta-ros-common/recipes-extended/libflann/libflann_1.9.2.bb b/meta-ros-common/recipes-extended/libflann/libflann_1.9.2.bb
@@ -12,14 +12,16 @@ S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
-DEPENDS = "hdf5 lz4 openmp"
+DEPENDS = "hdf5 lz4"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[openmp] = "-DUSE_OPENMP=ON,-DUSE_OPENMP=OFF,openmp"
 
 # Prevent it finding python
 EXTRA_OECMAKE = "\
     -DBUILD_MATLAB_BINDINGS=OFF \
     -DBUILD_PYTHON_BINDINGS=OFF \
     -DUSE_MPI=ON \
-    -DUSE_OPENMP=ON \
     -DBUILD_TESTS=ON \
     -DBUILD_CUDA_LIB=OFF \
     -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \

diff --git a/meta-ros-common/recipes-graphics/openexr/openexr_3.2.1.bb b/meta-ros-common/recipes-graphics/openexr/openexr_3.2.1.bb
@@ -12,7 +12,6 @@ DEPENDS += " \
     doxygen \
     libdeflate \
     imath \
-    clang-native \
 "
 
 inherit cmake python3-dir python3native pkgconfig

diff --git a/.../recipes-bbappends/gz-gui8/gz-gui8/0001-Fix-compilation-issue-due-to-missing-define.patch b/.../recipes-bbappends/gz-gui8/gz-gui8/0001-Fix-compilation-issue-due-to-missing-define.patch
@@ -0,0 +1,32 @@
+From 96bb47af36a09120894625a825ad0e4cc4993078 Mon Sep 17 00:00:00 2001
+From: Christian Kohn <chris.kohn@amd.com>
+Date: Fri, 12 Dec 2025 00:16:57 -0700
+Subject: [PATCH] Fix compilation issue due to missing define
+
+| /tmp/work/cortexa72-cortexa53-amd-linux/gz-gui8/8.4.0/git/src/plugins/minimal_scene/EngineToQtInterface.cc: In member function 'GLuint gz::gui::plugins::EngineToQtInterface::TextureId(gz::rendering::v8::CameraPtr&)':
+| /tmp/work/cortexa72-cortexa53-amd-linux/gz-gui8/8.4.0/git/src/plugins/minimal_scene/EngineToQtInterface.cc:179:7: error: 'GL_UNSIGNED_INT_8_8_8_8_REV' was not declared in this scope; did you mean 'GL_UNSIGNED_INT_5_9_9_9_REV'?
+|   179 |       GL_UNSIGNED_INT_8_8_8_8_REV, this->dataPtr->fallbackImage->Data());
+|       |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+|       |       GL_UNSIGNED_INT_5_9_9_9_REV
+
+Signed-off-by: Christian Kohn <chris.kohn@amd.com>
+---
+ src/plugins/minimal_scene/EngineToQtInterface.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/minimal_scene/EngineToQtInterface.cc b/src/plugins/minimal_scene/EngineToQtInterface.cc
+index 380f881f..3fac1499 100644
+--- a/src/plugins/minimal_scene/EngineToQtInterface.cc
++++ b/src/plugins/minimal_scene/EngineToQtInterface.cc
+@@ -23,6 +23,8 @@
+
+ #include <QOpenGLExtraFunctions>
+
++#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
++
+ // clang-format off
+ namespace gz
+ {
+-- 
+2.34.1
+
diff --git a/meta-ros2-jazzy/recipes-bbappends/gz-gui8/gz-gui8_8.4.0.bbappend b/meta-ros2-jazzy/recipes-bbappends/gz-gui8/gz-gui8_8.4.0.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+
+SRC_URI += "file://0001-Fix-compilation-issue-due-to-missing-define.patch"
diff --git a/meta-ros2-jazzy/recipes-bbappends/gz-ogre-next-vendor/gz-ogre-next-vendor_0.0.5-1.bbappend b/meta-ros2-jazzy/recipes-bbappends/gz-ogre-next-vendor/gz-ogre-next-vendor_0.0.5-1.bbappend
@@ -7,3 +7,9 @@ DEPENDS += "ogre-next"
 
 ROS_EXEC_DEPENDS:remove = "libxaw"
 ROS_EXEC_DEPENDS:append = "libxaw7"
+
+# Replace mesa with virtual/mesa
+ROS_BUILD_DEPENDS:remove = "mesa"
+ROS_BUILD_DEPENDS:append = "virtual/mesa"
+ROS_EXPORT_DEPENDS:remove = "mesa"
+ROS_EXPORT_DEPENDS:append = "virtual/mesa"
diff --git a/meta-ros2-jazzy/recipes-bbappends/rviz/rviz-ogre-vendor_%.bbappend b/meta-ros2-jazzy/recipes-bbappends/rviz/rviz-ogre-vendor_%.bbappend
@@ -10,3 +10,9 @@ SRC_URI += "file://0001-CMakeLists-remove-all-ament_vendor-calls.patch"
 # libxaw is empty, the library is installed in libxaw6 and libxaw7 packages
 # and ogre should get runtime dependency automatically through shlibs
 RDEPENDS:${PN}:remove = "libxaw"
+
+# Replace mesa with virtual/mesa
+ROS_BUILD_DEPENDS:remove = "mesa"
+ROS_BUILD_DEPENDS:append = "virtual/mesa"
+ROS_EXPORT_DEPENDS:remove = "mesa"
+ROS_EXPORT_DEPENDS:append = "virtual/mesa"
diff --git a/meta-ros2/recipes-support/openscenegraph/openscenegraph_3.6.5.bb b/meta-ros2/recipes-support/openscenegraph/openscenegraph_3.6.5.bb
@@ -1,14 +1,11 @@
-LICENSE = "LGPL-2.1-only & WxWindows-exception-3.1 & GPL-2.0-or-later"
+LICENSE = "OSGPL-1.0 & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1997b5e8aad6beab407654a49b4ac50c \
                     file://src/osgPlugins/3ds/lib3ds/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://src/osgPlugins/lwo/COPYING;md5=dcf3c825659e82539645da41a7908589 \
                     file://src/osgPlugins/x/LICENSE;md5=84e0bc9b7ca6053d5e8c673021069d2a"
 
 SRC_URI = "git://github.com/openscenegraph/OpenSceneGraph.git;protocol=https;branch=OpenSceneGraph-3.6"
 
-# WxWindows-exception-3.1 is a valid SPDX identifier but bitbake does not recognize it
-ERROR_QA:remove = "license-exists"
-
 # Modify these as desired
 PV = "3.6.5+git${SRCPV}"
 SRCREV = "a827840baf0786d72e11ac16d5338a4ee25779db"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"

		SRC_URI += "file://0001-Fix-compilation-issue-due-to-missing-define.patch"