From: Jakub Bogusz Date: Mon, 11 Apr 2022 20:07:35 +0000 (+0200) Subject: - updated dependencies X-Git-Tag: auto/th/ImageMagick-7.0.11.14-7~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2FImageMagick.git;a=commitdiff_plain;h=bdb064ce6607c84c24446e2c46f463f164584332 - updated dependencies - added autotrace patch (revert to 0.31.1; 0.31.2 seems never released, 0.40.0 is WIP) - added jxl patch and prepare jxl coder subpackage, but needs update for libjxl 0.6.x --- diff --git a/ImageMagick-autotrace.patch b/ImageMagick-autotrace.patch new file mode 100644 index 0000000..e441363 --- /dev/null +++ b/ImageMagick-autotrace.patch @@ -0,0 +1,32 @@ +commit 51968547b98bde1cd6c6cc7145faf3cc1f365a22 +Author: Cristy +Date: Sat Feb 22 09:54:09 2020 -0500 + + https://github.com/ImageMagick/ImageMagick/issues/1848 + +diff --git a/coders/svg.c b/coders/svg.c +index 199475a49..172ec558c 100644 +--- a/coders/svg.c ++++ b/coders/svg.c +@@ -3931,7 +3931,7 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) + { + #if defined(MAGICKCORE_AUTOTRACE_DELEGATE) + { +- at_bitmap_type ++ at_bitmap + *trace; + + at_fitting_opts_type +diff --git a/configure.ac b/configure.ac +index cc5d2344c..9eec1941a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1714,7 +1714,7 @@ AUTOTRACE_LIBS="" + AUTOTRACE_PKG="" + if test "x$with_autotrace" = "xyes"; then + AC_MSG_RESULT([-------------------------------------------------------------]) +- PKG_CHECK_MODULES([AUTOTRACE],[autotrace >= 0.31.1],[have_autotrace=yes],[have_autotrace=no]) ++ PKG_CHECK_MODULES([AUTOTRACE],[autotrace >= 0.31.2],[have_autotrace=yes],[have_autotrace=no]) + AC_MSG_RESULT([]) + fi + diff --git a/ImageMagick-jxl.patch b/ImageMagick-jxl.patch new file mode 100644 index 0000000..34dc611 --- /dev/null +++ b/ImageMagick-jxl.patch @@ -0,0 +1,14 @@ +--- 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 4becc33..7fa0d86 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,4 @@ # TODO -# - jxl delegate, BR: brunsli https://github.com/google/brunsli # - create sane default policy file: # https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801 # @@ -16,6 +15,7 @@ %bcond_without exr # OpenEXR module %bcond_without fpx # FlashPIX module (which uses fpx library) %bcond_without graphviz # dot module (which uses GraphViz libraries) +%bcond_with libjxl # JPEG-XL module (not ready for 0.6) %bcond_without openjpeg # JPEG2000 module (which uses openjpeg 2 library) %bcond_without wmf # WMF module (which uses libwmf library) # - module features: @@ -48,6 +48,8 @@ Patch2: %{name}-libpath.patch 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} @@ -70,6 +72,7 @@ BuildRequires: lcms2-devel >= 2.0 %{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libheif-devel BuildRequires: libjpeg-devel >= 6b +%{?with_libjxl:BuildRequires: libjxl-devel >= 0.6.1} BuildRequires: liblqr-devel >= 0.1.0 BuildRequires: libltdl-devel BuildRequires: libpng-devel >= %{libpng_ver} @@ -79,7 +82,7 @@ BuildRequires: librsvg-devel >= 2.9.0 BuildRequires: libstdc++-devel BuildRequires: libtiff-devel BuildRequires: libtool >= 2:2.2 -BuildRequires: libwebp-devel >= 0.4.4 +BuildRequires: libwebp-devel >= 0.5.0 %{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2} BuildRequires: libxml2-devel >= 2.0 BuildRequires: libzip-devel >= 1.0.0 @@ -100,8 +103,12 @@ BuildRequires: zlib-devel >= 1.0.0 BuildRequires: zstd-devel >= 1.0.0 Requires: %{name}-libs = %{epoch}:%{version}-%{release} Suggests: shared-color-profiles -Obsoletes: ImageMagick-coder-dps -Obsoletes: ImageMagick-coder-mpeg +Obsoletes: ImageMagick-coder-braille < 1:6.4.1.3-2 +Obsoletes: ImageMagick-coder-dds < 1:6.4.1.3-2 +Obsoletes: ImageMagick-coder-dps < 1:6.2.6.0-3 +Obsoletes: ImageMagick-coder-hdf < 1:5.5.2.5 +Obsoletes: ImageMagick-coder-xps < 1:6.4.1.3-2 +Obsoletes: ImageMagick-coder-mpeg < 1:5.5.2.5 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %if %{!?QuantumDepth:1}%{?QuantumDepth:0} @@ -299,7 +306,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: perl-dirs Provides: ImageMagick-perl = %{epoch}:%{version}-%{release} -Obsoletes: ImageMagick-perl +Obsoletes: ImageMagick-perl < 1:6.6.1.1-4 %description -n perl-%{name} This is the ImageMagick Perl support package. It perl modules and @@ -568,6 +575,19 @@ Coder module for JPEG-2000 (JP2/JPC) files using JasPer library. Moduł kodera dla plików JPEG-2000 (JP2/JPC) używajacy biblioteki JasPer. +%package coder-jxl +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 + +%description coder-jxl +Coder module for JPEG-XL files. + +%description coder-jxl -l pl.UTF-8 +Moduł kodera dla plików JPEG-XL. + %package coder-miff Summary: Coder module for MIFF files Summary(pl.UTF-8): Moduł kodera dla plików MIFF @@ -701,7 +721,7 @@ Summary: Coder module for WebP files Summary(pl.UTF-8): Moduł kodera dla plików WebP Group: X11/Applications/Graphics Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: libwebp >= 0.4.4 +Requires: libwebp >= 0.5.0 %description coder-webp Coder module for WebP files. @@ -730,6 +750,8 @@ Moduł kodera dla plików WMF. %patch3 -p1 %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}=' @@ -759,6 +781,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html --with-gs-font-dir=%{_fontsdir}/Type1 \ --with-gslib%{!?with_gs:=no} \ --with-gvc%{!?with_graphviz:=no} \ + --with-jxl%{!?with_libjxl:=no} \ --with-magick_plus_plus%{!?with_cxx:=no} \ --with-openexr%{!?with_exr:=no} \ --with-openjp2%{!?with_openjpeg:=no} \ @@ -1153,6 +1176,14 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/jp2.la %endif +%if %{with libjxl} +%files coder-jxl +%defattr(644,root,root,755) +# R: libjxl +%attr(755,root,root) %{modulesdir}/coders/jxl.so +%{modulesdir}/coders/jxl.la +%endif + %files coder-miff %defattr(644,root,root,755) # R: libjpeg, zlib, libbz2