diff options
| -rw-r--r-- | devel/Makefile | 1 | ||||
| -rw-r--r-- | devel/py-adb/Makefile | 3 | ||||
| -rw-r--r-- | devel/py-libusb1/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-libusb1/distinfo | 6 | ||||
| -rw-r--r-- | devel/py-libusb1/files/patch-usb1_____init____.py | 26 | ||||
| -rw-r--r-- | devel/py-libusb115/Makefile | 12 | ||||
| -rw-r--r-- | devel/py-libusb115/distinfo | 3 | ||||
| -rw-r--r-- | devel/py-libusb115/files/patch-usb1.py (renamed from devel/py-libusb1/files/patch-usb1.py) | 0 |
8 files changed, 50 insertions, 5 deletions
diff --git a/devel/Makefile b/devel/Makefile index ea5221850471..cc3b6973e253 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4355,6 +4355,7 @@ SUBDIR += py-libpeas SUBDIR += py-libplist SUBDIR += py-libusb1 + SUBDIR += py-libusb115 SUBDIR += py-libvirt SUBDIR += py-libzfs SUBDIR += py-linecache2 diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile index 1adcd0ae08a8..00922a4669a1 100644 --- a/devel/py-adb/Makefile +++ b/devel/py-adb/Makefile @@ -3,6 +3,7 @@ PORTNAME= adb DISTVERSION= 1.1.1-37 DISTVERSIONSUFFIX= -gfb09de9 +PORTREVISION= 1 CATEGORIES= devel comms python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +12,7 @@ COMMENT= Pure-python implementation of ADB and Fastboot protocols LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb115>=1.0.16:devel/py-libusb115 \ ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto USE_GITHUB= yes diff --git a/devel/py-libusb1/Makefile b/devel/py-libusb1/Makefile index 8f031763a3f0..05bafd837125 100644 --- a/devel/py-libusb1/Makefile +++ b/devel/py-libusb1/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libusb1 -PORTVERSION= 1.5.3 +PORTVERSION?= 1.6.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,6 +11,8 @@ COMMENT= Pure-python wrapper for libusb-1.0 LICENSE= LGPL21+ +CONFLICTS_INSTALL?= ${PKGNAMEPREFIX}${PORTNAME}15 + NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils diff --git a/devel/py-libusb1/distinfo b/devel/py-libusb1/distinfo index 2faaafcdc2a9..7402438aa860 100644 --- a/devel/py-libusb1/distinfo +++ b/devel/py-libusb1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1474053011 -SHA256 (libusb1-1.5.3.tar.gz) = 85f6bbf9fcfe9421f99864f20a37eacb00f30b8a7c29adc6b2a163bde29649ea -SIZE (libusb1-1.5.3.tar.gz) = 53409 +TIMESTAMP = 1486131645 +SHA256 (libusb1-1.6.4.tar.gz) = 8c930d9c1d037d9c83924c82608aa6a1adcaa01ca0e4a23ee0e8e18d7eee670d +SIZE (libusb1-1.6.4.tar.gz) = 55491 diff --git a/devel/py-libusb1/files/patch-usb1_____init____.py b/devel/py-libusb1/files/patch-usb1_____init____.py new file mode 100644 index 000000000000..e42cf7f83290 --- /dev/null +++ b/devel/py-libusb1/files/patch-usb1_____init____.py @@ -0,0 +1,26 @@ +https://lists.freebsd.org/pipermail/freebsd-usb/2015-January/013586.html + +--- usb1/__init__.py.orig 2016-11-23 13:07:52 UTC ++++ usb1/__init__.py +@@ -1830,15 +1830,20 @@ class USBDevice(object): + """ + Get device's port number. + """ +- return libusb1.libusb_get_port_number(self.device_p) ++ try: ++ return libusb1.libusb_get_port_number(self.device_p) ++ except AttributeError: ++ return 0 + + def getPortNumberList(self): + """ + Get the port number of each hub toward device. + """ + port_list = (c_uint8 * PATH_MAX_DEPTH)() ++ temp_handle = self.open() + result = libusb1.libusb_get_port_numbers( + self.device_p, port_list, len(port_list)) ++ temp_handle.close() + mayRaiseUSBError(result) + return list(port_list[:result]) + diff --git a/devel/py-libusb115/Makefile b/devel/py-libusb115/Makefile new file mode 100644 index 000000000000..a7fae3cc3585 --- /dev/null +++ b/devel/py-libusb115/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTVERSION= 1.5.3 +PKGNAMESUFFIX= 15 + +MASTERDIR= ${.CURDIR}/../py-libusb1 +DISTINFO_FILE= ${.CURDIR}/distinfo +PATCHDIR= ${.CURDIR}/files + +CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME} + +.include "${MASTERDIR}/Makefile" diff --git a/devel/py-libusb115/distinfo b/devel/py-libusb115/distinfo new file mode 100644 index 000000000000..2faaafcdc2a9 --- /dev/null +++ b/devel/py-libusb115/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1474053011 +SHA256 (libusb1-1.5.3.tar.gz) = 85f6bbf9fcfe9421f99864f20a37eacb00f30b8a7c29adc6b2a163bde29649ea +SIZE (libusb1-1.5.3.tar.gz) = 53409 diff --git a/devel/py-libusb1/files/patch-usb1.py b/devel/py-libusb115/files/patch-usb1.py index a47c742bd960..a47c742bd960 100644 --- a/devel/py-libusb1/files/patch-usb1.py +++ b/devel/py-libusb115/files/patch-usb1.py |