aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-06-20 01:14:17 +0800
committerjbeich <jbeich@FreeBSD.org>2015-06-20 01:14:17 +0800
commitbf01897c61a2d6485182cd85c3963d041952dd18 (patch)
treeff4192bc99ba1e8067fbe88ebe6bb09f9a63bc8e /devel
parent073c72ea976b16fff0df032c253d9f88a5e4622c (diff)
downloadfreebsd-ports-gnome-bf01897c61a2d6485182cd85c3963d041952dd18.tar.gz
freebsd-ports-gnome-bf01897c61a2d6485182cd85c3963d041952dd18.tar.zst
freebsd-ports-gnome-bf01897c61a2d6485182cd85c3963d041952dd18.zip
devel/android-tools-adb: fix "get-devpath" output
Catch up with the following upstream change: https://android.googlesource.com/platform/system/core/+/e109d26%5E!/ Before $ adb get-devpath unknown $ adb devices -l List of devices attached ABCD1234 device product:A1 model:Blah device:foo After $ adb get-devpath ugen1.2 $ adb devices -l List of devices attached ABCD1234 device ugen1.2 product:A1 model:Blah device:foo Differential Revision: https://reviews.freebsd.org/D2862 Obtained from: r389471 (based on) Approved by: kevlo (maintainer)
Diffstat (limited to 'devel')
-rw-r--r--devel/android-tools-adb/Makefile1
-rw-r--r--devel/android-tools-adb/files/patch-usb_libusb.c13
2 files changed, 14 insertions, 0 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 2b318fa8e1f3..e07710d1f486 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -3,6 +3,7 @@
PORTNAME= android-tools-adb
DISTVERSIONPREFIX= android-
DISTVERSION= 5.0.0_r7
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= kevlo@FreeBSD.org
diff --git a/devel/android-tools-adb/files/patch-usb_libusb.c b/devel/android-tools-adb/files/patch-usb_libusb.c
index 8af304b4f29c..0c39a437a9d8 100644
--- a/devel/android-tools-adb/files/patch-usb_libusb.c
+++ b/devel/android-tools-adb/files/patch-usb_libusb.c
@@ -9,3 +9,16 @@
static libusb_context *ctx = NULL;
struct usb_handle
+@@ -347,7 +347,11 @@ register_device(struct usb_handle *uh, c
+
+ adb_mutex_unlock(&usb_lock);
+
+- register_usb_transport(usb, serial, NULL, 1);
++ char devpath[64];
++ snprintf(devpath, sizeof(devpath), "ugen%d.%d",
++ uh->dev_bus, uh->dev_addr);
++
++ register_usb_transport(usb, serial, devpath, 1);
+
+ return (1);
+ }