Fix building tsocks for 32 bit architectures

[termux-packages] / packages / imagemagick / build.sh

diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 2eee2bc..4bf770d 100644 (file)
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -1,11 +1,9 @@
-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="7.0.4-5"
-# Since older releases are removed from imagemagick.org we use our bintray mirror to avoid breaking
-# the build for each minor version bump.
-TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=6bea9ab6509f34fa9cb6ab5e113507a47203d360ba5872f013d797fc11075ccd
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="\
+TERMUX_PKG_VERSION="7.0.7-4"
+TERMUX_PKG_SHA256=11127416dfdf2c99f33c671b76a0322fa5d7453460896840f5581aa9afcd750e
+TERMUX_PKG_SRCURL=https://github.com/ImageMagick/ImageMagick/archive/${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-largefile
 --without-x
 --without-gvc
@@ -16,5 +14,22 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="\
 --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_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
+}