[Pkg-phototools-devel] Bug#714441: libgphoto2: please switch to libusb-1.0

[Aurelien Jarno]

Package: libgphoto2
Version: 2.4.14-2
Severity: wishlist
Tags: patch

libgphoto2 is currently built against the libusb 0.1 library, which
is not maintained anymore upstream. It has been replaced by the libusb
1.0 library, which is supported by libgphoto2, though it still
defaults to the 0.1 when available.

The patch below allows to use libusb 1.0. Please note that with the
current configure script, it's not possible to use --with-libusb-1.0
configure option without also passing the corresponding CFLAGS and
LDFLAGS, so I let the configure script to autodetect it.

Would it be possible to include this patch in the next upload? Thanks in
advance.


diff -Nru libgphoto2-2.4.14/debian/control libgphoto2-2.4.14/debian/control
--- libgphoto2-2.4.14/debian/control	2012-04-22 19:07:13.000000000 +0200
+++ libgphoto2-2.4.14/debian/control	2013-06-28 13:36:48.000000000 +0200
@@ -10,7 +10,7 @@
  , libtool
  , libltdl-dev
  , zlib1g-dev
- , libusb-dev (>= 1:0.1.5) [!hurd-i386]
+ , libusb-1.0-0-dev [!hurd-i386]
  , libgpmg1-dev [linux-any]
  , pkg-config
  , libexif-dev (>= 0.5.9)
diff -Nru libgphoto2-2.4.14/debian/rules libgphoto2-2.4.14/debian/rules
--- libgphoto2-2.4.14/debian/rules	2012-04-22 19:07:13.000000000 +0200
+++ libgphoto2-2.4.14/debian/rules	2013-06-28 13:37:05.000000000 +0200
@@ -5,9 +5,10 @@
 major=2
 
 ### Architecture handling:
+CONFIGURE_OPTIONS += --without-libusb
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
-  CONFIGURE_OPTIONS += --without-libusb
+  CONFIGURE_OPTIONS += --without-libusb-1.0
 endif
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.9-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash