diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-27 21:37:54 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-27 21:37:54 +0000 |
| commit | 2fafab614194a0096fd1922e630d31eacb8dce4a (patch) | |
| tree | 0f232ba8d5bf3abc270a41bc882bce6651e3ef10 /media-libs | |
| parent | remove old (diff) | |
| download | gentoo-2-2fafab614194a0096fd1922e630d31eacb8dce4a.tar.gz gentoo-2-2fafab614194a0096fd1922e630d31eacb8dce4a.tar.bz2 gentoo-2-2fafab614194a0096fd1922e630d31eacb8dce4a.zip | |
Add a patch to make it build with FreeBSD libusb 1.0 implementation.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libmtp/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch | 17 | ||||
| -rw-r--r-- | media-libs/libmtp/libmtp-1.1.6.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog index eb8f72a2d0db..bb06f9b2a980 100644 --- a/media-libs/libmtp/ChangeLog +++ b/media-libs/libmtp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libmtp # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.132 2013/08/27 21:33:12 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.133 2013/08/27 21:37:53 aballier Exp $ + + 27 Aug 2013; Alexis Ballier <aballier@gentoo.org> libmtp-1.1.6.ebuild, + +files/libmtp-1.1.6-fbsdlibusb.patch: + Add a patch to make it build with FreeBSD libusb 1.0 implementation. 27 Aug 2013; Alexis Ballier <aballier@gentoo.org> -libmtp-1.1.4.ebuild, -libmtp-1.1.5.ebuild: diff --git a/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch b/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch new file mode 100644 index 000000000000..26c6e352747a --- /dev/null +++ b/media-libs/libmtp/files/libmtp-1.1.6-fbsdlibusb.patch @@ -0,0 +1,17 @@ +FreeBSD installs its libusb-1.0 implementation in libusb-1.0. libmtp uses +pkg-config to discover it which adds the correct -I flag, so just #include +libusb.h to make it work with every implementation. + +Index: libmtp-1.1.6/src/libusb-glue.h +=================================================================== +--- libmtp-1.1.6.orig/src/libusb-glue.h ++++ libmtp-1.1.6/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 --git a/media-libs/libmtp/libmtp-1.1.6.ebuild b/media-libs/libmtp/libmtp-1.1.6.ebuild index 8cbadca6230e..bf055f7b3404 100644 --- a/media-libs/libmtp/libmtp-1.1.6.ebuild +++ b/media-libs/libmtp/libmtp-1.1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.6 2013/08/10 12:49:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.6.ebuild,v 1.7 2013/08/27 21:37:53 aballier Exp $ EAPI=4 @@ -34,6 +34,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}/${P}-fbsdlibusb.patch" if [[ ${PV} == *9999* ]]; then touch config.rpath # This is from upstream autogen.sh eautoreconf |