Skip to content

Commit ea33b02

Browse files
kleisaukekleisauke
committed
Update for 8.13.0-rc1
- Update aom to 3.4.0. - Update ImageMagick to 6.9.12-54. - Switch libvips build to Meson.
1 parent 7edf897 commit ea33b02

File tree

12 files changed

+70
-107
lines changed

12 files changed

+70
-107
lines changed

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
1717

1818
| Dependency | Version | Used under the terms of |
1919
|-----------------|-----------|--------------------------------------------------------------|
20-
| [aom] | 3.3.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
20+
| [aom] | 3.4.0 | BSD 2-Clause + [Alliance for Open Media Patent License 1.0] |
2121
| [cairo] | 1.17.6 | Mozilla Public License 2.0 |
2222
| [cgif] | 0.3.0 | MIT Licence |
2323
| [expat] | 2.4.8 | MIT Licence |
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
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.12.2 | LGPLv3 |
40+
| [libvips] | 8.13.0² | LGPLv3 |
4141
| [libwebp] | 1.2.2 | New BSD License |
4242
| [libxml2] | 2.9.14 | MIT Licence |
4343
| [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] |
@@ -48,6 +48,8 @@ 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-rc1`](https://github.com/libvips/libvips/tree/v8.13.0-rc1) tag, see:
52+
https://github.com/libvips/libvips/releases/tag/v8.13.0-rc1
5153

5254
[aom]: https://aomedia.googlesource.com/aom/
5355
[Alliance for Open Media Patent License 1.0]: https://aomedia.org/license/patent-license/
@@ -97,7 +99,7 @@ Same as libvips-web + these extra dependencies:
9799
| [cfitsio] | 4.1.0 | BSD-like |
98100
| [fftw] | 3.3.10 | GPLv2 |
99101
| [highway] | 0.17.0 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-52 | [ImageMagick License] (Apache-2.0-like) |
102+
| [imagemagick] | 6.9.12-54 | [ImageMagick License] (Apache-2.0-like) |
101103
| [imath] | 3.1.5 | BSD 3-Clause |
102104
| [libjxl] | 0.6.1 | BSD 3-Clause |
103105
| [matio] | 1.5.23 | BSD 2-Clause |

‎build/aom.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := aom
22
$(PKG)_WEBSITE := https://aomedia.googlesource.com/aom/
33
$(PKG)_DESCR := AV1 Codec Library
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 3.3.0
6-
$(PKG)_CHECKSUM := 1dafde32bc2237bf0570294661ae61db30e818840f77dc4e90d1ebf5a6286664
5+
$(PKG)_VERSION := 3.4.0
6+
$(PKG)_CHECKSUM := bd754b58c3fa69f3ffd29da77de591bd9c26970e3b18537951336d6c0252e354
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_SUBDIR := libaom-$($(PKG)_VERSION)
99
$(PKG)_FILE := libaom-$($(PKG)_VERSION).tar.gz

‎build/overrides.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
3939
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4040

4141
# upstream version is 7, we want ImageMagick 6
42-
imagemagick_VERSION := 6.9.12-52
43-
imagemagick_CHECKSUM := 033bbb2b07219337ee49ec43d3b36813b0a6b92bb4089be39abceb48edc5e135
42+
imagemagick_VERSION := 6.9.12-54
43+
imagemagick_CHECKSUM := af0d88cdbfd814cea231e950367c4d1251e11371b84aeabda5ddf63dc5be760a
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

‎build/patches/aom-3-fixes.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
1212
index 1111111..2222222 100644
1313
--- a/build/cmake/aom_configure.cmake
1414
+++ b/build/cmake/aom_configure.cmake
15-
@@ -216,6 +216,12 @@ aom_get_inline("INLINE")
15+
@@ -242,6 +242,12 @@ aom_get_inline("INLINE")
1616
# Don't just check for pthread.h, but use the result of the full pthreads
1717
# including a linking check in FindThreads above.
1818
set(HAVE_PTHREAD_H ${CMAKE_USE_PTHREADS_INIT})
@@ -83,7 +83,7 @@ diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
8383
index 1111111..2222222 100644
8484
--- a/av1/decoder/decodeframe.c
8585
+++ b/av1/decoder/decodeframe.c
86-
@@ -5194,6 +5194,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
86+
@@ -5225,6 +5225,7 @@ static AOM_INLINE void setup_frame_info(AV1Decoder *pbi) {
8787
}
8888
}
8989

@@ -95,7 +95,7 @@ diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
9595
index 1111111..2222222 100644
9696
--- a/av1/encoder/encoder.c
9797
+++ b/av1/encoder/encoder.c
98-
@@ -3614,6 +3614,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
98+
@@ -3675,6 +3675,7 @@ static int encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
9999
return AOM_CODEC_OK;
100100
}
101101

‎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-
@@ -340,6 +340,7 @@ guint32 vips__random( guint32 seed );
12+
@@ -392,6 +392,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-
@@ -1227,6 +1227,12 @@ vips_guess_prefix( const char *argv0, const char *env_name )
24+
@@ -1213,6 +1213,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-
@@ -1251,6 +1257,7 @@ vips_guess_libdir( const char *argv0, const char *env_name )
37+
@@ -1237,6 +1243,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-
@@ -1983,6 +1983,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
49+
@@ -1993,6 +1993,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
5050
return( TRUE );
5151
}
5252
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
6363
index 1111111..2222222 100644
6464
--- a/compiler/rustc_target/src/spec/mod.rs
6565
+++ b/compiler/rustc_target/src/spec/mod.rs
66-
@@ -945,7 +945,9 @@ supported_targets! {
66+
@@ -950,7 +950,9 @@ supported_targets! {
6767
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
6868

6969
("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),

‎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-06-13/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2022-06-20/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := d78ac20cae80390dd2d075255ff77800e1fb9e4cea3c8a2bad1dd5ae57441a70
7+
$(PKG)_CHECKSUM := 8ae98efd12756c35ce3d808e1de97dc0561e1a8f5db5f89ff9bca1dbc36adc2b
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-06-13/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-06-20/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

‎build/plugins/nightly/overrides.mk‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,7 @@ vips-web_GH_CONF := libvips/libvips/branches/master
88
vips-web_SUBDIR := libvips-libvips-$(GIT_COMMIT)
99
vips-web_FILE := vips-web-$(GIT_COMMIT).tar.gz
1010

11-
vips-web_BUILD_x86_64-w64-mingw32 = $(subst configure,autogen.sh,$(vips-web_BUILD))
12-
vips-web_BUILD_i686-w64-mingw32 = $(subst configure,autogen.sh,$(vips-web_BUILD))
13-
vips-web_BUILD_aarch64-w64-mingw32 = $(subst configure,autogen.sh,$(vips-web_BUILD))
14-
vips-web_BUILD_armv7-w64-mingw32 = $(subst configure,autogen.sh,$(vips-web_BUILD))
15-
1611
vips-all_VERSION := $(GIT_COMMIT)
1712
vips-all_GH_CONF := libvips/libvips/branches/master
1813
vips-all_SUBDIR := libvips-libvips-$(GIT_COMMIT)
1914
vips-all_FILE := vips-all-$(GIT_COMMIT).tar.gz
20-
21-
vips-all_BUILD_x86_64-w64-mingw32 = $(subst configure,autogen.sh,$(vips-all_BUILD))
22-
vips-all_BUILD_i686-w64-mingw32 = $(subst configure,autogen.sh,$(vips-all_BUILD))
23-
vips-all_BUILD_aarch64-w64-mingw32 = $(subst configure,autogen.sh,$(vips-all_BUILD))
24-
vips-all_BUILD_armv7-w64-mingw32 = $(subst configure,autogen.sh,$(vips-all_BUILD))

‎build/variables.sh‎

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

33
vips_package=vips
4-
vips_version=8.12
5-
vips_patch_version=2
6-
#vips_pre_version=rc1
4+
vips_version=8.13
5+
vips_patch_version=0
6+
vips_pre_version=rc1
77

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

‎build/vips-all.mk‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ 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.12.2
6-
$(PKG)_CHECKSUM := 565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b
5+
$(PKG)_VERSION := 8.13.0
6+
$(PKG)_CHECKSUM := 3bce6ada3c18a38f59a8f51297ed59b19ab8ca1076770c715f0d33de19842d2a
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
8-
$(PKG)_GH_CONF := libvips/libvips/releases,v
9-
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)
10-
$(PKG)_FILE := vips-$($(PKG)_VERSION).tar.gz
11-
$(PKG)_DEPS := cc libwebp librsvg glib pango libgsf \
8+
$(PKG)_SUBDIR := libvips-$($(PKG)_VERSION)-rc1
9+
$(PKG)_GH_CONF := libvips/libvips/tags,v,-rc1
10+
$(PKG)_DEPS := cc meson-wrapper libwebp librsvg glib pango libgsf \
1211
libjpeg-turbo tiff lcms libexif libheif libpng \
1312
libspng libimagequant orc imagemagick matio openexr \
1413
cfitsio nifticlib poppler fftw openslide libjxl cgif
@@ -76,25 +75,18 @@ endef
7675
define $(PKG)_BUILD
7776
$($(PKG)_PRE_CONFIGURE)
7877

79-
# Allow libtool to statically link against libintl
80-
# by specifying lt_cv_deplibs_check_method="pass_all"
81-
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
82-
$(MXE_CONFIGURE_OPTS) \
83-
--enable-debug=no \
84-
$(if $(IS_LLVM),, --without-libjxl) \
85-
--without-pdfium \
86-
--disable-introspection \
87-
--disable-deprecated \
88-
--with-heif=$(if $(IS_HEVC),module,yes) \
89-
$(if $(findstring graphicsmagick,$($(PKG)_DEPS)), --with-magickpackage=GraphicsMagick) \
90-
CPPFLAGS='-DVIPS_DLLDIR_AS_LIBDIR' \
91-
$(if $(IS_INTL_DUMMY), lt_cv_deplibs_check_method="pass_all")
78+
$(MXE_MESON_WRAPPER) \
79+
-Ddeprecated=false \
80+
-Dintrospection=false \
81+
-Dmodules=enabled \
82+
-Dheif-module=$(if $(IS_HEVC),enabled,disabled) \
83+
-Djpeg-xl=$(if $(IS_LLVM),enabled,disabled) \
84+
$(if $(findstring graphicsmagick,$($(PKG)_DEPS)), -Dmagick-package=GraphicsMagick) \
85+
-Dpdfium=disabled \
86+
-Dquantizr=disabled \
87+
-Dc_args='$(CFLAGS) -DVIPS_DLLDIR_AS_LIBDIR' \
88+
'$(SOURCE_DIR)' \
89+
'$(BUILD_DIR)'
9290

93-
# remove -nostdlib from linker commandline options
94-
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
95-
$(if $(IS_LLVM), \
96-
$(SED) -i '/^archive_cmds=/s/\-nostdlib//g' '$(BUILD_DIR)/libtool')
97-
98-
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
99-
$(MAKE) -C '$(BUILD_DIR)' -j 1 $(INSTALL_STRIP_LIB)
91+
$(MXE_NINJA) -C '$(BUILD_DIR)' -j '$(JOBS)' install
10092
endef

0 commit comments

Comments
 (0)