From b506518fb24e8513cbeaf06433ebbc2861849a24 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Fri, 19 Jun 2015 17:14:53 +0000
Subject: devel/android-tools-adb-devel: add new slave port for git master

A temporary port to facilitate testing and updating master.

While copying usb_libusb.c [1] under FILESDIR clean it up:
- Add static keyword for file-local functions
- Fix const usage exposed in C++ mode [2]
- Fix casting 3rd argument of libusb_bulk_transfer(3) exposed in C++ mode
- Fix inconsistent whitespace: trailing, tabs + spaces, bogus indentation
- Fix typo in usb_kick() trace message
- Fix fprintf(3) warning in scan_usb_devices() trace message
- Convert err(3) usage to fatal_errno()
- Drop BSDism of sysexits(3)
- Drop unecessary struct keyword
- Drop unused headers [2]
- Explicitly include <signal.h> header

And chase the following commits:
https://android.googlesource.com/platform/system/core/+/506aea4%5E!/ [1]
https://android.googlesource.com/platform/system/core/+/dc3b459%5E!/#F3
https://android.googlesource.com/platform/system/core/+/9b0f354%5E!/#F5
https://android.googlesource.com/platform/system/core/+/cf07494%5E!/#F8
https://android.googlesource.com/platform/system/core/+/3313426%5E!/#F20
https://android.googlesource.com/platform/system/core/+/7664901%5E!/#F18

Changes:	https://android.googlesource.com/platform/system/core/+log/53d504f/adb
Differential Revision:	https://reviews.freebsd.org/D2870
Obtained from:	devel/android-tools-fastboot-devel (based on)
Obtained from:	OpenBSD ports [2]
Approved by:	kevlo (maintainer)
---
 .../files/patch-base_logging.cpp                       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 devel/android-tools-adb-devel/files/patch-base_logging.cpp

(limited to 'devel/android-tools-adb-devel/files/patch-base_logging.cpp')

diff --git a/devel/android-tools-adb-devel/files/patch-base_logging.cpp b/devel/android-tools-adb-devel/files/patch-base_logging.cpp
new file mode 100644
index 000000000000..53bf6fdd0537
--- /dev/null
+++ b/devel/android-tools-adb-devel/files/patch-base_logging.cpp
@@ -0,0 +1,18 @@
+--- base/logging.cpp.orig	2015-06-17 22:20:38 UTC
++++ base/logging.cpp
+@@ -23,12 +23,14 @@
+ #include <libgen.h>
+ 
+ // For getprogname(3) or program_invocation_short_name.
+-#if defined(__ANDROID__) || defined(__APPLE__)
++#if !defined(_WIN32) && !defined(__GLIBC__)
+ #include <stdlib.h>
+ #elif defined(__GLIBC__)
+ #include <errno.h>
+ #endif
+ 
++#include <cstring> // strlen
++#include <cstdio>  // fprintf
+ #include <iostream>
+ #include <limits>
+ #include <sstream>
-- 
cgit v1.2.3