diff options
Diffstat (limited to 'devel/android-tools-fastboot')
| -rw-r--r-- | devel/android-tools-fastboot/Makefile | 7 | ||||
| -rw-r--r-- | devel/android-tools-fastboot/distinfo | 10 | ||||
| -rw-r--r-- | devel/android-tools-fastboot/files/Makefile | 4 | ||||
| -rw-r--r-- | devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp | 10 |
4 files changed, 21 insertions, 10 deletions
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile index 2d50d1bf2832..137c21b53fd6 100644 --- a/devel/android-tools-fastboot/Makefile +++ b/devel/android-tools-fastboot/Makefile @@ -2,8 +2,8 @@ PORTNAME= android-tools-fastboot DISTVERSIONPREFIX= android- -DISTVERSION?= 8.0.0_r4 -PORTREVISION?= 1 +DISTVERSION?= 8.0.0_r24 +PORTREVISION?= 0 CATEGORIES= devel sysutils MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage DISTFILES= fastboot.1?id=706e754:manpage @@ -29,7 +29,7 @@ GH_SUBDIR= libselinux:libselinux .ifdef DISTVERSIONSUFFIX GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot .else -GH_REVISION= f6a78079a81a # generated by: make update-revision +GH_REVISION= 6cd85e2a8934 # generated by: make update-revision .endif CONFLICTS_INSTALL?= ${PORTNAME}-devel-* @@ -37,6 +37,7 @@ CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++11-lib pkgconfig uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} +CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" \ diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo index 482481c07268..852dba28f065 100644 --- a/devel/android-tools-fastboot/distinfo +++ b/devel/android-tools-fastboot/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1495068953 +TIMESTAMP = 1502781926 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 3eb686edb1ccaa7312fb195b65c413823a6d60442d519c499c18b2d18c3094a9 -SIZE (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 5115403 -SHA256 (jbeich-platform_system_extras-android-8.0.0_r4_GH0.tar.gz) = 83d4a27f5ffa434688b62d00fcc33edd352bdc523f8b7fcbc3e8d0c1453b1c41 -SIZE (jbeich-platform_system_extras-android-8.0.0_r4_GH0.tar.gz) = 192575526 +SHA256 (android-platform_system_core-android-8.0.0_r24_GH0.tar.gz) = 6b55a409e6c03f58add5a0d13765ebcb6aee7ecef6452ef5d780228209cb8a3a +SIZE (android-platform_system_core-android-8.0.0_r24_GH0.tar.gz) = 5190913 +SHA256 (jbeich-platform_system_extras-android-8.0.0_r24_GH0.tar.gz) = 3cd5069ada498e1fc69c531d00b145c5391484a69a09c1334c185d88ed6034b1 +SIZE (jbeich-platform_system_extras-android-8.0.0_r24_GH0.tar.gz) = 193208820 SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7 SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile index 380a6c2d1db2..62bccd06c932 100644 --- a/devel/android-tools-fastboot/files/Makefile +++ b/devel/android-tools-fastboot/files/Makefile @@ -88,7 +88,7 @@ SRCS+= output_file.c SRCS+= sparse.c SRCS+= sparse_crc32.c SRCS+= sparse_err.c -SRCS+= sparse_read.c +SRCS+= sparse_read.cpp # required by libziparchive .PATH: ${.CURDIR}/../libutils @@ -100,7 +100,7 @@ SRCS+= zip_archive.cc REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown) -CPPFLAGS+= -DFASTBOOT_REVISION="\"${REVISION}-android\"" +CPPFLAGS+= -DFASTBOOT_VERSION="\"26.0.0 rc1-${REVISION}-android\"" CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dftruncate64=ftruncate CPPFLAGS+= -Dlseek64=lseek diff --git a/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp b/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp new file mode 100644 index 000000000000..30753c5b96cd --- /dev/null +++ b/devel/android-tools-fastboot/files/patch-libsparse_sparse__read.cpp @@ -0,0 +1,10 @@ +--- libsparse/sparse_read.cpp.orig 2017-06-20 10:50:27 UTC ++++ libsparse/sparse_read.cpp +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string> ++#include <string.h> // memset + #include <unistd.h> + + #include <sparse/sparse.h> |