summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD26
2 files changed, 24 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da548e96e84d..55c5dd9b39f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = android-aarch64-openjpeg2
- pkgdesc = An open source JPEG 2000 codec, version 2.5.2 (android)
+ pkgdesc = An open source JPEG 2000 codec (Android aarch64)
pkgver = 2.5.2
- pkgrel = 1
+ pkgrel = 2
url = https://www.openjpeg.org
arch = any
license = BSD
@@ -9,6 +9,7 @@ pkgbase = android-aarch64-openjpeg2
depends = android-ndk
depends = android-aarch64-libpng
depends = android-aarch64-lcms2
+ depends = openjpeg2
options = !strip
options = !buildflags
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 9363d1aaffbb..f67e57b2dc75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,16 +6,17 @@ _android_arch=aarch64
pkgname=android-${_android_arch}-openjpeg2
pkgver=2.5.2
-pkgrel=1
+pkgrel=2
arch=('any')
-pkgdesc="An open source JPEG 2000 codec, version ${pkgver} (android)"
+pkgdesc="An open source JPEG 2000 codec (Android ${_android_arch})"
license=('BSD')
url="https://www.openjpeg.org"
depends=('android-ndk'
"android-${_android_arch}-libpng"
- "android-${_android_arch}-lcms2")
-options=(!strip !buildflags staticlibs !emptydirs)
+ "android-${_android_arch}-lcms2"
+ 'openjpeg2')
makedepends=('android-cmake')
+options=(!strip !buildflags staticlibs !emptydirs)
source=("https://github.com/uclouvain/openjpeg/archive/v${pkgver}.tar.gz")
md5sums=('f9ee64845881a15109ed0aa73a12202f')
@@ -29,16 +30,25 @@ build() {
-DBUILD_DOC=OFF \
-DBUILD_TESTING=OFF \
-DBUILD_SHARED_LIBS=OFF \
+ -DTIFF_LIBRARY="${ANDROID_PREFIX_LIB}/libtiff.a" \
+ -DTIFF_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \
+ -DLCMS2_LIBRARY="${ANDROID_PREFIX_LIB}/liblcms2.a" \
+ -DLCMS2_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \
..
make $MAKEFLAGS
popd
+
mkdir "build-${_android_arch}-shared" && pushd "build-${_android_arch}-shared"
android-${_android_arch}-cmake \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_DOC=OFF \
-DBUILD_TESTING=OFF \
-DBUILD_PKGCONFIG_FILES=ON \
+ -DTIFF_LIBRARY="${ANDROID_PREFIX_LIB}/libtiff.so" \
+ -DTIFF_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \
+ -DLCMS2_LIBRARY="${ANDROID_PREFIX_LIB}/liblcms2.so" \
+ -DLCMS2_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \
..
make $MAKEFLAGS
popd
@@ -52,7 +62,13 @@ package() {
cd "${srcdir}/openjpeg-${pkgver}/build-${_android_arch}-shared"
make DESTDIR="$pkgdir" install
- rm -r "${pkgdir}"/${ANDROID_PREFIX_BIN}
+ # Link tools to our host versions
+ rm -r "${pkgdir}"/${ANDROID_PREFIX_BIN}/*
+
+ for f in opj_compress opj_decompress opj_dump; do
+ ln -s "/usr/bin/$f" "$pkgdir/${ANDROID_PREFIX_BIN}/$f"
+ done
+
${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
}