X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5ff11631019a6ce832b238a10b989a77b449315a..d4fe57f935ce6ab35ca2a092e56a2b1515464fdb:/packages/openjpeg/build.sh

diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh
index 81edc71e..38a7634a 100644
--- a/packages/openjpeg/build.sh
+++ b/packages/openjpeg/build.sh
@@ -1,26 +1,11 @@
 TERMUX_PKG_HOMEPAGE=http://www.openjpeg.org/
 TERMUX_PKG_DESCRIPTION="JPEG 2000 image compression library"
-TERMUX_PKG_VERSION=2.1.0
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/openjpeg.mirror/${TERMUX_PKG_VERSION}/openjpeg-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_RM_AFTER_INSTALL="lib/openjpeg-2.1/*.cmake"
+TERMUX_PKG_VERSION=2.2.0
+TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b
+TERMUX_PKG_FOLDERNAME=openjpeg-$TERMUX_PKG_VERSION
 
-termux_step_configure () {
+termux_step_pre_configure () {
 	# Force symlinks to be overwritten:
 	rm -Rf $TERMUX_PREFIX/lib/libopenjp2.so*
-
-	cd $TERMUX_PKG_BUILDDIR
-	cmake -G "Unix Makefiles" .. \
-		-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
-		-DCMAKE_CROSSCOMPILING=True \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_FIND_ROOT_PATH=$TERMUX_PREFIX \
-		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-		-DCMAKE_INSTALL_PREFIX=$TERMUX_PREFIX \
-		-DCMAKE_LINKER=`which ${TERMUX_HOST_PLATFORM}-ld` \
-                -DCMAKE_MAKE_PROGRAM=`which make` \
-		-DCMAKE_RANLIB=`which ${TERMUX_HOST_PLATFORM}-ranlib` \
-		-DCMAKE_SYSTEM_NAME=Linux \
-		-DC_INCLUDE_DIRS=$TERMUX_PREFIX/include \
-		$TERMUX_PKG_SRCDIR
 }