From 65f0ffec504ccf6f61b72bf11bbbb092047d7287 Mon Sep 17 00:00:00 2001 From: "tho3.nguyen" Date: Sat, 29 Mar 2025 01:00:46 +0900 Subject: [PATCH] libcamera: Fix build with gcc-15 Backport patch to fix the following error: ... In file included from ../git/src/libcamera/dma_buf_allocator.cpp:9: ../git/include/libcamera/internal/dma_buf_allocator.h:66:19: error: 'uint64_t' has not been declared 66 | void sync(uint64_t step); | ^~~~~~~~ ../git/include/libcamera/internal/dma_buf_allocator.h:17:1: note: 'uint64_t' is defined in header ''; this is probably fixable by adding '#include ' ... Signed-off-by: tho3.nguyen Signed-off-by: Khem Raj --- ...ssing-stdint.h-include-to-dma_buf_al.patch | 38 +++++++++++++++++++ .../libcamera/libcamera_0.4.0.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch new file mode 100644 index 0000000000..18ba353de2 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch @@ -0,0 +1,38 @@ +From 91de550243121056984e5b9b693b486860655d31 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sat, 28 Dec 2024 19:11:19 +0000 +Subject: [PATCH] libcamera: Add missing include to + dma_buf_allocator.h + +Without the change the build fails on upcoming `gcc-15` as: + + In file included from ../src/libcamera/dma_buf_allocator.cpp:9: + ../include/libcamera/internal/dma_buf_allocator.h:66:19: error: 'uint64_t' has not been declared + 66 | void sync(uint64_t step); + | ^~~~~~~~ + +Signed-off-by: Sergei Trofimovich +Reviewed-by: Laurent Pinchart +Reviewed-by: Kieran Bingham +Signed-off-by: Laurent Pinchart + +Upstream-Status: Backport [https://git.libcamera.org/libcamera/libcamera.git/commit/?id=91de550243121056984e5b9b693b486860655d31] +--- + include/libcamera/internal/dma_buf_allocator.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/libcamera/internal/dma_buf_allocator.h b/include/libcamera/internal/dma_buf_allocator.h +index d26f8a74..13600915 100644 +--- a/include/libcamera/internal/dma_buf_allocator.h ++++ b/include/libcamera/internal/dma_buf_allocator.h +@@ -8,6 +8,7 @@ + #pragma once + + #include ++#include + #include + #include + +-- +2.34.1 + diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb index ef424c84e6..3d43b4f1da 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ file://0001-media_device-Add-bool-return-type-to-unlock.patch \ + file://0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch \ " SRCREV = "35ed4b91291d9f3d08e4b51acfb51163e65df8f8"