From c4f8e8d8b2479463e2c7fe634e7f58c73117c8c0 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 2 Sep 2022 15:53:57 +0200
Subject: [PATCH 01/14] udpate cross/lcms2 to v2.13.1

- update lcms2
- enable code optimization
- disable static library to speedup the build
---
 cross/lcms2/Makefile | 11 ++++++-----
 cross/lcms2/PLIST    |  2 +-
 cross/lcms2/digests  |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cross/lcms2/Makefile b/cross/lcms2/Makefile
index cc070651fc1..466a1977f36 100644
--- a/cross/lcms2/Makefile
+++ b/cross/lcms2/Makefile
@@ -1,10 +1,9 @@
 PKG_NAME = lcms2
-PKG_VERS = 2.11
+PKG_VERS = 2.13.1
 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)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/mm2/Little-CMS/releases/download/lcms$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libtiff cross/libjpeg cross/zlib
 
@@ -13,5 +12,7 @@ COMMENT  = Little CMS is a free, open source, CMM engine. It provides fast trans
 LICENSE  = MIT
 
 GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
+ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/lcms2/PLIST b/cross/lcms2/PLIST
index b79bc0f1e06..87712cafe55 100644
--- a/cross/lcms2/PLIST
+++ b/cross/lcms2/PLIST
@@ -1,3 +1,3 @@
 lnk:lib/liblcms2.so
 lnk:lib/liblcms2.so.2
-lib:lib/liblcms2.so.2.0.10
+lib:lib/liblcms2.so.2.0.13
diff --git a/cross/lcms2/digests b/cross/lcms2/digests
index 6039f1d36fb..a5c6eec3f5e 100644
--- a/cross/lcms2/digests
+++ b/cross/lcms2/digests
@@ -1,3 +1,3 @@
-lcms2-2.11.tar.gz SHA1 f1e050f80b834057c6b11e6b58186927b909bca7
-lcms2-2.11.tar.gz SHA256 478c9c3938d7a91b1171de4616f8b04308a8676d73eadc19505b7ace41327f28
-lcms2-2.11.tar.gz MD5 46191f94ac970fa8c22dd63a732440d6
+lcms2-2.13.1.tar.gz SHA1 72d0a0b7fbaeca12eb0186ab5728eb0f26806b22
+lcms2-2.13.1.tar.gz SHA256 d473e796e7b27c5af01bd6d1552d42b45b43457e7182ce9903f38bb748203b88
+lcms2-2.13.1.tar.gz MD5 47a99e781b89c958a773e2012e81ae8c

From fd8431f3bf5fdaad680e06e0ce46766bee7a559a Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sat, 3 Sep 2022 20:04:18 +0200
Subject: [PATCH 02/14] add OpenEXR v2.5.8

---
 cross/openexr/Makefile | 28 ++++++++++++++++++++++++++++
 cross/openexr/PLIST    | 28 ++++++++++++++++++++++++++++
 cross/openexr/digests  |  3 +++
 3 files changed, 59 insertions(+)
 create mode 100644 cross/openexr/Makefile
 create mode 100644 cross/openexr/PLIST
 create mode 100644 cross/openexr/digests

diff --git a/cross/openexr/Makefile b/cross/openexr/Makefile
new file mode 100644
index 00000000000..e81e9e88af8
--- /dev/null
+++ b/cross/openexr/Makefile
@@ -0,0 +1,28 @@
+PKG_NAME = openexr
+PKG_VERS = 2.5.8
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/AcademySoftwareFoundation/openexr/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/zlib
+
+# Toolchains lacking c++11 compiler ar not supported  
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+
+HOMEPAGE = https://www.openexr.com/
+COMMENT  = OpenEXR provides the specification and reference implementation of the EXR file format, the professional-grade image storage format of the motion picture industry.
+LICENSE  = 3-Clause BSD
+
+CMAKE_USE_NINJA = 1  
+CMAKE_ARGS += -DBUILD_TESTING=OFF
+CMAKE_ARGS += -DOPENEXR_BUILD_UTILS=OFF
+
+include ../../mk/spksrc.common.mk
+ifeq ($(call version_lt, $(TCVERSION), 7.0),1)
+# default is c++14, supported by DSM >= 7 only
+CMAKE_ARGS += -DCMAKE_CXX_STANDARD=11
+endif
+
+include ../../mk/spksrc.cross-cmake.mk
diff --git a/cross/openexr/PLIST b/cross/openexr/PLIST
new file mode 100644
index 00000000000..4fe5b3024b0
--- /dev/null
+++ b/cross/openexr/PLIST
@@ -0,0 +1,28 @@
+lnk:lib/libHalf-2_5.so
+lnk:lib/libHalf-2_5.so.25
+lib:lib/libHalf-2_5.so.25.0.7
+lnk:lib/libHalf.so
+lnk:lib/libIex-2_5.so
+lnk:lib/libIex-2_5.so.25
+lib:lib/libIex-2_5.so.25.0.7
+lnk:lib/libIex.so
+lnk:lib/libIexMath-2_5.so
+lnk:lib/libIexMath-2_5.so.25
+lib:lib/libIexMath-2_5.so.25.0.7
+lnk:lib/libIexMath.so
+lnk:lib/libIlmImf-2_5.so
+lnk:lib/libIlmImf-2_5.so.26
+lib:lib/libIlmImf-2_5.so.26.0.0
+lnk:lib/libIlmImf.so
+lnk:lib/libIlmImfUtil-2_5.so
+lnk:lib/libIlmImfUtil-2_5.so.26
+lib:lib/libIlmImfUtil-2_5.so.26.0.0
+lnk:lib/libIlmImfUtil.so
+lnk:lib/libIlmThread-2_5.so
+lnk:lib/libIlmThread-2_5.so.25
+lib:lib/libIlmThread-2_5.so.25.0.7
+lnk:lib/libIlmThread.so
+lnk:lib/libImath-2_5.so
+lnk:lib/libImath-2_5.so.25
+lib:lib/libImath-2_5.so.25.0.7
+lnk:lib/libImath.so
diff --git a/cross/openexr/digests b/cross/openexr/digests
new file mode 100644
index 00000000000..f8ec1c5eb4c
--- /dev/null
+++ b/cross/openexr/digests
@@ -0,0 +1,3 @@
+openexr-2.5.8.tar.gz SHA1 6d44100fdcf0f4b4f2404f577f4df33f92d60257
+openexr-2.5.8.tar.gz SHA256 db261a7fcc046ec6634e4c5696a2fc2ce8b55f50aac6abe034308f54c8495f55
+openexr-2.5.8.tar.gz MD5 92d87a37660d054516a4a7b10d91dfe7

From f110f3cbb18be302a6fdf3222e931e126df66268 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 4 Sep 2022 02:33:52 +0200
Subject: [PATCH 03/14] add djvulibre

---
 cross/djvulibre/Makefile | 18 ++++++++++++++++++
 cross/djvulibre/PLIST    |  3 +++
 cross/djvulibre/digests  |  3 +++
 3 files changed, 24 insertions(+)
 create mode 100644 cross/djvulibre/Makefile
 create mode 100644 cross/djvulibre/PLIST
 create mode 100644 cross/djvulibre/digests

diff --git a/cross/djvulibre/Makefile b/cross/djvulibre/Makefile
new file mode 100644
index 00000000000..af8894109f8
--- /dev/null
+++ b/cross/djvulibre/Makefile
@@ -0,0 +1,18 @@
+PKG_NAME = djvulibre
+PKG_VERS = 3.5.28
+PKG_EXT = tar.gz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://sourceforge.net/projects/djvu/files/DjVuLibre/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/libjpeg cross/libtiff
+
+HOMEPAGE = http://djvu.sourceforge.net/
+COMMENT  = DjVu is a web-centric format for distributing documents and images.
+LICENSE  = GPL
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS  = --disable-desktopfiles
+CONFIGURE_ARGS += --disable-xmltools 
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/djvulibre/PLIST b/cross/djvulibre/PLIST
new file mode 100644
index 00000000000..d04890ea59f
--- /dev/null
+++ b/cross/djvulibre/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libdjvulibre.so
+lnk:lib/libdjvulibre.so.21
+lib:lib/libdjvulibre.so.21.7.0
diff --git a/cross/djvulibre/digests b/cross/djvulibre/digests
new file mode 100644
index 00000000000..3c27287cd6d
--- /dev/null
+++ b/cross/djvulibre/digests
@@ -0,0 +1,3 @@
+djvulibre-3.5.28.tar.gz SHA1 e74c23e5480535898a6549aec11e5cfa1228e1ea
+djvulibre-3.5.28.tar.gz SHA256 fcd009ea7654fde5a83600eb80757bd3a76998e47d13c66b54c8db849f8f2edc
+djvulibre-3.5.28.tar.gz MD5 6cb8caf53634edbc91cdcf0f9108c478

From cdb8344485645e98b9b12e2c783c1fdddf025c0c Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 5 Sep 2022 08:44:45 +0200
Subject: [PATCH 04/14] add libraqm

---
 cross/libraqm/Makefile                         | 18 ++++++++++++++++++
 cross/libraqm/PLIST                            |  3 +++
 cross/libraqm/digests                          |  3 +++
 .../patches/001-disable-build-of-tests.patch   | 13 +++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 cross/libraqm/Makefile
 create mode 100644 cross/libraqm/PLIST
 create mode 100644 cross/libraqm/digests
 create mode 100644 cross/libraqm/patches/001-disable-build-of-tests.patch

diff --git a/cross/libraqm/Makefile b/cross/libraqm/Makefile
new file mode 100644
index 00000000000..1b46b998bc9
--- /dev/null
+++ b/cross/libraqm/Makefile
@@ -0,0 +1,18 @@
+PKG_NAME = libraqm
+PKG_VERS = 0.7.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = raqm-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/HOST-Oman/libraqm/releases/download/v$(PKG_VERS)
+PKG_DIR = raqm-$(PKG_VERS)
+
+DEPENDS = cross/freetype cross/fribidi cross/harfbuzz
+
+HOMEPAGE = https://host-oman.github.io/libraqm/
+COMMENT  = Raqm is a small library that encapsulates the logic for complex text layout and provides a convenient API.
+LICENSE  = MIT
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libraqm/PLIST b/cross/libraqm/PLIST
new file mode 100644
index 00000000000..6c654e7a715
--- /dev/null
+++ b/cross/libraqm/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libraqm.so
+lnk:lib/libraqm.so.0
+lib:lib/libraqm.so.0.700.0
diff --git a/cross/libraqm/digests b/cross/libraqm/digests
new file mode 100644
index 00000000000..37faec929e3
--- /dev/null
+++ b/cross/libraqm/digests
@@ -0,0 +1,3 @@
+raqm-0.7.0.tar.gz SHA1 47ec51ce4567d4af828c90100f771f3de75f4ed9
+raqm-0.7.0.tar.gz SHA256 e28575ecdd4e8a1d277d9be8268bb663ce1e476aaf55eb0456787821ddf0f941
+raqm-0.7.0.tar.gz MD5 d75dbe365fabebd053a9aecfc3d9e09f
diff --git a/cross/libraqm/patches/001-disable-build-of-tests.patch b/cross/libraqm/patches/001-disable-build-of-tests.patch
new file mode 100644
index 00000000000..fad75febbf9
--- /dev/null
+++ b/cross/libraqm/patches/001-disable-build-of-tests.patch
@@ -0,0 +1,13 @@
+# Disable subdirs "tests" and "doc" to speedup the build.
+# 
+--- Makefile.in.orig	2019-05-27 18:51:18.000000000 +0000
++++ Makefile.in	2022-09-05 06:33:57.432965360 +0000
+@@ -389,7 +389,7 @@
+ top_srcdir = @top_srcdir@
+ NULL = 
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = src docs tests
++SUBDIRS = src
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = @PACKAGE@.pc
+ MAINTAINERCLEANFILES = \

From 3f4b8114053d1f0a73594e5ede2ff97e23da1957 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 5 Sep 2022 08:46:22 +0200
Subject: [PATCH 05/14] add librsvg

- add cross/librsvg
- add cross/libcroco
- add cross/gdk-pixbuff
---
 cross/gdk-pixbuf/Makefile                     | 23 +++++++++++++++++++
 cross/gdk-pixbuf/PLIST                        | 14 +++++++++++
 cross/gdk-pixbuf/digests                      |  3 +++
 cross/libcroco/Makefile                       | 20 ++++++++++++++++
 cross/libcroco/PLIST                          |  3 +++
 cross/libcroco/digests                        |  3 +++
 .../patches/001-disable-tests-build.patch     | 13 +++++++++++
 cross/librsvg/Makefile                        | 23 +++++++++++++++++++
 cross/librsvg/PLIST                           |  3 +++
 cross/librsvg/digests                         |  3 +++
 10 files changed, 108 insertions(+)
 create mode 100644 cross/gdk-pixbuf/Makefile
 create mode 100644 cross/gdk-pixbuf/PLIST
 create mode 100644 cross/gdk-pixbuf/digests
 create mode 100644 cross/libcroco/Makefile
 create mode 100644 cross/libcroco/PLIST
 create mode 100644 cross/libcroco/digests
 create mode 100644 cross/libcroco/patches/001-disable-tests-build.patch
 create mode 100644 cross/librsvg/Makefile
 create mode 100644 cross/librsvg/PLIST
 create mode 100644 cross/librsvg/digests

diff --git a/cross/gdk-pixbuf/Makefile b/cross/gdk-pixbuf/Makefile
new file mode 100644
index 00000000000..36cb7099809
--- /dev/null
+++ b/cross/gdk-pixbuf/Makefile
@@ -0,0 +1,23 @@
+PKG_NAME = gdk-pixbuf
+PKG_VERS = 2.42.9
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://download.gnome.org/sources/gdk-pixbuf/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/glib cross/libpng cross/libjpeg cross/libtiff
+
+HOMEPAGE = https://docs.gtk.org/gdk-pixbuf/
+COMMENT  = gdk-pixbuf is an image loading library which is used by GTK.
+LICENSE  =
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS  = -Dtests=false -Dinstalled_tests=false
+CONFIGURE_ARGS += -Dman=false
+CONFIGURE_ARGS += -Dgio_sniffing=false
+ADDITIONAL_CFLAGS = -O
+
+# let it find glib-compile-resources
+ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"
+
+include ../../mk/spksrc.cross-meson.mk
diff --git a/cross/gdk-pixbuf/PLIST b/cross/gdk-pixbuf/PLIST
new file mode 100644
index 00000000000..4fa771c61af
--- /dev/null
+++ b/cross/gdk-pixbuf/PLIST
@@ -0,0 +1,14 @@
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
+lib:lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
+lnk:lib/libgdk_pixbuf-2.0.so
+lnk:lib/libgdk_pixbuf-2.0.so.0
+lib:lib/libgdk_pixbuf-2.0.so.0.4200.9
diff --git a/cross/gdk-pixbuf/digests b/cross/gdk-pixbuf/digests
new file mode 100644
index 00000000000..5591505a1c6
--- /dev/null
+++ b/cross/gdk-pixbuf/digests
@@ -0,0 +1,3 @@
+gdk-pixbuf-2.42.9.tar.xz SHA1 67784d1bbad2affbea95707773b0faf6d65ecc9d
+gdk-pixbuf-2.42.9.tar.xz SHA256 28f7958e7bf29a32d4e963556d241d0a41a6786582ff6a5ad11665e0347fc962
+gdk-pixbuf-2.42.9.tar.xz MD5 051599a83f0ae30ee9daeecfdafc765e
diff --git a/cross/libcroco/Makefile b/cross/libcroco/Makefile
new file mode 100644
index 00000000000..841f929cb80
--- /dev/null
+++ b/cross/libcroco/Makefile
@@ -0,0 +1,20 @@
+PKG_NAME = libcroco
+PKG_VERS = 0.6.13
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://download.gnome.org/sources/libcroco/$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/glib cross/libxml2
+
+# REMARKS: Archived project! Repository and other project resources are read-only.
+HOMEPAGE = https://gitlab.gnome.org/Archive/libcroco
+COMMENT  = Cascading Style Sheet (CSS) parsing and manipulation toolkit.
+LICENSE  = LGPL 2.1
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
+ADDITIONAL_CFLAGS = -O
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/libcroco/PLIST b/cross/libcroco/PLIST
new file mode 100644
index 00000000000..f49c02e7bca
--- /dev/null
+++ b/cross/libcroco/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/libcroco-0.6.so
+lnk:lib/libcroco-0.6.so.3
+lib:lib/libcroco-0.6.so.3.0.1
diff --git a/cross/libcroco/digests b/cross/libcroco/digests
new file mode 100644
index 00000000000..b851345c75b
--- /dev/null
+++ b/cross/libcroco/digests
@@ -0,0 +1,3 @@
+libcroco-0.6.13.tar.xz SHA1 cd54520c6c3c42e53685dc706e28721742aa3fff
+libcroco-0.6.13.tar.xz SHA256 767ec234ae7aa684695b3a735548224888132e063f92db585759b422570621d4
+libcroco-0.6.13.tar.xz MD5 c80c5a8385011a0260dce6bd0da93dce
diff --git a/cross/libcroco/patches/001-disable-tests-build.patch b/cross/libcroco/patches/001-disable-tests-build.patch
new file mode 100644
index 00000000000..f1eb9626e79
--- /dev/null
+++ b/cross/libcroco/patches/001-disable-tests-build.patch
@@ -0,0 +1,13 @@
+# remove tests folder from SUBDIRS to disable build of test code.
+# 
+--- Makefile.in.orig	2019-04-06 17:28:07.000000000 +0000
++++ Makefile.in	2022-09-03 21:47:34.788971931 +0000
+@@ -383,7 +383,7 @@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-SUBDIRS = src csslint docs tests win32
++SUBDIRS = src csslint docs win32
+ PKG_CONFIG_FILE_UNINSTALLED = libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@-uninstalled.pc
+ PKG_CONFIG_FILE = libcroco-@LIBCROCO_MAJOR_VERSION@.@LIBCROCO_MINOR_VERSION@.pc
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/cross/librsvg/Makefile b/cross/librsvg/Makefile
new file mode 100644
index 00000000000..394f42d7fe2
--- /dev/null
+++ b/cross/librsvg/Makefile
@@ -0,0 +1,23 @@
+PKG_NAME = librsvg
+PKG_VERS = 2.40.21
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://download.gnome.org/sources/librsvg/$(word 1, $(subst ., ,$(PKG_VERS))).$(word 2, $(subst ., ,$(PKG_VERS)))
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/pango cross/libcroco cross/libxml2 cross/gdk-pixbuf
+
+HOMEPAGE = https://wiki.gnome.org/Projects/LibRsvg
+COMMENT  = A library to render SVG images to Cairo surfaces.
+LICENSE  = LGPLv2.1
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS  = --disable-static
+CONFIGURE_ARGS += --disable-pixbuf-loader
+CONFIGURE_ARGS += --disable-introspection
+ADDITIONAL_CFLAGS = -O
+
+# let it find gdk-pixbuf-query-loaders
+ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"
+
+include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/librsvg/PLIST b/cross/librsvg/PLIST
new file mode 100644
index 00000000000..2e7f5c7f7c6
--- /dev/null
+++ b/cross/librsvg/PLIST
@@ -0,0 +1,3 @@
+lnk:lib/librsvg-2.so
+lnk:lib/librsvg-2.so.2
+lib:lib/librsvg-2.so.2.40.21
diff --git a/cross/librsvg/digests b/cross/librsvg/digests
new file mode 100644
index 00000000000..4f985504acd
--- /dev/null
+++ b/cross/librsvg/digests
@@ -0,0 +1,3 @@
+librsvg-2.40.21.tar.xz SHA1 063d1ca696633d43c462e1ca3e8be3145559d954
+librsvg-2.40.21.tar.xz SHA256 f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba
+librsvg-2.40.21.tar.xz MD5 66df60ef1909d6e24df8244042422a98

From 95c3553788977dbc82fdccc3c269a346b02baea9 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 5 Sep 2022 22:51:43 +0200
Subject: [PATCH 06/14] imagemagick: update and support for additional image
 formats and fonts

- update imagemagick to v7.1.0-47
- add DejaVu fonts
- update OpenJPEG
- add LibRaw
- add OpenEXR
- add librsvg
- optimizations
---
 cross/dejavu/Makefile               |  25 ++++
 cross/dejavu/PLIST                  |   1 +
 cross/dejavu/digests                |   3 +
 cross/imagemagick/Makefile          |  47 ++++++--
 cross/imagemagick/digests           |   6 +-
 cross/libpciaccess/Makefile         |   1 +
 cross/shine/Makefile                |  12 +-
 cross/shine/PLIST                   |   4 +-
 spk/imagemagick/Makefile            |   7 +-
 spk/imagemagick/src/type-dejavu.xml | 180 ++++++++++++++++++++++++++++
 10 files changed, 260 insertions(+), 26 deletions(-)
 create mode 100644 cross/dejavu/Makefile
 create mode 100644 cross/dejavu/PLIST
 create mode 100644 cross/dejavu/digests
 create mode 100644 spk/imagemagick/src/type-dejavu.xml

diff --git a/cross/dejavu/Makefile b/cross/dejavu/Makefile
new file mode 100644
index 00000000000..f8e6ccc7d37
--- /dev/null
+++ b/cross/dejavu/Makefile
@@ -0,0 +1,25 @@
+PKG_NAME = dejavu
+PKG_VERS = 2.37
+PKG_FULLNAME = $(PKG_NAME)-fonts-ttf-$(PKG_VERS)
+PKG_EXT = tar.bz2
+PKG_DIST_NAME = $(PKG_FULLNAME).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_$(subst .,_,$(PKG_VERS))
+
+DEPENDS =
+
+# arch independent
+override ARCH=
+
+HOMEPAGE = https://dejavu-fonts.github.io/
+COMMENT  = The DejaVu fonts are a font family based on the Vera Fonts. Its purpose is to provide a wider range of characters while maintaining the original look and feel through the process of collaborative development, under a Free license.
+LICENSE  = https://dejavu-fonts.github.io/License.html
+
+INSTALL_TARGET = dejavu_install
+
+include ../../mk/spksrc.install-resources.mk
+
+.PHONY: dejavu_install
+dejavu_install:
+	@$(RUN) install -m 755 -d $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/fonts -d $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/fontconfig
+	@$(RUN) cp $(PKG_FULLNAME)/ttf/* $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/fonts
+	@$(RUN) cp $(PKG_FULLNAME)/fontconfig/* $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME)/fontconfig
diff --git a/cross/dejavu/PLIST b/cross/dejavu/PLIST
new file mode 100644
index 00000000000..ce6a30f86a0
--- /dev/null
+++ b/cross/dejavu/PLIST
@@ -0,0 +1 @@
+rsc:share/dejavu/
diff --git a/cross/dejavu/digests b/cross/dejavu/digests
new file mode 100644
index 00000000000..69bc3156e3f
--- /dev/null
+++ b/cross/dejavu/digests
@@ -0,0 +1,3 @@
+dejavu-fonts-ttf-2.37.tar.bz2 SHA1 7fa15e7b9676fc3915338c41e76ad454c344fff5
+dejavu-fonts-ttf-2.37.tar.bz2 SHA256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7
+dejavu-fonts-ttf-2.37.tar.bz2 MD5 d0efec10b9f110a32e9b8f796e21782c
diff --git a/cross/imagemagick/Makefile b/cross/imagemagick/Makefile
index e859022454d..3a85ffa9da4 100644
--- a/cross/imagemagick/Makefile
+++ b/cross/imagemagick/Makefile
@@ -1,26 +1,47 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 7.1.0-35
+PKG_VERS = 7.1.0-47
 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
+OPTIONAL_DEPENDS = cross/libheif cross/libraw cross/openexr cross/libraqm  cross/librsvg
 
+# cross/openjpeg fails to build for DSM 7 when later in the dependency list...
+DEPENDS  = cross/openjpeg
 DEPENDS += cross/jemalloc
-DEPENDS += cross/bzip2 cross/xz cross/libxml2
-DEPENDS += cross/freetype cross/fontconfig
-DEPENDS += cross/libtool cross/urw-base35-fonts
-DEPENDS += cross/libpng cross/libjpeg cross/openjpeg
+DEPENDS += cross/bzip2 
+DEPENDS += cross/xz
+DEPENDS += cross/zstd
+DEPENDS += cross/libxml2
+DEPENDS += cross/freetype
+DEPENDS += cross/fontconfig
+DEPENDS += cross/urw-base35-fonts
+DEPENDS += cross/dejavu
+DEPENDS += cross/libjpeg
+DEPENDS += cross/jbigkit
+DEPENDS += cross/libpng
 DEPENDS += cross/libtiff
 DEPENDS += cross/libwmf
 DEPENDS += cross/libwebp
-DEPENDS += cross/zstd
+DEPENDS += cross/djvulibre
+DEPENDS += cross/libtool
 
-include ../../mk/spksrc.archs.mk
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+include ../../mk/spksrc.common.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
+ifeq ($(SUPPORT_CPP11),1)
 DEPENDS += cross/libheif
+DEPENDS += cross/libraw
+DEPENDS += cross/openexr
+DEPENDS += cross/libraqm
+DEPENDS += cross/librsvg
 endif
 
 HOMEPAGE = https://www.imagemagick.org/
@@ -31,11 +52,13 @@ GNU_CONFIGURE = 1
 
 CONFIGURE_ARGS  = --disable-installed --disable-docs --disable-static
 CONFIGURE_ARGS += --without-perl --without-x --without-fpx
+CONFIGURE_ARGS += --with-rsvg
 # 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-urw-base35-font-dir==$(INSTALL_PREFIX)/share/fonts
+CONFIGURE_ARGS += --with-dejavu-font-dir=$(INSTALL_PREFIX)/share/dejavu/fonts
+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))
@@ -44,6 +67,8 @@ ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += CFLAGS=-lrt
 endif
 
-ADDITIONAL_CFLAGS = -O
+ADDITIONAL_CFLAGS  = -O
+# librsvg-2.0.pc does not define the correct include dir.
+ADDITIONAL_CFLAGS += -I$(STAGING_INSTALL_PREFIX)/include/librsvg-2.0
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/imagemagick/digests b/cross/imagemagick/digests
index 3a3e80f6e8e..95ed56af353 100644
--- a/cross/imagemagick/digests
+++ b/cross/imagemagick/digests
@@ -1,3 +1,3 @@
-ImageMagick-7.1.0-35.tar.gz SHA1 1e8bd44bbc0efcd21047ad30ebdfe1b1c88f4b68
-ImageMagick-7.1.0-35.tar.gz SHA256 b368a792a3f104c819b496b495348e53ae28b8d15b71c18ced886083822ff30c
-ImageMagick-7.1.0-35.tar.gz MD5 522c4f333386f9ea093a278216be257f
+ImageMagick-7.1.0-47.tar.gz SHA1 dc083c6c46bff301307fb8cca3dcd0f8cda4d67e
+ImageMagick-7.1.0-47.tar.gz SHA256 ad489af583bdfc0b5edd6c2106c955bf3af68fe838f6bd32c0ee8505ec6891ff
+ImageMagick-7.1.0-47.tar.gz MD5 20e0613dc716a5f5837ca22cf70c42b4
diff --git a/cross/libpciaccess/Makefile b/cross/libpciaccess/Makefile
index 5f3d9227049..a5f003fd52d 100644
--- a/cross/libpciaccess/Makefile
+++ b/cross/libpciaccess/Makefile
@@ -12,6 +12,7 @@ COMMENT  = Generic PCI access library.
 LICENSE  = https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/COPYING
 
 GNU_CONFIGURE = 1
+CONFIGURE_ARGS = --disable-static
 ADDITIONAL_CFLAGS = -O
 
 include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/shine/Makefile b/cross/shine/Makefile
index a0ea5a1aa3e..283de986277 100644
--- a/cross/shine/Makefile
+++ b/cross/shine/Makefile
@@ -1,20 +1,19 @@
 PKG_NAME = shine
 PKG_VERS = 3.1.1
 PKG_EXT = tar.gz
-PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/toots/shine/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = 
+DEPENDS =
 
 HOMEPAGE = https://github.com/toots/shine
-COMMENT  = Super fast fixed-point MP3 encoder
+COMMENT  = Super fast fixed-point MP3 encoder.
 LICENSE  = GPLv2
 
 PRE_CONFIGURE_TARGET = shine_pre_configure
-CONFIGURE_ARGS = --includedir=$(INSTALL_DIR)/$(INSTALL_PREFIX)/include
-CONFIGURE_ARGS += --enable-shared
+CONFIGURE_ARGS  = --includedir=$(INSTALL_DIR)/$(INSTALL_PREFIX)/include
 CONFIGURE_ARGS += --disable-static
 
 GNU_CONFIGURE = 1
@@ -22,6 +21,5 @@ GNU_CONFIGURE = 1
 include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: shine_pre_configure
-
 shine_pre_configure: 
-	$(RUN) ./bootstrap
+	@$(RUN) ./bootstrap
diff --git a/cross/shine/PLIST b/cross/shine/PLIST
index 078a7ee5ace..b9873dea3b1 100644
--- a/cross/shine/PLIST
+++ b/cross/shine/PLIST
@@ -1,4 +1,4 @@
 bin:bin/shineenc
-lib:lib/libshine.so.3.0.1
-lnk:lib/libshine.so.3
 lnk:lib/libshine.so
+lnk:lib/libshine.so.3
+lib:lib/libshine.so.3.0.1
diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile
index 610e191802e..d2fe8fe59e9 100644
--- a/spk/imagemagick/Makefile
+++ b/spk/imagemagick/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = imagemagick
 SPK_VERS = 7.1.0
-SPK_REV = 8
+SPK_REV = 9
 SPK_ICON = src/imagemagick.png
 
 DEPENDS = cross/imagemagick cross/jpegoptim
@@ -8,7 +8,7 @@ DEPENDS = cross/imagemagick cross/jpegoptim
 MAINTAINER = SynoCommunity
 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 = "1. Update ImageMagick to v7.1.0-35.<br/>2. Update jpegoptim to v1.4.7."
+CHANGELOG = "1. Update ImageMagick to v7.1.0-47.<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."
 
 STARTABLE = no
 
@@ -26,7 +26,8 @@ include ../../mk/spksrc.spk.mk
 
 .PHONY: imagemagick_extra_install
 imagemagick_extra_install:
-	@$(MSG) Install type files for included fonts
+	@$(MSG) Install type files for included fonts.
+	@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
diff --git a/spk/imagemagick/src/type-dejavu.xml b/spk/imagemagick/src/type-dejavu.xml
new file mode 100644
index 00000000000..1deb2d1eb60
--- /dev/null
+++ b/spk/imagemagick/src/type-dejavu.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<typemap>
+
+  <type
+     format="ttf"
+     name="DejaVuSansMonoBOb"
+     fullname="DejaVu Sans Mono Bold Oblique"
+     family="DejaVu Sans Mono"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansMono-BoldOblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansMonoB"
+     fullname="DejaVu Sans Mono Bold"
+     family="DejaVu Sans Mono"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansMono-Bold.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansB"
+     fullname="DejaVu Sans Bold"
+     family="DejaVu Sans"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSans-Bold.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansCOb"
+     fullname="DejaVu Sans Condensed Oblique"
+     family="DejaVu Sans Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansCondensed-Oblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuMathTeXGyre"
+     fullname="DejaVuMathTeXGyre-Regular"
+     family="DejaVu Math TeX Gyre"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuMathTeXGyre.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifI"
+     fullname="DejaVu Serif Italic"
+     family="DejaVu Serif"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerif-Italic.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansC"
+     fullname="DejaVu Sans Condensed"
+     family="DejaVu Sans Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansCondensed.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSans"
+     fullname="DejaVu Sans"
+     family="DejaVu Sans"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSans.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifCB"
+     fullname="DejaVu Serif Condensed Bold"
+     family="DejaVu Serif Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerifCondensed-Bold.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifB"
+     fullname="DejaVu Serif Bold"
+     family="DejaVu Serif"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerif-Bold.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifCI"
+     fullname="DejaVu Serif Condensed Italic"
+     family="DejaVu Serif Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerifCondensed-Italic.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerif"
+     fullname="DejaVu Serif"
+     family="DejaVu Serif"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerif.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifC"
+     fullname="DejaVu Serif Condensed"
+     family="DejaVu Serif Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerifCondensed.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansOb"
+     fullname="DejaVu Sans Oblique"
+     family="DejaVu Sans"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSans-Oblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansBOb"
+     fullname="DejaVu Sans Bold Oblique"
+     family="DejaVu Sans"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSans-BoldOblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansMonoOb"
+     fullname="DejaVu Sans Mono Oblique"
+     family="DejaVu Sans Mono"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansMono-Oblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansMono"
+     fullname="DejaVu Sans Mono"
+     family="DejaVu Sans Mono"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansMono.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansCBOb"
+     fullname="DejaVu Sans Condensed Bold Oblique"
+     family="DejaVu Sans Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansCondensed-BoldOblique.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansExtraLight"
+     fullname="DejaVu Sans ExtraLight"
+     family="DejaVu Sans Light"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSans-ExtraLight.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifCBI"
+     fullname="DejaVu Serif Condensed Bold Italic"
+     family="DejaVu Serif Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerifCondensed-BoldItalic.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSerifBI"
+     fullname="DejaVu Serif Bold Italic"
+     family="DejaVu Serif"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSerif-BoldItalic.ttf"
+     />
+
+  <type
+     format="ttf"
+     name="DejaVuSansCB"
+     fullname="DejaVu Sans Condensed Bold"
+     family="DejaVu Sans Condensed"
+     glyphs="/var/packages/imagemagick/target/share/dejavu/fonts/DejaVuSansCondensed-Bold.ttf"
+     />
+
+</typemap>

From 9f234f3578b1460193a1884acb291aed37c12e92 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 9 Sep 2022 08:26:52 +0200
Subject: [PATCH 07/14] declare sickchill as broken

- sickchill needs update as 2021.* sources are gone
---
 spk/sickchill/BROKEN | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 spk/sickchill/BROKEN

diff --git a/spk/sickchill/BROKEN b/spk/sickchill/BROKEN
new file mode 100644
index 00000000000..d6e7b8ab37a
--- /dev/null
+++ b/spk/sickchill/BROKEN
@@ -0,0 +1,3 @@
+source of 2021.11.10 is not available for download anymore.
+all 2021.* sources are gone.
+needs update to 2022.*

From 4dcdf4e27c5fe3554b12cb80f31c429b9f88385e Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Wed, 16 Nov 2022 05:24:30 +0100
Subject: [PATCH 08/14] fixes after rebase

- patch library runpath in some bin and lib files
---
 spk/imagemagick/Makefile | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile
index d2fe8fe59e9..c76beca5150 100644
--- a/spk/imagemagick/Makefile
+++ b/spk/imagemagick/Makefile
@@ -34,3 +34,44 @@ imagemagick_extra_install:
 	@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
+
+	@$(MSG) "Set library runpath in lib and bin files with bad library rpath."
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/cwebp
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/dwebp
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-cache
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-cat
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-conflist
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-list
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-match
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-pattern
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-query
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-scan
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-validate
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/magick
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2eps
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2fig
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2gd
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2svg
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/xmlcatalog
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/xmllint
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libMagickCore-7.Q16HDRI.so.10.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libMagickWand-7.Q16HDRI.so.10.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-gobject.so.2.11600.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-script-interpreter.so.2.11600.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo.so.2.11600.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcroco-0.6.so.3.0.1
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libdjvulibre.so.21.7.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfontconfig.so.1.12.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfreetype.so.6.18.3
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libheif.so.1.12.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libjasper.so.6.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libpangocairo-1.0.so.0.3800.1
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libpangoft2-1.0.so.0.3800.1
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libraqm.so.0.700.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libraw_r.so.20.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/librsvg-2.so.2.40.21
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libwmf-0.2.so.7.1.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12

From fe9c3fb6c893b084edb4cb8e45690e009c820ebc Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 18 Nov 2022 15:35:53 +0100
Subject: [PATCH 09/14] jpegoptim: update to v1.5.0

---
 cross/jpegoptim/Makefile | 9 +++++----
 cross/jpegoptim/digests  | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cross/jpegoptim/Makefile b/cross/jpegoptim/Makefile
index 983c2faeb2f..d9cd571fae2 100644
--- a/cross/jpegoptim/Makefile
+++ b/cross/jpegoptim/Makefile
@@ -1,15 +1,16 @@
 PKG_NAME = jpegoptim
-PKG_VERS = 1.4.7
+PKG_VERS = 1.5.0
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tjko/jpegoptim/archive
-PKG_DIR = $(PKG_NAME)-$(PKG_NAME)-v$(PKG_VERS)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/libjpeg
 
 HOMEPAGE = https://github.com/tjko/jpegoptim
 COMMENT = Utility to optimize/compress JPEG files.
-LICENSE = GPLv2
+LICENSE = GPLv3
 
 GNU_CONFIGURE = 1
 ADDITIONAL_CFLAGS = -O
diff --git a/cross/jpegoptim/digests b/cross/jpegoptim/digests
index 77dddbd2ca6..1e805df7119 100644
--- a/cross/jpegoptim/digests
+++ b/cross/jpegoptim/digests
@@ -1,3 +1,3 @@
-jpegoptim-v1.4.7.tar.gz SHA1 9af6419a4ff5fd44847e392d35665856916ec3e8
-jpegoptim-v1.4.7.tar.gz SHA256 d672fde26a1a3c3a0db37cf7922c3a3f44d051e36b63a5a914add83954ba1e86
-jpegoptim-v1.4.7.tar.gz MD5 104cc2a368fa07c29190e8027bcb1ef5
+jpegoptim-1.5.0.tar.gz SHA1 9fcabe606bed5b857f000eaf4d624572f93700fa
+jpegoptim-1.5.0.tar.gz SHA256 67b0feba73fd72f0bd383f25bf84149a73378d34c0c25bc0b9b25b0264d85824
+jpegoptim-1.5.0.tar.gz MD5 aed52aa1a9ee501b0fccec26ff95a285

From d0c3ca6e65e53782be345cfdc923216428dbc70d Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 18 Nov 2022 15:36:55 +0100
Subject: [PATCH 10/14] imagemagick: update to v7.1.0-52

---
 cross/imagemagick/Makefile |  2 +-
 cross/imagemagick/digests  |  6 +++---
 spk/imagemagick/Makefile   | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cross/imagemagick/Makefile b/cross/imagemagick/Makefile
index 3a85ffa9da4..86255493257 100644
--- a/cross/imagemagick/Makefile
+++ b/cross/imagemagick/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = ImageMagick
-PKG_VERS = 7.1.0-47
+PKG_VERS = 7.1.0-52
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/ImageMagick/ImageMagick/archive
diff --git a/cross/imagemagick/digests b/cross/imagemagick/digests
index 95ed56af353..4ad88d0bb2d 100644
--- a/cross/imagemagick/digests
+++ b/cross/imagemagick/digests
@@ -1,3 +1,3 @@
-ImageMagick-7.1.0-47.tar.gz SHA1 dc083c6c46bff301307fb8cca3dcd0f8cda4d67e
-ImageMagick-7.1.0-47.tar.gz SHA256 ad489af583bdfc0b5edd6c2106c955bf3af68fe838f6bd32c0ee8505ec6891ff
-ImageMagick-7.1.0-47.tar.gz MD5 20e0613dc716a5f5837ca22cf70c42b4
+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
diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile
index c76beca5150..5df371a033c 100644
--- a/spk/imagemagick/Makefile
+++ b/spk/imagemagick/Makefile
@@ -8,7 +8,7 @@ DEPENDS = cross/imagemagick cross/jpegoptim
 MAINTAINER = SynoCommunity
 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 = "1. Update ImageMagick to v7.1.0-47.<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."
+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."
 
 STARTABLE = no
 
@@ -34,7 +34,6 @@ imagemagick_extra_install:
 	@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
-
 	@$(MSG) "Set library runpath in lib and bin files with bad library rpath."
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/cwebp
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/dwebp
@@ -48,24 +47,27 @@ imagemagick_extra_install:
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-scan
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/fc-validate
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/magick
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2eps
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2fig
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2gd
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/wmf2svg
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/xmlcatalog
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/xmllint
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libMagickCore-7.Q16HDRI.so.10.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libMagickWand-7.Q16HDRI.so.10.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libdjvulibre.so.21.7.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfontconfig.so.1.12.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfreetype.so.6.18.3
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libwmf-0.2.so.7.1.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-gobject.so.2.11600.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-script-interpreter.so.2.11600.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo.so.2.11600.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcroco-0.6.so.3.0.1
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libdjvulibre.so.21.7.0
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfontconfig.so.1.12.0
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libfreetype.so.6.18.3
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libheif.so.1.12.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libjasper.so.6.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libpangocairo-1.0.so.0.3800.1
@@ -73,5 +75,4 @@ imagemagick_extra_install:
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libraqm.so.0.700.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libraw_r.so.20.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/librsvg-2.so.2.40.21
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libwmf-0.2.so.7.1.0
-	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12
+endif

From a651f3742ca11786129f1fca022d5978de3ef9f0 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sat, 19 Nov 2022 15:49:10 +0100
Subject: [PATCH 11/14] imagemagick fixes

- fix rsvg integration (magick depends on bin/rsvg-convert)
- zlib.pc fix fixes OpenEXR integration
---
 cross/librsvg/PLIST      | 1 +
 spk/imagemagick/Makefile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cross/librsvg/PLIST b/cross/librsvg/PLIST
index 2e7f5c7f7c6..90351638758 100644
--- a/cross/librsvg/PLIST
+++ b/cross/librsvg/PLIST
@@ -1,3 +1,4 @@
+bin:bin/rsvg-convert
 lnk:lib/librsvg-2.so
 lnk:lib/librsvg-2.so.2
 lib:lib/librsvg-2.so.2.40.21
diff --git a/spk/imagemagick/Makefile b/spk/imagemagick/Makefile
index 5df371a033c..56c0029e318 100644
--- a/spk/imagemagick/Makefile
+++ b/spk/imagemagick/Makefile
@@ -62,6 +62,7 @@ imagemagick_extra_install:
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libxml2.so.2.9.12
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/pango-view
+	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/bin/rsvg-convert
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImf-2_5.so.26.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libIlmImfUtil-2_5.so.26.0.0
 	@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/lib/libcairo-gobject.so.2.11600.0

From 68adaa0af0015c6ae2c09fd70fb2ca3d7c775df2 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Sun, 20 Nov 2022 21:50:23 +0100
Subject: [PATCH 12/14] remove workarounds

---
 cross/imagemagick/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cross/imagemagick/Makefile b/cross/imagemagick/Makefile
index 86255493257..e25b2b7d7fd 100644
--- a/cross/imagemagick/Makefile
+++ b/cross/imagemagick/Makefile
@@ -8,9 +8,7 @@ PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 OPTIONAL_DEPENDS = cross/libheif cross/libraw cross/openexr cross/libraqm  cross/librsvg
 
-# cross/openjpeg fails to build for DSM 7 when later in the dependency list...
-DEPENDS  = cross/openjpeg
-DEPENDS += cross/jemalloc
+DEPENDS  = cross/jemalloc
 DEPENDS += cross/bzip2 
 DEPENDS += cross/xz
 DEPENDS += cross/zstd
@@ -19,6 +17,7 @@ DEPENDS += cross/freetype
 DEPENDS += cross/fontconfig
 DEPENDS += cross/urw-base35-fonts
 DEPENDS += cross/dejavu
+DEPENDS += cross/openjpeg
 DEPENDS += cross/libjpeg
 DEPENDS += cross/jbigkit
 DEPENDS += cross/libpng
@@ -68,7 +67,5 @@ CONFIGURE_ARGS += CFLAGS=-lrt
 endif
 
 ADDITIONAL_CFLAGS  = -O
-# librsvg-2.0.pc does not define the correct include dir.
-ADDITIONAL_CFLAGS += -I$(STAGING_INSTALL_PREFIX)/include/librsvg-2.0
 
 include ../../mk/spksrc.cross-cc.mk

From 456a0f4ee381f96c53b3ff9967398af7b53ab41f Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 21 Nov 2022 07:10:09 +0100
Subject: [PATCH 13/14] disable use of cross/harfbuzz for ARMv7L

---
 cross/pango/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cross/pango/Makefile b/cross/pango/Makefile
index 82ad98d1abf..cbb3e639813 100644
--- a/cross/pango/Makefile
+++ b/cross/pango/Makefile
@@ -10,7 +10,7 @@ DEPENDS = cross/fontconfig cross/cairo cross/glib
 OPTIONAL_DEPENDS = cross/harfbuzz
 
 include ../../mk/spksrc.archs.mk
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 # REMARKS: we must build glib before harfbuzz to get harbuzz glib integration (hb-glib.h)
 DEPENDS += cross/harfbuzz
 endif

From 461113cd6267e2c7fbe8bf4854684f20379b3a1e Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Mon, 21 Nov 2022 21:16:39 +0100
Subject: [PATCH 14/14] add harfbuzz_3 for ARMv7

- add harbuzz v3.0.0 for ARMv7_ARCHS
---
 cross/harfbuzz/Makefile   |  3 ++-
 cross/harfbuzz_3/Makefile | 30 ++++++++++++++++++++++++++++++
 cross/harfbuzz_3/PLIST    |  9 +++++++++
 cross/harfbuzz_3/digests  |  3 +++
 cross/libraqm/Makefile    | 13 ++++++++++++-
 cross/pango/Makefile      |  8 ++++++--
 6 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 cross/harfbuzz_3/Makefile
 create mode 100644 cross/harfbuzz_3/PLIST
 create mode 100644 cross/harfbuzz_3/digests

diff --git a/cross/harfbuzz/Makefile b/cross/harfbuzz/Makefile
index 7cee0295147..5985dc89942 100644
--- a/cross/harfbuzz/Makefile
+++ b/cross/harfbuzz/Makefile
@@ -18,8 +18,9 @@ LICENSE  = Old MIT
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS = -Dtests=disabled
 
+include ../../mk/spksrc.common.mk
 ifeq ($(call version_lt, $(TCVERSION), 7),1)
-ADDITIONAL_CFLAGS  = -std=c11
+ADDITIONAL_CFLAGS = -std=c11
 endif
 
 # let it find glib-mkenums
diff --git a/cross/harfbuzz_3/Makefile b/cross/harfbuzz_3/Makefile
new file mode 100644
index 00000000000..cccbd30eb1b
--- /dev/null
+++ b/cross/harfbuzz_3/Makefile
@@ -0,0 +1,30 @@
+PKG_NAME = harfbuzz
+# latest version that can be built with ARMv7 toolchain
+PKG_VERS = 3.0.0
+PKG_EXT = tar.xz
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+DEPENDS = cross/freetype cross/glib cross/cairo cross/fontconfig
+
+# Toolchains lacking c++11 compiler ar not supported
+# this is the latests version with support for ARMv7L
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+
+HOMEPAGE = https://harfbuzz.github.io/
+COMMENT  = HarfBuzz is a text shaping library. Using the HarfBuzz library allows programs to convert a sequence of Unicode input into properly formatted and positioned glyph output—for any writing system and language.
+LICENSE  = Old MIT
+
+GNU_CONFIGURE = 1
+CONFIGURE_ARGS = -Dtests=disabled
+
+include ../../mk/spksrc.common.mk
+ifeq ($(call version_lt, $(TCVERSION), 7),1)
+ADDITIONAL_CFLAGS  = -std=c11
+endif
+
+# let it find glib-mkenums
+ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"
+
+include ../../mk/spksrc.cross-meson.mk
diff --git a/cross/harfbuzz_3/PLIST b/cross/harfbuzz_3/PLIST
new file mode 100644
index 00000000000..c40652b8b98
--- /dev/null
+++ b/cross/harfbuzz_3/PLIST
@@ -0,0 +1,9 @@
+lnk:lib/libharfbuzz-gobject.so
+lnk:lib/libharfbuzz-gobject.so.0
+lib:lib/libharfbuzz-gobject.so.0.30000.0
+lnk:lib/libharfbuzz-subset.so
+lnk:lib/libharfbuzz-subset.so.0
+lib:lib/libharfbuzz-subset.so.0.30000.0
+lnk:lib/libharfbuzz.so
+lnk:lib/libharfbuzz.so.0
+lib:lib/libharfbuzz.so.0.30000.0
diff --git a/cross/harfbuzz_3/digests b/cross/harfbuzz_3/digests
new file mode 100644
index 00000000000..911cb04cbe4
--- /dev/null
+++ b/cross/harfbuzz_3/digests
@@ -0,0 +1,3 @@
+harfbuzz-3.0.0.tar.xz SHA1 be0c3cbaa73854929cee001e9142e1e7bea35165
+harfbuzz-3.0.0.tar.xz SHA256 036b0ee118451539783ec7864148bb4106be42a2eb964df4e83e6703ec46f3d9
+harfbuzz-3.0.0.tar.xz MD5 ae9bf986e12840ebe4e19c8106fd16bf
diff --git a/cross/libraqm/Makefile b/cross/libraqm/Makefile
index 1b46b998bc9..5536714b03a 100644
--- a/cross/libraqm/Makefile
+++ b/cross/libraqm/Makefile
@@ -5,7 +5,18 @@ PKG_DIST_NAME = raqm-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/HOST-Oman/libraqm/releases/download/v$(PKG_VERS)
 PKG_DIR = raqm-$(PKG_VERS)
 
-DEPENDS = cross/freetype cross/fribidi cross/harfbuzz
+DEPENDS = cross/freetype cross/fribidi
+OPTIONAL_DEPENDS = cross/harfbuzz cross/harfbuzz_3
+
+# harfbuzz
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
+include ../../mk/spksrc.archs.mk
+ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
+DEPENDS += cross/harfbuzz_3
+else
+DEPENDS += cross/harfbuzz
+endif
+
 
 HOMEPAGE = https://host-oman.github.io/libraqm/
 COMMENT  = Raqm is a small library that encapsulates the logic for complex text layout and provides a convenient API.
diff --git a/cross/pango/Makefile b/cross/pango/Makefile
index cbb3e639813..2c8a00cfd0f 100644
--- a/cross/pango/Makefile
+++ b/cross/pango/Makefile
@@ -7,13 +7,17 @@ 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
+OPTIONAL_DEPENDS = cross/harfbuzz cross/harfbuzz_3
 
 include ../../mk/spksrc.archs.mk
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(ARMv7L_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+ifneq ($(findstring $(ARCH),$(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_3
+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.