Skip to content

Commit 06e4d57

Browse files
committed
Update for 8.16.0
MXE Updates: - Update SQLite to 3.47.0.
1 parent d22422b commit 06e4d57

File tree

11 files changed

+17
-49
lines changed

11 files changed

+17
-49
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
3737
| [librsvg] | 2.59.1 | LGPLv3 |
3838
| [libspng] | 0.7.4 | BSD 2-Clause |
3939
| [libtiff] | 4.7.0 | [libtiff License] (BSD-like) |
40-
| [libvips] | 8.16.0² | LGPLv3 |
40+
| [libvips] | 8.16.0 | LGPLv3 |
4141
| [libwebp] | 1.4.0 | New BSD License |
4242
| [libxml2] | 2.13.4 | MIT Licence |
4343
| [mozjpeg] | 4.1.5 | [zlib License, IJG License, BSD-3-Clause] |
@@ -47,8 +47,6 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4747
| [zlib-ng] | 2.2.2 | [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.16.0-rc2`](https://github.com/libvips/libvips/tree/v8.16.0-rc2) tag, see:
51-
https://github.com/libvips/libvips/releases/tag/v8.16.0-rc2
5250

5351
[aom]: https://aomedia.googlesource.com/aom/
5452
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -106,7 +104,7 @@ Same as libvips-web + these extra dependencies:
106104
| [openjpeg] | 2.5.2 | BSD 2-Clause |
107105
| [openslide] | 4.0.0 | LGPLv3 |
108106
| [poppler] | 24.10.0 | GPLv2 |
109-
| [sqlite] | 3.46.1 | Public domain |
107+
| [sqlite] | 3.47.0 | Public domain |
110108

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

build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
# Always checkout a particular revision which will successfully build.
4646
# This ensures that it will not suddenly break a build.
4747
# Note: Must be regularly updated.
48-
revision="ab32df6df2d018b1f1ab2c300c9dd5e03a42f164"
48+
revision="333c94bd8f368efcde3f2f93179bc7a0d4359316"
4949
initialize=false
5050

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

build/cargo-c.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := cargo-c
22
$(PKG)_WEBSITE := https://github.com/lu-zero/cargo-c
33
$(PKG)_DESCR := cargo applet to build and install C-ABI compatibile libraries
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.10.4
6-
$(PKG)_CHECKSUM := 3382f6c3eca404695885e79babfce6448124a481a77cec11c3bfeb5830f677c1
5+
$(PKG)_VERSION := 0.10.5
6+
$(PKG)_CHECKSUM := 3f131a6a647851a617a87daaaf777a9e50817957be0af29806615613e98efc8a
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := lu-zero/cargo-c/tags,v
99
$(PKG)_TARGETS := $(BUILD)

build/overrides.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ pango_SUBDIR := pango-$(pango_VERSION)
5959
pango_FILE := pango-$(pango_VERSION).tar.xz
6060
pango_URL := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE)
6161

62-
# upstream version is 2.82.1
63-
glib_VERSION := 2.82.2
64-
glib_CHECKSUM := ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63
65-
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
66-
glib_SUBDIR := glib-$(glib_VERSION)
67-
glib_FILE := glib-$(glib_VERSION).tar.xz
68-
glib_URL := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
69-
7062
# upstream version is 1.0.13
7163
# cannot use GH_CONF:
7264
# fribidi_GH_CONF := fribidi/fribidi/releases,v

build/patches/cargo-c-0.10-fixes.patch

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

build/patches/meson-1-fixes.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
2121
index 1111111..2222222 100644
2222
--- a/mesonbuild/linkers/linkers.py
2323
+++ b/mesonbuild/linkers/linkers.py
24-
@@ -641,7 +641,8 @@ class GnuLikeDynamicLinkerMixin:
24+
@@ -644,7 +644,8 @@ class GnuLikeDynamicLinkerMixin:
2525
return self._apply_prefix('--out-implib=' + implibname)
2626

2727
def thread_flags(self, env: 'Environment') -> T.List[str]:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
2929
index 1111111..2222222 100644
3030
--- a/library/unwind/src/lib.rs
3131
+++ b/library/unwind/src/lib.rs
32-
@@ -179,3 +179,8 @@ cfg_if::cfg_if! {
32+
@@ -178,3 +178,8 @@ cfg_if::cfg_if! {
3333
#[cfg(target_os = "hurd")]
3434
#[link(name = "gcc_s")]
3535
extern "C" {}

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/2024-10-16/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2024-10-28/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := 6bfddf15640d040ced97d696b619f34ae74d352b82e7a414719df5f87d14e428
7+
$(PKG)_CHECKSUM := cd3eb21f52ef3d1d2ee460baa79d185bd2efaf66aca104860fa49e8aed8be602
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/2024-10-16/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2024-10-28/$($(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.16
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.16.0
6-
$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
6+
$(PKG)_CHECKSUM := 6eca46c6ba5fac86224fd69007741012b0ea1f9aa1fcb9256b0cbc2faf768563
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
8+
$(PKG)_GH_CONF := libvips/libvips/releases,v,,,,.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION)-rc2.tar.xz
10+
$(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 libpng \
1313
libspng libimagequant highway imagemagick matio openexr \

0 commit comments

Comments
 (0)