deleted file mode 100644
@@ -1,41 +0,0 @@
-From a3e25b6aa9775c43336e30d3b350f54c085a32c8 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: Denied [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040536.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 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 67029fc3..6eca9fb7 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 * sizeof(int)), *xHi = (int *)malloc(X * sizeof(int));
-+ double *xf = (double *)malloc(X * sizeof(double));
- 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. */
deleted file mode 100644
@@ -1,128 +0,0 @@
-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;
- }
-
similarity index 88%
rename from meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb
rename to meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb
@@ -11,11 +11,9 @@ 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-options-Replace-use-of-VLAs-in-C.patch \
- file://0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch \
"
-SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9"
+SRCREV = "35ed4b91291d9f3d08e4b51acfb51163e65df8f8"
PE = "1"
@@ -46,7 +44,7 @@ RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayla
inherit meson pkgconfig python3native
do_configure:prepend() {
- sed -i -e 's|py_compile=True,||' ${S}/utils/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
+ sed -i -e 's|py_compile=True,||' ${S}/utils/codegen/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
}
do_install:append() {
Upgrade libcamera to version 0.4.0, gaining support for ARM Mali-C55 ISP. Patches 0002-options-Replace-use-of-VLAs-in-C.patch and 0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch are obsolete. Issues have been fixed upstream (differently). Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- ...oc-instead-of-variable-length-arrays.patch | 41 ------ ...002-options-Replace-use-of-VLAs-in-C.patch | 128 ------------------ ...{libcamera_0.3.0.bb => libcamera_0.4.0.bb} | 6 +- 3 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch delete mode 100644 meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch rename meta-multimedia/recipes-multimedia/libcamera/{libcamera_0.3.0.bb => libcamera_0.4.0.bb} (88%)