X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/c204de6a3698dc6b1d685153ddec486efb07655c..9511a65f22d48d0555486fa3347a74d177c7dc55:/packages/imagemagick/build.sh

diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 5f884960..56d1fc6a 100644
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -1,7 +1,35 @@
-TERMUX_PKG_HOMEPAGE=http://www.imagemagick.org/
+TERMUX_PKG_HOMEPAGE=https://www.imagemagick.org/
 TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats"
-TERMUX_PKG_VERSION="6.9.1-9"
-TERMUX_PKG_SRCURL=http://www.imagemagick.org/download/ImageMagick-${TERMUX_PKG_VERSION}.tar.bz2
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-largefile --without-x --with-magick-plus-plus=no	--with-bzlib=no --with-xml=yes --with-lzma ac_cv_func_ftime=no ac_cv_header_complex_h=no"
-TERMUX_PKG_RM_AFTER_INSTALL="bin/Magick-config bin/MagickCore-config bin/MagickWand-config bin/Wand-config share/ImageMagick-6/francais.xml share/man/man1/Magick-config.1 share/man/man1/MagickCore-config.1 share/man/man1/MagickWand-config.1 share/man/man1/Wand-config.1"
+TERMUX_PKG_VERSION="7.0.6-9"
+TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=aa8cb89dad36b555d8ca497f207008a56b315727c9b5d6d7b28f8f9e3ee7ac25
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-largefile
+--without-x
+--without-gvc
+--without-ltdl
+--with-magick-plus-plus=no
+--with-bzlib=no
+--with-xml=yes
+--with-lzma
+ac_cv_func_ftime=no
+ac_cv_header_complex_h=no"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/Magick-config
+bin/MagickCore-config
+bin/MagickWand-config
+bin/Wand-config
+share/ImageMagick-6/francais.xml
+share/man/man1/Magick-config.1
+share/man/man1/MagickCore-config.1
+share/man/man1/MagickWand-config.1
+share/man/man1/Wand-config.1
+"
 TERMUX_PKG_DEPENDS="fftw, pango, glib, libbz2, libjpeg-turbo, liblzma, libpng, libtiff, libxml2, openjpeg, littlecms"
+
+termux_step_pre_configure() {
+	if [ $TERMUX_ARCH = "i686" ]; then
+		# Avoid "libMagickCore-7.Q16HDRI.so: error: undefined reference to '__atomic_load'":
+		LDFLAGS+=" -latomic"
+	fi
+}