Update from NDK version used from r15b to r15c

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

diff --git a/packages/imagemagick/build.sh b/packages/imagemagick/build.sh
index 76a3ab0..2545609 100644 (file)
--- a/packages/imagemagick/build.sh
+++ b/packages/imagemagick/build.sh
@@ -1,8 +1,8 @@
 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.5-6"
+TERMUX_PKG_VERSION="7.0.6-3"
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=f60c3e3466ccbf9a0e643284ffec3467363edf9611f16a98387f927a974b49ab
+TERMUX_PKG_SHA256=720a9f60a414d35ba13bc6fe592842de27cc6061b03866096d04038d953c89fc
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-largefile
 --without-x
@@ -14,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
+}