diff --git a/README.md b/README.md index 3945fb8..c1fc77b 100644 --- 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.15.5² | 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,8 @@ 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.15.5-rc1`](https://github.com/libvips/libvips/tree/v8.15.5-rc1) tag, see: -https://github.com/libvips/libvips/releases/tag/v8.15.5-rc1 +² libvips is built from the [`v8.16.0-rc1`](https://github.com/libvips/libvips/tree/v8.16.0-rc1) tag, see: +https://github.com/libvips/libvips/releases/tag/v8.16.0-rc1 [aom]: https://aomedia.googlesource.com/aom/ [Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/ @@ -140,7 +140,7 @@ In that case, the following version of libjpeg-turbo is built: | Dependency | Version | Used under the terms of | |-----------------|-----------|--------------------------------------------------------------| -| [libjpeg-turbo] | 3.0.3 | [zlib License, IJG License] | +| [libjpeg-turbo] | 3.0.4 | [zlib License, IJG License] | [libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo [zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/LICENSE.md diff --git a/build/overrides.mk b/build/overrides.mk index 10afa56..34f3ca5 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -95,8 +95,8 @@ openexr_FILE := openexr-$(openexr_VERSION).tar.gz openexr_URL := https://github.com/AcademySoftwareFoundation/openexr/archive/v$(openexr_VERSION).tar.gz # upstream version is 3.0.1 -libjpeg-turbo_VERSION := 3.0.3 -libjpeg-turbo_CHECKSUM := 343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d +libjpeg-turbo_VERSION := 3.0.4 +libjpeg-turbo_CHECKSUM := 99130559e7d62e8d695f2c0eaeef912c5828d5b84a0537dcb24c9678c9d5b76b libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch))) libjpeg-turbo_SUBDIR := libjpeg-turbo-$(libjpeg-turbo_VERSION) libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch index 97689af..265f14a 100644 --- a/build/patches/vips-8-dlldir-as-libdir.patch +++ b/build/patches/vips-8-dlldir-as-libdir.patch @@ -9,7 +9,7 @@ diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h index 1111111..2222222 100644 --- a/libvips/include/vips/util.h +++ b/libvips/include/vips/util.h -@@ -427,6 +427,7 @@ guint32 vips__random(guint32 seed); +@@ -418,6 +418,7 @@ guint32 vips__random(guint32 seed); guint32 vips__random_add(guint32 seed, int value); const char *vips__icc_dir(void); @@ -21,7 +21,7 @@ diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c index 1111111..2222222 100644 --- a/libvips/iofuncs/init.c +++ b/libvips/iofuncs/init.c -@@ -1171,6 +1171,12 @@ vips_guess_prefix(const char *argv0, const char *env_name) +@@ -1211,6 +1211,12 @@ vips_guess_prefix(const char *argv0, const char *env_name) const char * vips_guess_libdir(const char *argv0, const char *env_name) { @@ -34,7 +34,7 @@ index 1111111..2222222 100644 const char *prefix = vips_guess_prefix(argv0, env_name); static char *libdir = NULL; -@@ -1195,6 +1201,7 @@ vips_guess_libdir(const char *argv0, const char *env_name) +@@ -1235,6 +1241,7 @@ vips_guess_libdir(const char *argv0, const char *env_name) libdir = g_strdup_printf("%s/lib", prefix); return libdir; @@ -46,7 +46,7 @@ diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c index 1111111..2222222 100644 --- a/libvips/iofuncs/util.c +++ b/libvips/iofuncs/util.c -@@ -1980,6 +1980,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +@@ -1894,6 +1894,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } #endif diff --git a/build/patches/vips-8-heifsave-disable-hbr-support.patch b/build/patches/vips-8-heifsave-disable-hbr-support.patch index 15c9403..4b6b32e 100644 --- a/build/patches/vips-8-heifsave-disable-hbr-support.patch +++ b/build/patches/vips-8-heifsave-disable-hbr-support.patch @@ -18,7 +18,7 @@ diff --git a/libvips/foreign/heifsave.c b/libvips/foreign/heifsave.c index 1111111..2222222 100644 --- a/libvips/foreign/heifsave.c +++ b/libvips/foreign/heifsave.c -@@ -532,20 +532,9 @@ vips_foreign_save_heif_build(VipsObject *object) +@@ -533,20 +533,9 @@ vips_foreign_save_heif_build(VipsObject *object) !vips_object_argument_isset(object, "subsample_mode")) heif->subsample_mode = VIPS_FOREIGN_SUBSAMPLE_OFF; @@ -41,7 +41,7 @@ index 1111111..2222222 100644 vips_error("heifsave", _("%d-bit colour depth not supported"), heif->bitdepth); return -1; -@@ -691,14 +680,10 @@ vips_foreign_save_heif_build(VipsObject *object) +@@ -717,14 +706,10 @@ vips_foreign_save_heif_build(VipsObject *object) } #define UC VIPS_FORMAT_UCHAR @@ -57,7 +57,7 @@ index 1111111..2222222 100644 }; static void -@@ -733,7 +718,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class) +@@ -759,7 +744,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class) _("Number of bits per pixel"), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET(VipsForeignSaveHeif, bitdepth), @@ -66,7 +66,7 @@ index 1111111..2222222 100644 VIPS_ARG_BOOL(class, "lossless", 13, _("Lossless"), -@@ -786,7 +771,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif) +@@ -812,7 +797,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif) { heif->ctx = heif_context_alloc(); heif->Q = 50; diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch index b7c909c..901f11a 100644 --- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch +++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch @@ -16,12 +16,11 @@ diff --git a/compiler/rustc_target/src/spec/base/windows_gnullvm.rs b/compiler/r index 1111111..2222222 100644 --- a/compiler/rustc_target/src/spec/base/windows_gnullvm.rs +++ b/compiler/rustc_target/src/spec/base/windows_gnullvm.rs -@@ -42,6 +42,9 @@ pub(crate) fn opts() -> TargetOptions { +@@ -42,6 +42,8 @@ pub(crate) fn opts() -> TargetOptions { eh_frame_header: false, no_default_libraries: false, has_thread_local: true, + crt_static_allows_dylibs: true, -+ crt_static_default: true, + crt_static_respected: true, // FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to // output DWO, despite using DWARF, doesn't use ELF.. diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index 385ee01..a4587dd 100644 --- 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-02/rustc-nightly-src.tar.xz.sha256 +# https://static.rust-lang.org/dist/2024-10-10/rustc-nightly-src.tar.xz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := ca6051de8426585ef88d8594feb33e26607a5a9e1fb8ae02f473d52e0cb97015 +$(PKG)_CHECKSUM := 60afaca7ba28fd8f7831a788f34bbec0801feb6ebc442a0a5842af56d34bcc08 $(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-02/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2024-10-10/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) @@ -95,6 +95,6 @@ define $(PKG)_BUILD echo '[target.$(TARGET_RUST)]'; \ echo 'ar = "$(PREFIX)/$(BUILD)/bin/llvm-ar"'; \ echo 'linker = "$(TARGET)-clang"'; \ - $(if $(BUILD_SHARED), echo 'rustflags = ["-Ctarget-feature=-crt-static"]';)) \ + $(if $(BUILD_STATIC), echo 'rustflags = ["-Ctarget-feature=+crt-static"]';)) \ > '$(PREFIX)/$(TARGET)/.cargo/config.toml' endef diff --git a/build/variables.sh b/build/variables.sh index aa44cd7..6029d34 100755 --- a/build/variables.sh +++ b/build/variables.sh @@ -1,8 +1,8 @@ # included by all scripts vips_package=vips -vips_version=8.15 -vips_patch_version=5 +vips_version=8.16 +vips_patch_version=0 vips_pre_version=rc1 if [ -n "$GIT_COMMIT" ]; then diff --git a/build/vips-all.mk b/build/vips-all.mk index b966f1a..c6b48fb 100644 --- a/build/vips-all.mk +++ b/build/vips-all.mk @@ -2,8 +2,8 @@ PKG := vips-all $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.15.5 -$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7 +$(PKG)_VERSION := 8.16.0 +$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION) diff --git a/build/vips-web.mk b/build/vips-web.mk index 035d6f7..bffc3da 100644 --- a/build/vips-web.mk +++ b/build/vips-web.mk @@ -2,8 +2,8 @@ PKG := vips-web $(PKG)_WEBSITE := https://libvips.github.io/libvips/ $(PKG)_DESCR := A fast image processing library with low memory needs. $(PKG)_IGNORE := -$(PKG)_VERSION := 8.15.5 -$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7 +$(PKG)_VERSION := 8.16.0 +$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3 $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch))) $(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz $(PKG)_SUBDIR := vips-$($(PKG)_VERSION)