From owner-svn-ports-all@freebsd.org Sat Oct 29 05:14:44 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B9F4C24F6F; Sat, 29 Oct 2016 05:14:44 +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 mx1.freebsd.org (Postfix) with ESMTPS id 15D94295; Sat, 29 Oct 2016 05:14:44 +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 u9T5EhsW016137; Sat, 29 Oct 2016 05:14:43 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9T5Eg6P016131; Sat, 29 Oct 2016 05:14:42 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610290514.u9T5Eg6P016131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 29 Oct 2016 05:14:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424893 - in head/devel: android-tools-adb android-tools-adb-devel android-tools-adb-devel/files android-tools-adb/files android-tools-fastboot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Oct 2016 05:14:44 -0000 Author: jbeich Date: Sat Oct 29 05:14:42 2016 New Revision: 424893 URL: https://svnweb.freebsd.org/changeset/ports/424893 Log: devel/android-tools-{adb,fastboot}: update to 7.1.0.r4 Changes: https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/adb Changes: https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/fastboot Added: head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp (contents, props changed) - copied, changed from r424891, head/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp Deleted: head/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp Modified: head/devel/android-tools-adb-devel/Makefile (contents, props changed) head/devel/android-tools-adb/Makefile (contents, props changed) head/devel/android-tools-adb/distinfo (contents, props changed) head/devel/android-tools-adb/files/Makefile (contents, props changed) head/devel/android-tools-fastboot/Makefile (contents, props changed) head/devel/android-tools-fastboot/distinfo (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/Makefile Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-adb-devel/Makefile Sat Oct 29 05:14:42 2016 (r424893) @@ -15,11 +15,8 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-* GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} -CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 - OPTIONS_DEFINE= TEST_PYTHON -TEST_BUILD_DEPENDS= googlemock>=1.6.0:devel/googlemock TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} Modified: head/devel/android-tools-adb/Makefile ============================================================================== --- head/devel/android-tools-adb/Makefile Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-adb/Makefile Sat Oct 29 05:14:42 2016 (r424893) @@ -2,8 +2,8 @@ PORTNAME= android-tools-adb DISTVERSIONPREFIX= android- -DISTVERSION?= 7.0.0_r1 -PORTREVISION?= 1 +DISTVERSION?= 7.1.0_r4 +PORTREVISION?= 0 CATEGORIES= devel .ifndef EXTRA_PATCHES PATCH_SITES= https://github.com/android/platform_system_core/commit/ @@ -23,7 +23,7 @@ GH_PROJECT= platform_system_core .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else -GH_REVISION= 88f64719d756 # generated by: make update-revision +GH_REVISION= 75a38b87f304 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* @@ -37,6 +37,7 @@ USES= compiler:c++11-lib pkgconfig ssl BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} +CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 MAKEFILE= ${FILESDIR}/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" @@ -61,7 +62,8 @@ BASH_VARS= LICENSE+=MIT LICENSE_COMB=mu DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" -TEST_BUILD_DEPENDS+= googletest>=1.6.0:devel/googletest +TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \ + googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test pre-install-TEST-on: do-test Modified: head/devel/android-tools-adb/distinfo ============================================================================== --- head/devel/android-tools-adb/distinfo Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-adb/distinfo Sat Oct 29 05:14:42 2016 (r424893) @@ -1,6 +1,6 @@ -TIMESTAMP = 1472009581 -SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4 -SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346 +TIMESTAMP = 1477685972 +SHA256 (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 07f61b77c07e588473cac43daf2a36ef213440aa144f1dc0af214f5c7b0529ef +SIZE (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 1588982 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50 Modified: head/devel/android-tools-adb/files/Makefile ============================================================================== --- head/devel/android-tools-adb/files/Makefile Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-adb/files/Makefile Sat Oct 29 05:14:42 2016 (r424893) @@ -15,6 +15,7 @@ SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp SRCS+= adb_trace.cpp SRCS+= adb_utils.cpp +SRCS+= bugreport.cpp SRCS+= commandline.cpp SRCS+= console.cpp SRCS+= diagnose_usb.cpp @@ -31,6 +32,7 @@ SRCS+= transport_usb.cpp TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_utils_test.cpp +TEST_SRCS+= bugreport_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_test.cpp @@ -40,6 +42,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 @@ -104,6 +109,7 @@ CXXFLAGS+= ${CPPFLAGS} .endif TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) +TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags) .for f in ${TEST_SRCS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS} .endfor @@ -113,12 +119,14 @@ LDADD+= $$(${PKG_CONFIG} libusb-1.0 --li LDADD+= -lz \-lpthread DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) +TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags) TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} CLEANFILES+= ${PROG}_test ${TEST_OBJS} GIT?= git GTEST_CONFIG?= gtest-config +GMOCK_CONFIG?= gmock-config PKG_CONFIG?= pkg-config beforeinstall: Copied and modified: head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp (from r424891, head/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp) ============================================================================== Modified: head/devel/android-tools-fastboot/Makefile ============================================================================== --- head/devel/android-tools-fastboot/Makefile Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-fastboot/Makefile Sat Oct 29 05:14:42 2016 (r424893) @@ -2,7 +2,7 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- -DISTVERSION?= 7.0.0_r1 +DISTVERSION?= 7.1.0_r4 PORTREVISION?= 0 CATEGORIES= devel MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage @@ -28,7 +28,7 @@ GH_SUBDIR= libselinux:libselinux .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else -GH_REVISION= 88f64719d756 # generated by: make update-revision +GH_REVISION= 75a38b87f304 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* Modified: head/devel/android-tools-fastboot/distinfo ============================================================================== --- head/devel/android-tools-fastboot/distinfo Sat Oct 29 05:13:59 2016 (r424892) +++ head/devel/android-tools-fastboot/distinfo Sat Oct 29 05:14:42 2016 (r424893) @@ -1,11 +1,11 @@ -TIMESTAMP = 1472009581 +TIMESTAMP = 1477685972 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4 -SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346 -SHA256 (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = ff2ea6db032da70374edcd6867bd11d765a475a32d732b983d0dad6ae16e209b -SIZE (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = 79621110 -SHA256 (jbeich-platform_external_libselinux-android-7.0.0_r1_GH0.tar.gz) = bf335619fb77fc523e33d08523d20795de17a6a906b87e16fd7d79911f186a15 -SIZE (jbeich-platform_external_libselinux-android-7.0.0_r1_GH0.tar.gz) = 59544 +SHA256 (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 07f61b77c07e588473cac43daf2a36ef213440aa144f1dc0af214f5c7b0529ef +SIZE (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 1588982 +SHA256 (jbeich-platform_system_extras-android-7.1.0_r4_GH0.tar.gz) = 0bf738738bb2b7800069856f052757246e95d02d7404e976f002755927eed404 +SIZE (jbeich-platform_system_extras-android-7.1.0_r4_GH0.tar.gz) = 79624975 +SHA256 (jbeich-platform_external_libselinux-android-7.1.0_r4_GH0.tar.gz) = ecb2e57302e843e23dc3fa2ff7e37fd0ac897fa2cd60ab55e6d8b704ef84f5b8 +SIZE (jbeich-platform_external_libselinux-android-7.1.0_r4_GH0.tar.gz) = 59769 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967