From 9cae850cd70a81bfd0a6fb9887d8a08671784303 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 Oct 2025 18:31:03 +0200 Subject: [PATCH] package/libgphoto2: bump to version 2.5.33 The removed patch has been merged in version 2.5.32. Update file hash due to conversion the ISO-8859 text to UTF-8: https://github.com/gphoto/libgphoto2/commit/6fdc5f8f370b2716e7342f994c19b9c7ae37a0f6 Release notes: https://github.com/gphoto/libgphoto2/releases Signed-off-by: Dario Binacchi Signed-off-by: Julien Olivain --- ...gth-with-jpeg-jeaders.-fixes-https-g.patch | 39 ------------------- package/libgphoto2/libgphoto2.hash | 4 +- package/libgphoto2/libgphoto2.mk | 2 +- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/libgphoto2/0001-align-outlen-length-with-jpeg-jeaders.-fixes-https-g.patch diff --git a/package/libgphoto2/0001-align-outlen-length-with-jpeg-jeaders.-fixes-https-g.patch b/package/libgphoto2/0001-align-outlen-length-with-jpeg-jeaders.-fixes-https-g.patch deleted file mode 100644 index 910c9b125a..0000000000 --- a/package/libgphoto2/0001-align-outlen-length-with-jpeg-jeaders.-fixes-https-g.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 -From: Marcus Meissner -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 - -Signed-off-by: Dario Binacchi -Upstream: 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 e1d898f37811..e775ea1d4bbb 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; --- -2.43.0 - diff --git a/package/libgphoto2/libgphoto2.hash b/package/libgphoto2/libgphoto2.hash index af52b47dc8..c2ff672613 100644 --- a/package/libgphoto2/libgphoto2.hash +++ b/package/libgphoto2/libgphoto2.hash @@ -1,3 +1,3 @@ # Locally calculated hash -sha256 a7253bd18c6ef65352150ac36a668f883a5ad2634eb6455b3ca9aa6ac98d0073 libgphoto2-2.5.27.tar.xz -sha256 ebc385a0b1d477be5177ed6d9129557aa59a3ad0f26ebe7dd97ee942a0fb68ee COPYING +sha256 28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2 libgphoto2-2.5.33.tar.xz +sha256 530128f45fc02d92d4dae04d9c1e1f28a078a9b0d32c0ab254c406ba8fba43ec COPYING diff --git a/package/libgphoto2/libgphoto2.mk b/package/libgphoto2/libgphoto2.mk index c1d5352c00..851eb401a1 100644 --- a/package/libgphoto2/libgphoto2.mk +++ b/package/libgphoto2/libgphoto2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPHOTO2_VERSION = 2.5.27 +LIBGPHOTO2_VERSION = 2.5.33 LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.xz LIBGPHOTO2_SITE = https://github.com/gphoto/libgphoto2/releases/download/v$(LIBGPHOTO2_VERSION) LIBGPHOTO2_LICENSE = LGPL-2.1+, GPL-2.0 (adc65), GPL-2.0+ (some camlibs), \