Skip to content

Commit 6eb2151

Browse files
kleisaukekleisauke
committed
Update for 8.16.0-rc1
- Update libjpeg-turbo to 3.0.4.
1 parent 9d7428f commit 6eb2151

File tree

9 files changed

+25
-26
lines changed

9 files changed

+25
-26
lines changed

‎README.md‎

Lines changed: 4 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.15.5² | 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,8 @@ 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.15.5-rc1`](https://github.com/libvips/libvips/tree/v8.15.5-rc1) tag, see:
51-
https://github.com/libvips/libvips/releases/tag/v8.15.5-rc1
50+
² libvips is built from the [`v8.16.0-rc1`](https://github.com/libvips/libvips/tree/v8.16.0-rc1) tag, see:
51+
https://github.com/libvips/libvips/releases/tag/v8.16.0-rc1
5252

5353
[aom]: https://aomedia.googlesource.com/aom/
5454
[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:
140140

141141
| Dependency | Version | Used under the terms of |
142142
|-----------------|-----------|--------------------------------------------------------------|
143-
| [libjpeg-turbo] | 3.0.3 | [zlib License, IJG License] |
143+
| [libjpeg-turbo] | 3.0.4 | [zlib License, IJG License] |
144144

145145
[libjpeg-turbo]: https://github.com/libjpeg-turbo/libjpeg-turbo
146146
[zlib License, IJG License]: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/LICENSE.md

‎build/overrides.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ openexr_FILE := openexr-$(openexr_VERSION).tar.gz
9595
openexr_URL := https://github.com/AcademySoftwareFoundation/openexr/archive/v$(openexr_VERSION).tar.gz
9696

9797
# upstream version is 3.0.1
98-
libjpeg-turbo_VERSION := 3.0.3
99-
libjpeg-turbo_CHECKSUM := 343e789069fc7afbcdfe44dbba7dbbf45afa98a15150e079a38e60e44578865d
98+
libjpeg-turbo_VERSION := 3.0.4
99+
libjpeg-turbo_CHECKSUM := 99130559e7d62e8d695f2c0eaeef912c5828d5b84a0537dcb24c9678c9d5b76b
100100
libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch)))
101101
libjpeg-turbo_SUBDIR := libjpeg-turbo-$(libjpeg-turbo_VERSION)
102102
libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h
99
index 1111111..2222222 100644
1010
--- a/libvips/include/vips/util.h
1111
+++ b/libvips/include/vips/util.h
12-
@@ -427,6 +427,7 @@ guint32 vips__random(guint32 seed);
12+
@@ -418,6 +418,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-
@@ -1171,6 +1171,12 @@ vips_guess_prefix(const char *argv0, const char *env_name)
24+
@@ -1211,6 +1211,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-
@@ -1195,6 +1201,7 @@ vips_guess_libdir(const char *argv0, const char *env_name)
37+
@@ -1235,6 +1241,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-
@@ -1980,6 +1980,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
49+
@@ -1894,6 +1894,54 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
5050
return TRUE;
5151
}
5252
#endif

‎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-
@@ -532,20 +532,9 @@ vips_foreign_save_heif_build(VipsObject *object)
21+
@@ -533,20 +533,9 @@ vips_foreign_save_heif_build(VipsObject *object)
2222
!vips_object_argument_isset(object, "subsample_mode"))
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-
@@ -691,14 +680,10 @@ vips_foreign_save_heif_build(VipsObject *object)
44+
@@ -717,14 +706,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-
@@ -733,7 +718,7 @@ vips_foreign_save_heif_class_init(VipsForeignSaveHeifClass *class)
60+
@@ -759,7 +744,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-
@@ -786,7 +771,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
69+
@@ -812,7 +797,7 @@ vips_foreign_save_heif_init(VipsForeignSaveHeif *heif)
7070
{
7171
heif->ctx = heif_context_alloc();
7272
heif->Q = 50;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ diff --git a/compiler/rustc_target/src/spec/base/windows_gnullvm.rs b/compiler/r
1616
index 1111111..2222222 100644
1717
--- a/compiler/rustc_target/src/spec/base/windows_gnullvm.rs
1818
+++ b/compiler/rustc_target/src/spec/base/windows_gnullvm.rs
19-
@@ -42,6 +42,9 @@ pub(crate) fn opts() -> TargetOptions {
19+
@@ -42,6 +42,8 @@ pub(crate) fn opts() -> TargetOptions {
2020
eh_frame_header: false,
2121
no_default_libraries: false,
2222
has_thread_local: true,
2323
+ crt_static_allows_dylibs: true,
24-
+ crt_static_default: true,
2524
+ crt_static_respected: true,
2625
// FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to
2726
// output DWO, despite using DWARF, doesn't use ELF..

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

Lines changed: 4 additions & 4 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-02/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2024-10-10/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := ca6051de8426585ef88d8594feb33e26607a5a9e1fb8ae02f473d52e0cb97015
7+
$(PKG)_CHECKSUM := 60afaca7ba28fd8f7831a788f34bbec0801feb6ebc442a0a5842af56d34bcc08
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-02/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2024-10-10/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

@@ -95,6 +95,6 @@ define $(PKG)_BUILD
9595
echo '[target.$(TARGET_RUST)]'; \
9696
echo 'ar = "$(PREFIX)/$(BUILD)/bin/llvm-ar"'; \
9797
echo 'linker = "$(TARGET)-clang"'; \
98-
$(if $(BUILD_SHARED), echo 'rustflags = ["-Ctarget-feature=-crt-static"]';)) \
98+
$(if $(BUILD_STATIC), echo 'rustflags = ["-Ctarget-feature=+crt-static"]';)) \
9999
> '$(PREFIX)/$(TARGET)/.cargo/config.toml'
100100
endef

‎build/variables.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# included by all scripts
22

33
vips_package=vips
4-
vips_version=8.15
5-
vips_patch_version=5
4+
vips_version=8.16
5+
vips_patch_version=0
66
vips_pre_version=rc1
77

88
if [ -n "$GIT_COMMIT" ]; then

‎build/vips-all.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ 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.15.5
6-
$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7
5+
$(PKG)_VERSION := 8.16.0
6+
$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
88
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)

‎build/vips-web.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ 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.15.5
6-
$(PKG)_CHECKSUM := 7c59d20996373482fe55ebf7999ba605e74540fadd647894b17fa35ebf2f50b7
5+
$(PKG)_VERSION := 8.16.0
6+
$(PKG)_CHECKSUM := 190b8d8590094cb181a70b29272bbbe8c29729047d998b75ec7ce00adb4310e3
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
88
$(PKG)_GH_CONF := libvips/libvips/releases,v,-rc1,,,-rc1.tar.xz
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)

0 commit comments

Comments
 (0)