From dc4b3e6e04b12d3a91976dcb4f430dccfc983c12 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sat, 02 Mar 2024 13:35:33 +0100
Subject: [PATCH] imagemagick: update to 7.1.1-29
---
components/image/imagemagick/patches/02-dcraw.patch | 26 ++------------------------
components/image/imagemagick/manifests/sample-manifest.p5m | 1 -
components/image/imagemagick/Makefile | 5 +++--
3 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/components/image/imagemagick/Makefile b/components/image/imagemagick/Makefile
index 4124dd5..26cd071 100644
--- a/components/image/imagemagick/Makefile
+++ b/components/image/imagemagick/Makefile
@@ -25,19 +25,20 @@
#
BUILD_BITS= 64
+USE_PARALLEL_BUILD= yes
USE_DEFAULT_TEST_TRANSFORMS= yes
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= ImageMagick
COMPONENT_VERSION= 7.1.1
-COMPONENT_SUBVERSION= 28
+COMPONENT_SUBVERSION= 29
HUMAN_VERSION= $(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).$(COMPONENT_SUBVERSION)
COMPONENT_SUMMARY= ImageMagick - Image Manipulation Utilities and Libraries
COMPONENT_PROJECT_URL= https://imagemagick.org
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
COMPONENT_ARCHIVE= $(COMPONENT_NAME)-$(HUMAN_VERSION).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:691b6fe35aa39df351678fb626779bede8ba1b2f08ce1d95d421b9840a27a582
+COMPONENT_ARCHIVE_HASH= sha256:27bd25f945efdd7e38f6f9845a7c0a391fdb732f652dda140b743769c5f106e8
COMPONENT_ARCHIVE_URL= https://github.com/ImageMagick/ImageMagick/archive/$(HUMAN_VERSION).tar.gz
COMPONENT_FMRI= image/imagemagick
COMPONENT_CLASSIFICATION= System/Multimedia Libraries
diff --git a/components/image/imagemagick/manifests/sample-manifest.p5m b/components/image/imagemagick/manifests/sample-manifest.p5m
index 8185185..94851a1 100644
--- a/components/image/imagemagick/manifests/sample-manifest.p5m
+++ b/components/image/imagemagick/manifests/sample-manifest.p5m
@@ -663,7 +663,6 @@
file path=usr/share/doc/ImageMagick-7/www/source/contrast.c
file path=usr/share/doc/ImageMagick-7/www/source/core.c
file path=usr/share/doc/ImageMagick-7/www/source/delegates.xml
-file path=usr/share/doc/ImageMagick-7/www/source/delegates.xml.~1~
file path=usr/share/doc/ImageMagick-7/www/source/english.xml
file path=usr/share/doc/ImageMagick-7/www/source/examples.pl
file path=usr/share/doc/ImageMagick-7/www/source/francais.xml
diff --git a/components/image/imagemagick/patches/02-dcraw.patch b/components/image/imagemagick/patches/02-dcraw.patch
index 1503896..f7b523d 100644
--- a/components/image/imagemagick/patches/02-dcraw.patch
+++ b/components/image/imagemagick/patches/02-dcraw.patch
@@ -1,5 +1,5 @@
---- ImageMagick-7.1.1-22/MagickCore/delegate.c.orig 2023-12-03 20:10:05.000000000 +0100
-+++ ImageMagick-7.1.1-22/MagickCore/delegate.c 2023-12-05 22:30:39.034663885 +0100
+--- ImageMagick-7.1.1-29/MagickCore/delegate.c.orig 2024-02-25 14:45:06.000000000 +0100
++++ ImageMagick-7.1.1-29/MagickCore/delegate.c 2024-03-02 12:34:49.925852667 +0100
@@ -106,7 +106,7 @@
" <delegate decode=\"https\" command=\""curl" -s -k -L -o "%o" "https:%M"\"/>"
" <delegate decode=\"doc\" command=\""soffice" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; mv "%i.pdf" "%o"\"/>"
@@ -9,25 +9,3 @@
" <delegate decode=\"dot\" command=\""dot" -Tsvg "%i" -o "%o"\"/>"
" <delegate decode=\"dvi\" command=\""dvips" -sstdout=%%stderr -o "%o" "%i"\"/>"
" <delegate decode=\"dxf\" command=\""uniconvertor" "%i" "%o.svg"; mv "%o.svg" "%o"\"/>"
---- ImageMagick-7.1.1-22/config/delegates.xml.in.orig 2023-12-03 20:10:05.000000000 +0100
-+++ ImageMagick-7.1.1-22/config/delegates.xml.in 2023-12-05 22:32:25.844750507 +0100
-@@ -66,7 +66,7 @@
- <delegate decode="https:decode" command=""@WWWDecodeDelegate@" -s -k -L -o "%u.dat" "https:%M""/>
- <delegate decode="doc" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
- <delegate decode="docx" command=""@DOCDecodeDelegate@" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; @MVDelegate@ "%i.pdf" "%o""/>
-- <delegate decode="dng:decode" command=""@DNGDecodeDelegate@" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/>
-+ <delegate decode="dng:decode" stealth="True" command="dcraw -c -q 3 -H 5 -w "%i" > "%u.ppm""/>
- <delegate decode="dot" command=""@GVCDecodeDelegate@" -Tsvg "%i" -o "%o"" />
- <delegate decode="dvi" command=""@DVIDecodeDelegate@" -sstdout=%%stderr -o "%o" "%i""/>
- <delegate decode="edit" stealth="True" command=""@EditorDelegate@" -title "Edit Image Comment" -e vi "%o""/>
---- ImageMagick-7.1.1-22/www/source/delegates.xml.orig 2023-12-03 20:10:05.000000000 +0100
-+++ ImageMagick-7.1.1-22/www/source/delegates.xml 2023-12-05 22:33:41.240291059 +0100
-@@ -67,7 +67,7 @@
- <delegate decode="https" command=""curl" -s -k -L -o "%o" "https:%M""/>
- <delegate decode="doc" command=""soffice" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; /usr/bin/mv "%i.pdf" "%o""/>
- <delegate decode="docx" command=""soffice" --convert-to pdf -outdir `dirname "%i"` "%i" 2> "%u"; /usr/bin/mv "%i.pdf" "%o""/>
-- <delegate decode="dng:decode" command=""ufraw-batch" --silent --create-id=also --out-type=png --out-depth=16 "--output=%u.png" "%i""/>
-+ <delegate decode="dng:decode" stealth="True" command=""dcraw" -c -q 3 -H 5 -w "%i" > "%u.ppm"\"/>"
- <delegate decode="dot" command='"dot" -Tsvg "%i" -o "%o"' />
- <delegate decode="dvi" command=""dvips" -sstdout=%%stderr -o "%o" "%i""/>
- <delegate decode="dxf" command=""uniconvertor" "%i" "%o.svg"; /usr/bin/mv "%o.svg" "%o""/>
--
Gitblit v1.9.3