diff options
| author |   Mauro Anjo <maurosanjo@gmail.com> | 2021-12-06 16:44:51 -0300 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-12-08 11:12:23 -0800 |
| commit | b450b0bb822107c29902357dfaf0b77760b887fe (patch) | |
| tree | 23987fddcba5ffe29810734cc047e2c463e3bbca /meta-multimedia | |
| parent | 77d96d9f8fc7a5c8bbcb4345282b9efd9a5c59a4 (diff) | |
| download | meta-openembedded-contrib-b450b0bb822107c29902357dfaf0b77760b887fe.tar.gz | |
libcamera: Update to latest commit
Drop patch for musl/aarch64 and bump source commit to latest version that
has the patch applied.
Signed-off-by: Mauro Anjo <maurosanjo@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 3 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch | 41 |
2 files changed, 1 insertions, 43 deletions
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 97b920cead..82028ecb37 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,10 +10,9 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ - file://0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch \ " -SRCREV = "f47c9c36ed161c9afefe7d4910840fd41f38ae3d" +SRCREV = "acf8d028edda0a59b10e15962c2606137a4940af" PV = "202105+git${SRCPV}" diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch deleted file mode 100644 index 3c01c5a23c..0000000000 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8aa0d83749609ed571b984d2dc64c7f757950c7c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 1 Dec 2021 12:10:11 -0800 -Subject: [PATCH v2] backtrace: Include cxxabi.h without HAVE_DW - -Since its used in code without HAVE_DW, it fails to compile on such -systems e.g. linux/musl - -Fixes -src/libcamera/base/backtrace.cpp:235:16: error: use of undeclared identifier 'abi' - char *name = abi::__cxa_demangle(symbol, nullptr, nullptr, nullptr); - ^ -1 error generated. - -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2021-December/027989.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libcamera/base/backtrace.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/libcamera/base/backtrace.cpp b/src/libcamera/base/backtrace.cpp -index d93e5518..42c60f7c 100644 ---- a/src/libcamera/base/backtrace.cpp -+++ b/src/libcamera/base/backtrace.cpp -@@ -13,11 +13,12 @@ - #endif - - #ifdef HAVE_DW --#include <cxxabi.h> - #include <elfutils/libdwfl.h> - #include <unistd.h> - #endif - -+#include <cxxabi.h> -+ - #if HAVE_UNWIND - /* - * Disable support for remote unwinding to enable a more optimized --- -2.34.1 - |