Update for 8.13.1

- Update Poppler to 22.09.0.
libvips · Sep 3, 2022 · 561ba7c · 561ba7c
1 parent 8032084
commit 561ba7c
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 51 deletions.
diff --git 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.55.0    | LGPLv3                                                       |
 | [libspng]       | 0.7.2     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.4.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.13.0    | LGPLv3                                                       |
+| [libvips]       | 8.13.1    | LGPLv3                                                       |
 | [libwebp]       | 1.2.4     | New BSD License                                              |
 | [libxml2]       | 2.10.2    | MIT Licence                                                  |
 | [mozjpeg]       | 4.1.1     | [zlib License, IJG License, 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.08.0   | GPLv2                                                        |
+| [poppler]       | 22.09.0   | GPLv2                                                        |
 | [sqlite]        | 3.39.2    | Public domain                                                |
 
 ² libjxl is built from the [`v0.7rc`](https://github.com/libjxl/libjxl/tree/v0.7rc) tag, see:

diff --git a/build/overrides.mk b/build/overrides.mk
@@ -161,6 +161,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.08.0
+poppler_VERSION  := 22.09.0
+poppler_CHECKSUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
+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/poppler-mingw-std-threads.patch b/build/patches/poppler-mingw-std-threads.patch
@@ -105,7 +105,7 @@ diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
 index 1111111..2222222 100644
 --- a/poppler/PDFDoc.h
 +++ b/poppler/PDFDoc.h
-@@ -49,7 +49,11 @@
+@@ -50,7 +50,11 @@
 
  #include <algorithm>
  #include <cstdio>

diff --git a/build/patches/vips-8-libjxl-0.7-compat.patch b/build/patches/vips-8-libjxl-0.7-compat.patch
diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <[email protected]>
 Date: Tue, 15 Sep 2020 11:50:00 +0200
-Subject: [PATCH 1/2] Add llvm-mingw i686/ARMv7 targets
+Subject: [PATCH 1/3] Add llvm-mingw i686/ARMv7 targets
 
 Upstream-Status: Pending
 
@@ -62,7 +62,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
-@@ -1006,7 +1006,9 @@ supported_targets! {
+@@ -1045,7 +1045,9 @@ supported_targets! {
      ("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
 
      ("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),
@@ -76,7 +76,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Kleis Auke Wolthuizen <[email protected]>
 Date: Tue, 22 Sep 2020 10:00:00 +0200
-Subject: [PATCH 2/2] Ensure that panic_unwind/unwind can be successfully built on
+Subject: [PATCH 2/3] Ensure that panic_unwind/unwind can be successfully built on
  llvm-mingw
 
 Fixes undefined symbol errors while linking these crates on llvm-mingw
@@ -129,3 +129,47 @@ index 1111111..2222222 100644
          link(name = "unwind", kind = "static", modifiers = "-bundle")
      )]
      extern "C" {
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <[email protected]>
+Date: Tue, 30 Aug 2022 23:20:27 +0200
+Subject: [PATCH 3/3] windows-gnullvm: avoid linking to libunwind statically
+
+Avoid linking against the static variant of libunwind, which is not
+always available. Instead, prefer to use the unwind library from the
+toolchain, which the linker will automatically include, depending
+on what's available, and depending on the -static flag.
+
+diff --git a/compiler/rustc_target/src/spec/windows_gnullvm_base.rs b/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
+index 1111111..2222222 100644
+--- a/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
++++ b/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
+@@ -6,7 +6,7 @@ pub fn opts() -> TargetOptions {
+     // There were attempts to make it behave like libgcc (so one can just use -l<name>)
+     // but LLVM maintainers rejected it: https://reviews.llvm.org/D51440
+     let pre_link_args =
+-        TargetOptions::link_args(LinkerFlavor::Gcc, &["-nolibc", "--unwindlib=none"]);
++        TargetOptions::link_args(LinkerFlavor::Gcc, &["-nolibc"]);
+     // Order of `late_link_args*` does not matter with LLD.
+     let late_link_args = TargetOptions::link_args(
+         LinkerFlavor::Gcc,
+diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
+index 1111111..2222222 100644
+--- a/library/unwind/src/lib.rs
++++ b/library/unwind/src/lib.rs
+@@ -3,7 +3,6 @@
+ #![feature(link_cfg)]
+ #![feature(staged_api)]
+ #![feature(c_unwind)]
+-#![feature(cfg_target_abi)]
+ #![cfg_attr(not(target_env = "msvc"), feature(libc))]
+
+ cfg_if::cfg_if! {
+@@ -104,7 +103,3 @@ extern "C" {}
+ #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
+ #[link(name = "unwind", kind = "static", modifiers = "-bundle")]
+ extern "C" {}
+-
+-#[cfg(all(target_os = "windows", target_env = "gnu", target_abi = "llvm"))]
+-#[link(name = "unwind", kind = "static", modifiers = "-bundle")]
+-extern "C" {}
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-08-30/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2022-09-03/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 2f682fc0dbb88b56f3a556cabd5ac7c9a521fde8eaaf58cebfd4e0262838c3ce
+$(PKG)_CHECKSUM := b792d5b4dbebc76296cd39cbb1c817b8c06e3fdacab33f7476bec6bf0530a468
 $(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-08-30/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2022-09-03/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 
@@ -83,14 +83,9 @@ define $(PKG)_BUILD
             '$(PREFIX)/$(BUILD)/lib/rustlib/src/rust/library/rtstartup/$(FILE).rs';)
 
     # Install the startup objects
-    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib/self-contained'
+    $(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib'
     mv -vf '$(BUILD_DIR)/'rs{begin,end}.o '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib'
 
-    # Copy CRT objects needed for self-contained linkage (-Clink-self-contained=yes)
-    $(foreach FILE, crt2.o dllcrt2.o, \
-        cp '$(PREFIX)/$(TARGET)/$(PROCESSOR)-w64-mingw32/lib/$(FILE)' \
-            '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib/self-contained';)
-
     # Install Cargo config
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/.cargo'
     (echo '[unstable]'; \
@@ -102,9 +97,6 @@ define $(PKG)_BUILD
      echo 'CC_$(TARGET_RUST) = "$(TARGET)-clang"'; \
      echo 'RUST_COMPILER_RT_ROOT = "$(PREFIX)/$(BUILD)/lib/rustlib/src/rust/src/llvm-project/compiler-rt"'; \
      echo '[target.$(TARGET_RUST)]'; \
-     echo 'rustflags = ['; \
-     echo '    "-Clink-self-contained=yes"'; \
-     echo ']'; \
      echo 'linker = "$(TARGET)-clang"'; \
      echo 'ar = "$(PREFIX)/$(BUILD)/bin/llvm-ar"';) \
              > '$(PREFIX)/$(TARGET)/.cargo/config'

diff --git a/build/variables.sh b/build/variables.sh
@@ -2,7 +2,7 @@
 
 vips_package=vips
 vips_version=8.13
-vips_patch_version=0
+vips_patch_version=1
 #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.0
-$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
+$(PKG)_VERSION  := 8.13.1
+$(PKG)_CHECKSUM := ad377b7e561bb2118de9a3864fcaa60c61ba7f47e849f6044d1b339906197702
 $(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.0
-$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
+$(PKG)_VERSION  := 8.13.1
+$(PKG)_CHECKSUM := ad377b7e561bb2118de9a3864fcaa60c61ba7f47e849f6044d1b339906197702
 $(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)