From c13d9259991b10e63b6d7887cfab85f936c6067a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olav=20R=C3=B8nnestad=20Birkeland?= <6450056+o-l-a-v@users.noreply.github.com> Date: Fri, 31 Oct 2025 08:00:56 +0100 Subject: [PATCH] imagemagick@7.1.2-8 & imagemagick-lean@7.1.2-8: Use GitHub for checkver and download (#7231) * Use GitHub for checkver and download * Do the same for imagemagick-lean * Order architecture alphabetically * 7z don't need extract_dir anymore * Update ImageMagick version to 7.1.2-8 --- bucket/imagemagick-lean.json | 57 ++++++++++++++------------------- bucket/imagemagick.json | 61 +++++++++++++++++------------------- 2 files changed, 51 insertions(+), 67 deletions(-) diff --git a/bucket/imagemagick-lean.json b/bucket/imagemagick-lean.json index 7a6da686c1..ccfa154dc2 100644 --- a/bucket/imagemagick-lean.json +++ b/bucket/imagemagick-lean.json @@ -1,53 +1,42 @@ { - "version": "7.1.2-3", + "version": "7.1.2-8", "description": "Create, edit, compose, and convert 200+ of bitmap images formats.", "homepage": "https://imagemagick.org/", "license": "ImageMagick", - "architecture": { - "64bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-3-portable-Q16-HDRI-x64.zip", - "hash": "aff4739061ba3cb074b2b229a63e0b8b85d54e5661ae8785d736b49a782fb1a0", - "extract_dir": "ImageMagick-7.1.2-3-portable-Q16-HDRI-x64" - }, - "32bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-3-portable-Q16-HDRI-x86.zip", - "hash": "c36967c635232bf3a616b477173b426840e22f99dbc2dc7373eef05a6449fdaa", - "extract_dir": "ImageMagick-7.1.2-3-portable-Q16-HDRI-x86" - }, - "arm64": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-3-portable-Q16-HDRI-arm64.zip", - "hash": "3d147939e5230745a749514f821b9e70a993b174fd878ac76184a834abb41192", - "extract_dir": "ImageMagick-7.1.2-3-portable-Q16-HDRI-arm64" - } - }, - "bin": "magick.exe", "notes": [ "- This manifest contains the barebones ImageMagick installation.", "- For appropriate programming DLLs and environment variables, install 'imagemagick' instead." ], + "architecture": { + "32bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-portable-Q16-HDRI-x86.7z", + "hash": "6748ca1c0865255bffbc2ef56ffaa8f2989b92e1da4c3fdda5fe4103e2382f7c" + }, + "64bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-portable-Q16-HDRI-x64.7z", + "hash": "432aa98bc04cd6e7cecf22a5f9b56e804c9bdef97f4cf983dac02dd6d208e3ee" + }, + "arm64": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-portable-Q16-HDRI-arm64.7z", + "hash": "06d7830c7203886d2aecff271498f62694463fbb591dd6e3808a73005598b940" + } + }, + "bin": "magick.exe", "checkver": { - "url": "https://imagemagick.org/archive/binaries/digest.rdf", - "reverse": true, - "regex": "ImageMagick-([\\d.-]+)-portable-Q16-HDRI-x64\\.zip" + "url": "https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest", + "jsonpath": "$.tag_name" }, "autoupdate": { "architecture": { - "64bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-portable-Q16-HDRI-x64.zip", - "extract_dir": "ImageMagick-$version-portable-Q16-HDRI-x64" - }, "32bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-portable-Q16-HDRI-x86.zip", - "extract_dir": "ImageMagick-$version-portable-Q16-HDRI-x86" + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-portable-Q16-HDRI-x86.7z" + }, + "64bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-portable-Q16-HDRI-x64.7z" }, "arm64": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-portable-Q16-HDRI-arm64.zip", - "extract_dir": "ImageMagick-$version-portable-Q16-HDRI-arm64" + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-portable-Q16-HDRI-arm64.7z" } - }, - "hash": { - "mode": "rdf", - "url": "https://imagemagick.org/archive/binaries/digest.rdf" } } } diff --git a/bucket/imagemagick.json b/bucket/imagemagick.json index d2b167fcfb..98e3577642 100644 --- a/bucket/imagemagick.json +++ b/bucket/imagemagick.json @@ -3,27 +3,6 @@ "description": "Create, edit, compose, and convert 200+ bitmap image formats.", "homepage": "https://imagemagick.org/", "license": "ImageMagick", - "architecture": { - "64bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-8-Q16-HDRI-x64-dll.exe", - "hash": "a19f1af0193c7b29acd1659bbb8637bd68dccaaa2f850fc612cce16813ec8406" - }, - "32bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-8-Q16-HDRI-x86-dll.exe", - "hash": "88317d48e2c1f739f71fbadcf8e0e57fde513a91b8fb6d9026ae4f00dac24f50" - }, - "arm64": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-7.1.2-8-Q16-HDRI-arm64-dll.exe", - "hash": "aa7f0dcf888537a9a46a8efa3501ab55f205683bc6401521b6faea4e7d4acab6" - } - }, - "innosetup": true, - "env_set": { - "MAGICK_HOME": "$dir", - "MAGICK_CONFIGURE_PATH": "$dir", - "MAGICK_CODER_MODULE_PATH": "$dir\\modules\\coders" - }, - "env_add_path": ".", "notes": [ "ImageMagick requires Ghostscript to handle PDF files properly.", "You can install it by: scoop install ghostscript", @@ -31,26 +10,42 @@ "'convert.exe' is deprecated in v7 (it also conflicts with the builtin Windows 'convert' utility).", "Use 'magick convert ...' instead." ], + "architecture": { + "32bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-Q16-HDRI-x86-dll.exe", + "hash": "88317d48e2c1f739f71fbadcf8e0e57fde513a91b8fb6d9026ae4f00dac24f50" + }, + "64bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-Q16-HDRI-x64-dll.exe", + "hash": "a19f1af0193c7b29acd1659bbb8637bd68dccaaa2f850fc612cce16813ec8406" + }, + "arm64": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-8/ImageMagick-7.1.2-8-Q16-HDRI-arm64-dll.exe", + "hash": "aa7f0dcf888537a9a46a8efa3501ab55f205683bc6401521b6faea4e7d4acab6" + } + }, + "innosetup": true, + "env_add_path": ".", + "env_set": { + "MAGICK_HOME": "$dir", + "MAGICK_CONFIGURE_PATH": "$dir", + "MAGICK_CODER_MODULE_PATH": "$dir\\modules\\coders" + }, "checkver": { - "url": "https://imagemagick.org/archive/binaries/digest.rdf", - "reverse": true, - "regex": "ImageMagick-([\\d.-]+)-Q16-HDRI-x64-dll\\.exe" + "url": "https://api.github.com/repos/ImageMagick/ImageMagick/releases/latest", + "jsonpath": "$.tag_name" }, "autoupdate": { "architecture": { - "64bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-Q16-HDRI-x64-dll.exe" - }, "32bit": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-Q16-HDRI-x86-dll.exe" + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-Q16-HDRI-x86-dll.exe" + }, + "64bit": { + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-Q16-HDRI-x64-dll.exe" }, "arm64": { - "url": "https://imagemagick.org/archive/binaries/ImageMagick-$version-Q16-HDRI-arm64-dll.exe" + "url": "https://github.com/ImageMagick/ImageMagick/releases/download/$version/ImageMagick-$version-Q16-HDRI-arm64-dll.exe" } - }, - "hash": { - "mode": "rdf", - "url": "https://imagemagick.org/archive/binaries/digest.rdf" } } }