libjxl >= 0.7.0 now available, reenable jxl coder; rel 2

diff --git a/ImageMagick-jxl.patch b/ImageMagick-jxl.patch
deleted file mode 100644 (file)
index 34dc611..0000000
--- a/ImageMagick-jxl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ImageMagick-7.0.10-60/configure.ac.orig    2022-04-11 20:34:59.843577078 +0200
-+++ ImageMagick-7.0.10-60/configure.ac 2022-04-11 21:09:37.655653937 +0200
-@@ -2383,11 +2383,6 @@ AC_ARG_WITH([jxl],
- if test "$with_jxl" != 'yes'; then
-     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl "
- fi
--if test "$enable_static" = 'yes'; then
--    if test "$with_utilities" = 'yes'; then
--        with_jxl='no'
--    fi
--fi
- 
- # Check for the JPEG-XL library.
- have_jxl='no'

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 249c965097afcf01eafc1444413cdd3b533ae1e5..ae45c66087f217bf3b4f7d7b28155722b3baf58b 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -16,7 +16,7 @@
 %bcond_without fpx             # FlashPIX module (which uses fpx library)
 %bcond_without flif            # FLIF (Free Lossless Image Format) module (which uses flif library)
 %bcond_without graphviz        # dot module (which uses GraphViz libraries)
-%bcond_with    libjxl          # JPEG-XL module (not ready for 0.6)
+%bcond_without libjxl          # JPEG-XL module
 %bcond_without openjpeg        # JPEG2000 module (which uses openjpeg 2 library)
 %bcond_without wmf             # WMF module (which uses libwmf library)
 # - module features:
@@ -37,7 +37,7 @@ Summary(tr.UTF-8):    X altında resim gösterme, çevirme ve değişiklik yapma
 Summary(uk.UTF-8):     Перегляд, конвертування та обробка зображень під X Window
 Name:          ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
-Release:       1
+Release:       2
 Epoch:         1
 License:       Apache-like
 Group:         X11/Applications/Graphics
@@ -50,7 +50,6 @@ Patch3:               %{name}-ldflags.patch
 Patch4:                %{name}-lt.patch
 Patch5:                %{name}-OpenCL.patch
 Patch6:                %{name}-autotrace.patch
-Patch7:                %{name}-jxl.patch
 URL:           https://imagemagick.org/
 %{?with_opencl:BuildRequires:  OpenCL-devel}
 %{?with_exr:BuildRequires:     OpenEXR-devel >= 1.0.6}
@@ -581,7 +580,7 @@ Summary:    Coder module for JPEG-XL files
 Summary(pl.UTF-8):     Moduł kodera dla plików JPEG-XL
 Group:         X11/Applications/Graphics
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      libjxl >= 0.6.1
+Requires:      libjxl >= 0.7.0
 
 %description coder-jxl
 Coder module for JPEG-XL files.
@@ -752,7 +751,6 @@ Moduł kodera dla plików WMF.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -R
-#%patch7 -p1
 
 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}='