Skip to content

Commit 81f8856

Browse files
kleisaukekleisauke
committed
Update for 8.12.0-rc1
- Update librsvg to 2.52.4. - Update Pango to 1.49.3. - Update ImageMagick to 6.9.11-28. - Update libjxl to 0.6.1. - Update Poppler to 21.11.0. - Include cgif as dependency for GIF save support. - Add libheif patch to improve colour conversion performance. - Include "Upstream-Status"-labels in patches. MXE Updates: - Update HarfBuzz to 3.1.1.
1 parent 4ba87ed commit 81f8856

21 files changed

+163
-51
lines changed

‎README.md‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,42 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
1919
|-----------------|-----------|--------------------------------------------------------------|
2020
| [aom] | 3.2.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
2121
| [cairo] | 1.17.4 | Mozilla Public License 2.0 |
22+
| [cgif] | 0.0.2 | MIT Licence |
2223
| [expat] | 2.4.1 | MIT Licence |
2324
| [fontconfig] | 2.13.94 | [fontconfig Licence] (BSD-like) |
2425
| [freetype] | 2.11.0 | [freetype Licence] (BSD-like) |
2526
| [fribidi] | 1.0.11 | LGPLv3 |
2627
| [gdk-pixbuf] | 2.42.6 | LGPLv3 |
2728
| [glib] | 2.70.1 | LGPLv3 |
28-
| [harfbuzz] | 3.0.0 | MIT Licence |
29+
| [harfbuzz] | 3.1.1 | MIT Licence |
2930
| [lcms] | 2.12 | MIT Licence |
3031
| [libexif] | 0.6.23 | LGPLv3 |
3132
| [libffi] | 3.4.2 | MIT Licence |
3233
| [libgsf] | 1.14.47 | LGPLv3 |
3334
| [libheif] | 1.12.0 | LGPLv3 |
3435
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3536
| [libpng] | 1.6.37 | [libpng License version 2] |
36-
| [librsvg] | 2.52.3 | LGPLv3 |
37+
| [librsvg] | 2.52.4 | LGPLv3 |
3738
| [libspng] | 0.7.0 | BSD 2-Clause |
3839
| [libtiff] | 4.3.0 | [libtiff License] (BSD-like) |
39-
| [libvips] | 8.11.4 | LGPLv3 |
40+
| [libvips] | 8.12.0² | LGPLv3 |
4041
| [libwebp] | 1.2.1 | New BSD License |
4142
| [libxml2] | 2.9.12 | MIT Licence |
4243
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
4344
| [orc] | 0.4.32 | [orc License] (BSD-like) |
44-
| [pango] | 1.49.1 | LGPLv3 |
45+
| [pango] | 1.49.3 | LGPLv3 |
4546
| [pixman] | 0.40.0 | MIT Licence |
4647
| [proxy-libintl] | 0.2 | LGPLv3 |
4748
| [zlib-ng] | 2.0.5 | [zlib-ng Licence] |
4849

4950
¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.
51+
² libvips is built from the [`v8.12.0-rc1`](https://github.com/libvips/libvips/tree/v8.12.0-rc1) tag, see:
52+
https://github.com/libvips/libvips/releases/tag/v8.12.0-rc1
5053

5154
[aom]: https://aomedia.googlesource.com/aom/
5255
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
5356
[cairo]: https://gitlab.freedesktop.org/cairo/cairo
57+
[cgif]: https://github.com/dloebl/cgif
5458
[expat]: https://github.com/libexpat/libexpat
5559
[fontconfig]: https://gitlab.freedesktop.org/fontconfig/fontconfig
5660
[fontconfig Licence]: https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/master/COPYING
@@ -95,15 +99,15 @@ Same as libvips-web + these extra dependencies:
9599
| [cfitsio] | 4.0.0 | BSD-like |
96100
| [fftw] | 3.3.10 | GPLv2 |
97101
| [highway] | 0.14.2 | Apache-2.0 License |
98-
| [imagemagick] | 6.9.12-27 | [ImageMagick License] (Apache-2.0-like) |
102+
| [imagemagick] | 6.9.12-28 | [ImageMagick License] (Apache-2.0-like) |
99103
| [imath] | 3.1.3 | BSD 3-Clause |
100-
| [libjxl] | 0.6 | BSD 3-Clause |
104+
| [libjxl] | 0.6.1 | BSD 3-Clause |
101105
| [matio] | 1.5.21 | BSD 2-Clause |
102106
| [nifticlib] | 2.0.0 | Public domain |
103107
| [openexr] | 3.1.3 | BSD 3-Clause |
104108
| [openjpeg] | 2.4.0 | BSD 2-Clause |
105109
| [openslide] | 3.4.1 | LGPLv3 |
106-
| [poppler] | 21.10.0 | GPLv2 |
110+
| [poppler] | 21.11.0 | GPLv2 |
107111
| [sqlite] | 3.36.0 | Public domain |
108112

109113
[brotli]: https://github.com/google/brotli

‎build/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
# Always checkout a particular revision which will successfully build.
5252
# This ensures that it will not suddenly break a build.
5353
# Note: Must be regularly updated.
54-
revision="4d7331c95f14a9db5a66033c5c81d2e8dfb343f8"
54+
revision="02852a7b690aa411ce2a2089deea25a7292a33d6"
5555
initialize=false
5656

5757
if [ -f "$mxe_dir/Makefile" ]; then

‎build/cgif.mk‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
PKG := cgif
2+
$(PKG)_WEBSITE := https://github.com/dloebl/cgif
3+
$(PKG)_DESCR := A fast and lightweight GIF encoder
4+
$(PKG)_IGNORE :=
5+
$(PKG)_VERSION := 0.0.2
6+
$(PKG)_CHECKSUM := 679e8012b9fe387086e6b3bcc42373dbc66fb26f8d070d7a1d23f39d42842258
7+
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
8+
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
9+
$(PKG)_GH_CONF := dloebl/cgif/tags,V
10+
$(PKG)_DEPS := cc
11+
12+
define $(PKG)_BUILD
13+
'$(TARGET)-meson' \
14+
-Dtests=false \
15+
'$(SOURCE_DIR)' \
16+
'$(BUILD_DIR)'
17+
18+
ninja -C '$(BUILD_DIR)' install
19+
endef

‎build/libjxl.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := libjxl
22
$(PKG)_WEBSITE := https://github.com/libjxl/libjxl
33
$(PKG)_DESCR := JPEG XL image format reference implementation
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.6
6-
$(PKG)_CHECKSUM := 89584e20c6e537d8d65d286fd6ae48d5d6abb087ca89f3207238d8d7e6ced4dc
5+
$(PKG)_VERSION := 0.6.1
6+
$(PKG)_CHECKSUM := ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
88
$(PKG)_GH_CONF := libjxl/libjxl/tags,v
99
$(PKG)_DEPS := cc brotli highway lcms libjpeg-turbo libpng

‎build/overrides.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
4040
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4141

4242
# upstream version is 7, we want ImageMagick 6
43-
imagemagick_VERSION := 6.9.12-27
44-
imagemagick_CHECKSUM := 2dc8037c98e7cef54018bf12659a0a1602cb41c512e72763269fd4625361c069
43+
imagemagick_VERSION := 6.9.12-28
44+
imagemagick_CHECKSUM := 31564e017110287d675bb997233b73a6fb5bd62671ca7f708503d26232f8598b
4545
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4646
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4747

4848
# upstream version is 2.40.5
49-
librsvg_VERSION := 2.52.3
50-
librsvg_CHECKSUM := 36e7f5bc88d78608ea7f6c05e4afe4acc1606b9af13c2845d4385073d082b8a4
49+
librsvg_VERSION := 2.52.4
50+
librsvg_CHECKSUM := 660ec8836a3a91587bc9384920132d4c38d1d1718c67fe160c5213fe4dec2928
5151
librsvg_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/librsvg-[0-9]*.patch)))
5252
librsvg_SUBDIR := librsvg-$(librsvg_VERSION)
5353
librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
5454
librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
5555

5656
# upstream version is 1.37.4
57-
pango_VERSION := 1.49.1
58-
pango_CHECKSUM := c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f
57+
pango_VERSION := 1.49.3
58+
pango_CHECKSUM := 45c403b89910a121ad8eb6d57b5be1d8f19499d39b686435dc6f29b106d2be93
5959
pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
6060
pango_SUBDIR := pango-$(pango_VERSION)
6161
pango_FILE := pango-$(pango_VERSION).tar.xz
@@ -139,8 +139,8 @@ fftw_FILE := fftw-$(fftw_VERSION).tar.gz
139139
fftw_URL := http://www.fftw.org/$(fftw_FILE)
140140

141141
# upstream version is 21.06.1
142-
poppler_VERSION := 21.10.0
143-
poppler_CHECKSUM := 964b5b16290fbec3fae57c2a5bcdea49bb0736bd750c3a3711c47995c9efc394
142+
poppler_VERSION := 21.11.0
143+
poppler_CHECKSUM := 31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584
144144
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
145145
poppler_SUBDIR := poppler-$(poppler_VERSION)
146146
poppler_FILE := poppler-$(poppler_VERSION).tar.xz

‎build/patches/cairo-1-fixes.patch‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@ index 1111111..2222222 100644
2727
unset cairo_cv_warn_cflags
2828

2929
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30-
From: Kleis Auke Wolthuizen <[email protected]>
31-
Date: Wed, 12 Feb 2020 20:00:00 +0100
30+
From: Peter Wang <[email protected]>
31+
Date: Mon, 21 Oct 2019 12:22:44 +1100
3232
Subject: [PATCH 2/3] Always define _cairo_utf8_to_utf16 on Windows
3333

3434
_cairo_utf8_to_utf16 is used by _cairo_fopen on Windows so it must
3535
be defined even if Win32 fonts or other features are disabled.
3636

37+
Fixes #381
38+
39+
Upstream-Status: Accepted [https://gitlab.freedesktop.org/cairo/cairo/-/commit/bd54a1bf9805ebb7905b857d7234271ae496f904]
40+
3741
diff --git a/src/cairoint.h b/src/cairoint.h
3842
index 1111111..2222222 100644
3943
--- a/src/cairoint.h

‎build/patches/glib-2-fixes.patch‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
55
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
66
From: Kleis Auke Wolthuizen <[email protected]>
77
Date: Wed, 1 Jul 2020 12:30:21 +0200
8-
Subject: [PATCH 1/2] Revert "meson: Fix underlinking of static libintl by trying
8+
Subject: [PATCH 1/3] Revert "meson: Fix underlinking of static libintl by trying
99
iconv and pthread"
1010

1111
This reverts commit 56271ff27119f0b6b7dc6cc0c081d64bec06b473 as it causes
@@ -88,7 +88,7 @@ index 1111111..2222222 100644
8888
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
8989
From: Kleis Auke Wolthuizen <[email protected]>
9090
Date: Mon, 13 May 2019 18:00:00 +0200
91-
Subject: [PATCH 2/2] Disable some tests
91+
Subject: [PATCH 2/3] Disable some tests
9292

9393

9494
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
@@ -113,3 +113,25 @@ index 1111111..2222222 100644
113113

114114
plugin_resources_c = custom_target('plugin-resources.c',
115115
input : 'test4.gresource.xml',
116+
117+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
118+
From: Albert Astals Cid <[email protected]>
119+
Date: Sun, 7 Nov 2021 00:22:21 +0100
120+
Subject: [PATCH 3/3] Fix link to pcre-8.37.tar.bz2
121+
122+
ftp.pcre.org FTP site is no longer available
123+
124+
Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/glib/-/commit/e5dc299701df7189685d322cb709649ce3c9c81d]
125+
126+
diff --git a/subprojects/libpcre.wrap b/subprojects/libpcre.wrap
127+
index 1111111..2222222 100644
128+
--- a/subprojects/libpcre.wrap
129+
+++ b/subprojects/libpcre.wrap
130+
@@ -1,6 +1,6 @@
131+
[wrap-file]
132+
directory = pcre-8.37
133+
-source_url = https://ftp.pcre.org/pub/pcre/pcre-8.37.tar.bz2
134+
+source_url = https://sourceforge.net/projects/pcre/files/pcre/8.37/pcre-8.37.tar.bz2
135+
source_filename = pcre-8.37.tar.bz2
136+
source_hash = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d
137+
patch_filename = pcre_8.37-2_patch.zip

‎build/patches/imath-3-fixes.patch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Subject: [PATCH 1/1] Make libraries private within the pkg-config file
66
Assuming that Imath is built statically, this ensures that the
77
libraries are not exposed during linking.
88

9+
Upstream-Status: Inappropriate [other]
10+
Upstream may still build it as a shared library.
11+
912
diff --git a/config/Imath.pc.in b/config/Imath.pc.in
1013
index 1111111..2222222 100644
1114
--- a/config/Imath.pc.in

‎build/patches/lcms-2-fixes.patch‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ From: Kleis Auke Wolthuizen <[email protected]>
33
Date: Fri, 4 Jun 2021 12:12:02 +0200
44
Subject: [PATCH 1/3] Ensure threadsafe alternative of gmtime is used
55

6+
Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/45a7fea828e1fbaca3c11d1110eec65890231fd8]
67

78
diff --git a/configure.ac b/configure.ac
89
index 1111111..2222222 100644
@@ -70,6 +71,8 @@ Subject: [PATCH 2/3] Provide a thread-safe get time function
7071

7172
Use the context pool mutex in the case of none of the re-entrant alternatives to gmtime() is available
7273

74+
Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/79e8395cd405daa9fc99d7ab154762718587887a]
75+
7376
diff --git a/src/cmsio0.c b/src/cmsio0.c
7477
index 1111111..2222222 100644
7578
--- a/src/cmsio0.c
@@ -169,6 +172,8 @@ being called on Windows 32-bit, which will not work.
169172
This commit also generally ensures that a threadsafe alternative
170173
is provided for toolchains targeting Windows i686.
171174

175+
Upstream-Status: Accepted [https://github.com/mm2/Little-CMS/commit/68ee2ffca663f2b705dc84614f37b179a81b826c]
176+
172177
diff --git a/configure.ac b/configure.ac
173178
index 1111111..2222222 100644
174179
--- a/configure.ac

‎build/patches/libgsf-1-fixes.patch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ From: Morten Welinder <[email protected]>
279279
Date: Sat, 2 May 2020 21:24:12 -0400
280280
Subject: [PATCH 4/4] Compilation: fix win32 build
281281

282+
Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/libgsf/-/commit/8441d5863cb90ed48199d6976bc6e2fcfbe3365a]
282283

283284
diff --git a/gsf/Makefile.am b/gsf/Makefile.am
284285
index 1111111..2222222 100644

0 commit comments

Comments
 (0)