fix imagemagick build

This commit is contained in:
Lucy Phipps 2021-08-17 11:02:38 +01:00
parent b0b0b83199
commit b7d6f09353
No known key found for this signature in database
GPG Key ID: 8F688A3DB7869BFE
2 changed files with 9 additions and 4 deletions

View File

@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -2389,46 +2389,24 @@ AC_ARG_WITH([jxl],
@@ -2389,46 +2389,30 @@
if test "$with_jxl" != 'yes'; then
DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl "
fi
@ -29,7 +29,8 @@
- AC_CHECK_LIB([jxl],[JxlDecoderCreate],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
- AC_CHECK_LIB([jxl],[JxlEncoderSetBasicInfo],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],[])
- fi
-
+fi
- AC_MSG_CHECKING([if jpeg-xl package is complete])
- if test $passed -gt 0; then
- if test $failed -gt 0; then
@ -45,6 +46,10 @@
- else
- AC_MSG_RESULT([no])
- fi
+if test "$with_jxl" != 'no'; then
+ AC_MSG_RESULT([-------------------------------------------------------------])
+ PKG_CHECK_MODULES([JXL],[libjxl-threads >= 0.5],[have_jxl=yes],[have_jxl=no])
+ AC_MSG_RESULT([])
fi
+
+if test "$have_jxl" = 'yes'; then

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a v
TERMUX_PKG_LICENSE="ImageMagick"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=7.1.0.4
TERMUX_PKG_REVISION=6
TERMUX_PKG_REVISION=7
TERMUX_PKG_SRCURL=https://download.imagemagick.org/ImageMagick/download/ImageMagick-$(echo $TERMUX_PKG_VERSION | sed 's/\(.*\)\./\1-/').tar.lz
TERMUX_PKG_SHA256=5959267fe286698ad1f249dd85a8776f121a1a181012b3358b5142957da58b3a
TERMUX_PKG_DEPENDS="fftw, fontconfig, freetype, fribidi, glib, harfbuzz, libandroid-support, libbz2, libcairo, libffi, libgraphite, libheif, libjpeg-turbo, libjxl, liblzma, libpixman, libpng, librsvg, libtiff, libuuid, libwebp, libx11, libxau, libxcb, libxdmcp, libxext, libxml2, littlecms, openjpeg, pango, pcre, zlib"
@ -33,5 +33,5 @@ termux_step_pre_configure() {
fi
# for allow-static-libjxl.patch
autoreconf -fi
autoconf
}