4 files changed, 45 insertions, 177 deletions

diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch
deleted file mode 100644
index c336e92548..0000000000
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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. */
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 <slyich@gmail.com>
+Date: Sat, 28 Dec 2024 19:11:19 +0000
+Subject: [PATCH] libcamera: Add missing <stdint.h> 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 <slyich@gmail.com>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+
+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 <memory>
++#include <stdint.h>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.34.1
+
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch
deleted file mode 100644
index 473820653e..0000000000
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch
+++ /dev/null
@@ -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;
- }
- 
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb
index 93f29c1612..c7fe631a43 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.4.0.bb
@@ -11,23 +11,23 @@ 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-alloca-instead-of-variable-length-arrays.patch \
+        file://0002-libcamera-Add-missing-stdint.h-include-to-dma_buf_al.patch \
 "
 
-SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9"
+SRCREV = "35ed4b91291d9f3d08e4b51acfb51163e65df8f8"
 
 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"
+PACKAGES =+ "${PN}-gst ${PN}-pycamera"
 
 PACKAGECONFIG ??= ""
+PACKAGECONFIG[dng] = ",,tiff"
 PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11"
 
 LIBCAMERA_PIPELINES ??= "auto"
 
@@ -45,7 +45,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() {
@@ -71,6 +71,7 @@ do_package_recalculate_ipa_signatures() {
 
 FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so"
 FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
+FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera"
 
 # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
 # both 32 and 64 bit file APIs.