Skip to content

Commit 3afa590

Browse files
libcamera-apps: upgrade 1.4.2 -> 1.9.0
Quite a few things have changed lately, eaiser to browse the release page: https://github.com/raspberrypi/rpicam-apps/releases The main reason for the update it improved build-compatibiltiy with tensorflow-lite: it doesn't need cmake/pkg-config file anymore to find the library, so it should be easier to integrate it with meta-tensorflow. Signed-off-by: Gyorgy Sarvari <[email protected]>
1 parent 33a3ab2 commit 3afa590

File tree

4 files changed

+71
-315
lines changed

4 files changed

+71
-315
lines changed

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps/0002-Revert-Support-compressed-pixel-formats-when-saving-.patch

Lines changed: 0 additions & 271 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
add missing header
2+
3+
When compiling with gcc15, compiliation fails with the following error:
4+
5+
| In file included from ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation_tf_stage.cpp:8:
6+
| ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation.hpp:15:82: error: 'uint8_t' was not declared in this scope
7+
| 15 | Segmentation(int w, int h, std::vector<std::string> l, const std::vector<uint8_t> &s)
8+
9+
To avoid it, add the cstdint header to the offending file.
10+
11+
Upstream-Status: Submitted [https://github.com/raspberrypi/rpicam-apps/pull/861]
12+
Signed-off-by: Gyorgy Sarvari <[email protected]>
13+
diff --git a/post_processing_stages/segmentation.hpp b/post_processing_stages/segmentation.hpp
14+
index ac87228..82d7939 100644
15+
--- a/post_processing_stages/segmentation.hpp
16+
+++ b/post_processing_stages/segmentation.hpp
17+
@@ -7,6 +7,7 @@
18+
19+
#pragma once
20+
21+
+#include <cstdint>
22+
#include <string>
23+
#include <vector>
24+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
SUMMARY = "A suite of libcamera-based apps"
2+
DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \
3+
copy the functionality of the existing \"raspicam\" apps."
4+
HOMEPAGE = "https://github.com/raspberrypi/rpicam-apps"
5+
SECTION = "console/utils"
6+
7+
LICENSE = "BSD-2-Clause"
8+
LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77"
9+
10+
SRC_URI = "\
11+
git://github.com/raspberrypi/rpicam-apps.git;protocol=https;branch=main \
12+
file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \
13+
file://add-missing-header.patch \
14+
"
15+
16+
SRCREV = "eca9928b76c106141667288f1cef935d02ba59b3"
17+
18+
PROVIDES += "rpicam-apps"
19+
20+
DEPENDS = "libcamera libexif jpeg tiff libpng boost"
21+
22+
PACKAGECONFIG ??= "drm tflite"
23+
PACKAGECONFIG[libav] = "-Denable_libav=enabled, -Denable_libav=disabled, libav"
24+
PACKAGECONFIG[drm] = "-Denable_drm=enabled, -Denable_drm=disabled, libdrm"
25+
PACKAGECONFIG[egl] = "-Denable_egl=enabled, -Denable_egl=disabled, virtual/egl"
26+
PACKAGECONFIG[qt] = "-Denable_qt=enabled, -Denable_qt=disabled, qtbase"
27+
PACKAGECONFIG[opencv] = "-Denable_opencv=enabled, -Denable_opencv=disabled, opencv"
28+
PACKAGECONFIG[tflite] = "-Denable_tflite=enabled, -Denable_tflite=disabled, tensorflow-lite"
29+
30+
inherit meson pkgconfig
31+
32+
NEON_FLAGS = ""
33+
NEON_FLAGS:aarch64 = "-Dneon_flags=arm64"
34+
NEON_FLAGS:arm:raspberrypi3 = "-Dneon_flags=armv8-neon"
35+
NEON_FLAGS:arm:raspberrypi4 = "-Dneon_flags=armv8-neon"
36+
EXTRA_OEMESON += "${NEON_FLAGS}"
37+
38+
# QA Issue: /usr/bin/camera-bug-report contained in package libcamera-apps requires /usr/bin/python3
39+
# QA Issue: File /usr/lib/pkgconfig/rpicam_app.pc in package libcamera-apps-dev contains reference to TMPDIR
40+
do_install:append() {
41+
rm -v ${D}/${bindir}/camera-bug-report
42+
sed -i "s,${RECIPE_SYSROOT}${libdir},$\{libdir},g" ${D}${libdir}/pkgconfig/rpicam_app.pc
43+
}
44+
45+
FILES:${PN} += "${libdir}/rpicam-apps-postproc \
46+
${libdir}/rpicam-apps-preview \
47+
${datadir}/rpi-camera-assets"

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps_git.bb

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)