Skip to content

Commit 8c586e5

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update libxml2 to 2.9.14. - Update proxy-libintl to 0.4. - Update CFITSIO to 4.1.0. - Update ImageMagick to 6.9.12-48. MXE Updates: - Update Poppler to 22.05.0. - Update SQLite to 3.38.5.
1 parent 4985e3f commit 8c586e5

File tree

5 files changed

+16
-95
lines changed

5 files changed

+16
-95
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3939
| [libtiff] | 4.3.0 | [libtiff License] (BSD-like) |
4040
| [libvips] | 8.12.2 | LGPLv3 |
4141
| [libwebp] | 1.2.2 | New BSD License |
42-
| [libxml2] | 2.9.13 | MIT Licence |
42+
| [libxml2] | 2.9.14 | MIT Licence |
4343
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
4444
| [orc] | 0.4.32 | [orc License] (BSD-like) |
4545
| [pango] | 1.50.7 | LGPLv3 |
4646
| [pixman] | 0.40.0 | MIT Licence |
47-
| [proxy-libintl] | 0.3 | LGPLv3 |
47+
| [proxy-libintl] | 0.4 | LGPLv3 |
4848
| [zlib-ng] | 2.0.6 | [zlib-ng Licence] |
4949

5050
¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.
@@ -94,19 +94,19 @@ Same as libvips-web + these extra dependencies:
9494
| Dependency | Version | Used under the terms of |
9595
|-----------------|-----------|--------------------------------------------------------------|
9696
| [brotli] | 1.0.9 | MIT Licence |
97-
| [cfitsio] | 4.0.0 | BSD-like |
97+
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
9999
| [highway] | 0.16.0 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-47 | [ImageMagick License] (Apache-2.0-like) |
100+
| [imagemagick] | 6.9.12-48 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102102
| [libjxl] | 0.6.1 | BSD 3-Clause |
103103
| [matio] | 1.5.23 | BSD 2-Clause |
104104
| [nifticlib] | 3.0.1 | Public domain |
105105
| [openexr] | 3.1.5 | BSD 3-Clause |
106106
| [openjpeg] | 2.4.0 | BSD 2-Clause |
107107
| [openslide] | 3.4.1 | LGPLv3 |
108-
| [poppler] | 22.04.0 | GPLv2 |
109-
| [sqlite] | 3.38.3 | Public domain |
108+
| [poppler] | 22.05.0 | GPLv2 |
109+
| [sqlite] | 3.38.5 | Public domain |
110110

111111
[brotli]: https://github.com/google/brotli
112112
[cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

‎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="27cf734072cde1c2f96aaf6ea97f5e52497ab44a"
54+
revision="598a5414b2f9d260c5e8a23e9dd7694f829aa53c"
5555
initialize=false
5656

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

‎build/overrides.mk

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ gdk-pixbuf_URL := https://download.gnome.org/sources/gdk-pixbuf/$(call SHOR
2121

2222
# no longer needed by libvips, but some of the deps need it
2323
# upstream version is 2.9.12
24-
libxml2_VERSION := 2.9.13
25-
libxml2_CHECKSUM := 276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
24+
libxml2_VERSION := 2.9.14
25+
libxml2_CHECKSUM := 60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
2626
libxml2_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libxml2-[0-9]*.patch)))
2727
libxml2_SUBDIR := libxml2-$(libxml2_VERSION)
2828
libxml2_FILE := libxml2-$(libxml2_VERSION).tar.xz
@@ -39,8 +39,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
3939
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4040

4141
# upstream version is 7, we want ImageMagick 6
42-
imagemagick_VERSION := 6.9.12-47
43-
imagemagick_CHECKSUM := e93756b5f09b5632cf93392fe8a4d6f432eed66bf7ae68db17f5c452fd2dd3f7
42+
imagemagick_VERSION := 6.9.12-48
43+
imagemagick_CHECKSUM := af46e8caa8fc871f77e6cd55713fdc660d80d8803feb3bb5991bd82e18bddd15
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

@@ -119,8 +119,8 @@ openexr_FILE := openexr-$(openexr_VERSION).tar.gz
119119
openexr_URL := https://github.com/AcademySoftwareFoundation/openexr/archive/v$(openexr_VERSION).tar.gz
120120

121121
# upstream version is 3410
122-
cfitsio_VERSION := 4.0.0
123-
cfitsio_CHECKSUM := b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
122+
cfitsio_VERSION := 4.1.0
123+
cfitsio_CHECKSUM := b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a
124124
cfitsio_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/cfitsio-[0-9]*.patch)))
125125
cfitsio_SUBDIR := cfitsio-$(cfitsio_VERSION)
126126
cfitsio_FILE := cfitsio-$(cfitsio_VERSION).tar.gz
@@ -135,28 +135,6 @@ pixman_SUBDIR := pixman-$(pixman_VERSION)
135135
pixman_FILE := pixman-$(pixman_VERSION).tar.gz
136136
pixman_URL := https://cairographics.org/releases/$(pixman_FILE)
137137

138-
# upstream version is 2.12.0
139-
freetype_VERSION := 2.12.1
140-
freetype_CHECKSUM := 4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f
141-
freetype_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/freetype-[0-9]*.patch)))
142-
freetype_SUBDIR := freetype-$(freetype_VERSION)
143-
freetype_FILE := freetype-$(freetype_VERSION).tar.xz
144-
freetype_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(freetype_VERSION)/$(freetype_FILE)
145-
146-
# upstream version is 2.12.0
147-
freetype-bootstrap_VERSION := $(freetype_VERSION)
148-
freetype-bootstrap_CHECKSUM := $(freetype_CHECKSUM)
149-
freetype-bootstrap_PATCHES := $(freetype_PATCHES)
150-
freetype-bootstrap_SUBDIR := $(freetype_SUBDIR)
151-
freetype-bootstrap_FILE := $(freetype_FILE)
152-
freetype-bootstrap_URL := $(freetype_URL)
153-
154-
# upstream version is 4.2.0
155-
harfbuzz_VERSION := 4.2.1
156-
harfbuzz_CHECKSUM := bd17916513829aeff961359a5ccebba6de2f4bf37a91faee3ac29c120e3d7ee1
157-
harfbuzz_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
158-
harfbuzz_GH_CONF := harfbuzz/harfbuzz/releases,,,,,.tar.xz
159-
160138
# upstream version is 2.13
161139
# cannot use GH_CONF:
162140
# lcms_GH_CONF := mm2/Little-CMS,lcms
@@ -228,7 +206,7 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
228206
# Removed: pthreads
229207
# Poppler:
230208
# Added: libjpeg-turbo, lcms
231-
# Removed: boost, curl, qtbase, libwebp
209+
# Removed: boost, curl, qt6-qtbase, libwebp
232210
# librsvg:
233211
# Added: libxml2, rust
234212
# Removed: libcroco, libgsf

‎build/patches/cfitsio-4-fixes.patch

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎build/plugins/proxy-libintl/proxy-libintl.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ PKG := proxy-libintl
22
$(PKG)_WEBSITE := https://github.com/frida/proxy-libintl
33
$(PKG)_DESCR := Proxy for a dynamically loaded optional libintl.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.3
6-
$(PKG)_CHECKSUM := db1649fc97ddd686b1a4d4fe6a26775ff7a91ffd317ce700d027d19de73a7e04
5+
$(PKG)_VERSION := 0.4
6+
$(PKG)_CHECKSUM := 13ef3eea0a3bc0df55293be368dfbcff5a8dd5f4759280f28e030d1494a5dffb
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := frida/proxy-libintl/tags
99
$(PKG)_DEPS := cc meson-wrapper
1010

1111
define $(PKG)_BUILD
1212
$(MXE_MESON_WRAPPER) \
1313
--default-library=static \
14-
-Dc_args='$(CFLAGS) -DG_INTL_STATIC_COMPILATION' \
1514
'$(SOURCE_DIR)' \
1615
'$(BUILD_DIR)'
1716

0 commit comments

Comments
 (0)