Index: head/multimedia/libmtp/Makefile =================================================================== --- head/multimedia/libmtp/Makefile (revision 384816) +++ head/multimedia/libmtp/Makefile (revision 384817) @@ -1,52 +1,44 @@ # Created by: Petar Zhivkov Petrov # $FreeBSD$ PORTNAME= libmtp -PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTVERSION= 1.1.9 CATEGORIES= multimedia audio MASTER_SITES= SF MAINTAINER= jbeich@FreeBSD.org COMMENT= Media Transfer Protocol (MTP) library LICENSE= LGPL21 # or any later version CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a OPTIONS_DEFINE= MTPZ OPTIONS_DEFAULT= MTPZ MTPZ_DESC= Enable functionality to connect to MTPZ devices GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen INSTALL_TARGET= install-strip USES= iconv libtool pathfix pkgconfig USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) CONFIGURE_ENV+= LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb" .endif MTPZ_CONFIGURE_ENABLE= mtpz MTPZ_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt post-patch: .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) @${REINPLACE_CMD} -i .pkgconf.bak -e \ '/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure @${REINPLACE_CMD} -i .pkgconf.bak -e \ '/Libs.private/s|:|& @LIBUSB_LIBS@|' ${WRKSRC}/libmtp.pc.in .endif - @${REINPLACE_CMD} -e \ - '/if test/s|==|=| ; \ - /endian.h/s|machine|sys|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|Requires|&.private|' ${WRKSRC}/libmtp.pc.in - @${REINPLACE_CMD} -e \ - 's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c .include Index: head/multimedia/libmtp/distinfo =================================================================== --- head/multimedia/libmtp/distinfo (revision 384816) +++ head/multimedia/libmtp/distinfo (revision 384817) @@ -1,2 +1,2 @@ -SHA256 (libmtp-1.1.8.tar.gz) = 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 -SIZE (libmtp-1.1.8.tar.gz) = 757109 +SHA256 (libmtp-1.1.9.tar.gz) = 23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 +SIZE (libmtp-1.1.9.tar.gz) = 760593 Index: head/multimedia/libmtp/files/patch-src_libusb1-glue.c =================================================================== --- head/multimedia/libmtp/files/patch-src_libusb1-glue.c (nonexistent) +++ head/multimedia/libmtp/files/patch-src_libusb1-glue.c (revision 384817) @@ -0,0 +1,15 @@ +Reset libusb_context for successive init_usb() calls instead of error + +https://github.com/phatina/simple-mtpfs/issues/37 + +--- src/libusb1-glue.c.orig 2015-04-09 21:10:06 UTC ++++ src/libusb1-glue.c +@@ -142,7 +142,7 @@ static LIBMTP_error_number_t init_usb() + * We use the same level debug between MTP and USB. + */ + if (libusb1_initialized) +- return LIBMTP_ERROR_NONE; ++ libusb_exit(NULL); + + if (libusb_init(NULL) < 0) { + LIBMTP_ERROR("Libusb1 init failed\n"); Property changes on: head/multimedia/libmtp/files/patch-src_libusb1-glue.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/libmtp/pkg-plist =================================================================== --- head/multimedia/libmtp/pkg-plist (revision 384816) +++ head/multimedia/libmtp/pkg-plist (revision 384817) @@ -1,27 +1,27 @@ bin/mtp-albumart bin/mtp-albums bin/mtp-connect bin/mtp-delfile bin/mtp-detect bin/mtp-emptyfolders bin/mtp-files bin/mtp-filetree bin/mtp-folders bin/mtp-format bin/mtp-getfile bin/mtp-getplaylist bin/mtp-newfolder bin/mtp-newplaylist bin/mtp-playlists bin/mtp-reset bin/mtp-sendfile bin/mtp-sendtr bin/mtp-thumb bin/mtp-tracks bin/mtp-trexist include/libmtp.h lib/libmtp.a lib/libmtp.so lib/libmtp.so.9 -lib/libmtp.so.9.2.0 +lib/libmtp.so.9.3.0 libdata/pkgconfig/libmtp.pc