From owner-svn-ports-head@FreeBSD.ORG Fri Jun 19 17:14:18 2015 Return-Path: Delivered-To: svn-ports-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BAF3B90D; Fri, 19 Jun 2015 17:14:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EBD0BD2; Fri, 19 Jun 2015 17:14:18 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JHEIun044275; Fri, 19 Jun 2015 17:14:18 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JHEIBo044273; Fri, 19 Jun 2015 17:14:18 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201506191714.t5JHEIBo044273@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 19 Jun 2015 17:14:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390136 - in head/devel/android-tools-adb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2015 17:14:18 -0000 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@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); + }