Update for 8.11.2

- Update Pango to 1.48.6. - Update Imath to 3.0.5. - Update OpenEXR to 3.0.5. - Update Poppler to 21.07.0. - Update highway to the latest git revision. - Update libjxl to the latest git revision. - Install dynamic loadable modules in /bin.
libvips · Jul 3, 2021 · 18a99a0 · 18a99a0
1 parent f1d3fca
commit 18a99a0
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -36,12 +36,12 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.51.3    | LGPLv3                                                       |
 | [libspng]       | 0.6.3     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.11.0    | LGPLv3                                                       |
+| [libvips]       | 8.11.2    | LGPLv3                                                       |
 | [libwebp]       | 1.2.0     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |
 | [orc]           | 0.4.32    | [orc License] (BSD-like)                                     |
-| [pango]         | 1.48.5    | LGPLv3                                                       |
+| [pango]         | 1.48.6    | LGPLv3                                                       |
 | [pixman]        | 0.40.0    | MIT Licence                                                  |
 | [zlib-ng]       | 2.0.5     | [zlib-ng Licence]                                            |
 
@@ -92,20 +92,20 @@ Same as libvips-web + these extra dependencies:
 | [brotli]        | 1.0.9     | MIT Licence                                                  |
 | [cfitsio]       | 3.49      | BSD-like                                                     |
 | [fftw]          | 3.3.9     | GPLv2                                                        |
-| [highway]       | [9fefc7c] | Apache-2.0 License                                           |
+| [highway]       | [91017e4] | Apache-2.0 License                                           |
 | [imagemagick]   | 6.9.12-17 | [ImageMagick License] (Apache-2.0-like)                      |
-| [imath]         | 3.0.4     | BSD 3-Clause                                                 |
-| [libjxl]        | [6783d48] | BSD 3-Clause                                                 |
+| [imath]         | 3.0.5     | BSD 3-Clause                                                 |
+| [libjxl]        | [c8b0bf3] | BSD 3-Clause                                                 |
 | [matio]         | 1.5.21    | BSD 2-Clause                                                 |
 | [nifticlib]     | 2.0.0     | Public domain                                                |
-| [openexr]       | 3.0.4     | BSD 3-Clause                                                 |
+| [openexr]       | 3.0.5     | BSD 3-Clause                                                 |
 | [openjpeg]      | 2.4.0     | BSD 2-Clause                                                 |
 | [openslide]     | 3.4.1     | LGPLv3                                                       |
-| [poppler]       | 21.06.1   | GPLv2                                                        |
+| [poppler]       | 21.07.0   | GPLv2                                                        |
 | [sqlite]        | 3.36.0    | Public domain                                                |
 
-[9fefc7c]: https://github.com/google/highway/commit/9fefc7cef1dd5ee83221b3446a1415020a64eabf
-[6783d48]: https://github.com/libjxl/libjxl/commit/6783d48aa68dbca76b2259f3414efbbffa14eeab
+[91017e4]: https://github.com/google/highway/commit/91017e4f3bb7e3a178e3f2b1f393adea60a6df0d
+[c8b0bf3]: https://github.com/libjxl/libjxl/commit/c8b0bf3789351c9ccd8c48441354c522fd9ab188
 
 [brotli]: https://github.com/google/brotli
 [cfitsio]: https://heasarc.gsfc.nasa.gov/fitsio/

diff --git a/build/highway.mk b/build/highway.mk
@@ -2,9 +2,9 @@ PKG             := highway
 $(PKG)_WEBSITE  := https://github.com/google/highway
 $(PKG)_DESCR    := Performance-portable, length-agnostic SIMD with runtime dispatch
 $(PKG)_IGNORE   :=
-# https://github.com/google/highway/tarball/9fefc7cef1dd5ee83221b3446a1415020a64eabf
-$(PKG)_VERSION  := 9fefc7c
-$(PKG)_CHECKSUM := 73fd70cbbb5cf2d80ea4e14042d15dcc8be5b7b7935e7caf4547ff234e88ee06
+# https://github.com/google/highway/tarball/91017e4f3bb7e3a178e3f2b1f393adea60a6df0d
+$(PKG)_VERSION  := 91017e4
+$(PKG)_CHECKSUM := c07f25290c3a6c660b5ebf9b2184c4353a643828a1b9f1d7390d40bc733eb274
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/highway-[0-9]*.patch)))
 $(PKG)_GH_CONF  := google/highway/branches/master
 $(PKG)_DEPS     := cc

diff --git a/build/imath.mk b/build/imath.mk
@@ -2,8 +2,8 @@ PKG             := imath
 $(PKG)_WEBSITE  := https://github.com/AcademySoftwareFoundation/Imath
 $(PKG)_DESCR    := A C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics.
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.4
-$(PKG)_CHECKSUM := 3b5cef518964755963550b5f4a16e7c0a0872574921b1443f1d47fdb6b8c5afe
+$(PKG)_VERSION  := 3.0.5
+$(PKG)_CHECKSUM := 38b94c840c6400959ccf647bc1631f96f3170cb081021d774813803e798208bd
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_GH_CONF  := AcademySoftwareFoundation/Imath/tags,v
 $(PKG)_DEPS     := cc

diff --git a/build/libjxl.mk b/build/libjxl.mk
@@ -2,9 +2,9 @@ PKG             := libjxl
 $(PKG)_WEBSITE  := https://github.com/libjxl/libjxl
 $(PKG)_DESCR    := JPEG XL image format reference implementation
 $(PKG)_IGNORE   :=
-# https://github.com/libjxl/libjxl/tarball/6783d48aa68dbca76b2259f3414efbbffa14eeab
-$(PKG)_VERSION  := 6783d48
-$(PKG)_CHECKSUM := 2ff471794b0d85f705faaea4a13a1c0cdd9da9533639c57e82ef8e1f689f00df
+# https://github.com/libjxl/libjxl/tarball/c8b0bf3789351c9ccd8c48441354c522fd9ab188
+$(PKG)_VERSION  := c8b0bf3
+$(PKG)_CHECKSUM := 7f9ee9d54a3a2bbf753680aac67ce49a316d062ffb072958232cfdbf0ff78fdc
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjxl-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libjxl/libjxl/branches/main
 $(PKG)_DEPS     := cc brotli highway lcms libjpeg-turbo libpng

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -54,8 +54,8 @@ librsvg_FILE     := librsvg-$(librsvg_VERSION).tar.xz
 librsvg_URL      := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
 
 # upstream version is 1.37.4
-pango_VERSION  := 1.48.5
-pango_CHECKSUM := 501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a
+pango_VERSION  := 1.48.6
+pango_CHECKSUM := 3027cd6b5e34bff49c38c769ca651a5f9ef6e0d54cadaa1263d872044bedc7dd
 pango_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
 pango_SUBDIR   := pango-$(pango_VERSION)
 pango_FILE     := pango-$(pango_VERSION).tar.xz
@@ -98,8 +98,8 @@ cairo_URL      := http://cairographics.org/snapshots/$(cairo_FILE)
 # upstream version is 2.2.0
 # cannot use GH_CONF:
 # openexr_GH_CONF  := AcademySoftwareFoundation/openexr/tags
-openexr_VERSION  := 3.0.4
-openexr_CHECKSUM := 64daae95d406fe3f59ee11ad8586d03fe7df2552b9630eac1a4f9152b8015fb9
+openexr_VERSION  := 3.0.5
+openexr_CHECKSUM := 7aa6645da70e9a0cce8215d25030cfd4f4b17b4abf1ceec314f7eae15674e8e4
 openexr_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/openexr-[0-9]*.patch)))
 openexr_SUBDIR   := openexr-$(openexr_VERSION)
 openexr_FILE     := openexr-$(openexr_VERSION).tar.gz
@@ -139,8 +139,8 @@ fftw_FILE     := fftw-$(fftw_VERSION).tar.gz
 fftw_URL      := http://www.fftw.org/$(fftw_FILE)
 
 # upstream version is 21.02.0
-poppler_VERSION  := 21.06.1
-poppler_CHECKSUM := 86b09e5a02de40081a3916ef8711c5128eaf4b1fc59d5f87d0ec66f04f595db4
+poppler_VERSION  := 21.07.0
+poppler_CHECKSUM := e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4
 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
@@ -468,6 +468,9 @@ endef
 # build with the Meson build system
 # force FontConfig since the Win32 font backend within Cairo is disabled
 define pango_BUILD
+    # Disable utils, examples, tests and tools
+    $(SED) -i "/subdir('utils')/{N;N;N;d;}" '$(SOURCE_DIR)/meson.build'
+
     '$(TARGET)-meson' \
         --buildtype=release \
         $(if $(STRIP_LIB), --strip) \
@@ -528,13 +531,14 @@ define poppler_BUILD
         -DENABLE_DCTDECODER='libjpeg' \
         -DFONT_CONFIGURATION=win32 \
         -DENABLE_UNSTABLE_API_ABI_HEADERS=OFF \
-        -DENABLE_SPLASH=OFF \
+        -DENABLE_BOOST=OFF \
         -DENABLE_CPP=OFF \
         -DBUILD_GTK_TESTS=OFF \
         -DENABLE_UTILS=OFF \
         -DENABLE_QT5=OFF \
         -DENABLE_LIBCURL=OFF \
         -DBUILD_QT5_TESTS=OFF \
+        -DBUILD_QT6_TESTS=OFF \
         -DBUILD_CPP_TESTS=OFF \
         -DBUILD_MANUAL_TESTS=OFF \
         -DENABLE_GTK_DOC=OFF \

diff --git a/build/package-vipsdev.sh b/build/package-vipsdev.sh
@@ -94,7 +94,7 @@ strip=$mxe_prefix/bin/$target.$deps-strip
 # Directories
 install_dir=$mxe_prefix/$target.$deps
 bin_dir=$install_dir/bin
-module_dir=$install_dir/lib/vips-modules-$vips_version
+module_dir=$install_dir/bin/vips-modules-$vips_version
 
 echo "Copying libvips and dependencies"
 
@@ -120,6 +120,8 @@ if [ -d "$module_dir" ]; then
       cp -n $dll $repackage_dir/bin
     done
   done
+  mkdir -p $repackage_dir/bin/vips-modules-$vips_version
+  cp $module_dir/*.dll $repackage_dir/bin/vips-modules-$vips_version
 fi
 
 echo "Copying install area $install_dir/"
@@ -161,7 +163,7 @@ echo "Strip unneeded symbols"
 # Remove all symbols that are not needed
 if [ "$DEBUG" = "false" ]; then
   $strip --strip-unneeded $repackage_dir/bin/*.{exe,dll}
-  [ -d "$module_dir" ] && $strip --strip-unneeded $repackage_dir/lib/vips-modules-$vips_version/*.dll
+  [ -d "$module_dir" ] && $strip --strip-unneeded $repackage_dir/bin/vips-modules-$vips_version/*.dll
 fi
 
 echo "Copying packaging files"

diff --git a/build/patches/libjxl-0.4-fixes.patch b/build/patches/libjxl-0.4-fixes.patch
@@ -250,7 +250,7 @@ index 1111111..2222222 100644
    extras/codec_pnm.cc
    extras/codec_pnm.h
    extras/codec_psd.cc
-@@ -32,9 +30,17 @@ set_property(TARGET jxl_extras-static PROPERTY POSITION_INDEPENDENT_CODE ON)
+@@ -34,9 +32,17 @@ set_property(TARGET jxl_extras-static PROPERTY POSITION_INDEPENDENT_CODE ON)
  target_include_directories(jxl_extras-static PUBLIC "${PROJECT_SOURCE_DIR}")
  target_link_libraries(jxl_extras-static PUBLIC
    jxl-static
@@ -306,7 +306,7 @@ diff --git a/lib/jxl.cmake b/lib/jxl.cmake
 index 1111111..2222222 100644
 --- a/lib/jxl.cmake
 +++ b/lib/jxl.cmake
-@@ -545,7 +545,10 @@ endforeach()
+@@ -543,7 +543,10 @@ endforeach()
  # contains symbols also in libjxl which would conflict if programs try to use
  # both.
  install(TARGETS jxl

diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
@@ -53,7 +53,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
 index 1111111..2222222 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -827,10 +827,12 @@ supported_targets! {
+@@ -863,10 +863,12 @@ supported_targets! {
 
      ("x86_64-unknown-illumos", x86_64_unknown_illumos),
 
@@ -72,7 +72,7 @@ index 0000000..1111111
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/thumbv7a_pc_windows_gnu.rs
 @@ -0,0 +1,35 @@
-+use crate::spec::{LinkerFlavor, LinkOutputKind, LldFlavor, Target};
++use crate::spec::{FramePointer, LinkerFlavor, LinkOutputKind, LldFlavor, Target};
 +
 +pub fn target() -> Target {
 +    let mut base = super::windows_gnu_base::opts();
@@ -81,7 +81,7 @@ index 0000000..1111111
 +    base.pre_link_args
 +        .insert(LinkerFlavor::Lld(LldFlavor::Ld), vec!["-m".to_string(), "thumb2pe".to_string()]);
 +    base.max_atomic_width = Some(64);
-+    base.eliminate_frame_pointer = false; // Required for backtraces
++    base.frame_pointer = FramePointer::Always; // Required for backtraces
 +    base.linker = Some("ld.lld".to_string());
 +    base.linker_flavor = LinkerFlavor::Lld(LldFlavor::Ld);
 +
@@ -180,8 +180,8 @@ index 1111111..2222222 100644
 --- a/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs
 +++ b/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs
 @@ -1,4 +1,4 @@
--use crate::spec::{LinkerFlavor, LldFlavor, Target};
-+use crate::spec::{LinkerFlavor, LinkOutputKind, LldFlavor, Target};
+-use crate::spec::{FramePointer, LinkerFlavor, LldFlavor, Target};
++use crate::spec::{FramePointer, LinkerFlavor, LinkOutputKind, LldFlavor, Target};
 
  pub fn target() -> Target {
      let mut base = super::windows_gnu_base::opts();

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/2021-06-29/rustc-nightly-src.tar.gz.sha256
+# https://static.rust-lang.org/dist/2021-07-03/rustc-nightly-src.tar.gz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 0eaf8739ef5777c7bc8aec61517d76eab3d2b2f3159d87d5753c8a360e92ba93
+$(PKG)_CHECKSUM := d1de51184c7b2693c3cf9eb61f6ff98e40cd04eb8acdb2811240b124af02abb3
 $(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.gz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2021-06-29/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2021-07-03/$($(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.11
-vips_patch_version=1
+vips_patch_version=2
 #vips_pre_version=rc1
 
 # build-win64-mxe/build dir we are building

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.11.1
-$(PKG)_CHECKSUM := 426f04d245e57341165ac7e8c1d201eb34c8ed5720a192787dba22ef98ff3605
+$(PKG)_VERSION  := 8.11.2
+$(PKG)_CHECKSUM := bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 $(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)
@@ -71,8 +71,14 @@ endef
 define $(PKG)_BUILD
     $($(PKG)_PRE_CONFIGURE)
 
+    # --libdir argument ensures that the dynamic modules
+    # are installed and found in /bin (Windows convention).
+    # --with-pkgconfigdir argument is needed since we have
+    # overwritten the $libdir variable.
     cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
         $(MXE_CONFIGURE_OPTS) \
+        --libdir='$(PREFIX)/$(TARGET)/bin' \
+        --with-pkgconfigdir='$(PREFIX)/$(TARGET)/lib/pkgconfig' \
         --enable-debug=no \
         --without-pdfium \
         --disable-introspection \

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.11.1
-$(PKG)_CHECKSUM := 426f04d245e57341165ac7e8c1d201eb34c8ed5720a192787dba22ef98ff3605
+$(PKG)_VERSION  := 8.11.2
+$(PKG)_CHECKSUM := bb5ab776ee4c61ae94b4496c63ef523ca7367ebceabcba78ceb1bf97b1d36e06
 $(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)