Skip to content

Commit e9e8046

Browse files
kleisaukekleisauke
committed
Update for 8.13.0
- Update GLib to 2.73.2. - Update libgsf to 1.14.50. - Update libwebp to 1.2.3. MXE Updates: - Update SQLite to 3.39.2.
1 parent 7367141 commit e9e8046

File tree

10 files changed

+156
-38
lines changed

10 files changed

+156
-38
lines changed

‎README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2525
| [freetype] | 2.12.1 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.12 | LGPLv3 |
2727
| [gdk-pixbuf] | 2.42.8 | LGPLv3 |
28-
| [glib] | 2.73.1 | LGPLv3 |
28+
| [glib] | 2.73.2 | LGPLv3 |
2929
| [harfbuzz] | 4.4.1 | MIT Licence |
3030
| [lcms] | 2.13.1 | MIT Licence |
3131
| [libexif] | 0.6.24 | LGPLv3 |
3232
| [libffi] | 3.4.2 | MIT Licence |
33-
| [libgsf] | 1.14.49 | LGPLv3 |
33+
| [libgsf] | 1.14.50 | LGPLv3 |
3434
| [libheif] | 1.12.0 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
3636
| [libpng] | 1.6.37 | [libpng License version 2] |
3737
| [librsvg] | 2.54.4 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
40-
| [libvips] | 8.13.0² | LGPLv3 |
41-
| [libwebp] | 1.2.2 | New BSD License |
40+
| [libvips] | 8.13.0 | LGPLv3 |
41+
| [libwebp] | 1.2.3 | New BSD License |
4242
| [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) |
@@ -48,8 +48,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
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.
51-
² libvips is built from the [`v8.13.0-rc2`](https://github.com/libvips/libvips/tree/v8.13.0-rc2) tag, see:
52-
https://github.com/libvips/libvips/releases/tag/v8.13.0-rc2
5351

5452
[aom]: https://aomedia.googlesource.com/aom/
5553
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -108,7 +106,7 @@ Same as libvips-web + these extra dependencies:
108106
| [openjpeg] | 2.5.0 | BSD 2-Clause |
109107
| [openslide] | 3.4.1 | LGPLv3 |
110108
| [poppler] | 22.07.0 | GPLv2 |
111-
| [sqlite] | 3.39.0 | Public domain |
109+
| [sqlite] | 3.39.2 | Public domain |
112110

113111
[brotli]: https://github.com/google/brotli
114112
[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="95649828bc29334d5f9abef2718d49a55d9a5407"
54+
revision="523678e36c2678f3d170c91c095a84b3bcc2bbfe"
5555
initialize=false
5656

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

‎build/overrides.mk

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,25 @@ fribidi_SUBDIR := fribidi-$(fribidi_VERSION)
7878
fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz
7979
fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE)
8080

81+
# upstream version is 1.2.2
82+
libwebp_VERSION := 1.2.3
83+
libwebp_CHECKSUM := f5d7ab2390b06b8a934a4fc35784291b3885b557780d099bd32f09241f9d83f9
84+
libwebp_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch)))
85+
libwebp_SUBDIR := libwebp-$(libwebp_VERSION)
86+
libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz
87+
libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
88+
8189
# upstream version is 2.70.2
82-
glib_VERSION := 2.73.1
83-
glib_CHECKSUM := 77b21da5bd195a8e5f751206a2acab477636e3d02fe4f3796ede5788255382ae
90+
glib_VERSION := 2.73.2
91+
glib_CHECKSUM := 5f3ee36e34f4aaab393c3e3dc46fb01b32f7ead6c88d41d7f20d88a49cdef1d9
8492
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
8593
glib_SUBDIR := glib-$(glib_VERSION)
8694
glib_FILE := glib-$(glib_VERSION).tar.xz
8795
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
8896

8997
# upstream version is 1.14.30
90-
libgsf_VERSION := 1.14.49
91-
libgsf_CHECKSUM := e9ebe36688f010c9e6e40c8903f3732948deb8aca032578d07d0751bd82cf857
98+
libgsf_VERSION := 1.14.50
99+
libgsf_CHECKSUM := 6e6c20d0778339069d583c0d63759d297e817ea10d0d897ebbe965f16e2e8e52
92100
libgsf_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libgsf-[0-9]*.patch)))
93101
libgsf_SUBDIR := libgsf-$(libgsf_VERSION)
94102
libgsf_FILE := libgsf-$(libgsf_VERSION).tar.xz
@@ -736,11 +744,10 @@ define glib_BUILD
736744

737745
# Build as shared library, since we need `libgobject-2.0-0.dll`
738746
# and `libglib-2.0-0.dll` for the language bindings.
739-
# Enable networking to allow gvdb and libpcre to be downloaded
740-
# from WrapDB
747+
# Enable networking to allow gvdb to be downloaded from WrapDB
741748
MXE_ENABLE_NETWORK=1 $(MXE_MESON_WRAPPER) \
742749
--default-library=shared \
743-
--force-fallback-for=gvdb,libpcre \
750+
--force-fallback-for=gvdb \
744751
-Dnls=disabled \
745752
'$(SOURCE_DIR)' \
746753
'$(BUILD_DIR)'

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ Subject: [PATCH 1/1] Ensure standalone intl support library can be found
99

1010
See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2109#note_1485662
1111

12+
Upstream-Status: Pending
13+
1214
diff --git a/meson.build b/meson.build
1315
index 1111111..2222222 100644
1416
--- a/meson.build
1517
+++ b/meson.build
16-
@@ -2065,11 +2065,11 @@ if libintl.found()
18+
@@ -2077,11 +2077,11 @@ if libintl.found()
1719
#
1820
# Meson's builtin dependency lookup as of 0.60.0 doesn't check for
1921
# pthread, so we do this manually here.
@@ -27,7 +29,7 @@ index 1111111..2222222 100644
2729
libintl_deps += [libintl, libintl_pthread]
2830
else
2931
libintl = disabler()
30-
@@ -2078,7 +2078,7 @@ if libintl.found()
32+
@@ -2090,7 +2090,7 @@ if libintl.found()
3133
endif
3234

3335
if libintl.found()

‎build/patches/glib-2-without-gregex.patch

Lines changed: 118 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
3+
Date: Wed, 13 Jul 2022 09:44:36 +0200
4+
Subject: [PATCH 1/1] Remove GRegex pre-emptively
5+
6+
Unused by libvips or any of the libraries it relies on.
7+
8+
Upstream-Status: Inappropriate [disable feature]
9+
Upstream may still depend on GRegex.
10+
111
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
212
index 1111111..2222222 100644
313
--- a/gio/gsettingsschema.c
414
+++ b/gio/gsettingsschema.c
5-
@@ -553,58 +553,7 @@ start_element (GMarkupParseContext *context,
15+
@@ -553,62 +553,7 @@ start_element (GMarkupParseContext *context,
616
static gchar *
717
normalise_whitespace (const gchar *orig)
818
{
@@ -32,10 +42,14 @@ index 1111111..2222222 100644
3242
- {
3343
- GRegex *s;
3444
-
35-
- cleanup[0] = g_regex_new ("^\\s+", 0, 0, 0);
36-
- cleanup[1] = g_regex_new ("\\s+$", 0, 0, 0);
37-
- cleanup[2] = g_regex_new ("\\s+", 0, 0, 0);
38-
- s = g_regex_new ("\\n\\s*\\n+", 0, 0, 0);
45+
- cleanup[0] = g_regex_new ("^\\s+", G_REGEX_DEFAULT,
46+
- G_REGEX_MATCH_DEFAULT, NULL);
47+
- cleanup[1] = g_regex_new ("\\s+$", G_REGEX_DEFAULT,
48+
- G_REGEX_MATCH_DEFAULT, NULL);
49+
- cleanup[2] = g_regex_new ("\\s+", G_REGEX_DEFAULT,
50+
- G_REGEX_MATCH_DEFAULT, NULL);
51+
- s = g_regex_new ("\\n\\s*\\n+", G_REGEX_DEFAULT,
52+
- G_REGEX_MATCH_DEFAULT, NULL);
3953
-
4054
- g_once_init_leave (&splitter, s);
4155
- }
@@ -76,7 +90,7 @@ index 1111111..2222222 100644
7690
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSequence, g_sequence_free)
7791
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GSList, g_slist_free)
7892
diff --git a/glib/glib.h b/glib/glib.h
79-
index e72c09da5..d639e645e 100644
93+
index 1111111..2222222 100644
8094
--- a/glib/glib.h
8195
+++ b/glib/glib.h
8296
@@ -74,7 +74,6 @@
@@ -99,11 +113,43 @@ index 1111111..2222222 100644
99113
'gscanner.h',
100114
'gsequence.h',
101115
'gshell.h',
116+
@@ -272,7 +271,6 @@ glib_sources = files(
117+
'grcbox.c',
118+
'grefcount.c',
119+
'grefstring.c',
120+
- 'gregex.c',
121+
'gscanner.c',
122+
'gsequence.c',
123+
'gshell.c',
124+
@@ -357,13 +355,7 @@ else
125+
glib_dtrace_hdr = []
126+
endif
127+
128+
-pcre2_static_args = []
129+
-
130+
-if use_pcre2_static_flag
131+
- pcre2_static_args = ['-DPCRE2_STATIC']
132+
-endif
133+
-
134+
-glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre2_static_args + glib_hidden_visibility_args
135+
+glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + glib_hidden_visibility_args
136+
libglib = library('glib-2.0',
137+
glib_dtrace_obj, glib_dtrace_hdr,
138+
sources : [deprecated_sources, glib_sources],
139+
@@ -375,7 +367,7 @@ libglib = library('glib-2.0',
140+
link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
141+
include_directories : configinc,
142+
link_with: [charset_lib, gnulib_lib],
143+
- dependencies : [pcre2, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
144+
+ dependencies : [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
145+
c_args : glib_c_args,
146+
objc_args : glib_c_args,
147+
)
102148
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
103149
index 1111111..2222222 100644
104150
--- a/gobject/gboxed.c
105151
+++ b/gobject/gboxed.c
106-
@@ -148,9 +148,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
152+
@@ -150,9 +150,6 @@ G_DEFINE_BOXED_TYPE (GByteArray, g_byte_array, g_byte_array_ref, g_byte_array_un
107153
G_DEFINE_BOXED_TYPE (GBytes, g_bytes, g_bytes_ref, g_bytes_unref)
108154
G_DEFINE_BOXED_TYPE (GTree, g_tree, g_tree_ref, g_tree_unref)
109155

@@ -113,3 +159,68 @@ index 1111111..2222222 100644
113159
#define g_variant_type_get_type g_variant_type_get_gtype
114160
G_DEFINE_BOXED_TYPE (GVariantType, g_variant_type, g_variant_type_copy, g_variant_type_free)
115161
#undef g_variant_type_get_type
162+
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
163+
index 1111111..2222222 100644
164+
--- a/gobject/glib-types.h
165+
+++ b/gobject/glib-types.h
166+
@@ -87,15 +87,6 @@ typedef gsize GType;
167+
*/
168+
#define G_TYPE_HASH_TABLE (g_hash_table_get_type ())
169+
170+
-/**
171+
- * G_TYPE_REGEX:
172+
- *
173+
- * The #GType for a boxed type holding a #GRegex reference.
174+
- *
175+
- * Since: 2.14
176+
- */
177+
-#define G_TYPE_REGEX (g_regex_get_type ())
178+
-
179+
/**
180+
* G_TYPE_MATCH_INFO:
181+
*
182+
diff --git a/meson.build b/meson.build
183+
index 1111111..2222222 100644
184+
--- a/meson.build
185+
+++ b/meson.build
186+
@@ -2018,40 +2018,6 @@ else
187+
libiconv = dependency('iconv')
188+
endif
189+
190+
-pcre2 = dependency('libpcre2-8', version: '>= 10.32', required : false)
191+
-if not pcre2.found()
192+
- if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
193+
- # MSVC: Search for the PCRE2 library by the configuration, which corresponds
194+
- # to the output of CMake builds of PCRE2. Note that debugoptimized
195+
- # is really a Release build with .PDB files.
196+
- if vs_crt == 'debug'
197+
- pcre2 = cc.find_library('pcre2d-8', required : false)
198+
- else
199+
- pcre2 = cc.find_library('pcre2-8', required : false)
200+
- endif
201+
- endif
202+
-endif
203+
-
204+
-# Try again with the fallback
205+
-if not pcre2.found()
206+
- pcre2 = dependency('libpcre2-8', required : true, fallback : ['pcre2', 'libpcre2_8'])
207+
- use_pcre2_static_flag = true
208+
-elif host_system == 'windows'
209+
- pcre2_static = cc.links('''#define PCRE2_STATIC
210+
- #define PCRE2_CODE_UNIT_WIDTH 8
211+
- #include <pcre2.h>
212+
- int main() {
213+
- void *p = NULL;
214+
- pcre2_code_free(p);
215+
- return 0;
216+
- }''',
217+
- dependencies: pcre2,
218+
- name : 'Windows system PCRE2 is a static build')
219+
- use_pcre2_static_flag = pcre2_static
220+
-else
221+
- use_pcre2_static_flag = false
222+
-endif
223+
-
224+
# Import the gvdb sources as a subproject to avoid having the copylib in-tree
225+
subproject('gvdb')
226+
gvdb_dep = dependency('gvdb')

‎build/plugins/llvm-mingw/patches/rust-1-fixes.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ index 1111111..2222222 100644
102102
// https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c
103103

104104
cfg_if::cfg_if! {
105-
- if #[cfg(all(target_arch = "arm", not(target_os = "ios"), not(target_os = "netbsd")))] {
106-
+ if #[cfg(all(target_arch = "arm", not(target_os = "ios"), not(target_os = "netbsd"), not(target_os = "windows")))] {
105+
- if #[cfg(all(target_arch = "arm", not(target_os = "ios"), not(target_os = "watchos"), not(target_os = "netbsd")))] {
106+
+ if #[cfg(all(target_arch = "arm", not(target_os = "ios"), not(target_os = "watchos"), not(target_os = "netbsd"), not(target_os = "windows")))] {
107107
// ARM EHABI personality routine.
108108
// https://infocenter.arm.com/help/topic/com.arm.doc.ihi0038b/IHI0038B_ehabi.pdf
109109
//
@@ -115,8 +115,8 @@ index 1111111..2222222 100644
115115
}
116116

117117
cfg_if::cfg_if! {
118-
-if #[cfg(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm")))] {
119-
+if #[cfg(any(target_os = "ios", target_os = "netbsd", target_os = "windows", not(target_arch = "arm")))] {
118+
-if #[cfg(any(target_os = "ios", target_os = "watchos", target_os = "netbsd", not(target_arch = "arm")))] {
119+
+if #[cfg(any(target_os = "ios", target_os = "watchos", target_os = "netbsd", target_os = "windows", not(target_arch = "arm")))] {
120120
// Not ARM EHABI
121121
#[repr(C)]
122122
#[derive(Copy, Clone, PartialEq)]

‎build/plugins/llvm-mingw/rust.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ PKG := rust
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/2022-07-12/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2022-07-22/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := ebe29c7ce66ad25ce7a94f6ab388248e599b8beea374b3b22ab9fe9d14a160c2
7+
$(PKG)_CHECKSUM := 84ff10ba66df6377f91883fafc44de619780bc2c410929652dc3536caa2fac54
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
99
$(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src
1010
$(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2022-07-12/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-07-22/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

‎build/variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
vips_package=vips
44
vips_version=8.13
55
vips_patch_version=0
6-
vips_pre_version=rc2
6+
#vips_pre_version=rc2
77

88
if [ -n "$GIT_COMMIT" ]; then
99
vips_version=$GIT_COMMIT

‎build/vips-all.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.13.0
6-
$(PKG)_CHECKSUM := e52625465f07c68119bd1dcb123558720594439d45cddeb2a24d8464197879b0
6+
$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v
89
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
9-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.gz
10-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.gz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.gz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant orc imagemagick matio openexr \

‎build/vips-web.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE := https://libvips.github.io/libvips/
33
$(PKG)_DESCR := A fast image processing library with low memory needs.
44
$(PKG)_IGNORE :=
55
$(PKG)_VERSION := 8.13.0
6-
$(PKG)_CHECKSUM := e52625465f07c68119bd1dcb123558720594439d45cddeb2a24d8464197879b0
6+
$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v
89
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
9-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.gz
10-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.gz
10+
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.gz
1111
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \
1212
libjpeg-turbo tiff lcms libexif libheif libpng \
1313
libspng libimagequant orc cgif

0 commit comments

Comments
 (0)