NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libcamera-apps: bump to version 1.1.2

Browse Source 
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Marcus Folkesson 2023-03-09 23:04:14 +01:00 committed by Thomas Petazzoni
parent 6a8e1e220f
commit 9ce280ba18
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch
View File

@ -1,35 +0,0 @@
From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001
From: Marcus Folkesson <marcus.folkesson@gmail.com>
Date: Tue, 31 Jan 2023 09:14:15 +0100
Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long
VIDIOC_QUARYCAP is an unsigned long and should be passed as one.
Get rid of the following error:
core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow]
33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
core/libcamera_app.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp
index 04696fb..8cb6563 100644
--- a/core/libcamera_app.cpp
+++ b/core/libcamera_app.cpp
@@ -30,7 +30,9 @@ static void check_camera_stack()
return;
v4l2_capability caps;
- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps);
+ unsigned long request = VIDIOC_QUERYCAP;
+
+ int ret = ioctl(fd, request, &caps);
close(fd);
if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal"))
--
2.38.1

2
package/libcamera-apps/libcamera-apps.hash
View File

@ -1,3 +1,3 @@
# Locally computed
sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz
sha256 a19f3960b97ec1c0d42df8af972868ff0d4c48be6096e7ac02dbaaa4c7c75636 libcamera-apps-1.1.2.tar.gz
sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt

2
package/libcamera-apps/libcamera-apps.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBCAMERA_APPS_VERSION = 1.1.1
LIBCAMERA_APPS_VERSION = 1.1.2
LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION))
LIBCAMERA_APPS_LICENSE = BSD-2-Clause
LIBCAMERA_APPS_LICENSE_FILES = license.txt