Update for 8.13.3

- Update Orc to 0.4.33. - Update highway to 1.0.2. - Update Poppler to 22.11.0.
libvips · Nov 1, 2022 · a96b47a · a96b47a
1 parent 795deeb
commit a96b47a
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -37,11 +37,11 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.55.1    | LGPLv3                                                       |
 | [libspng]       | 0.7.2     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.4.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.13.2    | LGPLv3                                                       |
+| [libvips]       | 8.13.3    | LGPLv3                                                       |
 | [libwebp]       | 1.2.4     | New BSD License                                              |
 | [libxml2]       | 2.10.3    | MIT Licence                                                  |
 | [mozjpeg]       | 4.1.1     | [zlib License, IJG License, BSD-3-Clause]                    |
-| [orc]           | 0.4.32    | [orc License] (BSD-like)                                     |
+| [orc]           | 0.4.33    | [orc License] (BSD-like)                                     |
 | [pango]         | 1.50.11   | LGPLv3                                                       |
 | [pixman]        | 0.42.0    | MIT Licence                                                  |
 | [proxy-libintl] | 0.4       | LGPLv3                                                       |
@@ -96,7 +96,7 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 4.1.0     | BSD-like                                                     |
 | [fftw]          | 3.3.10    | GPLv2                                                        |
-| [highway]       | 1.0.1     | Apache-2.0 License                                           |
+| [highway]       | 1.0.2     | Apache-2.0 License                                           |
 | [imagemagick]   | 6.9.12-66 | [ImageMagick License] (Apache-2.0-like)                      |
 | [imath]         | 3.1.5     | BSD 3-Clause                                                 |
 | [libjxl]        | 0.7.0     | BSD 3-Clause                                                 |
@@ -105,7 +105,7 @@ Same as libvips-web + these extra dependencies:
 | [openexr]       | 3.1.5     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.5.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
-| [poppler]       | 22.10.0   | GPLv2                                                        |
+| [poppler]       | 22.11.0   | GPLv2                                                        |
 | [sqlite]        | 3.39.4    | Public domain                                                |
 
 [brotli]: https://github.com/google/brotli

diff --git a/build/build.sh b/build/build.sh
@@ -51,7 +51,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="ade463f7bce4aa9c20867f6db1a7a4245fcb51ce"
+revision="6b0647c122d56431ece83424c4110b1ece45b7c3"
 initialize=false
 
 if [ -f "$mxe_dir/Makefile" ]; then

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,8 +2,8 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.1
-$(PKG)_CHECKSUM := 7ca6af7dc2e3e054de9e17b9dfd88609a7fd202812b1c216f43cc41647c97311
+$(PKG)_VERSION  := 1.0.2
+$(PKG)_CHECKSUM := e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/tags
 $(PKG)_DEPS     := cc

diff --git a/build/orc.mk b/build/orc.mk
@@ -2,8 +2,8 @@ PKG             := orc
 $(PKG)_WEBSITE  := https://gstreamer.freedesktop.org/modules/orc.html
 $(PKG)_DESCR    := Library and set of tools for compiling and executing SIMD assembly language-like programs that operate on arrays of data.
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.4.32
-$(PKG)_CHECKSUM := a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
+$(PKG)_VERSION  := 0.4.33
+$(PKG)_CHECKSUM := 844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -69,14 +69,6 @@ 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 2.4.9
-expat_VERSION  := 2.5.0
-expat_CHECKSUM := ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
-expat_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/expat-[0-9]*.patch)))
-expat_SUBDIR   := expat-$(expat_VERSION)
-expat_FILE     := expat-$(expat_VERSION).tar.xz
-expat_URL      := https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(expat_VERSION))/$(expat_FILE)
-
 # upstream version is 1.14.30
 libgsf_VERSION  := 1.14.50
 libgsf_CHECKSUM := 6e6c20d0778339069d583c0d63759d297e817ea10d0d897ebbe965f16e2e8e52
@@ -144,6 +136,14 @@ fftw_SUBDIR   := fftw-$(fftw_VERSION)
 fftw_FILE     := fftw-$(fftw_VERSION).tar.gz
 fftw_URL      := http://www.fftw.org/$(fftw_FILE)
 
+# upstream version is 22.10.0
+poppler_VERSION  := 22.11.0
+poppler_CHECKSUM := 093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828
+poppler_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
+poppler_SUBDIR   := poppler-$(poppler_VERSION)
+poppler_FILE     := poppler-$(poppler_VERSION).tar.xz
+poppler_URL      := https://poppler.freedesktop.org/$(poppler_FILE)
+
 # upstream version is 2.14.02
 nasm_VERSION  := 2.15.05
 nasm_CHECKSUM := 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f

diff --git a/build/patches/orc-0.4-fixes.patch b/build/patches/orc-0.4-fixes.patch
@@ -12,15 +12,15 @@ diff --git a/meson.build b/meson.build
 index 1111111..2222222 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -19,6 +19,7 @@ add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
+@@ -18,6 +18,7 @@ add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 
  orc_inc = include_directories('.')
 
 +host_os = host_machine.system()
  cc = meson.get_compiler('c')
 
  cdata = configuration_data()      # config.h
-@@ -33,13 +34,19 @@ if meson.version().version_compare('>= 0.46.0')
+@@ -30,13 +31,19 @@ if meson.version().version_compare('>= 0.46.0')
  endif
 
  # Symbol visibility
@@ -47,7 +47,7 @@ index 1111111..2222222 100644
  endif
  # Passing this through the command line would be too messy
  cdata.set('ORC_API_EXPORT', export_define)
-@@ -88,7 +95,6 @@ if cc.has_header_symbol('android/log.h', '__android_log_print')
+@@ -96,7 +103,6 @@ if cc.has_header_symbol('android/log.h', '__android_log_print')
    liblog = [cc.find_library('log', required : true)]
  endif
 

diff --git a/build/patches/poppler-mingw-std-threads.patch b/build/patches/poppler-mingw-std-threads.patch
@@ -57,7 +57,7 @@ diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
 index 1111111..2222222 100644
 --- a/poppler/CairoFontEngine.h
 +++ b/poppler/CairoFontEngine.h
-@@ -32,7 +32,11 @@
+@@ -33,7 +33,11 @@
  #define CAIROFONTENGINE_H
 
  #include <memory>

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/2022-10-26/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2022-11-01/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 077df82b82351368dd5ce2897765f48992b487d1d9070209334f64767c480f82
+$(PKG)_CHECKSUM := d2891fd47f7c5a8533662099cd225330f57376ba0f7f27ebb4f431b107612a78
 $(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/2022-10-26/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2022-11-01/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 

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

diff --git 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.13.2
-$(PKG)_CHECKSUM := 41db5ed40a22ad50f8f37782e1ae5bac76f9f2e0b5731728f97c55f245f1da2a
+$(PKG)_VERSION  := 8.13.3
+$(PKG)_CHECKSUM := 4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)

diff --git 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.13.2
-$(PKG)_CHECKSUM := 41db5ed40a22ad50f8f37782e1ae5bac76f9f2e0b5731728f97c55f245f1da2a
+$(PKG)_VERSION  := 8.13.3
+$(PKG)_CHECKSUM := 4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)