imagemagick: update libheif to support HEIC format of iOS 18+

cross/imagemagick/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 7.1.2-3
+PKG_VERS = 7.1.2-7
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/ImageMagick/ImageMagick/archive

cross/imagemagick/digests

@@ -1,3 +1,3 @@
-ImageMagick-7.1.2-3.tar.gz SHA1 04c12c191c722870daff38716aba499b64358cec
-ImageMagick-7.1.2-3.tar.gz SHA256 b16415e8694a2e15e5282d64fc7b358f309ff3a514a90eb5da268676c772de3d
-ImageMagick-7.1.2-3.tar.gz MD5 a782af96816b24692f5f760146112f42
+ImageMagick-7.1.2-7.tar.gz SHA1 ed3210ba1a1d5e5b04afff1dd3d2d1c295d36dae
+ImageMagick-7.1.2-7.tar.gz SHA256 d532c7be0b4fbd17d03ef311f55ad8a4845c63cb74f8725320b7d3d3c6a7a4f7
+ImageMagick-7.1.2-7.tar.gz MD5 26479a75fecced26d6a28c7ec2fceb0e

cross/libheif-1.18/Makefile

@@ -0,0 +1,28 @@
+PKG_NAME = libheif
+PKG_VERS = 1.18.2
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/strukturag/libheif/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS  = cross/libjpeg
+DEPENDS += cross/libpng
+DEPENDS += cross/libde265
+DEPENDS += cross/x265
+# libwebp for libsharpyuv:
+DEPENDS += cross/libwebp
+DEPENDS += cross/gdk-pixbuf
+
+# ARMv5 and OLD_PPC_ARCHS fail on cross/libde265
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+
+HOMEPAGE = http://www.libheif.org
+COMMENT  = libheif is a ISO/IEC 23008-12:2017 HEIF file format decoder and encoder.
+LICENSE  = LGPLv3
+
+CMAKE_ARGS += -DWITH_EXAMPLES=OFF
+CMAKE_ARGS += -DBUILD_TESTING=OFF
+
+ADDITIONAL_CXXFLAGS = -O
+
+include ../../mk/spksrc.cross-cmake.mk

cross/libheif/PLIST → cross/libheif-1.18/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libheif.so
 lnk:lib/libheif.so.1
-lib:lib/libheif.so.1.12.0
+lib:lib/libheif.so.1.18.2

cross/libheif-1.18/digests

@@ -0,0 +1,3 @@
+libheif-1.18.2.tar.gz SHA1 45d4cfb05db5b188f7e24acc71173211f834c91c
+libheif-1.18.2.tar.gz SHA256 c4002a622bec9f519f29d84bfdc6024e33fd67953a5fb4dc2c2f11f67d5e45bf
+libheif-1.18.2.tar.gz MD5 5446af621e88be0edc9373c22c198007

cross/libheif-latest/Makefile

@@ -0,0 +1,29 @@
+PKG_NAME = libheif
+PKG_VERS = 1.20.2
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/strukturag/libheif/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS  = cross/libjpeg
+DEPENDS += cross/libpng
+DEPENDS += cross/libde265
+DEPENDS += cross/x265
+# libwebp for libsharpyuv:
+DEPENDS += cross/libwebp
+DEPENDS += cross/gdk-pixbuf
+
+# requires the language dialect "CXX20".
+REQUIRED_MIN_DSM = 7.1
+UNSUPPORTED_ARCHS = comcerto2k
+
+HOMEPAGE = http://www.libheif.org
+COMMENT  = libheif is a ISO/IEC 23008-12:2017 HEIF file format decoder and encoder.
+LICENSE  = LGPLv3
+
+CMAKE_ARGS += -DWITH_EXAMPLES=OFF
+CMAKE_ARGS += -DBUILD_TESTING=OFF
+
+ADDITIONAL_CXXFLAGS = -O
+
+include ../../mk/spksrc.cross-cmake.mk

cross/libheif-latest/PLIST

@@ -0,0 +1,3 @@
+lnk:lib/libheif.so
+lnk:lib/libheif.so.1
+lib:lib/libheif.so.1.20.2

cross/libheif-latest/digests

@@ -0,0 +1,3 @@
+libheif-1.20.2.tar.gz SHA1 58269716d421b2f6c7bc5ea46a5661a8a7b48704
+libheif-1.20.2.tar.gz SHA256 68ac9084243004e0ef3633f184eeae85d615fe7e4444373a0a21cebccae9d12a
+libheif-1.20.2.tar.gz MD5 5d0442f7197a34b7aaf95bdffabb51e9

cross/libheif/Makefile

@@ -1,21 +1,15 @@
-PKG_NAME = libheif
-PKG_VERS = 1.12.0
-PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/strukturag/libheif/releases/download/v$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_NAME = libheif-main
 
-DEPENDS = cross/libjpeg cross/libpng cross/libde265 cross/x265
+OPTIONAL_DEPENDS  = cross/libheif-latest
+OPTIONAL_DEPENDS += cross/libheif-1.18
 
-# ARMv5 and OLD_PPC_ARCHS fail on cross/libde265
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
-HOMEPAGE = http://www.libheif.org
-COMMENT  = libheif is a ISO/IEC 23008-12:2017 HEIF file format decoder and encoder.
-LICENSE  = LGPLv3
+include ../../mk/spksrc.main-depends.mk
 
-GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --disable-examples --disable-go --disable-static
-ADDITIONAL_CXXFLAGS = -O
-
-include ../../mk/spksrc.cross-cc.mk
+# support for C++20
+ifeq ($(call version_ge, $(TC_GCC), 8.5),1)
+DEPENDS = cross/libheif-latest
+else
+DEPENDS = cross/libheif-1.18
+endif

cross/optipng/Makefile

@@ -0,0 +1,23 @@
+PKG_NAME = optipng
+PKG_VERS = 7.9.1
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://sourceforge.net/projects/optipng/files/OptiPNG/$(PKG_NAME)-$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/libpng
+
+HOMEPAGE = https://optipng.sourceforge.net/
+COMMENT  = OptiPNG is a PNG optimizer that recompresses image files to a smaller size, without losing any information. This program also converts external formats (BMP, GIF, PNM and TIFF) to optimized PNG, and performs PNG integrity checks and corrections.
+LICENSE  = zlib/libpng License
+
+POST_INSTALL_TARGET = optipng_post_install
+
+CMAKE_ARGS += -DOPTIPNG_USE_SYSTEM_LIBS=ON
+CMAKE_ARGS += -DOPTIPNG_BUILD_TESTS=OFF
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: optipng_post_install
+optipng_post_install:
+	@chmod +x $(STAGING_INSTALL_PREFIX)/bin/optipng

cross/optipng/PLIST

@@ -0,0 +1 @@
+bin:bin/optipng

cross/optipng/digests

@@ -0,0 +1,3 @@
+optipng-7.9.1.tar.gz SHA1 14e119a3fbfc3a5e2efc69bfb75fdf11f00085c5
+optipng-7.9.1.tar.gz SHA256 c2579be58c2c66dae9d63154edcb3d427fef64cb00ec0aff079c9d156ec46f29
+optipng-7.9.1.tar.gz MD5 aa10f5a484a2e844892825d14ffa0bb5

cross/optipng/patches/001-fix-opng_print_fsize_ratio.patch

@@ -0,0 +1,14 @@
+# fix opng_print_fsize_ratio
+# avoid use of opng_ulratio when OPNG_LLONG_T_DEFINED is not defined
+# 
+--- src/optipng/optim.c.orig	2025-05-20 21:39:10.000000000 +0200
++++ src/optipng/optim.c	2025-10-18 15:37:26.880922145 +0200
+@@ -218,7 +218,7 @@
+ static void
+ opng_print_fsize_ratio(opng_fsize_t num, opng_fsize_t denom)
+ {
+-#if OPNG_FSIZE_MAX <= ULONG_MAX
++#ifndef OPNG_LLONG_T_DEFINED
+ #define RATIO_TYPE struct opng_ulratio
+ #define RATIO_CONV_FN opng_ulratio_to_factor_string
+ #else

spk/imagemagick/Makefile

@@ -1,18 +1,18 @@
 SPK_NAME = imagemagick
 SPK_VERS = 7.1.2
-SPK_REV = 13
+SPK_REV = 14
 SPK_ICON = src/imagemagick.png
 
 # WARNING: pngquant will fail when built after cross/zlib (i.e. cross/libpng)
 DEPENDS  = cross/pngquant
 DEPENDS += cross/imagemagick
 # additional tools for image compression:
-DEPENDS += cross/jpegoptim cross/pngcrush
+DEPENDS += cross/jpegoptim cross/pngcrush cross/optipng
 
 MAINTAINER = hgy59
-DESCRIPTION = ImageMagick is a software suite to create, edit, compose, or convert bitmap images.  This package includes some tools for image compression, that are not part of imagemagick: jpegoptim, a utility to optimize/compress JPEG files; pngcrush an optimizer for png files.
+DESCRIPTION = ImageMagick is a software suite to create, edit, compose, or convert bitmap images.  This package includes some tools for image compression, that are not part of imagemagick: jpegoptim, a utility to optimize/compress JPEG files; OptiPNG is a PNG optimizer that recompresses image files to a smaller size, without losing any information; pngcrush an optimizer for png files; pngquant for lossy compression of PNG images.
 DISPLAY_NAME = ImageMagick
-CHANGELOG = "1. Update ImageMagick to v7.1.2-3. <br/>2. Add support for JPEG XL and UHDR formats (DSM 7 only). <br/>3. Update libraries (cairo, giflib, harfbuzz, jasper, libde265, libpng, libraqm, libraw, libtiff, libwebp, openexr, openjpeg, pixman, x265)."
+CHANGELOG = "1. Update ImageMagick to v7.1.2-7. <br/>2. Update libheif to support HEIC format of iOS 18+. <br/>3. Add optiPNG png optimizer. "
 
 STARTABLE = no
 
@@ -24,9 +24,10 @@ POST_STRIP_TARGET = imagemagick_extra_install
 SPK_COMMANDS  = bin/magick bin/magick-script bin/animate bin/compare bin/composite bin/conjure
 SPK_COMMANDS += bin/convert bin/display bin/identify bin/import bin/mogrify bin/montage bin/stream
 # additional tools:
-SPK_COMMANDS += bin/pngquant
 SPK_COMMANDS += bin/jpegoptim
+SPK_COMMANDS += bin/optipng
 SPK_COMMANDS += bin/pngcrush
+SPK_COMMANDS += bin/pngquant
 
 include ../../mk/spksrc.spk.mk