diff options
Diffstat (limited to 'devel')
14 files changed, 137 insertions, 33 deletions
diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile index 562820fe5be1..9bce76418687 100644 --- a/devel/android-tools-adb-devel/Makefile +++ b/devel/android-tools-adb-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-m-preview -DISTVERSION= m-preview-6225 -DISTVERSIONSUFFIX= -gaef26bb1a4ad +DISTVERSION= m-preview-6425 +DISTVERSIONSUFFIX= -g0fc006685c20 PORTREVISION= 0 PKGNAMESUFFIX= -devel diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo index e2fdf309fe6a..c960001d4218 100644 --- a/devel/android-tools-adb-devel/distinfo +++ b/devel/android-tools-adb-devel/distinfo @@ -1,5 +1,5 @@ -SHA256 (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = be20282d07edffa0301a2ffa524169ec2f27ac99597ec88920343e820d38d824 -SIZE (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = 1470573 +SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e +SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 SHA256 (android-platform_development-android-m-preview-2510-g72f24a0_GH0.tar.gz) = a7e3172a61be2b7545fb4c10d5516cceb68b574cf7c83b7fc00c5cac0527b182 diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile index b1193d9ada6c..caa45279d558 100644 --- a/devel/android-tools-adb-devel/files/Makefile +++ b/devel/android-tools-adb-devel/files/Makefile @@ -23,7 +23,6 @@ SRCS+= file_sync_client.cpp SRCS+= line_printer.cpp SRCS+= services.cpp SRCS+= shell_service_protocol.cpp -# XXX SuffFindDeps may fail to restore suffix lost in transformation SRCS+= ../adb/sockets.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp @@ -34,6 +33,7 @@ TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_test.cpp +TEST_SRCS+= sysdeps_test.cpp TEST_SRCS+= transport_test.cpp .PATH: ${.CURDIR}/client diff --git a/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp deleted file mode 100644 index 6ed5ff31cf39..000000000000 --- a/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- adb/adb_utils_test.cpp.orig 2015-11-07 17:05:12 UTC -+++ adb/adb_utils_test.cpp -@@ -194,7 +194,7 @@ TEST(adb_utils, parse_host_and_port) { - } - - void test_mkdirs(const std::string basepath) { -- EXPECT_TRUE(mkdirs(basepath)); -+ EXPECT_TRUE(mkdirs(adb_dirname(basepath))); - EXPECT_NE(-1, adb_creat(basepath.c_str(), 0600)); - EXPECT_FALSE(mkdirs(basepath + "/subdir/")); - } diff --git a/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h index 7480e1799b35..8ca18724c86a 100644 --- a/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h +++ b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h @@ -1,5 +1,21 @@ --- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC +++ adb/sysdeps.h +@@ -61,11 +61,13 @@ + #endif + #endif + +-#ifdef _WIN32 +- ++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7) + // Clang-only nullability specifiers + #define _Nonnull + #define _Nullable ++#endif ++ ++#ifdef _WIN32 + + #include <ctype.h> + #include <direct.h> @@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d #include <string> diff --git a/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp b/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp new file mode 100644 index 000000000000..b640a75485fa --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp @@ -0,0 +1,10 @@ +--- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC ++++ base/parsenetaddress.cpp +@@ -16,6 +16,7 @@ + + #include "android-base/parsenetaddress.h" + ++#include <stdio.h> // sscanf + #include <algorithm> + + #include "android-base/stringprintf.h" diff --git a/devel/android-tools-adb-devel/files/usb_libusb.cpp b/devel/android-tools-adb-devel/files/usb_libusb.cpp index 3b63ed328874..cfed6aa214e6 100644 --- a/devel/android-tools-adb-devel/files/usb_libusb.cpp +++ b/devel/android-tools-adb-devel/files/usb_libusb.cpp @@ -600,8 +600,8 @@ scan_usb_devices() libusb_free_device_list(devs, 1); } -static void * -device_poll_thread(void* unused) +static void +device_poll_thread(void*) { adb_thread_setname("USB scan"); D("device_poll_thread(): Created USB scan thread"); @@ -611,9 +611,6 @@ device_poll_thread(void* unused) kick_disconnected(); scan_usb_devices(); } - - /* never reaching this point */ - return (NULL); } static void diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile index f010225105fd..a7c96514a9c4 100644 --- a/devel/android-tools-fastboot-devel/Makefile +++ b/devel/android-tools-fastboot-devel/Makefile @@ -1,18 +1,19 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-m-preview -DISTVERSION= m-preview-6225 -DISTVERSIONSUFFIX= -gaef26bb1a4ad +DISTVERSION= m-preview-6425 +DISTVERSIONSUFFIX= -g0fc006685c20 PORTREVISION= 0 PKGNAMESUFFIX= -devel -GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-1153-gb764f45:extras \ - ${DISTVERSIONFULL:C/-[0-9].*//}-96-g589c5ac:libselinux +GH_TAGNAME= ${DISTVERSIONFULL:C/-[0-9].*//}-1197-g21ac023:extras \ + ${DISTVERSIONFULL:C/-[0-9].*//}-98-gde7b594:libselinux CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* MASTERDIR= ${.CURDIR}/../android-tools-fastboot -FILESDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo +FILESDIR= ${.CURDIR}/files +EXTRA_PATCHES= ${.CURDIR}/files/patch-* .include "${MASTERDIR}/Makefile" diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo index 427a6e7b75c6..028086c4720c 100644 --- a/devel/android-tools-fastboot-devel/distinfo +++ b/devel/android-tools-fastboot-devel/distinfo @@ -1,10 +1,10 @@ SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = be20282d07edffa0301a2ffa524169ec2f27ac99597ec88920343e820d38d824 -SIZE (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = 1470573 -SHA256 (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = c890a16360c65b126d73736382085e858c7135e7fec918a18aea1c0d29a9deac -SIZE (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = 76537274 -SHA256 (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 6c8bd5123ff5e2f1110ee70cda5d3f396c128c3f92bff71035676fc12c48f81b -SIZE (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 59097 +SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e +SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347 +SHA256 (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = bf6df99267b76e7a3446f3d4d613bbb1493b3ba43ab87aca99f0ade9d2990163 +SIZE (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = 76589937 +SHA256 (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 6ce79ee148103a59ed16e49fd3b9af80e84e65ec4a4ab0a883c14befd6cc29b6 +SIZE (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 59433 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile index c1c277bd2351..12a5bd68108e 100644 --- a/devel/android-tools-fastboot-devel/files/Makefile +++ b/devel/android-tools-fastboot-devel/files/Makefile @@ -11,6 +11,9 @@ SRCS+= engine.cpp SRCS+= fastboot.cpp SRCS+= fs.cpp SRCS+= protocol.cpp +SRCS+= socket.cpp +SRCS+= tcp.cpp +SRCS+= udp.cpp SRCS+= util.cpp .PATH: ${EXTRADIR} @@ -23,9 +26,11 @@ SRCS+= diagnose_usb.cpp # required by fastboot, diagnose_usb and libziparchive .PATH: ${.CURDIR}/../base +SRCS+= errors_unix.cpp SRCS+= file.cpp -SRCS+= strings.cpp +SRCS+= parsenetaddress.cpp SRCS+= stringprintf.cpp +SRCS+= strings.cpp # required by fastboot .PATH: ${.CURDIR}/../ext4_utils @@ -41,6 +46,14 @@ SRCS+= make_ext4fs.c SRCS+= sha1.c SRCS+= wipe.c +# required by fastboot +.PATH: ${.CURDIR}/../libcutils +SRCS+= ../libcutils/sockets.cpp +SRCS+= socket_inaddr_any_server_unix.c +SRCS+= socket_network_client_unix.c +SRCS+= sockets_unix.cpp +CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 + # required by base and libutils .PATH: ${.CURDIR}/../liblog SRCS+= fake_log_device.c diff --git a/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h b/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h new file mode 100644 index 000000000000..8ca18724c86a --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h @@ -0,0 +1,43 @@ +--- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC ++++ adb/sysdeps.h +@@ -61,11 +61,13 @@ + #endif + #endif + +-#ifdef _WIN32 +- ++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7) + // Clang-only nullability specifiers + #define _Nonnull + #define _Nullable ++#endif ++ ++#ifdef _WIN32 + + #include <ctype.h> + #include <direct.h> +@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d + + #include <string> + ++#if defined(__Bitrig__) || defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || defined(__OpenBSD__) ++#include <pthread_np.h> ++#endif ++ + #define OS_PATH_SEPARATORS "/" + #define OS_PATH_SEPARATOR '/' + #define OS_PATH_SEPARATOR_STR "/" +@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create + static __inline__ int adb_thread_setname(const std::string& name) { + #ifdef __APPLE__ + return pthread_setname_np(name.c_str()); ++#elif defined(__Bitrig__) || defined(__DragonFly__) || \ ++ defined(__FreeBSD__) || defined(__OpenBSD__) ++ pthread_set_name_np(pthread_self(), name.c_str()); ++ return 0; ++#elif defined(__NetBSD__) ++ return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str()); + #else + const char *s = name.c_str(); + diff --git a/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp b/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp new file mode 100644 index 000000000000..f9ccad0a59b5 --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp @@ -0,0 +1,11 @@ +--- base/errors_unix.cpp.orig 2016-02-20 02:39:51 UTC ++++ base/errors_unix.cpp +@@ -16,7 +16,7 @@ + + #include "android-base/errors.h" + +-#include <errno.h> ++#include <string.h> + + namespace android { + namespace base { diff --git a/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp b/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp new file mode 100644 index 000000000000..b640a75485fa --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp @@ -0,0 +1,10 @@ +--- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC ++++ base/parsenetaddress.cpp +@@ -16,6 +16,7 @@ + + #include "android-base/parsenetaddress.h" + ++#include <stdio.h> // sscanf + #include <algorithm> + + #include "android-base/stringprintf.h" diff --git a/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h b/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h new file mode 100644 index 000000000000..6b0b4bf20dd5 --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h @@ -0,0 +1,14 @@ +--- fastboot/socket.h.orig 2016-02-20 02:39:51 UTC ++++ fastboot/socket.h +@@ -41,7 +41,10 @@ + + #include <android-base/macros.h> + #include <cutils/sockets.h> +-#include <gtest/gtest_prod.h> ++ ++// Copied from <gtest/gtest_prod.h> ++#define FRIEND_TEST(test_case_name, test_name)\ ++friend class test_case_name##_##test_name##_Test + + // Socket interface to be implemented for each platform. + class Socket { |