rpm/libgphoto2
SHA256
1
0
Fork 0
forked from pool/libgphoto2
Code Pull Requests Activity

- libgphoto2-fix-fuji.patch: check before using a ptp property that

Browse Source 
is only available in some updated Fuji cameras (bsc#1048853)

OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=174
This commit is contained in:
Marcus Meissner 2017-07-16 13:34:43 +00:00 committed by Git OBS Bridge
parent b34b28df44
commit a2c54b78dc
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libgphoto2-fix-fuji.patch Normal file
View File

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

6
libgphoto2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Jul 16 13:34:04 UTC 2017 - meissner@suse.com
- libgphoto2-fix-fuji.patch: check before using a ptp property that
is only available in some updated Fuji cameras (bsc#1048853)
-------------------------------------------------------------------
Mon Jun 5 18:58:54 UTC 2017 - meissner@suse.com

2
libgphoto2.spec
View File

@ -53,6 +53,7 @@ Version: 2.5.14
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
@ -134,6 +135,7 @@ This is its API documentation in HTML format.
%prep
%setup -q
%patch0 -p1
(cd doc; tar xaf libgphoto2-api.html.tar.gz)
%build