diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-03-03 15:23:08 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-03-03 19:55:28 -0800 |
| commit | 5593fac20fed30069baf369aba71dbfd355e08a7 (patch) | |
| tree | 271dde98a674f18642876345f48b173197d41abc | |
| parent | 57a7c1ed7d45b28cadd70d8fabda42fe906ddff7 (diff) | |
| download | meta-openembedded-contrib-5593fac20fed30069baf369aba71dbfd355e08a7.tar.gz | |
libcamera: Update to latest
Add a fix for build with gcc11
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera.bb | 7 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch | 38 |
2 files changed, 42 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb index 5505626d3e..b05df32102 100644 --- a/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera.bb @@ -10,15 +10,16 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://linuxtv.org/libcamera.git;protocol=git \ + file://0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch \ " -SRCREV = "1e8c91b65695449c5246d17ba7dc439c8058b781" +SRCREV = "f490a87fd339fc7443f5d8467ba56a35c750a5f7" -PV = "202008+git${SRCPV}" +PV = "202102+git${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "python3-pyyaml-native udev gnutls boost chrpath-native" +DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls boost chrpath-native" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" PACKAGES =+ "${PN}-gst" diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch new file mode 100644 index 0000000000..4ca412c695 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-uvcvideo-Use-auto-variable-to-avoid-range-loop-warni.patch @@ -0,0 +1,38 @@ +From 767267ef69c001870d41caf9c60dd7fec89b0a13 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 3 Mar 2021 15:11:46 -0800 +Subject: [PATCH] uvcvideo: Use auto variable to avoid range loop warnings + +With c++17 loop range bases are defined where copy is obvious since +iterator returns a copy and not reference, gcc11 will emit a warning +about this + +uvcvideo.cpp:432:33: error: loop variable 'name' of type 'const string&' {aka 'const std::__cxx11::basic_string<cha +r>&'} binds to a temporary constructed from type 'const char* const' [-Werror=range-loop-construct] +| 432 | for (const std::string &name : { "idVendor", "idProduct" }) { +| | ^~~~ + +Therefore making it explicit is better + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2021-March/017966.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +index 031f96e2..ef23ece7 100644 +--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp ++++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +@@ -429,7 +429,7 @@ std::string PipelineHandlerUVC::generateId(const UVCCameraData *data) + + /* Creata a device ID from the USB devices vendor and product ID. */ + std::string deviceId; +- for (const std::string &name : { "idVendor", "idProduct" }) { ++ for (const auto name : { "idVendor", "idProduct" }) { + std::ifstream file(path + "/../" + name); + + if (!file.is_open()) +-- +2.30.1 + |