X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..71430aa64e5287398bc8e3bd563eb9b7ecb9c493:/packages/openjpeg/build.sh

diff --git a/packages/openjpeg/build.sh b/packages/openjpeg/build.sh
index ff577456..4b12305f 100644
--- a/packages/openjpeg/build.sh
+++ b/packages/openjpeg/build.sh
@@ -1,23 +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_VERSION=2.1.2
+TERMUX_PKG_SRCURL=https://github.com/uclouvain/openjpeg/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_FOLDERNAME=openjpeg-$TERMUX_PKG_VERSION
 TERMUX_PKG_RM_AFTER_INSTALL="lib/openjpeg-2.1/*.cmake"
 
-termux_step_configure () {
-	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
+termux_step_pre_configure () {
+	# Force symlinks to be overwritten:
+	rm -Rf $TERMUX_PREFIX/lib/libopenjp2.so*
 }