From owner-svn-ports-head@freebsd.org Wed Aug 15 18:00:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8EC8C106A8D0; Wed, 15 Aug 2018 18:00:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4555C719C9; Wed, 15 Aug 2018 18:00:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 265F65DF7; Wed, 15 Aug 2018 18:00:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7FI0OTb073703; Wed, 15 Aug 2018 18:00:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7FI0ND7073701; Wed, 15 Aug 2018 18:00:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808151800.w7FI0ND7073701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 15 Aug 2018 18:00:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477246 - head/devel/android-tools-adb/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/android-tools-adb/files X-SVN-Commit-Revision: 477246 X-SVN-Commit-Repository: ports 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.27 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: Wed, 15 Aug 2018 18:00:24 -0000 Author: jbeich Date: Wed Aug 15 18:00:23 2018 New Revision: 477246 URL: https://svnweb.freebsd.org/changeset/ports/477246 Log: devel/android-tools-adb: adjust for USB dispatch on Windows after r477245 See https://android.googlesource.com/platform/system/core/+/9425996b4521%5E!/ Modified: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-adb_usb.h (contents, props changed) Modified: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 18:00:23 2018 (r477246) @@ -21,7 +21,7 @@ }; namespace libusb { -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) struct usb_handle : public ::usb_handle { +#else +struct usb_handle { Modified: head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Wed Aug 15 18:00:23 2018 (r477246) @@ -1,11 +1,11 @@ ---- adb/transport_usb.cpp.orig 2017-06-20 10:50:27 UTC +--- adb/transport_usb.cpp.orig 2018-06-21 00:58:42 UTC +++ adb/transport_usb.cpp -@@ -191,6 +191,8 @@ int is_adb_interface(int usb_class, int usb_subclass, +@@ -186,6 +186,8 @@ int is_adb_interface(int usb_class, int usb_subclass, bool should_use_libusb() { - #if defined(_WIN32) || !ADB_HOST + #if !ADB_HOST return false; -+#elif !defined(__linux__) && !defined(__APPLE__) ++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32) + return true; #else - static bool disable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "0") == 0; - return !disable; + static bool enable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "1") == 0; + return enable; Modified: head/devel/android-tools-adb/files/patch-adb_usb.h ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_usb.h Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_usb.h Wed Aug 15 18:00:23 2018 (r477246) @@ -4,7 +4,7 @@ ADB_USB_INTERFACE(libusb::usb_handle*); } -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) namespace native { struct usb_handle; ADB_USB_INTERFACE(native::usb_handle*);