libgphoto2: Upgrade to 2.5.32

Use xz for archive and drop upstreamed patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2025-08-05 20:00:47 -07:00
parent ba158bb8cc
commit 90c47eb0a4
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 2 additions and 39 deletions

View File

@ -1,36 +0,0 @@
From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Mon, 4 Dec 2023 13:26:08 +0100
Subject: [PATCH] align outlen length with jpeg jeaders. fixes
https://github.com/gphoto/libgphoto2/issues/941
---
Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5]
camlibs/ptp2/chdk.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c
index e1d898f378..e775ea1d4b 100644
--- a/camlibs/ptp2/chdk.c
+++ b/camlibs/ptp2/chdk.c
@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
struct jpeg_error_mgr jerr;
JSAMPROW row_ptr[1];
uint8_t *outbuf = NULL, *tmprowbuf = NULL;
- uint64_t outlen = 0;
+ unsigned long outlen = 0;
unsigned int row_inc;
int sshift, dshift, xshift, skip;
@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
sshift = 6;
dshift = (width/height > 2) ? 6 : 12;
xshift = 4;
- /* Digic 6 cameras: 8 bit per element UYVY,
- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
+ /* Digic 6 cameras: 8 bit per element UYVY,
+ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
} else {
row_inc = buf_width*2;
sshift = 4;

View File

@ -9,12 +9,11 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
# libgphoto2-2.5.8/packaging/generic$ qemu-arm -s 1048576 -r 2.6.24 -L /OE/angstrom-dev/staging/armv5te-angstrom-linux-gnueabi/ .libs/print-camera-list
# They are release specific, so please regen when adding new releases
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.xz;name=libgphoto2 \
file://40-libgphoto2.rules \
file://0001-configure-Filter-out-buildpaths-from-CC.patch \
file://fix-build-with-gcc-14.patch \
"
SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b"
SRC_URI[libgphoto2.sha256sum] = "495a347be21b8f970607a81e739aa91513a8479cbd73b79454a339c73e2b860e"
inherit autotools pkgconfig gettext lib_package