Skip to content

Commit e891292

Browse files
kleisaukekleisauke
committed
Update for 8.17.0-rc1
- Update libarchive to 3.8.1. - Update Poppler to 25.06.0.
1 parent 382f3d5 commit e891292

File tree

7 files changed

+60
-32
lines changed

7 files changed

+60
-32
lines changed

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2828
| [harfbuzz] | 11.2.1 | MIT Licence |
2929
| [highway] | 1.2.0 | Apache-2.0 License, BSD 3-Clause |
3030
| [lcms] | 2.17 | MIT Licence |
31-
| [libarchive] | 3.8.0 | BSD 2-Clause |
31+
| [libarchive] | 3.8.1 | BSD 2-Clause |
3232
| [libexif] | 0.6.25 | LGPLv3 |
3333
| [libffi] | 3.4.8 | MIT Licence |
3434
| [libheif] | 1.19.8 | LGPLv3 |
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3737
| [librsvg] | 2.60.0 | LGPLv3 |
3838
| [libspng] | 0.7.4 | BSD 2-Clause |
3939
| [libtiff] | 4.7.0 | [libtiff License] (BSD-like) |
40-
| [libvips] | 8.16.1 | LGPLv3 |
40+
| [libvips] | 8.17.0² | LGPLv3 |
4141
| [libwebp] | 1.5.0 | New BSD License |
4242
| [libxml2] | 2.14.3 | MIT Licence |
4343
| [mozjpeg] | 4.1.5 | [zlib License, IJG License, BSD-3-Clause] |
@@ -47,6 +47,8 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4747
| [zlib-ng] | 2.2.4 | [zlib-ng Licence] |
4848

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

5153
[aom]: https://aomedia.googlesource.com/aom/
5254
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -103,7 +105,7 @@ Same as libvips-web + these extra dependencies:
103105
| [openexr] | 3.1.11 | BSD 3-Clause |
104106
| [openjpeg] | 2.5.3 | BSD 2-Clause |
105107
| [openslide] | 4.0.0 | LGPLv3 |
106-
| [poppler] | 25.05.0 | GPLv2 |
108+
| [poppler] | 25.06.0 | GPLv2 |
107109
| [sqlite] | 3.49.2 | Public domain |
108110

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

‎build/overrides.mk‎

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

1515
# upstream version is 3.4.0
16-
libarchive_VERSION := 3.8.0
17-
libarchive_CHECKSUM := 67bfac3798a778143f4b1cadcdb3792b4269486f8e1b70ca5c0ee5841398bfdf
16+
libarchive_VERSION := 3.8.1
17+
libarchive_CHECKSUM := 19f917d42d530f98815ac824d90c7eaf648e9d9a50e4f309c812457ffa5496b5
1818
libarchive_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libarchive-[0-9]*.patch)))
1919
libarchive_SUBDIR := libarchive-$(libarchive_VERSION)
2020
libarchive_FILE := libarchive-$(libarchive_VERSION).tar.xz
@@ -102,8 +102,8 @@ libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz
102102
libjpeg-turbo_URL := https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE)
103103

104104
# upstream version is 23.09.0
105-
poppler_VERSION := 25.05.0
106-
poppler_CHECKSUM := 9b1627c5b76816ac5e4052a03f5b605ba40b45cf06b02cadd0479620b499ab38
105+
poppler_VERSION := 25.06.0
106+
poppler_CHECKSUM := 8199532d38984fab46dbd0020ec9c40f20e928e33e9b4cc6043572603a821d83
107107
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
108108
poppler_SUBDIR := poppler-$(poppler_VERSION)
109109
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
@@ -180,7 +180,7 @@ zlib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))
180180
# libjpeg-turbo:
181181
# Replaced: yasm with $(BUILD)~nasm
182182
# libxml2:
183-
# Removed: xz, zlib
183+
# Removed: libiconv, xz, zlib
184184
# Fontconfig:
185185
# Added: meson-wrapper
186186
# Removed: gettext

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

Lines changed: 30 additions & 3 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: Thu, 28 Mar 2024 18:29:25 +0100
8-
Subject: [PATCH 1/3] Ignore any errors from native-static-libs query
8+
Subject: [PATCH 1/4] Ignore any errors from native-static-libs query
99

1010
It will not properly work with `-Zbuild-std`.
1111

@@ -32,7 +32,7 @@ index 1111111..2222222 100644
3232
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
3333
From: Kleis Auke Wolthuizen <[email protected]>
3434
Date: Fri, 7 Jul 2023 18:41:29 +0200
35-
Subject: [PATCH 2/3] Disable PDF/PostScript features in cairo-rs
35+
Subject: [PATCH 2/4] Disable PDF/PostScript features in cairo-rs
3636

3737
We build Cairo with `-Dzlib=disabled`, which implicitly disables
3838
these surface backends.
@@ -67,7 +67,7 @@ index 1111111..2222222 100644
6767
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6868
From: Kleis Auke Wolthuizen <[email protected]>
6969
Date: Sun, 21 Apr 2024 12:01:02 +0200
70-
Subject: [PATCH 3/3] Disallow GIF and WebP embedded in SVG images
70+
Subject: [PATCH 3/4] Disallow GIF and WebP embedded in SVG images
7171

7272
Upstream-Status: Inappropriate [disable feature]
7373
This is specific to libvips' prebuilt binaries.
@@ -147,3 +147,30 @@ index 1111111..2222222 100644
147147
itertools.workspace = true
148148
language-tags.workspace = true
149149
libc.workspace = true
150+
151+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
152+
From: Lovell Fuller <[email protected]>
153+
Date: Sat, 17 May 2025 14:43:53 +0100
154+
Subject: [PATCH 4/4] text: verify pango/fontconfig found a suitable font
155+
156+
Helps prevent panic when no fonts are installed
157+
158+
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1106]
159+
160+
diff --git a/rsvg/src/text.rs b/rsvg/src/text.rs
161+
index 1111111..2222222 100644
162+
--- a/rsvg/src/text.rs
163+
+++ b/rsvg/src/text.rs
164+
@@ -297,6 +297,12 @@ fn compute_baseline_offset(
165+
166+
if run.is_some() {
167+
let item = run.unwrap().item();
168+
+ unsafe {
169+
+ let analysis = (*item.as_ptr()).analysis;
170+
+ if analysis.font.is_null() {
171+
+ break;
172+
+ }
173+
+ }
174+
let font = item.analysis().font();
175+
176+
let metrics = font.metrics(None);

‎build/patches/vips-8-dlldir-as-libdir.patch‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ Subject: [PATCH 1/1] Support for using the DLL directory as libdir
55

66
Upstream-Status: Pending [https://github.com/libvips/build-win64-mxe/issues/34]
77

8-
diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h
8+
diff --git a/libvips/include/vips/internal.h b/libvips/include/vips/internal.h
99
index 1111111..2222222 100644
10-
--- a/libvips/include/vips/util.h
11-
+++ b/libvips/include/vips/util.h
12-
@@ -418,6 +418,7 @@ guint32 vips__random(guint32 seed);
10+
--- a/libvips/include/vips/internal.h
11+
+++ b/libvips/include/vips/internal.h
12+
@@ -426,6 +426,7 @@ guint32 vips__random(guint32 seed);
1313
guint32 vips__random_add(guint32 seed, int value);
1414

1515
const char *vips__icc_dir(void);
@@ -21,7 +21,7 @@ diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
2121
index 1111111..2222222 100644
2222
--- a/libvips/iofuncs/init.c
2323
+++ b/libvips/iofuncs/init.c
24-
@@ -1200,6 +1200,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
24+
@@ -1201,6 +1201,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
2525
const char *
2626
vips_guess_libdir(const char *argv0, const char *env_name)
2727
{
@@ -34,7 +34,7 @@ index 1111111..2222222 100644
3434
const char *prefix = vips_guess_prefix(argv0, env_name);
3535
static char *libdir = NULL;
3636

37-
@@ -1224,6 +1230,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
37+
@@ -1225,6 +1231,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
3838
libdir = g_strdup_printf("%s/lib", prefix);
3939

4040
return libdir;
@@ -46,7 +46,7 @@ diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c
4646
index 1111111..2222222 100644
4747
--- a/libvips/iofuncs/util.c
4848
+++ b/libvips/iofuncs/util.c
49-
@@ -1894,6 +1894,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
49+
@@ -1986,6 +1986,53 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
5050
return TRUE;
5151
}
5252
#endif
@@ -94,8 +94,7 @@ index 1111111..2222222 100644
9494
+{
9595
+ static GOnce once = G_ONCE_INIT;
9696
+
97-
+ return (const char *) g_once(&once,
98-
+ vips__dll_dir_once, NULL);
97+
+ return (const char *) g_once(&once, vips__dll_dir_once, NULL);
9998
+}
10099
+#endif /*VIPS_DLLDIR_AS_LIBDIR*/
101100
#endif /*G_OS_WIN32*/

‎build/patches/vips-8-heifsave-disable-hbr-support.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ diff --git a/libvips/foreign/heifsave.c b/libvips/foreign/heifsave.c
1818
index 1111111..2222222 100644
1919
--- a/libvips/foreign/heifsave.c
2020
+++ b/libvips/foreign/heifsave.c
21-
@@ -539,20 +539,9 @@ vips_foreign_save_heif_build(VipsObject *object)
21+
@@ -531,20 +531,9 @@ vips_foreign_save_heif_build(VipsObject *object)
2222
if (heif->lossless)
2323
heif->subsample_mode = VIPS_FOREIGN_SUBSAMPLE_OFF;
2424

@@ -41,7 +41,7 @@ index 1111111..2222222 100644
4141
vips_error("heifsave", _("%d-bit colour depth not supported"),
4242
heif->bitdepth);
4343
return -1;
44-
@@ -756,14 +745,10 @@ vips_foreign_save_heif_build(VipsObject *object)
44+
@@ -738,14 +727,10 @@ vips_foreign_save_heif_build(VipsObject *object)
4545
}
4646

4747
#define UC VIPS_FORMAT_UCHAR
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
5757
};
5858

5959
static void
60-
@@ -798,7 +783,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
60+
@@ -781,7 +766,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
6161
_("Number of bits per pixel"),
6262
VIPS_ARGUMENT_OPTIONAL_INPUT,
6363
G_STRUCT_OFFSET(VipsForeignSaveHeif, bitdepth),
@@ -66,7 +66,7 @@ index 1111111..2222222 100644
6666

6767
VIPS_ARG_BOOL(class, "lossless", 13,
6868
_("Lossless"),
69-
@@ -851,7 +836,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
69+
@@ -834,7 +819,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
7070
{
7171
heif->ctx = heif_context_alloc();
7272
heif->Q = 50;

‎build/vips-all.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PKG := vips-all
22
$(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 8.16.1
6-
$(PKG)_CHECKSUM := d114d7c132ec5b45f116d654e17bb4af84561e3041183cd4bfd79abfb85cf724
5+
$(PKG)_VERSION := 8.17.0-rc1
6+
$(PKG)_CHECKSUM := 9cf374587869fce6fa283a7b1a70d3b8a7e74ebaf1b8b038983228e365a63acd
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
9-
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,-rc1.tar.xz
9+
$(PKG)_SUBDIR := vips-$(firstword $(subst -, ,$($(PKG)_VERSION)))
1010
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libspng \

‎build/vips-web.mk‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PKG := vips-web
22
$(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 8.16.1
6-
$(PKG)_CHECKSUM := d114d7c132ec5b45f116d654e17bb4af84561e3041183cd4bfd79abfb85cf724
5+
$(PKG)_VERSION := 8.17.0-rc1
6+
$(PKG)_CHECKSUM := 9cf374587869fce6fa283a7b1a70d3b8a7e74ebaf1b8b038983228e365a63acd
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
9-
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,-rc1.tar.xz
9+
$(PKG)_SUBDIR := vips-$(firstword $(subst -, ,$($(PKG)_VERSION)))
1010
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.xz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libarchive \
1212
libjpeg-turbo tiff lcms libexif libheif libspng \

0 commit comments

Comments
 (0)