diff options
| author |   Markus Volk <f_L_K@t-online.de> | 2023-04-01 17:46:08 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2023-04-01 08:55:06 -0700 |
| commit | 17180ae0d2b3b01d0cea024ce9091966e818fc2c (patch) | |
| tree | b8ea169c9511a5900cc5c377ab453a1c987ae2f4 /meta-multimedia | |
| parent | fb3430b8f3be218aca30c6d7f3001ef7774c9028 (diff) | |
| download | meta-openembedded-contrib-17180ae0d2b3b01d0cea024ce9091966e818fc2c.tar.gz | |
libcamera: re-introduce fix for gcc-13
Signed-off-by: Markus Volk <f_L_K@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch | 44 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.4.bb | 5 |
2 files changed, 48 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch new file mode 100644 index 0000000000..55a5977a7a --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-file_sink.cpp-Avoid-dangling-reference.patch @@ -0,0 +1,44 @@ +From 2eaffc9ac8b47c354404075761fe8f76fad0ced4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 24 Jan 2023 01:18:25 -0800 +Subject: [PATCH] file_sink.cpp: Avoid dangling-reference + +Fixes following errors with gcc-13 + +../git/src/cam/file_sink.cpp:92:45: error: possibly dangling reference to a temporary [-Werror=dangling-reference] + 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + | ^~~~ +../git/src/cam/file_sink.cpp:92:81: note: the temporary was destroyed at the end of the full expression '(& buffer->libcamera::FrameBuffer::metadata())->libcamera::FrameMetadata::planes().libcamera::Span<const libcamera::FrameMetadata::Plane>::operator[](i)' + 92 | const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + | ^ +cc1plus: all warnings being treated as errors + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2023-January/036575.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/apps/cam/file_sink.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp +index b32aad24..9f4c5648 100644 +--- a/src/apps/cam/file_sink.cpp ++++ b/src/apps/cam/file_sink.cpp +@@ -114,13 +114,13 @@ void FileSink::writeBuffer(const Stream *stream, FrameBuffer *buffer, + } + + for (unsigned int i = 0; i < buffer->planes().size(); ++i) { +- const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; ++ unsigned int bytesused = buffer->metadata().planes()[i].bytesused; + + Span<uint8_t> data = image->data(i); +- unsigned int length = std::min<unsigned int>(meta.bytesused, data.size()); ++ unsigned int length = std::min<unsigned int>(bytesused, data.size()); + +- if (meta.bytesused > data.size()) +- std::cerr << "payload size " << meta.bytesused ++ if (bytesused > data.size()) ++ std::cerr << "payload size " << bytesused + << " larger than plane size " << data.size() + << std::endl; + diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.4.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.4.bb index cbcc33aa4c..12d42991eb 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.4.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.0.4.bb @@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = "\ file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ " -SRC_URI = "git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master" +SRC_URI = " \ + git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ + file://0001-file_sink.cpp-Avoid-dangling-reference.patch \ +" SRCREV = "6cf637eb253a68edebe59505bea55435fafb00cd" |