meta-xilinx-demos: meta-ros2-jazzy: mcap-vendor: fix build

The rosbag2/mcap-vendor build was failing due to being unable to
find the requested commit hash.

The originally-generated recipe was mostly correct, but was overridden by a
bbappend, in upstream meta-ros/meta-ros2-jazzy, which replaced the hash with
one from the release/rolling/mcap_vendor/0.24.0-1 branch.

The jazzy branch of meta-ros2 was created from the rolling release branch,
which is why the rosbag2/mcap-vendor recipe had an override which specified
a commit from the rolling branch of rosbag2-release. This wasn't updated to
point to a commit on the jazzy branch when the jazzy branch was created.

Update the SRCREV to point to a release on the release/jazzy/mcap_vendor
branch of rosbag2-release Also, update to the latest commit on this branch.

Additionally the build was failing because it was not able to find necessary
header files that were provided in the source tree.

Signed-off-by: Trevor Woerner <trevor.woerner@amd.com>
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

2 files changed, 33 insertions, 0 deletions

diff --git a/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor/0001-fix-include-dir.patch b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor/0001-fix-include-dir.patch
new file mode 100644
index 00000000..35650c23
--- /dev/null
+++ b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor/0001-fix-include-dir.patch
@@ -0,0 +1,27 @@
+From f15236807f0b5ac96979840a12cd0be0c115f055 Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <trevor.woerner@amd.com>
+Date: Thu, 12 Sep 2024 15:21:33 -0400
+Subject: [PATCH] fix include dir
+
+Upstream-Status: inappropriate
+Signed-off-by: Trevor Woerner <trevor.woerner@amd.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d5789b292025..e5e97fa9fa0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,7 +43,7 @@ macro(build_mcap_vendor)
+     src/main.cpp
+   )
+ 
+-  set(_mcap_include_dir ${mcap_SOURCE_DIR}/cpp/mcap/include)
++  set(_mcap_include_dir ${mcap_vendor_SOURCE_DIR}/mcap/cpp/mcap/include)
+   file(GLOB _mcap_installed_headers ${_mcap_include_dir}/mcap/*.hpp)
+ 
+   target_include_directories(mcap PUBLIC
+-- 
+2.44.0.478.g7774cfed6261
+
diff --git a/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor_%.bbappend b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor_%.bbappend
new file mode 100644
index 00000000..dc63cf76
--- /dev/null
+++ b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/mcap-vendor_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+B = "${S}"
+SRC_URI:remove = "file://0001-CMakeLists.txt-fetch-dependencies-with-bitbake-fetch.patch"
+SRC_URI:append = " file://0001-fix-include-dir.patch"
+SRCREV_release:forcevariable = "6884e7ba7d29d8db98ad2bbf09a6875bf5141e19"