Accepting request 1312222 from graphics

- libgphoto2 2.5.33 release
  * serial:
    * added caching
  * canon:
    * use caching from serial driver
  * ptp2:
    * fixed crash on capture regression
    * added new ids:
      * Sony ZV-E10M2
      * Fuji X-M5
      * Ricoh GR IIIx (corrected id)
    * imported libmtp ids
  * translations: updated romanian, chinese, polish, ukrainian

OBS-URL: https://build.opensuse.org/request/show/1312222
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=140

libgphoto2-2.5.31.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfEr9Ydiq51cHlqUXIgnWkC+WnJUFAmTzALYACgkQIgnWkC+W
-nJVldg//d9p6IsqxaNJ1sVkDdO59SLuZAw1cbrPlVAkRb78QZefIZcfQeYlCSo7g
-SzvoqkeJd1fuWSCQl4c5YOY1sbw6sa40edSq2AI/7aOpS7E8y6OVHnI6tlhPjnfH
-jOMKNxTb+ucRs+QtwRX9dBxLrtyup7BdLmSFDChgnlaMxJlpxrDEEyEE/B8geTk9
-FaqoLosPUum9ja536JIk/TFyc4luBeRTS0KiM/q582o9Sxgeiiny+GVOIXyzl/ho
-DesKeEbc3G1MkDetlTl82z2cAGsB2SfTarPaE3PXokAYYthQgf6QkeMJgcvcrBaS
-yBr91WcG8tmW4ewhhNtOISEpWE6XGfUBDtHGOmjo7bC8Y2s4RRyDhETB9O/xoUnH
-fOi0p2sZLjRn3a8crA1Ut7P+vVfdQAHcrI9f5s0y6IB+CzMrtq+MuU0MAlNhj6rG
-T/SjOzT/vgU59xpletdKWdiii3ncUuwDGuzUb+R1MM5whQFEubzkVI03ZHUM1v42
-2fkDTeTBl9TEb4jKPw9AZyWkw5PxHjOw7q1J0z2p9y29eKVwKa+QwU6sz4i+ZRoL
-maseJSviSkUXadReCmPbAZB1jNmt8r6EXy9OLxLfQxIDTseU9Dh40Azcjg4ZEurr
-7n3q2D6Myy0JpNrVgbJ4b4nHtOlUgisVSJjmcy7xG1zJS3/QObQ=
-=f+AI
------END PGP SIGNATURE-----

libgphoto2-2.5.33.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2
+size 6958144

libgphoto2-2.5.33.tar.xz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfEr9Ydiq51cHlqUXIgnWkC+WnJUFAmj038AACgkQIgnWkC+W
+nJUTbxAAjSrNZBpXfVFU/Z/soiDozABn8dioNjU09r78vVxwTShnI81tM+qOeou7
+7WVpqssu6ILqXnUjX7q98R5djffyXE5hS2FO0WrqS0LQemfkuodacUqt4Vh+/ojQ
+zO1hQIbS0ZUfjQsHO0apwJJrqHKctgRQaZBn1IRl4Q/OVeqXDPLbaXK2n7ffJksZ
+svrMfW8Yj0M16GPgUWBvkBqfoAVkrhx7hZWVxydz9QvB3zA68XWDQ066VSaE/ssp
+OFI5f7N50V7KEjRrWVYabwuPhY0Wrv3l3nsQnzyKJ/bwzYQ4XASuqKTrdamtJ5u0
+/j2v5PR+/LOptWt4QmGZzH5Mmxufs5eTVHH3DHbYGeGUrcXR2JpJmJYKvlAQrzF4
+9NRdlDhhaz8VvU8C20UpB04wX/AlyP3FvVDPxN9KS9gTUPiP/aP1Bpx3GZ9io3ee
+L4NVDSYvc/Hw7une2V/177DAOHfaLWgg8LZNwgU2c7Cavc/a3I3VV0h0QspsyLVR
+IYIicxqZlSD/uKLlEsiB8VSDrx6Ibuk1QAa9qOaFN5uremQqdHOxYbTGXcPKrOBz
+MoXLmS3xtlYsiD8tRpoKgf4AIkgM4om0IjZOq4wsY2n7+Z3YAlm50bVHtKxgFOkl
+RtE/KXWHwUdaOVP9nRL4b81gZkzR4qH7wOkwUDudqYeftw362iE=
+=O4dS
+-----END PGP SIGNATURE-----

libgphoto2-c99.patch

@@ -1,35 +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
-
----
- 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;
-

libgphoto2.changes

@@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+Sun Oct 19 13:21:07 UTC 2025 - Marcus Meissner <meissner@suse.com>
+
+- libgphoto2 2.5.33 release
+  * serial:
+    * added caching
+  * canon:
+    * use caching from serial driver
+  * ptp2:
+    * fixed crash on capture regression
+    * added new ids:
+      * Sony ZV-E10M2
+      * Fuji X-M5
+      * Ricoh GR IIIx (corrected id)
+    * imported libmtp ids
+  * translations: updated romanian, chinese, polish, ukrainian
+
+-------------------------------------------------------------------
+Sun Jul  6 10:15:47 UTC 2025 - Marcus Meissner <meissner@suse.com>
+
+- libgphoto2 2.5.32 release
+
+  quicktake1x0:
+  * New Apple Quicktake (serial camera) driver
+
+  pentax:
+  * Added Pentax K1II, K3III
+  * sync with pktriggercord fixes
+  
+  ptp2:
+  * Big code and (canon eos) debug outout cleanups by Axel W
+  * --summary output format changed to be more condensed
+  * Canon EOS: imageformat output changed
+  * Canon: added disablemodedial
+  * Canon: keepdeviceon send less often to speed up
+  * Sony: Now officially documented by Sony. Changes imported from the documentation.
+  * Sony: support newer sony property format
+  * Sony: added capturemode, focalposition, magnifysetting, spotfocusarea,
+  * Sony: fixed crash in movie option
+  * Panasonic: bugfixes
+  * Fuji: configurations added, af drive manual, availableshots, graineffect, rawcompression
+  * Fuji: bugfixes
+  * Nikon: support 32bit properties
+  * Added ids:
+    - Canon EOS R100, R3, R8, R50, G7 X Mark 3,
+    - Sony Alpha A6100, ZV-E10, A6700, NEX-5N, SLT A99V, ILCE-9M3, ILX-LR1
+    - Nikon Zf, Z6 III
+    - Olympus OM-1Mark2
+    - Fuji X-H2S, X100V1, GFX100 II
+    - Ricoh GR III
+    - Leica Q3, M11 Monochrome
+  
+  ports/usb:
+  * added more Android support (passing in filedescriptor)
+  
+  ports/serial:
+  * some fixes, needed for quicktake
+  
+  all:
+  * IOLIBS and CAMLIBS now runtime configurable
+  * Builds use silent rules by default now
+  * Meson buildsupport, parallel to automake
+  * print-camera-list can now print camera list in JSON format
+  * added new functions: gp_setting_set_get_func, gp_setting_set_set_func
+    for user defined settings setters
+  * added new port functions: gp_port_usb_set_sys_device,
+    gp_port_usb_get_sys_device used for Android
+  
+  translations:
+  * added georgian, friulian, polish, romanian, ukrainian, chinese, brazilian
+- remove libgphoto2-c99.patch: upstream
+
 -------------------------------------------------------------------
 Mon Aug  5 12:07:01 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
 

libgphoto2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libgphoto2
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -55,13 +55,12 @@ Obsoletes:      libgphoto2-64bit
 Summary:        A Digital Camera Library
 License:        LGPL-2.1-or-later
 Group:          Hardware/Camera
-Version:        2.5.31
+Version:        2.5.33
 Release:        0
 Source0:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%version/%name-%version.tar.xz
 Source1:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%version/%name-%version.tar.xz.asc
 Source2:        %name.keyring
 Source3:        baselibs.conf
-Patch0:         libgphoto2-c99.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libgphoto2-%major