summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorMauro Anjo <maurosanjo@gmail.com>2021-12-06 16:44:51 -0300
committerKhem Raj <raj.khem@gmail.com>2021-12-08 11:12:23 -0800
commitb450b0bb822107c29902357dfaf0b77760b887fe (patch)
tree23987fddcba5ffe29810734cc047e2c463e3bbca /meta-multimedia
parent77d96d9f8fc7a5c8bbcb4345282b9efd9a5c59a4 (diff)
downloadmeta-openembedded-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.bb3
-rw-r--r--meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch41
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 = "\
10 10
11SRC_URI = " \ 11SRC_URI = " \
12 git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ 12 git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
13 file://0001-backtrace-Include-cxxabi.h-without-HAVE_DW.patch \
14" 13"
15 14
16SRCREV = "f47c9c36ed161c9afefe7d4910840fd41f38ae3d" 15SRCREV = "acf8d028edda0a59b10e15962c2606137a4940af"
17 16
18PV = "202105+git${SRCPV}" 17PV = "202105+git${SRCPV}"
19 18
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 @@
1From 8aa0d83749609ed571b984d2dc64c7f757950c7c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 1 Dec 2021 12:10:11 -0800
4Subject: [PATCH v2] backtrace: Include cxxabi.h without HAVE_DW
5
6Since its used in code without HAVE_DW, it fails to compile on such
7systems e.g. linux/musl
8
9Fixes
10src/libcamera/base/backtrace.cpp:235:16: error: use of undeclared identifier 'abi'
11 char *name = abi::__cxa_demangle(symbol, nullptr, nullptr, nullptr);
12 ^
131 error generated.
14
15Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2021-December/027989.html]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 src/libcamera/base/backtrace.cpp | 3 ++-
19 1 file changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/src/libcamera/base/backtrace.cpp b/src/libcamera/base/backtrace.cpp
22index d93e5518..42c60f7c 100644
23--- a/src/libcamera/base/backtrace.cpp
24+++ b/src/libcamera/base/backtrace.cpp
25@@ -13,11 +13,12 @@
26 #endif
27
28 #ifdef HAVE_DW
29-#include <cxxabi.h>
30 #include <elfutils/libdwfl.h>
31 #include <unistd.h>
32 #endif
33
34+#include <cxxabi.h>
35+
36 #if HAVE_UNWIND
37 /*
38 * Disable support for remote unwinding to enable a more optimized
39--
402.34.1
41