kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/android-tools-{adb,fastboot}-devel: update to n.p.5.126

Browse source 
Changes:	80beb506cf..2f21b7cecd/adb
Changes:	80beb506cf..2f21b7cecd/fastboot
This commit is contained in:
Jan Beich 2016-08-09 16:48:21 +00:00
parent b22878e069
commit 9c6b00d6e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=419937
16 changed files with 135 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
devel/android-tools-adb-devel/Makefile
View file

@ -1,8 +1,8 @@
# $FreeBSD$
# Hint: git describe --abbrev=12 --match android-n-preview-4
DISTVERSION= n-preview-4-74
DISTVERSIONSUFFIX= -g80beb506cf84
# Hint: git describe --abbrev=12 --match android-n-preview-5
DISTVERSION= n-preview-5-126
DISTVERSIONSUFFIX= -g2f21b7cecda2
PORTREVISION= 0
PKGNAMESUFFIX= -devel
@ -21,7 +21,7 @@ TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d
TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/}
TEST_PYTHON_GH_PROJECT= platform_development:development
TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-6-g256e246:development
TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-14-g735aab1:development
TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
TEST_PYTHON_USES= python:2.7,build

9
devel/android-tools-adb-devel/distinfo
View file

@ -1,6 +1,7 @@
SHA256 (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 552cd8e6500e7ee0149c59116ea2a560906fc1ecd3b557ea714f8c11269e6a7a
SIZE (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 1558004
TIMESTAMP = 1470755379
SHA256 (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 61256486af01cfefeee6779f9926ba32334b9fb1a5aacfa2cd4a682d66f01a2a
SIZE (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 1561372
SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
SHA256 (android-platform_development-android-n-preview-4-6-g256e246_GH0.tar.gz) = 5caaa22733ebcb1110953b2a1ee9548f82634c4b8713d105137ac58689fea361
SIZE (android-platform_development-android-n-preview-4-6-g256e246_GH0.tar.gz) = 149182859
SHA256 (android-platform_development-android-n-preview-5-14-g735aab1_GH0.tar.gz) = e3559503f88e0dc3f0fa3e04cd11b0666538c64a24275fc39af951b74e50f32c
SIZE (android-platform_development-android-n-preview-5-14-g735aab1_GH0.tar.gz) = 149193336

3
devel/android-tools-adb-devel/files/Makefile
View file

@ -41,6 +41,9 @@ TEST_SRCS+= transport_test.cpp
.PATH: ${.CURDIR}/client
SRCS+= main.cpp
.PATH: ${.CURDIR}/sysdeps
TEST_SRCS+= stat_test.cpp
.PATH: ${EXTRADIR}
SRCS+= get_my_path_freebsd.cpp
SRCS+= usb_libusb.cpp

11
devel/android-tools-adb-devel/files/patch-base_file.cpp Normal file
View file

@ -0,0 +1,11 @@
--- base/file.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/file.cpp
@@ -21,6 +21,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <cstdio> // BUFSIZ
+#include <cstring> // strerror
#include <string>
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.

26
devel/android-tools-adb-devel/files/patch-base_logging.cpp
View file

@ -1,6 +1,24 @@
--- base/logging.cpp.orig 2015-12-14 21:12:52 UTC
--- base/logging.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/logging.cpp
@@ -66,6 +68,14 @@
@@ -25,7 +25,7 @@
#include <time.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>
@@ -35,6 +35,8 @@
#include <sys/uio.h>
#endif
+#include <cstring> // strrchr
+#include <cstdio> // fprintf
#include <iostream>
#include <limits>
#include <sstream>
@@ -71,6 +72,14 @@
#include <unistd.h>
#elif defined(_WIN32)
#include <windows.h>
@ -14,8 +32,8 @@
+#include <stdint.h>
#endif
static pid_t GetThreadId() {
@@ -77,6 +89,14 @@ static pid_t GetThreadId() {
#if defined(_WIN32)
@@ -88,6 +97,14 @@ static thread_id GetThreadId() {
return syscall(__NR_gettid);
#elif defined(_WIN32)
return GetCurrentThreadId();

2
devel/android-tools-adb/Makefile
View file

@ -26,7 +26,9 @@ CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
.ifndef EXTRA_PATCHES
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_include_base_logging.h
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file__test.cpp
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_logging.cpp
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-liblog_logd__write.c
.endif

0
devel/android-tools-adb/files/patch-base_file.cpp → devel/android-tools-adb/files/extra-patch-base_file.cpp
View file

0
devel/android-tools-adb/files/patch-base_logging.cpp → devel/android-tools-adb/files/extra-patch-base_logging.cpp
View file

10
devel/android-tools-fastboot-devel/Makefile
View file

@ -1,14 +1,14 @@
# $FreeBSD$
# Hint: git describe --abbrev=12 --match android-n-preview-4
DISTVERSION= n-preview-4-74
DISTVERSIONSUFFIX= -g80beb506cf84
# Hint: git describe --abbrev=12 --match android-n-preview-5
DISTVERSION= n-preview-5-126
DISTVERSIONSUFFIX= -g2f21b7cecda2
PORTREVISION= 0
PKGNAMESUFFIX= -devel
GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
GH_TAGNAME= ${GH_MYTAG}-38-gd937202:extras \
${GH_MYTAG}:libselinux
GH_TAGNAME= ${GH_MYTAG}-64-g8cd939bd7af7:extras \
${GH_MYTAG}-1-g1fdb726:libselinux
CONFLICTS_INSTALL= ${PORTNAME}-[0-9]*

13
devel/android-tools-fastboot-devel/distinfo
View file

@ -1,10 +1,11 @@
TIMESTAMP = 1470755379
SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
SIZE (fastboot.1?id=706e754) = 5906
SHA256 (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 552cd8e6500e7ee0149c59116ea2a560906fc1ecd3b557ea714f8c11269e6a7a
SIZE (android-platform_system_core-android-n-preview-4-74-g80beb506cf84_GH0.tar.gz) = 1558004
SHA256 (jbeich-platform_system_extras-android-n-preview-4-38-gd937202_GH0.tar.gz) = 2a6b991d4c5921ca89dc30f40361c71d4ebf55eb86744032e5efcc7a2af277c9
SIZE (jbeich-platform_system_extras-android-n-preview-4-38-gd937202_GH0.tar.gz) = 81924921
SHA256 (jbeich-platform_external_libselinux-android-n-preview-4_GH0.tar.gz) = 303f8c77786413cf6ea2a24a502c2e9e8a0348ae168f85a710f46b8acce0211c
SIZE (jbeich-platform_external_libselinux-android-n-preview-4_GH0.tar.gz) = 63010
SHA256 (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 61256486af01cfefeee6779f9926ba32334b9fb1a5aacfa2cd4a682d66f01a2a
SIZE (android-platform_system_core-android-n-preview-5-126-g2f21b7cecda2_GH0.tar.gz) = 1561372
SHA256 (jbeich-platform_system_extras-android-n-preview-5-64-g8cd939bd7af7_GH0.tar.gz) = 8506118d4606458f098d2e7b089c3304fee935c8e50ae9bb1e1ae8caab654be7
SIZE (jbeich-platform_system_extras-android-n-preview-5-64-g8cd939bd7af7_GH0.tar.gz) = 82049260
SHA256 (jbeich-platform_external_libselinux-android-n-preview-5-1-g1fdb726_GH0.tar.gz) = a898cb59e585de2ec51c6c13759069e62480efe785fb808d991043a469649624
SIZE (jbeich-platform_external_libselinux-android-n-preview-5-1-g1fdb726_GH0.tar.gz) = 63005
SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948

5
devel/android-tools-fastboot-devel/files/Makefile
View file

@ -28,6 +28,7 @@ SRCS+= diagnose_usb.cpp
.PATH: ${.CURDIR}/../base
SRCS+= errors_unix.cpp
SRCS+= file.cpp
SRCS+= logging.cpp
SRCS+= parsenetaddress.cpp
SRCS+= stringprintf.cpp
SRCS+= strings.cpp
@ -124,8 +125,8 @@ CXXFLAGS+= ${CPPFLAGS}
LDADD+= $$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
LDADD+= -lz
DPADD+= ${LIBPCRE} ${LIBUSB} ${LIBZ}
LDADD+= -lz \-lpthread
DPADD+= ${LIBPCRE} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
GIT?= git
PKG_CONFIG?= pkg-config

11
devel/android-tools-fastboot-devel/files/patch-base_file.cpp Normal file
View file

@ -0,0 +1,11 @@
--- base/file.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/file.cpp
@@ -21,6 +21,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <cstdio> // BUFSIZ
+#include <cstring> // strerror
#include <string>
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.

11
devel/android-tools-fastboot-devel/files/patch-base_include_android-base_logging.h Normal file
View file

@ -0,0 +1,11 @@
--- base/include/android-base/logging.h.orig 2015-09-29 18:07:07 UTC
+++ base/include/android-base/logging.h
@@ -25,6 +25,8 @@
#endif
#endif
+#include <errno.h>
+
#include <functional>
#include <memory>
#include <ostream>

50
devel/android-tools-fastboot-devel/files/patch-base_logging.cpp Normal file
View file

@ -0,0 +1,50 @@
--- base/logging.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/logging.cpp
@@ -25,7 +25,7 @@
#include <time.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>
@@ -35,6 +35,8 @@
#include <sys/uio.h>
#endif
+#include <cstring> // strrchr
+#include <cstdio> // fprintf
#include <iostream>
#include <limits>
#include <sstream>
@@ -71,6 +72,14 @@
#include <unistd.h>
#elif defined(_WIN32)
#include <windows.h>
+#elif defined(__DragonFly__)
+#include <unistd.h>
+#elif defined(__FreeBSD__)
+#include <pthread_np.h>
+#elif defined(__NetBSD__)
+#include <lwp.h>
+#else
+#include <stdint.h>
#endif
#if defined(_WIN32)
@@ -88,6 +97,14 @@ static thread_id GetThreadId() {
return syscall(__NR_gettid);
#elif defined(_WIN32)
return GetCurrentThreadId();
+#elif defined(__DragonFly__)
+ return lwp_gettid();
+#elif defined(__NetBSD__)
+ return _lwp_self();
+#elif defined(__FreeBSD__)
+ return pthread_getthreadid_np();
+#else
+ return (intptr_t) pthread_self();
#endif
}

1
devel/android-tools-fastboot/Makefile
View file

@ -33,6 +33,7 @@ GH_REVISION= f7f765fd62bf # generated by: make update-revision
CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
.ifndef EXTRA_PATCHES
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-base_file.cpp
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-liblog_logd__write.c
.endif

0
devel/android-tools-fastboot/files/patch-base_file.cpp → devel/android-tools-fastboot/files/extra-patch-base_file.cpp
View file