SynoCommunity · hgy59 · May 18, 2021 · Apr 26, 2021 · Apr 26, 2021 · Apr 27, 2021
diff --git a/cross/imagemagick/Makefile b/cross/imagemagick/Makefile
@@ -1,37 +1,43 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 7.0.8-53
+PKG_VERS = 7.0.11-6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/ImageMagick/ImageMagick/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/freetype cross/libpng cross/libxml2 cross/libtiff cross/libjpeg
+OPTIONAL_DEPENDS = cross/libwebp cross/libheif
+
+DEPENDS += cross/libtiff cross/libpng cross/libjpeg cross/openjpeg
+DEPENDS += cross/bzip2 cross/xz cross/libxml2
+DEPENDS += cross/freetype cross/fontconfig
+DEPENDS += cross/libtool cross/urw-base35-fonts
+DEPENDS += cross/libwmf
+
+include ../../mk/spksrc.archs.mk
+ifneq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
+DEPENDS += cross/libwebp
+endif
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+DEPENDS += cross/libheif
+endif
 
 HOMEPAGE = https://www.imagemagick.org/
 COMMENT  = ImageMagick is a software suite to create, edit, compose, or convert bitmap images.
 LICENSE  = Apache 2.0
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --disable-installed --without-perl --without-x --without-fpx --without-wmf --disable-openmp
-INSTALL_TARGET = imagemagick_install
 
-include ../../mk/spksrc.cross-cc.mk
+CONFIGURE_ARGS  = --disable-installed --disable-docs
+CONFIGURE_ARGS += --without-perl --without-x --without-fpx
+CONFIGURE_ARGS += --with-modules
+CONFIGURE_ARGS += --with-urw-base35-font-dir==$(INSTALL_PREFIX)/share/fonts
+CONFIGURE_ARGS += --with-windows-font-dir=$(INSTALL_PREFIX)/share/libwmf/fonts
 
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 # ARMv5 and PPC archs (except QorIQ) have older kernels
 # linking to lib rt fixes unreferenced clock_gettime
 CONFIGURE_ARGS += CFLAGS=-lrt
 endif
 
-.PHONY: imagemagick_install
-imagemagick_install:
-	$(RUN) make install prefix=$(STAGING_INSTALL_PREFIX) \
-	SHARE_PATH=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \
-	DATA_DIR=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \
-	CONFIGURE_PATH=$(STAGING_INSTALL_PREFIX)/etc/ImageMagick-6/ \
-	LIBRARY_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-7.0.8/ \
-	SHAREARCH_PATH=$(STAGING_INSTALL_PREFIX)/lib/ImageMagick-7.0.7/config-Q16 \
-	DOCUMENTATION_PATH=$(STAGING_INSTALL_PREFIX)/share/doc/ImageMagick-7 \
-	INCLUDE_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-7 \
-	INCLUDEARCH_PATH=$(STAGING_INSTALL_PREFIX)/include/ImageMagick-7
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/imagemagick/PLIST b/cross/imagemagick/PLIST
@@ -8,19 +8,15 @@ lnk:bin/convert
 lnk:bin/display
 lnk:bin/identify
 lnk:bin/import
-rsc:bin/Magick++-config
-rsc:bin/MagickCore-config
-rsc:bin/MagickWand-config
 lnk:bin/mogrify
 lnk:bin/montage
 lnk:bin/stream
-rsc:etc/ImageMagick-6
-lnk:lib/libMagick++-7.Q16HDRI.so
-lnk:lib/libMagick++-7.Q16HDRI.so.4
-lib:lib/libMagick++-7.Q16HDRI.so.4.0.0
+rsc:etc/ImageMagick-7
+lib:lib/ImageMagick-7.0.11/modules-Q16HDRI/coders/*.so
+lib:lib/ImageMagick-7.0.11/modules-Q16HDRI/filters/*.so
 lnk:lib/libMagickCore-7.Q16HDRI.so
-lnk:lib/libMagickCore-7.Q16HDRI.so.6
-lib:lib/libMagickCore-7.Q16HDRI.so.6.0.0
+lnk:lib/libMagickCore-7.Q16HDRI.so.9
+lib:lib/libMagickCore-7.Q16HDRI.so.9.0.0
 lnk:lib/libMagickWand-7.Q16HDRI.so
-lnk:lib/libMagickWand-7.Q16HDRI.so.6
-lib:lib/libMagickWand-7.Q16HDRI.so.6.0.0
+lnk:lib/libMagickWand-7.Q16HDRI.so.9
+lib:lib/libMagickWand-7.Q16HDRI.so.9.0.0
diff --git a/cross/imagemagick/digests b/cross/imagemagick/digests
@@ -1,3 +1,3 @@
-ImageMagick-7.0.8-53.tar.gz SHA1 06e9e30024408ff8b09ab4f54bb474dfc72855dc
-ImageMagick-7.0.8-53.tar.gz SHA256 b8c35e03fc4bd2bf66bddfe232a34473e7df68c3716c831ba76dc30520e7b490
-ImageMagick-7.0.8-53.tar.gz MD5 990c8f23a2ca2d438d8f0a1c0c52c64b
+ImageMagick-7.0.11-6.tar.gz SHA1 9000b66e2abdb8a7a06f7a6b0560e576830dfd2e
+ImageMagick-7.0.11-6.tar.gz SHA256 8adc1605784653b078572b825e8cd1d3d54f8a1b4ba86b32ca253c038f7e4c37
+ImageMagick-7.0.11-6.tar.gz MD5 c20842be5b5426ad86fd8aac9f2e446a
diff --git a/cross/lcms2/Makefile b/cross/lcms2/Makefile
@@ -0,0 +1,17 @@
+PKG_NAME = lcms2
+PKG_VERS = 2.11
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE =  https://github.com/mm2/Little-CMS/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = Little-CMS-$(PKG_VERS)
+
+DEPENDS = cross/libtiff cross/libjpeg cross/zlib
+
+HOMEPAGE = http://www.littlecms.com/
+COMMENT  = Little CMS is a free, open source, CMM engine. It provides fast transforms between ICC profiles.
+LICENSE  = MIT
+
+GNU_CONFIGURE = 1
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/lcms2/PLIST b/cross/lcms2/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/liblcms2.so
+lnk:lib/liblcms2.so.2
+lib:lib/liblcms2.so.2.0.10
diff --git a/cross/lcms2/digests b/cross/lcms2/digests
@@ -0,0 +1,3 @@
+lcms2-2.11.tar.gz SHA1 f1e050f80b834057c6b11e6b58186927b909bca7
+lcms2-2.11.tar.gz SHA256 478c9c3938d7a91b1171de4616f8b04308a8676d73eadc19505b7ace41327f28
+lcms2-2.11.tar.gz MD5 46191f94ac970fa8c22dd63a732440d6
diff --git a/cross/libde265/Makefile b/cross/libde265/Makefile
@@ -0,0 +1,20 @@
+PKG_NAME = libde265
+PKG_VERS = 1.0.8
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/strukturag/$(PKG_NAME)/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =
+
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+
+HOMEPAGE = http://www.libheif.org
+COMMENT  = Open h.265 video codec implementation. 
+LICENSE  = LGPLv3
+
+GNU_CONFIGURE = 1
+# Disable build of applications, build library only
+CONFIGURE_ARGS = --disable-dec265 --disable-sherlock265
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libde265/PLIST b/cross/libde265/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libde265.so
+lnk:lib/libde265.so.0
+lib:lib/libde265.so.0.1.1
diff --git a/cross/libde265/digests b/cross/libde265/digests
@@ -0,0 +1,3 @@
+libde265-1.0.8.tar.gz SHA1 db8fa137a4681ec092e7546d9155bbaa95938e5e
+libde265-1.0.8.tar.gz SHA256 24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905
+libde265-1.0.8.tar.gz MD5 e5a8c91c533ae5926e5118087f78930f
diff --git a/cross/libheif/Makefile b/cross/libheif/Makefile
@@ -0,0 +1,20 @@
+PKG_NAME = libheif
+PKG_VERS = 1.11.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/strukturag/$(PKG_NAME)/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/libjpeg cross/libpng cross/libde265 cross/x265
+
+# 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
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-examples --disable-go
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libheif/PLIST b/cross/libheif/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libheif.so
+lnk:lib/libheif.so.1
+lib:lib/libheif.so.1.11.0
diff --git a/cross/libheif/digests b/cross/libheif/digests
@@ -0,0 +1,3 @@
+libheif-1.11.0.tar.gz SHA1 def98b8c83861b6e4f3cdf6d3b57c9aaf3408923
+libheif-1.11.0.tar.gz SHA256 c550938f56ff6dac83702251a143f87cb3a6c71a50d8723955290832d9960913
+libheif-1.11.0.tar.gz MD5 1927b1507d33eaf2b8714239d9dbbde8
diff --git a/cross/libjpeg/Makefile b/cross/libjpeg/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = libjpeg
-PKG_VERS = 9c
+PKG_VERS = 9d
 PKG_EXT = tar.gz
 PKG_DIST_NAME = jpegsrc.v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.ijg.org/files

diff --git a/cross/libjpeg/PLIST b/cross/libjpeg/PLIST
@@ -5,4 +5,4 @@ bin:bin/rdjpgcom
 bin:bin/wrjpgcom
 lnk:lib/libjpeg.so
 lnk:lib/libjpeg.so.9
-lib:lib/libjpeg.so.9.3.0
+lib:lib/libjpeg.so.9.4.0
diff --git a/cross/libjpeg/digests b/cross/libjpeg/digests
@@ -1,3 +1,3 @@
-jpegsrc.v9c.tar.gz SHA1 bc4ac17d1cc1162a034fa7708cda8d70aebff702
-jpegsrc.v9c.tar.gz SHA256 1e9793e1c6ba66e7e0b6e5fe7fd0f9e935cc697854d5737adec54d93e5b3f730
-jpegsrc.v9c.tar.gz MD5 cbc68018646e09b3fd8091e3de5ea451
+jpegsrc.v9d.tar.gz SHA1 e44187fc7717896d4372271ddd4aa1d465c811b8
+jpegsrc.v9d.tar.gz SHA256 6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee
+jpegsrc.v9d.tar.gz MD5 ad7e40dedc268f97c44e7ee3cd54548a
diff --git a/cross/libtiff/Makefile b/cross/libtiff/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = tiff
-PKG_VERS = 4.0.10
+PKG_VERS = 4.3.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = http://download.osgeo.org/libtiff
@@ -12,5 +12,6 @@ COMMENT  = LibTIFF provides support for the Tag Image File Format (TIFF), a wide
 LICENSE  =
 
 GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --enable-rpath
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libtiff/PLIST b/cross/libtiff/PLIST
@@ -1,6 +1,6 @@
 lnk:lib/libtiff.so
 lnk:lib/libtiff.so.5
-lib:lib/libtiff.so.5.4.0
+lib:lib/libtiff.so.5.7.0
 lnk:lib/libtiffxx.so
 lnk:lib/libtiffxx.so.5
-lib:lib/libtiffxx.so.5.4.0
+lib:lib/libtiffxx.so.5.7.0
diff --git a/cross/libtiff/digests b/cross/libtiff/digests
@@ -1,3 +1,3 @@
-tiff-4.0.10.tar.gz SHA1 c783b80f05cdacf282aa022dc5f5b0ede5e021ae
-tiff-4.0.10.tar.gz SHA256 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
-tiff-4.0.10.tar.gz MD5 114192d7ebe537912a2b97408832e7fd
+tiff-4.3.0.tar.gz SHA1 c03f6cb05b64ff496b3a5c733a0af6296aead051
+tiff-4.3.0.tar.gz SHA256 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8
+tiff-4.3.0.tar.gz MD5 0a2e4744d1426a8fc8211c0cdbc3a1b3
diff --git a/cross/libwebp/Makefile b/cross/libwebp/Makefile
@@ -0,0 +1,22 @@
+PKG_NAME = libwebp
+PKG_VERS = 1.2.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/webmproject/$(PKG_NAME)/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/libtiff cross/xz cross/libjpeg cross/libpng
+
+HOMEPAGE = https://developers.google.com/speed/webp
+COMMENT  = WebP codec: library to encode and decode images in WebP format.
+LICENSE  = https://github.com/webmproject/libwebp/blob/master/COPYING
+
+GNU_CONFIGURE = 1
+PRE_CONFIGURE_TARGET = libwebp_pre_configure
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: libwebp_pre_configure
+libwebp_pre_configure:
+	$(RUN) ./autogen.sh
diff --git a/cross/libwebp/PLIST b/cross/libwebp/PLIST
@@ -0,0 +1,8 @@
+bin:bin/cwebp
+bin:bin/dwebp
+lnk:lib/libwebp.so
+lnk:lib/libwebp.so.7
+lib:lib/libwebp.so.7.1.1
+lnk:lib/libwebpdemux.so
+lnk:lib/libwebpdemux.so.2
+lib:lib/libwebpdemux.so.2.0.7
diff --git a/cross/libwebp/digests b/cross/libwebp/digests
@@ -0,0 +1,3 @@
+libwebp-1.2.0.tar.gz SHA1 54383895bd18783c7af8517620252a712258b22c
+libwebp-1.2.0.tar.gz SHA256 d60608c45682fa1e5d41c3c26c199be5d0184084cd8a971a6fc54035f76487d3
+libwebp-1.2.0.tar.gz MD5 d0df15b4235d024652841f2f926f72b4
diff --git a/cross/libwmf/Makefile b/cross/libwmf/Makefile
@@ -0,0 +1,17 @@
+PKG_NAME = libwmf
+PKG_VERS = 0.2.8.4
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://sourceforge.net/projects/wvware/files/$(PKG_NAME)/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/freetype cross/libpng cross/libjpeg cross/libxml2
+
+HOMEPAGE = http://wvware.sourceforge.net/
+COMMENT  = libwmf is a library for reading vector images in Microsoft's native Windows Metafile Format (WMF) and for either displaying them or converting them to more standard/open file formats.
+LICENSE  = LGPL
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --with-freetype=$(STAGING_INSTALL_PREFIX)
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libwmf/PLIST b/cross/libwmf/PLIST
@@ -0,0 +1,13 @@
+rsc:bin/libwmf-config
+rsc:bin/libwmf-fontmap
+bin:bin/wmf2eps
+bin:bin/wmf2fig
+bin:bin/wmf2gd
+bin:bin/wmf2svg
+lnk:lib/libwmf-0.2.so.7
+lib:lib/libwmf-0.2.so.7.1.0
+lnk:lib/libwmf.so
+lnk:lib/libwmflite-0.2.so.7
+lib:lib/libwmflite-0.2.so.7.0.1
+lib:lib/libwmflite.so
+rsc:share/libwmf/fonts
diff --git a/cross/libwmf/digests b/cross/libwmf/digests
@@ -0,0 +1,3 @@
+libwmf-0.2.8.4.tar.gz SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89
+libwmf-0.2.8.4.tar.gz SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
+libwmf-0.2.8.4.tar.gz MD5 d1177739bf1ceb07f57421f0cee191e0
diff --git a/cross/openjpeg/Makefile b/cross/openjpeg/Makefile
@@ -0,0 +1,15 @@
+PKG_NAME = openjpeg
+PKG_VERS = 2.4.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/uclouvain/$(PKG_NAME)/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS =  cross/libtiff cross/libjpeg cross/libpng cross/lcms2
+
+HOMEPAGE = https://github.com/uclouvain/openjpeg#readme
+COMMENT  = OpenJPEG is an open-source JPEG 2000 codec written in C language. 
+LICENSE  = BSD 2-clause simplified
+
+include ../../mk/spksrc.cross-cmake.mk
diff --git a/cross/openjpeg/PLIST b/cross/openjpeg/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libopenjp2.so
+lib:lib/libopenjp2.so.2.4.0
+lnk:lib/libopenjp2.so.7
diff --git a/cross/openjpeg/digests b/cross/openjpeg/digests
@@ -0,0 +1,3 @@
+openjpeg-2.4.0.tar.gz SHA1 bbbf4dc4d9ce95286843cd39ac2febd3fd516c9d
+openjpeg-2.4.0.tar.gz SHA256 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
+openjpeg-2.4.0.tar.gz MD5 4d388298335947367e91f1d100468af1
diff --git a/cross/pyload/Makefile b/cross/pyload/Makefile
@@ -1,7 +1,7 @@
 PKG_NAME = pyload
 PKG_VERS = 0.4.20
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/pyload/pyload/archive
 PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile
@@ -1,18 +1,23 @@
 SPK_NAME = imagemagick
-SPK_VERS = 7.0.8
-SPK_REV = 4
+SPK_VERS = 7.0.11
+SPK_REV = 5
 SPK_ICON = src/imagemagick.png
 
-DEPENDS = cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME) cross/jpegoptim
 
 MAINTAINER = SynoCommunity
-DESCRIPTION = ImageMagick is a software suite to create, edit, compose, or convert bitmap images.
+DESCRIPTION = ImageMagick is a software suite to create, edit, compose, or convert bitmap images. This package includes jpegoptim, a utility to optimize/compress JPEG files, that is not part of imagemagick.
 DISPLAY_NAME = ImageMagick
-CHANGELOG = Update to ImageMagick 7.0.8-53
+CHANGELOG = "1. Update to ImageMagick 7.0.11-6.<br/>2. Add jpegoptim, a jpeg compression tool."
 
 STARTABLE = no
 
 HOMEPAGE = https://www.imagemagick.org/
 LICENSE  = Apache 2.0
 
+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/jpegoptim
+
 include ../../mk/spksrc.spk.mk