Update ImageMagick

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 39fa02d0d00d55dcddcb2749ad0b7c30d3f585253f2940d3e0f56c5327ed8a28..18b6c9bf0c41c9c2280102be6c5303f5f1e04bb3b08ba9ef16eb24fc003b9b04 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -92,8 +92,7 @@
 /httpd-2.4.59.tar.bz2
 /icu4c-63.tgz
 /Image-ExifTool-13.44.tar.gz
-/imagemagick-7.1.1-33.tar.zst
-/imagemagick.git/
+/ImageMagick-7.1.2-15.tar.xz
 /imlib2-1.12.2.tar.xz
 /include-what-you-use-0.19.tar.gz
 /iniparser-v4.2.2.tar.zst

diff --git a/build/distfiles/ImageMagick-7.1.2-15.tar.xz.meta4 b/build/distfiles/ImageMagick-7.1.2-15.tar.xz.meta4
new file mode 100644 (file)
index 0000000..caf0635
--- /dev/null
+++ b/build/distfiles/ImageMagick-7.1.2-15.tar.xz.meta4
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="ImageMagick-7.1.2-15.tar.xz">
+    <hash type="blake3-256">9afa1ef0f067d4e6d4e274c69daf829b673d013eff8bd9cd79cb0fb44ba4e331</hash>
+    <hash type="blake2b-512">8812291b24c476955b7974a0e08d12aee6b3e865222ba6b242816538ca11d07f5ab409d19c50cb35af402f05a66321b01e78f71740f817c12e268420e28ee7ae</hash>
+    <hash type="blake2b-256">bb5dc8ea05924f8ab8f5ceb8ed84d749ba68689d5e77097d0aca2880ecd72c57</hash>
+    <hash type="skein-512">15e457b9b85e82d6f9de0b385605ecb3264e7c0adadea1a5629c1fb5ad0fcc155dc26a7b73dc453e72cc229f0c1b0d5eaa14d0cb3670083f707b1e8ef9d36509</hash>
+    <hash type="shake128">ff532eca11f2b6318bb63b180077b38a3ff510c958d325ecbf6dae6df820d163</hash>
+    <hash type="shake256">57fb6fe624816fe7f6543f9beccf0c78f13749c829751105bd48a17ef425dc48e8cde09db5e303a7aa746344e3aef4488d4edbc7ae0f1707657e7c04429c417d</hash>
+    <hash type="sha-512">cc0eb08110c25668ea67cc10bf916f7a960d0e35afa10a4de3661c18e0b2ebe3c4cf27ea721c1689b34284485d506a1d4812ec7a908c32ce6dc868111decba65</hash>
+    <hash type="sha-256">ccb9913bba578daa582b73b2a97e55db49765d926cbb8ebf54e4e79b458e6679</hash>
+    <hash type="streebog-512">a0a811847075f017449bc8fe44b62d57e6310ef43128ed7e6a76a264c9778e5cb5b180585addc268bb07e5d0d7cbbe2b605cc7979f2adfb4cc703009fd44ac6c</hash>
+    <hash type="streebog-256">86e75afd8dc1b75fd50c86cce2f9fbf52c3846057af52abe0e0c5f204d008a58</hash>
+    <hash type="xxh3-128">f9ec0ec248275ff2ac6ab2e12c536461</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmmblWQACgkQiatj1IJ3
+N3rx+A//XPRLE+I3/aavE+6QS3bO8pEqtSmSEu4pGhhHziGtc+pd1gk4YVMG2jQF
+KhoDqsDjui9KJa70gHaYLTapi604Qpv6Y17CFAzVL3qpVEyYFxyI7DJY37qr1Hqy
+bSbV6P/Jk8CynnhCbXtVNtwzbRkiCLv4LqI4kIU4yruIeArSdaqevfyySGTPF82l
+/7SK00E8k09PB50PPXuL05PWGld3VMS0GZ7PjSr+qcncfaUW7clOkwALF27UF7pt
+j5ZQE0s/KsWxhNy0OjlwI7uXt83V+oizh8NckCfxjAI2HtPq5xpMSjVXtynCGx/a
+q6NrMdTBGf5t9dszBW/IEX1lECZ16ETJpkxzP6lYQOH0vlWMgTSC7XceaFuJhDJl
+ZhTIjzZ/cFJVkGwy9zEd56ZqX6FxiUFjSZQ2D/+cFedUlc+4spmjfYO3Rtgd0L5q
+SHOinGhg1j4g2TJCvY5DNTkiebXgEVtamb2E9cnoNRthAQv/LSJeWZ+aWknr88Lh
+zCDdmTVonvVNOG8LusRhKwMK5X0g6G2cDUW0D7/aLe1wo1ZbhuOjqEBz3g0Wj0/s
+BYpDDP36/ljOyRoUH2Yql5DjwEVkIuxUiuJ/+TXTUUii7remCfQjjaOi5qBILzMf
+FfiktMAdaivHzkTIouAleBwaM9Xi7p+lX/rHEaicVI0xKM7cf2w=
+=4Bg5
+-----END PGP SIGNATURE-----
+]]></signature>
+    <size>10798676</size>
+    <url priority="1" location="au">http://mirror.aarnet.edu.au/pub/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="1" location="ch">http://mirror.metanet.ch/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="1" location="de">http://mirror.checkdomain.de/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="1" location="de">http://mirror.dogado.de/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="1" location="pl">http://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="1" location="se">http://mirror.accum.se/mirror/imagemagick.org/ftp/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="au">https://mirror.aarnet.edu.au/pub/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="ch">https://mirror.metanet.ch/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="de">https://mirror.checkdomain.de/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="de">https://mirror.dogado.de/imagemagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="pl">https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="2" location="se">https://mirror.accum.se/mirror/imagemagick.org/ftp/releases/ImageMagick-7.1.2-15.tar.xz</url>
+    <url priority="3" location="us">https://imagemagick.org/archive/releases/ImageMagick-7.1.2-15.tar.xz</url>
+  </file>
+  <file name="ImageMagick-7.1.2-15.tar.xz.asc">
+    <size>833</size>
+    <url>https://imagemagick.org/archive/releases/ImageMagick-7.1.2-15.tar.xz.asc</url>
+  </file>
+</metalink>

diff --git a/build/distfiles/imagemagick-7.1.1-33.tar.zst.do b/build/distfiles/imagemagick-7.1.1-33.tar.zst.do
deleted file mode 100644 (file)
index 8a31fa9..0000000
--- a/build/distfiles/imagemagick-7.1.1-33.tar.zst.do
+++ /dev/null
@@ -1,7 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-[ -d imagemagick.git ] || git clone --depth 1 --bare https://github.com/ImageMagick/ImageMagick.git imagemagick.git >&2
-cd imagemagick.git
-commit=057259c12960243cf55899ead99a6dc80d300a7b
-git fetch origin $commit >&2
-git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR

diff --git a/build/skel/graphics/imagemagick-7.1.1-33.do b/build/skel/graphics/ImageMagick-7.1.2-15.do
similarity index 91%
rename from build/skel/graphics/imagemagick-7.1.1-33.do
rename to build/skel/graphics/ImageMagick-7.1.2-15.do
index 739cea55dac973453f89bb3dfd1b5e001d5bd8b856ea085752e5c9e52dcd342b..f0401ed7efc52a212c1fe7130d730aef0c6966537104edc4e854c5e5b408cf5a 100644 (file)
--- a/build/skel/graphics/imagemagick-7.1.1-33.do
+++ b/build/skel/graphics/ImageMagick-7.1.2-15.do
@@ -14,12 +14,12 @@ graphics/openjpeg-2.5.2
 graphics/tiff-4.6.0
 print/ghostpdl-10.06.0
 "
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.zst
+$TAR xf "$DISTFILES"/$NAME.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME