Accepting request 530520 from graphics

- updated to 2.5.15 release
  - ptp2:
    * fuji: Fix cameras without new capture properties.
    * Canon EOS: config aspectratio, highisonr
    * Canon EOS: emit CAPTURECOMPLETE event
    * Canon EOS: whitebalanaceadjustment is 32bit signed, not 16bit signed
    * usb: better error feedback
    * fixed some bugs found by AFL fuzzing
    * Added USB ids:
      * Sony: A6500, HX400V
      * Nikon: D500, D7500
      * Olympus: VR360
      * Canon PowerShot: ELPH 350 HS
      * Canon EOS: 200D, Rebel T7i
      * Fuji: GFX 50 S
      * Ricoh Theta S, Theta SC
  - libgphoto2_port/vusb:
    * now default disabled as it confused people, enable with --enable-vusb
- libgphoto2-fix-fuji.patch: upstreamed

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

libgphoto2-2.5.14.tar.bz2

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

libgphoto2-2.5.14.tar.bz2.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEfEr9Ydiq51cHlqUXIgnWkC+WnJUFAlk1o9EACgkQIgnWkC+W
-nJWz3g//WNyXiQKa1/F1z2dkXoMfaOd9vJ4XGgtjnXUeAG6yWrbSXefO3bwXhBiz
-vXSUZx7L48A+wy2H93sL+YVL/k9dHlDpvsUtVY6mreb7VLUmyFhITH9S4jPV7t55
-UCVynB7V3JvjVlpHp5WPW7xouearWicck4VFNpwhMQmfJiLy0TIpbLGh/eJX4Rl0
-gn+zbWIRoU01f4LKbJ/O/b4HbCy0AKmDfqvTgv2CTyBCPz8GqCx6EbpDlefOxnOa
-MB/PKiZPVAqUdEpn0V5leybzj1a8BuTU0jnfA53h13ppjG+5jDdI3r5h/reXTbpZ
-cfQMs3+IE/nbh+XTGl6YjbYo8ioRh6LbX6qX1HmRXUvtDTTLI8xNXN4BjDwe77zw
-8Yy6wbMgOFLo1PCyJFOfVrchJSlEKx3eRx+3N82JFoN18E0iIgxPmySPIZtnkoWF
-QR+BxTQuvkhE5CbbfqsJVOisIkI5+V5WUIcv5XUp2LE3vwdj8DUoP74dk0jTNT0i
-YCBx4mz9iBTYzUdaWychwj+wLLL0kRlbzVGNSYYDIzPKfd0PebcTvZ/3yOsQIDFC
-fen6wfASwCpxhadK0FPGK78XYo+IUL8hRWhGEFj4vSpCBbPtDcxq332ffU0ifpmP
-Qar1BhilvmCreKx3HrNlhB9K2qdJN4dqkPX42/DSCEEUR3PmQrQ=
-=UV7G
------END PGP SIGNATURE-----

libgphoto2-2.5.15.tar.bz2

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

libgphoto2-2.5.15.tar.bz2.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEfEr9Ydiq51cHlqUXIgnWkC+WnJUFAlnSPKgACgkQIgnWkC+W
+nJVxjA/+N5NPH1LJkzTWKdU3G28AQCtCrg/OgQjMfeP8btPp+Cr1O1Fe2r5dOJx1
+Wywac+zpgbfRzceyNtKqJVbax5cNXMm/hGWz1XnefDN2myacsEpyvDwUtXWqlyR+
+z+SZf9Z3Mi2DBbJ8e97hduDmYx/B1JYxiTwFHmXtuvIk5/BxjQx2z7oH2w0OqMsC
+uHGhWWTiOI5p26StK2vLERR1/k7FF08ZPd5iZPbiLPdO4YjY9ZJ37DUoD1RFaJi+
+i1pmAUOi/laaqh0DkcVpJUddVbXH4ZwZGZCOh2z434Rr2bQt296PsvCCRzKiWdXi
+Alz1DC1u7YT2Be1zanXb9/6lixOcygSQXIZWKmNlTvMm0J9qhkwsCIPBNKzEeefw
+j5IRCU0pmxjCUcTGxBysnH3TpTnGG3bkfVCaEDhuisETED2Rv5l/xak8Sozmu/GR
+cLUmhAcp0XTDkmpdYDtfFVxGyROHLdc1fmeey6UuUVj0Lymalu+zQqkKoyWfQGHu
+yR4WnWKhitoFI2waYHPRQF0885jIgIeC4udspmqYesOzn7x+zc73FstUiYMxE5Jy
+IRZvQ4Vay0UAT6k8iCW9Zn+bBe76B1q/p8hIlI3Zc3x6uN0awZEG/pNAgIa7nxnc
+ihkz4yu/6tV++ushSRWpoPxctDCmxJDCDhhtR2C6kGVykgF90Ro=
+=bz/g
+-----END PGP SIGNATURE-----

libgphoto2-fix-fuji.patch

@@ -1,21 +0,0 @@
-commit 472a9461b457b4d08ecf10a93bb7f1efdc2124c0
-Author: Marcus Meissner <marcus@jet.franken.de>
-Date:   Mon Jun 19 20:13:14 2017 +0200
-
-    ignore missing 0xd207 property on Fuji XT-2 without firmware update
-
-diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
-index 5a2a637f1..858f6bdbe 100644
---- a/camlibs/ptp2/config.c
-+++ b/camlibs/ptp2/config.c
-@@ -482,6 +482,10 @@ camera_prepare_capture (Camera *camera, GPContext *context)
- 		{
- 			PTPPropertyValue propval;
- 
-+			/* without the firmware update ... not an error... */
-+			if (!have_prop (camera, PTP_VENDOR_FUJI, 0xd207))
-+				return GP_OK;
-+
- 			propval.u16 = 0x0002;
- 			C_PTP (ptp_setdevicepropvalue (params, 0xd207, &propval, PTP_DTC_UINT16));
- 			return GP_OK;

libgphoto2.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Oct  2 16:38:09 UTC 2017 - meissner@suse.com
+
+- updated to 2.5.15 release
+  - ptp2:
+    * fuji: Fix cameras without new capture properties.
+    * Canon EOS: config aspectratio, highisonr
+    * Canon EOS: emit CAPTURECOMPLETE event
+    * Canon EOS: whitebalanaceadjustment is 32bit signed, not 16bit signed
+    * usb: better error feedback
+    * fixed some bugs found by AFL fuzzing
+    * Added USB ids:
+      * Sony: A6500, HX400V
+      * Nikon: D500, D7500
+      * Olympus: VR360
+      * Canon PowerShot: ELPH 350 HS
+      * Canon EOS: 200D, Rebel T7i
+      * Fuji: GFX 50 S
+      * Ricoh Theta S, Theta SC
+  - libgphoto2_port/vusb:
+    * now default disabled as it confused people, enable with --enable-vusb
+- libgphoto2-fix-fuji.patch: upstreamed
+
 -------------------------------------------------------------------
 Sun Jul 16 13:34:04 UTC 2017 - meissner@suse.com
 

libgphoto2.spec

@@ -49,11 +49,10 @@ Obsoletes:      libgphoto2-64bit
 Summary:        A Digital Camera Library
 License:        LGPL-2.1+
 Group:          Hardware/Camera
-Version:        2.5.14
+Version:        2.5.15
 Release:        0
 Source0:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{name}-%{version}.tar.bz2
 Source1:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}//%{name}-%{version}.tar.bz2.asc
-Patch0:         libgphoto2-fix-fuji.patch
 Source2:        %name.keyring
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -135,7 +134,6 @@ This is its API documentation in HTML format.
 
 %prep
 %setup -q
-%patch0 -p1
 (cd doc; tar xaf libgphoto2-api.html.tar.gz)
 
 %build