svn commit: r389153 - in head/devel/android-tools-fastboot: . files

[Jan Beich]

Author: jbeich
Date: Wed Jun 10 23:18:37 2015
New Revision: 389153
URL: https://svnweb.freebsd.org/changeset/ports/389153

Log:
  devel/android-tools-fastboot: update to 5.1.1.r4

Modified:
  head/devel/android-tools-fastboot/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/distinfo   (contents, props changed)
  head/devel/android-tools-fastboot/files/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/files/usb_freebsd.c   (contents, props changed)

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Wed Jun 10 23:18:23 2015	(r389152)
+++ head/devel/android-tools-fastboot/Makefile	Wed Jun 10 23:18:37 2015	(r389153)
@@ -2,7 +2,7 @@
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	4.4.4_r2.0.1
+DISTVERSION=	5.1.1_r4
 CATEGORIES=	devel
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
 DISTFILES=	fastboot.1?id=706e754:manpage
@@ -14,6 +14,8 @@ COMMENT=	Android Fastboot protocol CLI t
 LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	android jbeich:extras,libselinux
 GH_PROJECT=	platform_system_core platform_system_extras:extras \
@@ -23,7 +25,10 @@ USES=		uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV=	FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin"
+MAKE_ENV=	FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin" \
+		LIBPCRE="${LOCALBASE}/lib/libpcre.a"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	bin/fastboot \
 		man/man1/fastboot.1.gz
 

Modified: head/devel/android-tools-fastboot/distinfo
==============================================================================
--- head/devel/android-tools-fastboot/distinfo	Wed Jun 10 23:18:23 2015	(r389152)
+++ head/devel/android-tools-fastboot/distinfo	Wed Jun 10 23:18:37 2015	(r389153)
@@ -1,8 +1,8 @@
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-4.4.4_r2.0.1_GH0.tar.gz) = e8391ac6aa6755f648f9925c7dc3ac04eb6dfff3948e214d96fac6e0fc741c07
-SIZE (android-platform_system_core-android-4.4.4_r2.0.1_GH0.tar.gz) = 1154454
-SHA256 (jbeich-platform_system_extras-android-4.4.4_r2.0.1_GH0.tar.gz) = 0edf5fa5ce7b2b46a1839dd1e486e2e8cdc83370b8c5505a0b0471359bc05077
-SIZE (jbeich-platform_system_extras-android-4.4.4_r2.0.1_GH0.tar.gz) = 272326
-SHA256 (jbeich-platform_external_libselinux-android-4.4.4_r2.0.1_GH0.tar.gz) = 7ad3e2c78ea30b777b1dc03318c489711a6ea4f2e56fcc49eec8624512fdd044
-SIZE (jbeich-platform_external_libselinux-android-4.4.4_r2.0.1_GH0.tar.gz) = 44455
+SHA256 (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 076421a742ef98158d5ea290b8aed007f2115521f1e39832d8be3560e990ea13
+SIZE (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 1210714
+SHA256 (jbeich-platform_system_extras-android-5.1.1_r4_GH0.tar.gz) = 43230a03c166b4000336a3bf13a73b91b69b672a9522efcd6d346cdc7e52e154
+SIZE (jbeich-platform_system_extras-android-5.1.1_r4_GH0.tar.gz) = 282780
+SHA256 (jbeich-platform_external_libselinux-android-5.1.1_r4_GH0.tar.gz) = 81bda8ddee4830c62415f308eaea85736b0c2c02324801fe67a712ce192360df
+SIZE (jbeich-platform_external_libselinux-android-5.1.1_r4_GH0.tar.gz) = 49185

Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile	Wed Jun 10 23:18:23 2015	(r389152)
+++ head/devel/android-tools-fastboot/files/Makefile	Wed Jun 10 23:18:37 2015	(r389153)
@@ -7,7 +7,9 @@ BINDIR?=/usr/bin
 SRCS+=	bootimg.c
 SRCS+=	engine.c
 SRCS+=	fastboot.c
+SRCS+=	fs.c
 SRCS+=	protocol.c
+SRCS+=	util.c
 
 .PATH:	${FILESDIR}
 SRCS+=	usb_freebsd.c
@@ -17,6 +19,7 @@ SRCS+=	util_freebsd.c
 SRCS+=	allocate.c
 SRCS+=	contents.c
 SRCS+=	crc16.c
+SRCS+=	ext4_sb.c
 SRCS+=	ext4_utils.c
 SRCS+=	ext4fixup.c
 SRCS+=	extent.c
@@ -47,16 +50,18 @@ SRCS+=	sparse_read.c
 SRCS+=	centraldir.c
 SRCS+=	zipfile.c
 
+CFLAGS+=-D_FILE_OFFSET_BITS=64 # utils/Compat.h
 CFLAGS+=-D__APPLE__ -D__MACH__ # off64_t
 CFLAGS+=-DDARWIN # statfs
 CFLAGS+=-I${.CURDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../mkbootimg
 CFLAGS+=-I${.CURDIR}/../ext4_utils
+CFLAGS+=-I${.CURDIR}/../f2fs_utils
 CFLAGS+=-I${.CURDIR}/../libselinux/include
 CFLAGS+=-I${.CURDIR}/../libsparse/include
 
-LDADD+=	-lusb -lz
-DPADD+=	${LIBUSB} ${LIBZ}
+LDADD+=	-lpcre -lusb -lz
+DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 .include <bsd.prog.mk>

Modified: head/devel/android-tools-fastboot/files/usb_freebsd.c
==============================================================================
--- head/devel/android-tools-fastboot/files/usb_freebsd.c	Wed Jun 10 23:18:23 2015	(r389152)
+++ head/devel/android-tools-fastboot/files/usb_freebsd.c	Wed Jun 10 23:18:37 2015	(r389153)
@@ -195,3 +195,10 @@ usb_open(ifc_match_func callback)
 {
 	return (enumerate(callback));
 }
+
+int
+usb_wait_for_disconnect(usb_handle * h)
+{
+	/* TODO: Punt for now */
+	return 0;
+}