svn commit: r390136 - in head/devel/android-tools-adb: . files

[Jan Beich]

Author: jbeich
Date: Fri Jun 19 17:14:17 2015
New Revision: 390136
URL: https://svnweb.freebsd.org/changeset/ports/390136

Log:
  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)

Modified:
  head/devel/android-tools-adb/Makefile   (contents, props changed)
  head/devel/android-tools-adb/files/patch-usb_libusb.c   (contents, props changed)

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Fri Jun 19 17:13:59 2015	(r390135)
+++ head/devel/android-tools-adb/Makefile	Fri Jun 19 17:14:17 2015	(r390136)
@@ -3,6 +3,7 @@
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	5.0.0_r7
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	kevlo at FreeBSD.org

Modified: head/devel/android-tools-adb/files/patch-usb_libusb.c
==============================================================================
--- head/devel/android-tools-adb/files/patch-usb_libusb.c	Fri Jun 19 17:13:59 2015	(r390135)
+++ head/devel/android-tools-adb/files/patch-usb_libusb.c	Fri Jun 19 17:14:17 2015	(r390136)
@@ -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);
+ }