stm-st-stm32mp: add libcamera-stm32mp recipe

Integrate ST libcamera recipe from meta-st-openstlinux layer at
openstlinux-6.6-yocto-scarthgap-mpu-v25.06.11 tag. This recipe is required by
the NPU demos in meta-st-x-linux-ai.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2025-10-28 13:19:29 +01:00
parent 1674f6462c
commit 3e8042f8d8
6 changed files with 8708 additions and 0 deletions

View File

@ -0,0 +1,59 @@
From 6914c4fd3d53c0c6ea304123bf57429bb64ec16f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 31 Jan 2024 21:01:27 -0800
Subject: [PATCH 1/2] media_device: Add bool return type to unlock()
unlock uses lockf which is marked with __attribute__
((warn_unused_result)) and compilers warn about it and some treat
-Wunused-result as error with -Werror turned on, It would be good to
check if lockf failed or succeeded, however, that piece is not changed
with this, this fixes build with clang++ 18
../git/src/libcamera/media_device.cpp:167:2: error: ignoring return value of function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result]
167 | lockf(fd_.get(), F_ULOCK, 0);
| ^~~~~ ~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040380.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/libcamera/internal/media_device.h | 2 +-
src/libcamera/media_device.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h
index eb8cfde4..b09dfd16 100644
--- a/include/libcamera/internal/media_device.h
+++ b/include/libcamera/internal/media_device.h
@@ -33,7 +33,7 @@ public:
bool busy() const { return acquired_; }
bool lock();
- void unlock();
+ bool unlock();
int populate();
bool isValid() const { return valid_; }
diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp
index 2949816b..eaa2fdb0 100644
--- a/src/libcamera/media_device.cpp
+++ b/src/libcamera/media_device.cpp
@@ -159,12 +159,12 @@ bool MediaDevice::lock()
*
* \sa lock()
*/
-void MediaDevice::unlock()
+bool MediaDevice::unlock()
{
if (!fd_.isValid())
- return;
+ return false;
- lockf(fd_.get(), F_ULOCK, 0);
+ return lockf(fd_.get(), F_ULOCK, 0) == 0;
}
/**
--
2.43.0

View File

@ -0,0 +1,43 @@
From 11cc6dbd45f0880beea64cdc514f57484b90bc39 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 20 Feb 2024 18:44:23 -0800
Subject: [PATCH] rpi: Use malloc instead of variable length arrays
Clang-18+ diagnoses this as error
| ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X];
| | ^
Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040529.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
s
---
src/ipa/rpi/controller/rpi/alsc.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp
index 8a205c60..a7d42614 100644
--- a/src/ipa/rpi/controller/rpi/alsc.cpp
+++ b/src/ipa/rpi/controller/rpi/alsc.cpp
@@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn,
* Precalculate and cache the x sampling locations and phases to save
* recomputing them on every row.
*/
- int xLo[X], xHi[X];
- double xf[X];
+ int *xLo = (int*)malloc(X), *xHi = (int*)malloc(X);
+ double *xf = (double*)malloc(X);
double scaleX = cameraMode.sensorWidth /
(cameraMode.width * cameraMode.scaleX);
double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth;
@@ -539,6 +539,9 @@ void resampleCalTable(const Array2D<double> &calTableIn,
*(out++) = above * (1 - yf) + below * yf;
}
}
+ free(xf);
+ free(xHi);
+ free(xLo);
}
/* Calculate chrominance statistics (R/G and B/G) for each region. */

View File

@ -0,0 +1,128 @@
From 6e4736180fcaffdb06acf52fd3eb50ba5baa3d2a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 31 Jan 2024 21:04:28 -0800
Subject: [PATCH] options: Replace use of VLAs in C++
Clang++ 18 is fussy about this with new warning checks.
../git/src/apps/common/options.cpp:882:20: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension]
882 | char shortOptions[optionsMap_.size() * 3 + 2];
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
Therefore replace using VLAs with alloca and malloc/free
Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040381.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/apps/common/options.cpp | 12 ++++++++++--
src/libcamera/ipc_unixsocket.cpp | 13 +++++++++----
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/apps/common/options.cpp b/src/apps/common/options.cpp
index 4f7e8691..3656f3c1 100644
--- a/src/apps/common/options.cpp
+++ b/src/apps/common/options.cpp
@@ -879,8 +879,8 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
* Allocate short and long options arrays large enough to contain all
* options.
*/
- char shortOptions[optionsMap_.size() * 3 + 2];
- struct option longOptions[optionsMap_.size() + 1];
+ char *shortOptions = (char*)malloc(optionsMap_.size() * 3 + 2);
+ struct option *longOptions = (struct option*)malloc(sizeof(struct option) * (optionsMap_.size() + 1));
unsigned int ids = 0;
unsigned int idl = 0;
@@ -935,12 +935,16 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
std::cerr << argv[optind - 1] << std::endl;
usage();
+ free(shortOptions);
+ free(longOptions);
return options;
}
const Option &option = *optionsMap_[c];
if (!parseValue(option, optarg, &options)) {
usage();
+ free(shortOptions);
+ free(longOptions);
return options;
}
}
@@ -949,10 +953,14 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv)
std::cerr << "Invalid non-option argument '" << argv[optind]
<< "'" << std::endl;
usage();
+ free(shortOptions);
+ free(longOptions);
return options;
}
options.valid_ = true;
+ free(shortOptions);
+ free(longOptions);
return options;
}
diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp
index 1980d374..3bd861cb 100644
--- a/src/libcamera/ipc_unixsocket.cpp
+++ b/src/libcamera/ipc_unixsocket.cpp
@@ -8,6 +8,7 @@
#include "libcamera/internal/ipc_unixsocket.h"
#include <array>
+#include <cstdint>
#include <poll.h>
#include <string.h>
#include <sys/socket.h>
@@ -247,8 +248,8 @@ int IPCUnixSocket::sendData(const void *buffer, size_t length,
iov[0].iov_base = const_cast<void *>(buffer);
iov[0].iov_len = length;
- char buf[CMSG_SPACE(num * sizeof(uint32_t))];
- memset(buf, 0, sizeof(buf));
+ char *buf = (char*)malloc(CMSG_SPACE(num * sizeof(uint32_t)));
+ memset((void*)buf, 0, sizeof(buf));
struct cmsghdr *cmsg = (struct cmsghdr *)buf;
cmsg->cmsg_len = CMSG_LEN(num * sizeof(uint32_t));
@@ -270,9 +271,11 @@ int IPCUnixSocket::sendData(const void *buffer, size_t length,
int ret = -errno;
LOG(IPCUnixSocket, Error)
<< "Failed to sendmsg: " << strerror(-ret);
+ free(buf);
return ret;
}
+ free(buf);
return 0;
}
@@ -283,8 +286,8 @@ int IPCUnixSocket::recvData(void *buffer, size_t length,
iov[0].iov_base = buffer;
iov[0].iov_len = length;
- char buf[CMSG_SPACE(num * sizeof(uint32_t))];
- memset(buf, 0, sizeof(buf));
+ char *buf = (char*)malloc(CMSG_SPACE(num * sizeof(uint32_t)));
+ memset((void*)buf, 0, sizeof(buf));
struct cmsghdr *cmsg = (struct cmsghdr *)buf;
cmsg->cmsg_len = CMSG_LEN(num * sizeof(uint32_t));
@@ -305,12 +308,14 @@ int IPCUnixSocket::recvData(void *buffer, size_t length,
if (ret != -EAGAIN)
LOG(IPCUnixSocket, Error)
<< "Failed to recvmsg: " << strerror(-ret);
+ free(buf);
return ret;
}
if (fds)
memcpy(fds, CMSG_DATA(cmsg), num * sizeof(uint32_t));
+ free(buf);
return 0;
}

View File

@ -0,0 +1,91 @@
SUMMARY = "Linux libcamera framework"
SECTION = "libs"
LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "\
file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
"
# 0.3.0
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-options-Replace-use-of-VLAs-in-C.patch \
file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \
"
SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9"
SRC_URI += " \
file://0001-0.3.0-stm32mp-add-dcmipp-ipa.patch \
"
PV = "v0.3.0-stm32mp"
PROVIDES += "libcamera"
PE = "1"
S = "${WORKDIR}/git"
DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
PACKAGES =+ "${PN}-gst"
PACKAGECONFIG ??= "gst python"
PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
PACKAGECONFIG[python] = "-Dpycamera=enabled,-Dpycamera=disabled,python3-pybind11"
LIBCAMERA_PIPELINES ??= "dcmipp"
LIBCAMERA_IPAS = "dcmipp"
EXTRA_OEMESON = " \
-Dpipelines=${LIBCAMERA_PIPELINES} \
-Dv4l2=true \
-Dcam=enabled \
-Dlc-compliance=disabled \
-Dtest=false \
-Ddocumentation=disabled \
"
EXTRA_OEMESON += " \
-Dipas=${LIBCAMERA_IPAS} \
"
RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}"
inherit meson pkgconfig python3native python3-dir
do_configure:prepend() {
sed -i -e 's|py_compile=True,||' ${S}/utils/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
}
do_install:append() {
chrpath -d ${D}${libdir}/libcamera.so
chrpath -d ${D}${libexecdir}/libcamera/v4l2-compat.so
}
do_package:append() {
bb.build.exec_func("do_package_recalculate_ipa_signatures", d)
}
do_package_recalculate_ipa_signatures() {
local modules
for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do
module="${module%.sign}"
if [ -f "${module}" ] ; then
modules="${modules} ${module}"
fi
done
${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}"
}
FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so"
FILES:${PN} += "${datadir} ${libdir} ${PYTHON_SITEPACKAGES_DIR}"
FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
# libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
# both 32 and 64 bit file APIs.
GLIBC_64BIT_TIME_FLAGS = ""

View File

@ -8,6 +8,8 @@ inherit packagegroup python3-dir
COMMON_PACKAGES = " \ COMMON_PACKAGES = " \
stai-mpu-tools \ stai-mpu-tools \
tim-vx-tools \ tim-vx-tools \
libcamera-stm32mp \
libcamera-stm32mp-gst \
" "
TFLITE_PACKAGES = " \ TFLITE_PACKAGES = " \