update imagemagick (#6130)

* update imagemagick
- update imagemagick to v7.1.1-33
- update jpegoptim to v1.5.5
- Update libraries to current versions (advancecomp, fontconfig, freetype, giflib, libpng, libtiff, libwebp, openjpeg)

* imagemagick library updates
- update fribidi to v1.0.15
- update libass to v0.17.2
- update libraqm to v 0.10.1
- update libraw to v0.21.2

* revert update of cross/libraqm

* cross/libraqm: restore patch for reverted update

* revert update of cross/libass

* revert dependency order change

- birdl librsvg after libraqm

* update fribidi to v1.0.15

- temporary commit to validate build of ffmpeg et al.

cross/advancecomp/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = advancecomp
-PKG_VERS = 2.4
+PKG_VERS = 2.6
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/amadvance/advancecomp/releases/download/v$(PKG_VERS)

cross/advancecomp/digests

@@ -1,3 +1,3 @@
-advancecomp-2.4.tar.gz SHA1 787587237a07a1e6297bf896386aa08e9a208721
-advancecomp-2.4.tar.gz SHA256 911133b8bdebd43aa86379e19584112b092459304401a56066e964207da423a5
-advancecomp-2.4.tar.gz MD5 ada016424a40f8f2026c5dd711f1c51a
+advancecomp-2.6.tar.gz SHA1 4d54539cb3c6ea229f485d2315f44b0a9a931990
+advancecomp-2.6.tar.gz SHA256 b07d77735540409771cbe1b6df165b5151c11bb9c3d8f01290be0ec88ec3498f
+advancecomp-2.6.tar.gz MD5 fc7f6c2bdbabae26f90bf18ec63e9242

cross/imagemagick/Makefile

@@ -1,12 +1,12 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 7.1.0-52
+PKG_VERS = 7.1.1-33
 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)
 
-OPTIONAL_DEPENDS = cross/libheif cross/libraw cross/openexr cross/libraqm  cross/librsvg
+OPTIONAL_DEPENDS = cross/libheif cross/libraw cross/openexr cross/libraqm cross/librsvg
 
 DEPENDS = cross/jemalloc
 DEPENDS += cross/bzip2 
@@ -29,6 +29,11 @@ DEPENDS += cross/libtool
 DEPENDS += cross/libfpx
 DEPENDS += cross/fftw
 
+CONFIGURE_ARGS = --disable-installed --disable-docs --disable-static
+CONFIGURE_ARGS += --without-perl --without-x
+# magick *++* files fail to add to package by PLIST
+CONFIGURE_ARGS += --without-magick-plus-plus
+
 include ../../mk/spksrc.common.mk
 SUPPORT_CPP11 = 1
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
@@ -37,12 +42,14 @@ endif
 ifeq ($(call version_lt, $(TCVERSION), 6.0)$(call version_ge, $(TCVERSION), 3.0),11)
 SUPPORT_CPP11 = 0
 endif
+
 ifeq ($(SUPPORT_CPP11),1)
 DEPENDS += cross/libheif
 DEPENDS += cross/libraw
 DEPENDS += cross/openexr
 DEPENDS += cross/libraqm
 DEPENDS += cross/librsvg
+CONFIGURE_ARGS += --with-rsvg
 endif
 
 HOMEPAGE = https://www.imagemagick.org/
@@ -51,13 +58,8 @@ LICENSE = Apache 2.0
 
 GNU_CONFIGURE = 1
 
-CONFIGURE_ARGS = --disable-installed --disable-docs --disable-static
-CONFIGURE_ARGS += --without-perl --without-x
-CONFIGURE_ARGS += --with-rsvg
 CONFIGURE_ARGS += --with-fpx
 CONFIGURE_ARGS += --with-fftw
-# magick *++* files fail to add to package by PLIST
-CONFIGURE_ARGS += --without-magick-plus-plus
 CONFIGURE_ARGS += --with-jemalloc
 CONFIGURE_ARGS += --with-modules
 CONFIGURE_ARGS += --with-dejavu-font-dir=$(INSTALL_PREFIX)/share/dejavu/fonts

cross/imagemagick/PLIST

@@ -12,14 +12,14 @@ lnk:bin/mogrify
 lnk:bin/montage
 lnk:bin/stream
 rsc:etc/ImageMagick-7/
-rsc:lib/ImageMagick-7.1.0/config-Q16HDRI/configure.xml
-lib:lib/ImageMagick-7.1.0/modules-Q16HDRI/coders/*.so
-rsc:lib/ImageMagick-7.1.0/modules-Q16HDRI/coders/*.la
-lib:lib/ImageMagick-7.1.0/modules-Q16HDRI/filters/*.so
-rsc:lib/ImageMagick-7.1.0/modules-Q16HDRI/filters/*.la
+rsc:lib/ImageMagick-7.1.1/config-Q16HDRI/configure.xml
+lib:lib/ImageMagick-7.1.1/modules-Q16HDRI/coders/*.so
+rsc:lib/ImageMagick-7.1.1/modules-Q16HDRI/coders/*.la
+lib:lib/ImageMagick-7.1.1/modules-Q16HDRI/filters/*.so
+rsc:lib/ImageMagick-7.1.1/modules-Q16HDRI/filters/*.la
 lnk:lib/libMagickCore-7.Q16HDRI.so
 lnk:lib/libMagickCore-7.Q16HDRI.so.10
-lib:lib/libMagickCore-7.Q16HDRI.so.10.0.0
+lib:lib/libMagickCore-7.Q16HDRI.so.10.0.1
 lnk:lib/libMagickWand-7.Q16HDRI.so
 lnk:lib/libMagickWand-7.Q16HDRI.so.10
-lib:lib/libMagickWand-7.Q16HDRI.so.10.0.0
+lib:lib/libMagickWand-7.Q16HDRI.so.10.0.1

cross/imagemagick/digests

@@ -1,3 +1,3 @@
-ImageMagick-7.1.0-52.tar.gz SHA1 9ac7a34a01481c9154b059474c1e12b8890ae065
-ImageMagick-7.1.0-52.tar.gz SHA256 bacd6d63f16482f269bf5cfe76d34b9a2b01ec737e9cb41fd2612d37f34698fc
-ImageMagick-7.1.0-52.tar.gz MD5 7e142f732735cafbcd77bc16408b8b4d
+ImageMagick-7.1.1-33.tar.gz SHA1 649d2f89635ad54adbc1fc2a24294c50b3a752a3
+ImageMagick-7.1.1-33.tar.gz SHA256 3fe527ce04ee5485dc6f7726eccd05c962add5c5d91843c5abf6c608e4f55330
+ImageMagick-7.1.1-33.tar.gz MD5 e36a8eaab88e1ff51d1e6c305170f5eb

cross/jpegoptim/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = jpegoptim
-PKG_VERS = 1.5.0
+PKG_VERS = 1.5.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tjko/jpegoptim/archive

cross/jpegoptim/digests

@@ -1,3 +1,3 @@
-jpegoptim-1.5.0.tar.gz SHA1 9fcabe606bed5b857f000eaf4d624572f93700fa
-jpegoptim-1.5.0.tar.gz SHA256 67b0feba73fd72f0bd383f25bf84149a73378d34c0c25bc0b9b25b0264d85824
-jpegoptim-1.5.0.tar.gz MD5 aed52aa1a9ee501b0fccec26ff95a285
+jpegoptim-1.5.5.tar.gz SHA1 120e99aec656c546a635e0a6e1c1eb8b1ddb0bb0
+jpegoptim-1.5.5.tar.gz SHA256 90a309d1c092de358bb411d702281ac3039b489d03adb0bc3c4ef04cf0067d38
+jpegoptim-1.5.5.tar.gz MD5 d756b8f407ac64f93a09f6155ba7959f

cross/libraw/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = LibRaw
-PKG_VERS = 0.20.2
+PKG_VERS = 0.21.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.libraw.org/data
@@ -23,10 +23,4 @@ CONFIGURE_ARGS += --enable-jasper
 CONFIGURE_ARGS += ac_cv_lib_jasper_jas_init=yes
 ADDITIONAL_CXXFLAGS = -O
 
-PRE_CONFIGURE_TARGET = libraw_pre_configure
-
 include ../../mk/spksrc.cross-cc.mk
-
-.PHONY: libraw_pre_configure
-libraw_pre_configure:
- $(RUN) aclocal

cross/libraw/PLIST

@@ -1,3 +1,3 @@
 lnk:lib/libraw_r.so
-lnk:lib/libraw_r.so.20
-lib:lib/libraw_r.so.20.0.0
+lnk:lib/libraw_r.so.23
+lib:lib/libraw_r.so.23.0.0

cross/libraw/digests

@@ -1,3 +1,3 @@
-LibRaw-0.20.2.tar.gz SHA1 8143597d820167fb4f3a51c920e142e6f1386d01
-LibRaw-0.20.2.tar.gz SHA256 dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6
-LibRaw-0.20.2.tar.gz MD5 2e5bedb59ea433e2d2ef6bbbe5253179
+LibRaw-0.21.2.tar.gz SHA1 02e700e85fa432be199c273f5893bd2f6d60b4e2
+LibRaw-0.21.2.tar.gz SHA256 fe7288013206854baf6e4417d0fb63ba4ed7227bf36fff021992671c2dd34b03
+LibRaw-0.21.2.tar.gz MD5 0533724bad17c0fde22e642e4594e45d

cross/pango/Makefile

@@ -7,17 +7,13 @@ PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/fontconfig cross/cairo cross/glib
-OPTIONAL_DEPENDS = cross/harfbuzz cross/harfbuzz_2
+OPTIONAL_DEPENDS = cross/harfbuzz
 
 include ../../mk/spksrc.archs.mk
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+ifneq ($(findstring $(ARCH),$(ARMv7L_ARCHS) $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 # REMARKS: we must build glib before harfbuzz to get harbuzz glib integration (hb-glib.h)
-ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
-DEPENDS += cross/harfbuzz_2
-else
 DEPENDS += cross/harfbuzz
 endif
-endif
 
 HOMEPAGE = https://pango.gnome.org/
 COMMENT = Pango is a library for layout and rendering of text, with an emphasis on internationalization.

spk/imagemagick/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = imagemagick
-SPK_VERS = 7.1.0
-SPK_REV = 10
+SPK_VERS = 7.1.1
+SPK_REV = 11
 SPK_ICON = src/imagemagick.png
 
 DEPENDS = cross/imagemagick
@@ -10,7 +10,7 @@ DEPENDS += cross/jpegoptim cross/pngcrush
 MAINTAINER = SynoCommunity
 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.
 DISPLAY_NAME = ImageMagick
-CHANGELOG = "1. Update ImageMagick to v7.1.0-52 and jpegoptim to v1.5.0.<br/>2. Add DejaVu fonts.<br/>3. Update OpenJPEG library to v2.5.0.<br/>4. Add libraries to support additional image formats: Raw, OpenEXR, SVG, Flashpix (fpx).<br/>5. Add pngcrush v1.8.13."
+CHANGELOG = "1. Update ImageMagick to v7.1.1-33 and jpegoptim to v1.5.5.<br/>2. Update libraries to current versions (fontconfig, freetype, giflib, libpng, libtiff, libwebp, openjpeg)."
 
 STARTABLE = no
 
@@ -27,17 +27,9 @@ SPK_COMMANDS += bin/pngcrush
 
 include ../../mk/spksrc.spk.mk
 
-SUPPORT_CPP11 = 1
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-SUPPORT_CPP11 = 0
-endif
-ifeq ($(call version_lt, $(TCVERSION), 6.0)$(call version_ge, $(TCVERSION), 3.0),11)
-SUPPORT_CPP11 = 0
-endif
-
 .PHONY: imagemagick_patch_rpath
 # some binaries and libraries contain the full installation path in RPATH (.../spk/imagemagick/...)
-# might be caused by incomplete implementation of install_correct_lib_files target in spksrc.install.mk
+# this might be caused by incomplete implementation of install_correct_lib_files target in spksrc.install.mk
 # or false paths in generated pkgconfig files
 imagemagick_patch_rpath:
  @$(MSG) "Patching binaries and libraries of $(SPK_NAME) (some have bad library rpath)."
@@ -59,7 +51,7 @@ imagemagick_extra_install: imagemagick_patch_rpath
  @install -m 644 src/type-dejavu.xml $(STAGING_DIR)/etc/ImageMagick-7/
  @install -m 644 src/type-windows.xml $(STAGING_DIR)/etc/ImageMagick-7/
  @install -m 644 src/type-urw-base35.xml $(STAGING_DIR)/etc/ImageMagick-7/
- @$(MSG) Adjust included libtool files
+ @$(MSG) Adjust included libtool files.
  @for la_file in $(wildcard $(STAGING_DIR)/lib/ImageMagick-7.1.0/modules-Q16HDRI/*/*.la) ; do \
  sed -i -e 's#$(INSTALL_DIR)##g' $${la_file} ; \
  done