Date: Mon, 27 Apr 2015 06:35:09 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384817 - in head/multimedia/libmtp: . files Message-ID: <201504270635.t3R6Z9c8048634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Apr 27 06:35:08 2015 New Revision: 384817 URL: https://svnweb.freebsd.org/changeset/ports/384817 Log: - Update to 1.1.9 - Avoid regressing sysutils/fusefs-simple-mtpfs with workaround - Drop no longer necessary == fix since base r219084 (8.3R earliest) Changes: http://sourceforge.net/projects/libmtp/files/libmtp/1.1.9/README/view Added: head/multimedia/libmtp/files/ head/multimedia/libmtp/files/patch-src_libusb1-glue.c (contents, props changed) Modified: head/multimedia/libmtp/Makefile head/multimedia/libmtp/distinfo head/multimedia/libmtp/pkg-plist Modified: head/multimedia/libmtp/Makefile ============================================================================== --- head/multimedia/libmtp/Makefile Mon Apr 27 06:16:06 2015 (r384816) +++ head/multimedia/libmtp/Makefile Mon Apr 27 06:35:08 2015 (r384817) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libmtp -PORTVERSION= 1.1.8 -PORTREVISION= 1 +PORTVERSION= 1.1.9 CATEGORIES= multimedia audio MASTER_SITES= SF @@ -41,12 +40,5 @@ post-patch: @${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 <bsd.port.mk> Modified: head/multimedia/libmtp/distinfo ============================================================================== --- head/multimedia/libmtp/distinfo Mon Apr 27 06:16:06 2015 (r384816) +++ head/multimedia/libmtp/distinfo Mon Apr 27 06:35:08 2015 (r384817) @@ -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 Added: head/multimedia/libmtp/files/patch-src_libusb1-glue.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libmtp/files/patch-src_libusb1-glue.c Mon Apr 27 06:35:08 2015 (r384817) @@ -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"); Modified: head/multimedia/libmtp/pkg-plist ============================================================================== --- head/multimedia/libmtp/pkg-plist Mon Apr 27 06:16:06 2015 (r384816) +++ head/multimedia/libmtp/pkg-plist Mon Apr 27 06:35:08 2015 (r384817) @@ -23,5 +23,5 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504270635.t3R6Z9c8048634>