diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-04-27 14:35:08 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-04-27 14:35:08 +0800 |
| commit | d2952c0873bb12fb20e3c5ef57fc75b7d7f110a6 (patch) | |
| tree | 5ebc7fbfabe839f3267f3469e30ee29e0dca6fb4 | |
| parent | e7925b34dd92e4e4a5780bafcb092586f426b9d4 (diff) | |
| download | freebsd-ports-gnome-d2952c0873bb12fb20e3c5ef57fc75b7d7f110a6.tar.gz freebsd-ports-gnome-d2952c0873bb12fb20e3c5ef57fc75b7d7f110a6.tar.zst freebsd-ports-gnome-d2952c0873bb12fb20e3c5ef57fc75b7d7f110a6.zip | |
- 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
| -rw-r--r-- | multimedia/libmtp/Makefile | 10 | ||||
| -rw-r--r-- | multimedia/libmtp/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmtp/files/patch-src_libusb1-glue.c | 15 | ||||
| -rw-r--r-- | multimedia/libmtp/pkg-plist | 2 |
4 files changed, 19 insertions, 12 deletions
diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index e1007ebb3273..1b6029e95748 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -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> diff --git a/multimedia/libmtp/distinfo b/multimedia/libmtp/distinfo index 051e53bf75c2..81268281e064 100644 --- a/multimedia/libmtp/distinfo +++ b/multimedia/libmtp/distinfo @@ -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 diff --git a/multimedia/libmtp/files/patch-src_libusb1-glue.c b/multimedia/libmtp/files/patch-src_libusb1-glue.c new file mode 100644 index 000000000000..28dedb101563 --- /dev/null +++ b/multimedia/libmtp/files/patch-src_libusb1-glue.c @@ -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"); diff --git a/multimedia/libmtp/pkg-plist b/multimedia/libmtp/pkg-plist index dc8081989bef..92471b114dce 100644 --- a/multimedia/libmtp/pkg-plist +++ b/multimedia/libmtp/pkg-plist @@ -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 |