Update for 8.16.0

MXE Updates: - Update SQLite to 3.47.0.
libvips · Oct 28, 2024 · 06e4d57 · 06e4d57
1 parent d22422b
commit 06e4d57
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.59.1    | LGPLv3                                                       |
 | [libspng]       | 0.7.4     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.7.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.16.0²   | LGPLv3                                                       |
+| [libvips]       | 8.16.0    | LGPLv3                                                       |
 | [libwebp]       | 1.4.0     | New BSD License                                              |
 | [libxml2]       | 2.13.4    | MIT Licence                                                  |
 | [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.
 | [zlib-ng]       | 2.2.2     | [zlib-ng Licence]                                            |
 
 ¹ [A fork](https://github.com/lovell/libimagequant) of the BSD 2-Clause licensed libimagequant v2.4.1 is used.  
-² libvips is built from the [`v8.16.0-rc2`](https://github.com/libvips/libvips/tree/v8.16.0-rc2) tag, see:
-https://github.com/libvips/libvips/releases/tag/v8.16.0-rc2
 
 [aom]: https://aomedia.googlesource.com/aom/
 [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:
 | [openjpeg]      | 2.5.2     | BSD 2-Clause                                                 |
 | [openslide]     | 4.0.0     | LGPLv3                                                       |
 | [poppler]       | 24.10.0   | GPLv2                                                        |
-| [sqlite]        | 3.46.1    | Public domain                                                |
+| [sqlite]        | 3.47.0    | Public domain                                                |
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

diff --git a/build/build.sh b/build/build.sh
@@ -45,7 +45,7 @@ fi
 # Always checkout a particular revision which will successfully build.
 # This ensures that it will not suddenly break a build.
 # Note: Must be regularly updated.
-revision="ab32df6df2d018b1f1ab2c300c9dd5e03a42f164"
+revision="333c94bd8f368efcde3f2f93179bc7a0d4359316"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

diff --git a/build/cargo-c.mk b/build/cargo-c.mk
@@ -2,8 +2,8 @@ PKG             := cargo-c
 $(PKG)_WEBSITE  := https://github.com/lu-zero/cargo-c
 $(PKG)_DESCR    := cargo applet to build and install C-ABI compatibile libraries
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.10.4
-$(PKG)_CHECKSUM := 3382f6c3eca404695885e79babfce6448124a481a77cec11c3bfeb5830f677c1
+$(PKG)_VERSION  := 0.10.5
+$(PKG)_CHECKSUM := 3f131a6a647851a617a87daaaf777a9e50817957be0af29806615613e98efc8a
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := lu-zero/cargo-c/tags,v
 $(PKG)_TARGETS  := $(BUILD)

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -59,14 +59,6 @@ pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_VERSION).tar.xz
 pango_URL      := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,pango)/$(pango_FILE)
 
-# upstream version is 2.82.1
-glib_VERSION  := 2.82.2
-glib_CHECKSUM := ab45f5a323048b1659ee0fbda5cecd94b099ab3e4b9abf26ae06aeb3e781fd63
-glib_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
-glib_SUBDIR   := glib-$(glib_VERSION)
-glib_FILE     := glib-$(glib_VERSION).tar.xz
-glib_URL      := https://download.gnome.org/sources/glib/$(call SHORT_PKG_VERSION,glib)/$(glib_FILE)
-
 # upstream version is 1.0.13
 # cannot use GH_CONF:
 # fribidi_GH_CONF  := fribidi/fribidi/releases,v

diff --git a/build/patches/cargo-c-0.10-fixes.patch b/build/patches/cargo-c-0.10-fixes.patch
diff --git a/build/patches/meson-1-fixes.patch b/build/patches/meson-1-fixes.patch
@@ -21,7 +21,7 @@ diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
 index 1111111..2222222 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -641,7 +641,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -644,7 +644,8 @@ class GnuLikeDynamicLinkerMixin:
          return self._apply_prefix('--out-implib=' + implibname)
 
      def thread_flags(self, env: 'Environment') -> T.List[str]:

diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
@@ -29,7 +29,7 @@ diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
 index 1111111..2222222 100644
 --- a/library/unwind/src/lib.rs
 +++ b/library/unwind/src/lib.rs
-@@ -179,3 +179,8 @@ cfg_if::cfg_if! {
+@@ -178,3 +178,8 @@ cfg_if::cfg_if! {
  #[cfg(target_os = "hurd")]
  #[link(name = "gcc_s")]
  extern "C" {}

diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk
@@ -2,13 +2,13 @@ PKG             := rust
 $(PKG)_WEBSITE  := https://www.rust-lang.org/
 $(PKG)_DESCR    := A systems programming language focused on safety, speed and concurrency.
 $(PKG)_IGNORE   :=
-# https://static.rust-lang.org/dist/2024-10-16/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2024-10-28/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 6bfddf15640d040ced97d696b619f34ae74d352b82e7a414719df5f87d14e428
+$(PKG)_CHECKSUM := cd3eb21f52ef3d1d2ee460baa79d185bd2efaf66aca104860fa49e8aed8be602
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)c-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2024-10-16/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2024-10-28/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 

diff --git a/build/variables.sh b/build/variables.sh
@@ -3,7 +3,7 @@
 vips_package=vips
 vips_version=8.16
 vips_patch_version=0
-vips_pre_version=rc2
+#vips_pre_version=rc2
 
 if [ -n "$GIT_COMMIT" ]; then
   vips_version=$GIT_COMMIT

diff --git a/build/vips-all.mk b/build/vips-all.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.16.0
-$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
+$(PKG)_CHECKSUM := 6eca46c6ba5fac86224fd69007741012b0ea1f9aa1fcb9256b0cbc2faf768563
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc2.tar.xz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.xz
 $(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant highway imagemagick matio openexr \

diff --git a/build/vips-web.mk b/build/vips-web.mk
@@ -3,11 +3,11 @@ $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 8.16.0
-$(PKG)_CHECKSUM := 1e4efe52104f16710cb6608f855641d41c701c45510c6b9f9c5fbb123b74c873
+$(PKG)_CHECKSUM := 6eca46c6ba5fac86224fd69007741012b0ea1f9aa1fcb9256b0cbc2faf768563
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
-$(PKG)_GH_CONF  := libvips/libvips/releases,v,-rc2,,,-rc2.tar.xz
+$(PKG)_GH_CONF  := libvips/libvips/releases,v,,,,.tar.xz
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)
-$(PKG)_FILE     := vips-$($(PKG)_VERSION)-rc2.tar.xz
+$(PKG)_FILE     := vips-$($(PKG)_VERSION).tar.xz
 $(PKG)_DEPS     := cc meson-wrapper libwebp librsvg glib pango libarchive \
                    libjpeg-turbo tiff lcms libexif libheif libpng \
                    libspng libimagequant highway cgif