[packages/libgphoto2] - up to 2.5.16; vusb is only for testing and upstream disabled it by default

[arekm]

commit a72d59c129f26bde3d350550cccd80da4a9a7a2a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 26 12:10:08 2018 +0200

    - up to 2.5.16; vusb is only for testing and upstream disabled it by default

 gphoto2-device-return.patch | 32 ++++++++++++++++++++++++++++++++
 libgphoto2.spec             | 11 ++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/libgphoto2.spec b/libgphoto2.spec
index 7984a0a..c3c575f 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -11,14 +11,16 @@ Summary(es.UTF-8):	Foto GNU (gphoto) Release 2
 Summary(pl.UTF-8):	Biblioteki obsługi kamer cyfrowych
 Summary(pt_BR.UTF-8):	GNU Photo - programa GNU para câmeras digitais
 Name:		libgphoto2
-Version:	2.5.14
+Version:	2.5.16
 Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5:	65acb6cbd2b4f3f46829599f5dabd89c
+# Source0-md5:	084d220d078d28c0c7a3ba13f4476128
 Patch0:		%{name}-mode-owner-group.patch
 Patch1:		%{name}-pl.po-update.patch
+# from FC
+Patch2:		gphoto2-device-return.patch
 URL:		http://www.gphoto.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -168,7 +170,8 @@ w przestrzeni użytkownika.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po libgphoto2_port/po/stamp-po
 
@@ -330,13 +333,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/usb1.so
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/usbdiskdirect.so
 %attr(755,root,root) %{_libdir}/libgphoto2_port/*/usbscsi.so
-%attr(755,root,root) %{_libdir}/libgphoto2_port/*/vusb.so
 %{_libdir}/libgphoto2_port/*/disk.la
 %{_libdir}/libgphoto2_port/*/ptpip.la
 %{_libdir}/libgphoto2_port/*/usb1.la
 %{_libdir}/libgphoto2_port/*/usbdiskdirect.la
 %{_libdir}/libgphoto2_port/*/usbscsi.la
-%{_libdir}/libgphoto2_port/*/vusb.la
 
 # utilities
 %attr(755,root,root) %{_libdir}/libgphoto2/print-camera-list
diff --git a/gphoto2-device-return.patch b/gphoto2-device-return.patch
new file mode 100644
index 0000000..456c2d4
--- /dev/null
+++ b/gphoto2-device-return.patch
@@ -0,0 +1,32 @@
+From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Fri, 23 Oct 2009 13:12:16 +0200
+Subject: [PATCH] Repair reattach of kernel driver if it was unbound
+
+Drah in the header for USBDEVFS_CONNECT.
+
+Signed-off-by: Lubomir Rintel <lkundrak at v3.sk>
+---
+ libgphoto2_port/usb/libusb.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
+index d1535a5..c8a63f1 100644
+--- a/libgphoto2_port/usb/libusb.c
++++ b/libgphoto2_port/usb/libusb.c
+@@ -38,6 +38,12 @@
+ #include <gphoto2/gphoto2-port-result.h>
+ #include <gphoto2/gphoto2-port-log.h>
+ 
++#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
++/* Pull in USBDEVFS_CONNECT */
++#include <sys/ioctl.h>
++#include <linux/usbdevice_fs.h>
++#endif
++
+ #ifdef ENABLE_NLS
+ #  include <libintl.h>
+ #  undef _
+-- 
+1.6.5.rc2
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgphoto2.git/commitdiff/a72d59c129f26bde3d350550cccd80da4a9a7a2a