Accepting request 1108555 from graphics

- updated to 2.5.31 release
  ptp2:
  * do better event queueing during capture (makes capture faster, avoids losing events)
  * Canon EOS: OLC logic rewritten to be table driven, more debugging of the content,
    config "testolc" to generate debugoutput. Supports more cameras better.
  * Canon EOS: various bugfixes
  * Sony Alpha: Added config options: focusarea, liveviewsettingeffect
  * Olympus: Enabled OM-1 capture
  * Battery Level: also support ENUM style battery reporting for Canon
  * Nikon 1: S1 also does not support everything
  * Sony Alpha: small changes in config setters
  * merged some improvements from NorthOfYou fork for Canon EOS, Nikon and Sony
  * New ids:
    - Canon EOS 850D, R7, R10, R5 C, R6m2
    - Fuji X-H2, X-T5
    - GOPRO HERO 11 BLACK, 11 BLACK mini
    - new ids also imported from libmtp
    - Nikon Z30, Z8
    - OMSYSTEM OM-1
    - Pentax KP (PTP mode)
    - Ricoh GR IIIx
    - Sigma fp L
    - Sony A7S III, ILCE-1, ILME-FX3, 7RM5 aka A7-RV,
  digigr8:
  * fixed init to not switch to webcam mode
  pentax:
  * Added Pentax KP
  general:
  * disable log formatting when we are not logging (speeds up large downloads, as
    we are not hex dumping the whole data and immediately discard the result)

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

libgphoto2-2.5.30.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d50e71d771ca78e33f10308e7f15ad00a2268d1b5af4a19cd4c5512a1b62a62
-size 5890196

libgphoto2-2.5.30.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfEr9Ydiq51cHlqUXIgnWkC+WnJUFAmLAEaAACgkQIgnWkC+W
-nJXaJxAAkIuqkvDQ4lwQdUVi8g9T5wOaOFngCyRv2loWZiZkERRFloG0T+WYAY+P
-qJ3zVSnUFvKYLt/wTqfYmjKYCj/IKTroRHzJuj0UsONo+VKOqJ1PNXshGFyz+5ab
-B2SnMFBUa11tD4ccb+3SSj/mmJqQkg/XCLZGJKPiR8bJK/yYIjFfBTMsMt2V5IOi
-4Olu1+dBmKrcoQ9KZSekAXjZk4vZQp60vlCMdCB6WAc7dubJ4fMsA2n4XP5W1SQ7
-CQ2yiMZjllpU3yykGK8bUURk2DFT4Ia7DhihYB6+Ssp9rQYdmn6ivaB1A9RH5xvs
-yDhRBHX1j8PaKjHymamePyjE0/WFEzXY74LjODemx+u01/hOP3VJ35hpc5sHF/Ec
-Rw98rt/8bhRGAo/LntcIo77qOrWhLgNdVrHe05sH4cIEDF9anNQvpxOEBkjuEKtu
-ItwIX2ZbBJ6WC2nzCmU6Z/FfSjCdWmpBhFLqaI2FnB6lDbF8+TTx+fwXBwwl1/Da
-GlmfQY7fCChO07KecY07S7qahw5MFaS0V+DVRsi6cnTl0/n39Bs7FyqLAzC9H0qs
-7reiEdvQ3mx50JVqItwZEPe7FQ9JxpgjMylwMAffcU+uCs+70/+adIYmBbqiEGav
-8WoeghZrl8nIebBGRXk+wEf42j4WNcSZriFc85Bpm7+Qsxr791o=
-=Hqg4
------END PGP SIGNATURE-----

libgphoto2-2.5.31.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fc7bf40f979459509b87dd4ff1aae9b6c1c2b4724d37db576081eec15406ace
+size 6322264

libgphoto2-2.5.31.tar.xz.asc

@@ -0,0 +1,16 @@
+-----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-enable-vusb-ptp.patch

@@ -1,13 +0,0 @@
-Index: libgphoto2-2.5.30/libgphoto2_port/vusb/vcamera.h
-===================================================================
---- libgphoto2-2.5.30.orig/libgphoto2_port/vusb/vcamera.h
-+++ libgphoto2-2.5.30/libgphoto2_port/vusb/vcamera.h
-@@ -22,7 +22,7 @@
- #ifndef IOLIBS_VUSB_VCAMERA_H
- #define IOLIBS_VUSB_VCAMERA_H
- 
--#undef FUZZ_PTP
-+#define FUZZ_PTP
- 
- #include <stdio.h>
- 

libgphoto2.changes

@@ -1,3 +1,48 @@
+-------------------------------------------------------------------
+Sat Sep  2 09:59:49 UTC 2023 - Marcus Meissner <meissner@suse.com>
+
+- updated to 2.5.31 release
+  ptp2:
+  * do better event queueing during capture (makes capture faster, avoids losing events)
+  * Canon EOS: OLC logic rewritten to be table driven, more debugging of the content,
+    config "testolc" to generate debugoutput. Supports more cameras better.
+  * Canon EOS: various bugfixes
+  * Sony Alpha: Added config options: focusarea, liveviewsettingeffect
+  * Olympus: Enabled OM-1 capture
+  * Battery Level: also support ENUM style battery reporting for Canon
+  * Nikon 1: S1 also does not support everything
+  * Sony Alpha: small changes in config setters
+  * merged some improvements from NorthOfYou fork for Canon EOS, Nikon and Sony
+  * New ids:
+    - Canon EOS 850D, R7, R10, R5 C, R6m2
+    - Fuji X-H2, X-T5
+    - GOPRO HERO 11 BLACK, 11 BLACK mini
+    - new ids also imported from libmtp
+    - Nikon Z30, Z8
+    - OMSYSTEM OM-1
+    - Pentax KP (PTP mode)
+    - Ricoh GR IIIx
+    - Sigma fp L
+    - Sony A7S III, ILCE-1, ILME-FX3, 7RM5 aka A7-RV,
+
+  digigr8:
+  * fixed init to not switch to webcam mode
+
+  pentax:
+  * Added Pentax KP
+
+  general:
+  * disable log formatting when we are not logging (speeds up large downloads, as
+    we are not hex dumping the whole data and immediately discard the result)
+  * libltdl usage now thread-safe. (some other library pieces are not threadsafe yet)
+  * some time_t 32bit vs 64bit fixes
+  * some cleanups and warning fixes
+
+  translations:
+  * updated swedish, spanish
+  * added georgian, friulian
+- libgphoto2-enable-vusb-ptp.patch: upstream
+
 -------------------------------------------------------------------
 Mon Jul 10 11:01:53 UTC 2023 - Ludwig Nussel <lnussel@suse.com>
 

libgphoto2.spec

@@ -55,13 +55,12 @@ Obsoletes:      libgphoto2-64bit
 Summary:        A Digital Camera Library
 License:        LGPL-2.1-or-later
 Group:          Hardware/Camera
-Version:        2.5.30
+Version:        2.5.31
 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-enable-vusb-ptp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libgphoto2-%major
@@ -159,7 +158,6 @@ This is its API documentation in HTML format.
 
 %prep
 %setup -q
-%patch0 -p1
 (cd doc && tar -xaf libgphoto2-api.html.tar.gz)
 
 %build
@@ -182,7 +180,7 @@ export LIBRARY_PATH="%buildroot/%_libdir"
 # .la files are not needed
 rm %buildroot/%_libdir/*.la
 rm %buildroot/%_libdir/libgphoto2/%version/*.la
-rm %buildroot/%_libdir/libgphoto2_port/0.12.1/*.la
+rm %buildroot/%_libdir/libgphoto2_port/0.12.2/*.la
 
 rm -rf %buildroot/usr/share/doc/libgphoto2_port