From c3662879de2f09aac42063ddcd87f430bdec1d2a Mon Sep 17 00:00:00 2001 From: elbachir-one Date: Mon, 28 Jul 2025 12:49:41 +0100 Subject: [PATCH] libgphoto2: update to 2.5.32 --- srcpkgs/libgphoto2/patches/gcc14-compat.patch | 34 ------------------- srcpkgs/libgphoto2/template | 4 +-- 2 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/libgphoto2/patches/gcc14-compat.patch diff --git a/srcpkgs/libgphoto2/patches/gcc14-compat.patch b/srcpkgs/libgphoto2/patches/gcc14-compat.patch deleted file mode 100644 index cf7768dd1d3..00000000000 --- a/srcpkgs/libgphoto2/patches/gcc14-compat.patch +++ /dev/null @@ -1,34 +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 - ---- - 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; diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template index 16a4699edbb..b3b4f278e57 100644 --- a/srcpkgs/libgphoto2/template +++ b/srcpkgs/libgphoto2/template @@ -1,6 +1,6 @@ # Template file for 'libgphoto2' pkgname=libgphoto2 -version=2.5.31 +version=2.5.32 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev" @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="http://www.gphoto.org" changelog="https://raw.githubusercontent.com/gphoto/libgphoto2/master/NEWS" distfiles="https://github.com/gphoto/libgphoto2/releases/download/v${version}/libgphoto2-${version}.tar.bz2" -checksum=4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b +checksum=02b29ab0bcfceda1c7f81c75ec7cb5e64d329cf4b8fd0fcd5bc5a89ff09561bc if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libgphoto2"