Package: src:libmtp
Version: 1.1.6-20-g1b9f164-1
Severity: wishlist
Tags: patch
Since libgphoto2 has switch to libusb 1.0, there are dependency conflicts
which prevents gvfs to be built:
| gvfs build-depends on:
| - libgphoto2-2-dev (>= 2.4.0)
| libgphoto2-2-dev depends on:
| - libusb-1.0-0-dev | --virtual-libusb-1.0-0-dev
| gvfs build-depends on:
| - libmtp-dev (>= 1.1.6)
| libmtp-dev depends on:
| - libusb-dev
| libusb2-dev conflicts with:
| - libusb-dev
The solution for that is to also switch to libusb 1.0 on kfreebsd, like
it was done recently. This is the goal of the patch below. Note that in
addition to the build-dependency changes, a small patch is also needed,
but it has already been merged upstream. I haven't changed the
build-dependency for hurd, because AFAIK they still don't have "support"
for libusb 1.0.
diff -Nru libmtp-1.1.6-20-g1b9f164/debian/control
libmtp-1.1.6-20-g1b9f164/debian/control
--- libmtp-1.1.6-20-g1b9f164/debian/control 2013-11-10 18:02:26.000000000
+0000
+++ libmtp-1.1.6-20-g1b9f164/debian/control 2013-11-10 18:22:38.000000000
+0000
@@ -13,8 +13,8 @@
dpkg-dev (>= 1.13.19),
gnulib,
libgcrypt11-dev,
- libusb-1.0-0-dev [!hurd-i386],
- libusb-dev [hurd-i386],
+ libusb-1.0-0-dev [!hurd-any],
+ libusb-dev [hurd-any],
lsb-release,
pkg-config,
xsltproc
@@ -96,8 +96,8 @@
Architecture: any
Depends:
libmtp9 (= ${binary:Version}),
- libusb-1.0-0-dev [linux-any],
- libusb-dev [!linux-any],
+ libusb-1.0-0-dev [!hurd-any],
+ libusb-dev [hurd-any],
${misc:Depends}
Multi-Arch: same
Description: Media Transfer Protocol (MTP) development files
diff -Nru libmtp-1.1.6-20-g1b9f164/debian/patches/libusb-1.0-kfreebsd.patch
libmtp-1.1.6-20-g1b9f164/debian/patches/libusb-1.0-kfreebsd.patch
--- libmtp-1.1.6-20-g1b9f164/debian/patches/libusb-1.0-kfreebsd.patch
1970-01-01 00:00:00.000000000 +0000
+++ libmtp-1.1.6-20-g1b9f164/debian/patches/libusb-1.0-kfreebsd.patch
2013-11-10 18:36:43.000000000 +0000
@@ -0,0 +1,13 @@
+http://sourceforge.net/p/libmtp/patches/52/
+
+--- libmtp-1.1.6-20-g1b9f164.orig/src/libusb-glue.h
++++ libmtp-1.1.6-20-g1b9f164/src/libusb-glue.h
+@@ -32,7 +32,7 @@
+
+ #include "ptp.h"
+ #ifdef HAVE_LIBUSB1
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ #endif
+ #ifdef HAVE_LIBUSB0
+ #include <usb.h>
diff -Nru libmtp-1.1.6-20-g1b9f164/debian/patches/series
libmtp-1.1.6-20-g1b9f164/debian/patches/series
--- libmtp-1.1.6-20-g1b9f164/debian/patches/series 2013-08-23
08:12:08.000000000 +0000
+++ libmtp-1.1.6-20-g1b9f164/debian/patches/series 2013-11-10
18:23:06.000000000 +0000
@@ -1 +1,2 @@
1002-udev_rules.patch
+libusb-1.0-kfreebsd.patch
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 9.0-2-amd64
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
