Added missing dependencies.

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1fe30b7068b5..5e6b3a4ee801 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = android-x86-64-libtiff
-	pkgdesc = Library for manipulation of TIFF images (Android, x86-64)
+	pkgdesc = Library for manipulation of TIFF images (Android x86-64)
 	pkgver = 4.6.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.simplesystems.org/libtiff/
 	arch = any
 	license = custom
 	makedepends = android-configure
+	depends = android-x86-64-jbigkit
 	depends = android-x86-64-libjpeg-turbo
 	depends = android-x86-64-zlib
 	depends = android-x86-64-xz
+	depends = android-x86-64-zstd
 	options = !strip
 	options = !buildflags
 	options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index af70cc26b492..272b89d6c300 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,16 @@ _android_arch=x86-64
 
 pkgname=android-${_android_arch}-libtiff
 pkgver=4.6.0
-pkgrel=2
-pkgdesc="Library for manipulation of TIFF images (Android, ${_android_arch})"
+pkgrel=3
 arch=('any')
+pkgdesc="Library for manipulation of TIFF images (Android ${_android_arch})"
 url="http://www.simplesystems.org/libtiff/"
 license=('custom')
-depends=("android-${_android_arch}-libjpeg-turbo"
+depends=("android-${_android_arch}-jbigkit"
+         "android-${_android_arch}-libjpeg-turbo"
          "android-${_android_arch}-zlib"
-         "android-${_android_arch}-xz")
+         "android-${_android_arch}-xz"
+         "android-${_android_arch}-zstd")
 makedepends=('android-configure')
 options=(!strip !buildflags staticlibs !emptydirs)
 source=("http://download.osgeo.org/libtiff/tiff-${pkgver}.tar.gz")
@@ -28,8 +30,11 @@ build() {
     export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
 
     android-${_android_arch}-configure \
-        --disable-jbig \
-        --without-x
+        --sysconfdir="${ANDROID_PREFIX_ETC}" \
+        --enable-cxx \
+        --disable-tools \
+        --disable-tests \
+        --disable-docs
     make $MAKEFLAGS
 }
 
@@ -40,8 +45,6 @@ package() {
     make DESTDIR="$pkgdir" install
     cp libtiff/{tiffiop,tif_dir}.h "${pkgdir}/${ANDROID_PREFIX_INCLUDE}/"
     cp libtiff/tif_config.h "${pkgdir}/${ANDROID_PREFIX_INCLUDE}/"
-    rm -r "${pkgdir}"/${ANDROID_PREFIX_BIN}
-    rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
     ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
     ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }