Skip to content

Commit 561ba7c

Browse files
kleisaukekleisauke
committed
Update for 8.13.1
- Update Poppler to 22.09.0.
1 parent 8032084 commit 561ba7c

File tree

9 files changed

+67
-51
lines changed

9 files changed

+67
-51
lines changed

‎README.md

Lines changed: 2 additions & 2 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.55.0 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
40-
| [libvips] | 8.13.0 | LGPLv3 |
40+
| [libvips] | 8.13.1 | LGPLv3 |
4141
| [libwebp] | 1.2.4 | New BSD License |
4242
| [libxml2] | 2.10.2 | MIT Licence |
4343
| [mozjpeg] | 4.1.1 | [zlib License, IJG License, BSD-3-Clause] |
@@ -105,7 +105,7 @@ Same as libvips-web + these extra dependencies:
105105
| [openexr] | 3.1.5 | BSD 3-Clause |
106106
| [openjpeg] | 2.5.0 | BSD 2-Clause |
107107
| [openslide] | 3.4.1 | LGPLv3 |
108-
| [poppler] | 22.08.0 | GPLv2 |
108+
| [poppler] | 22.09.0 | GPLv2 |
109109
| [sqlite] | 3.39.2 | Public domain |
110110

111111
² libjxl is built from the [`v0.7rc`](https://github.com/libjxl/libjxl/tree/v0.7rc) tag, see:

‎build/overrides.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,14 @@ fftw_SUBDIR := fftw-$(fftw_VERSION)
161161
fftw_FILE := fftw-$(fftw_VERSION).tar.gz
162162
fftw_URL := http://www.fftw.org/$(fftw_FILE)
163163

164+
# upstream version is 22.08.0
165+
poppler_VERSION := 22.09.0
166+
poppler_CHECKSUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
167+
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
168+
poppler_SUBDIR := poppler-$(poppler_VERSION)
169+
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
170+
poppler_URL := https://poppler.freedesktop.org/$(poppler_FILE)
171+
164172
# upstream version is 2.14.02
165173
nasm_VERSION := 2.15.05
166174
nasm_CHECKSUM := 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f

‎build/patches/poppler-mingw-std-threads.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
105105
index 1111111..2222222 100644
106106
--- a/poppler/PDFDoc.h
107107
+++ b/poppler/PDFDoc.h
108-
@@ -49,7 +49,11 @@
108+
@@ -50,7 +50,11 @@
109109

110110
#include <algorithm>
111111
#include <cstdio>

‎build/patches/vips-8-libjxl-0.7-compat.patch

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
55
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
66
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
77
Date: Tue, 15 Sep 2020 11:50:00 +0200
8-
Subject: [PATCH 1/2] Add llvm-mingw i686/ARMv7 targets
8+
Subject: [PATCH 1/3] Add llvm-mingw i686/ARMv7 targets
99

1010
Upstream-Status: Pending
1111

@@ -62,7 +62,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
6262
index 1111111..2222222 100644
6363
--- a/compiler/rustc_target/src/spec/mod.rs
6464
+++ b/compiler/rustc_target/src/spec/mod.rs
65-
@@ -1006,7 +1006,9 @@ supported_targets! {
65+
@@ -1045,7 +1045,9 @@ supported_targets! {
6666
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
6767

6868
("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),
@@ -76,7 +76,7 @@ index 1111111..2222222 100644
7676
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
7777
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
7878
Date: Tue, 22 Sep 2020 10:00:00 +0200
79-
Subject: [PATCH 2/2] Ensure that panic_unwind/unwind can be successfully built on
79+
Subject: [PATCH 2/3] Ensure that panic_unwind/unwind can be successfully built on
8080
llvm-mingw
8181

8282
Fixes undefined symbol errors while linking these crates on llvm-mingw
@@ -129,3 +129,47 @@ index 1111111..2222222 100644
129129
link(name = "unwind", kind = "static", modifiers = "-bundle")
130130
)]
131131
extern "C" {
132+
133+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
134+
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
135+
Date: Tue, 30 Aug 2022 23:20:27 +0200
136+
Subject: [PATCH 3/3] windows-gnullvm: avoid linking to libunwind statically
137+
138+
Avoid linking against the static variant of libunwind, which is not
139+
always available. Instead, prefer to use the unwind library from the
140+
toolchain, which the linker will automatically include, depending
141+
on what's available, and depending on the -static flag.
142+
143+
diff --git a/compiler/rustc_target/src/spec/windows_gnullvm_base.rs b/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
144+
index 1111111..2222222 100644
145+
--- a/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
146+
+++ b/compiler/rustc_target/src/spec/windows_gnullvm_base.rs
147+
@@ -6,7 +6,7 @@ pub fn opts() -> TargetOptions {
148+
// There were attempts to make it behave like libgcc (so one can just use -l<name>)
149+
// but LLVM maintainers rejected it: https://reviews.llvm.org/D51440
150+
let pre_link_args =
151+
- TargetOptions::link_args(LinkerFlavor::Gcc, &["-nolibc", "--unwindlib=none"]);
152+
+ TargetOptions::link_args(LinkerFlavor::Gcc, &["-nolibc"]);
153+
// Order of `late_link_args*` does not matter with LLD.
154+
let late_link_args = TargetOptions::link_args(
155+
LinkerFlavor::Gcc,
156+
diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
157+
index 1111111..2222222 100644
158+
--- a/library/unwind/src/lib.rs
159+
+++ b/library/unwind/src/lib.rs
160+
@@ -3,7 +3,6 @@
161+
#![feature(link_cfg)]
162+
#![feature(staged_api)]
163+
#![feature(c_unwind)]
164+
-#![feature(cfg_target_abi)]
165+
#![cfg_attr(not(target_env = "msvc"), feature(libc))]
166+
167+
cfg_if::cfg_if! {
168+
@@ -104,7 +103,3 @@ extern "C" {}
169+
#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
170+
#[link(name = "unwind", kind = "static", modifiers = "-bundle")]
171+
extern "C" {}
172+
-
173+
-#[cfg(all(target_os = "windows", target_env = "gnu", target_abi = "llvm"))]
174+
-#[link(name = "unwind", kind = "static", modifiers = "-bundle")]
175+
-extern "C" {}

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

Lines changed: 4 additions & 12 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-08-30/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2022-09-03/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := 2f682fc0dbb88b56f3a556cabd5ac7c9a521fde8eaaf58cebfd4e0262838c3ce
7+
$(PKG)_CHECKSUM := b792d5b4dbebc76296cd39cbb1c817b8c06e3fdacab33f7476bec6bf0530a468
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-08-30/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-09-03/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

@@ -83,14 +83,9 @@ define $(PKG)_BUILD
8383
'$(PREFIX)/$(BUILD)/lib/rustlib/src/rust/library/rtstartup/$(FILE).rs';)
8484

8585
# Install the startup objects
86-
$(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib/self-contained'
86+
$(INSTALL) -d '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib'
8787
mv -vf '$(BUILD_DIR)/'rs{begin,end}.o '$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib'
8888

89-
# Copy CRT objects needed for self-contained linkage (-Clink-self-contained=yes)
90-
$(foreach FILE, crt2.o dllcrt2.o, \
91-
cp '$(PREFIX)/$(TARGET)/$(PROCESSOR)-w64-mingw32/lib/$(FILE)' \
92-
'$(PREFIX)/$(BUILD)/lib/rustlib/$(TARGET_RUST)/lib/self-contained';)
93-
9489
# Install Cargo config
9590
$(INSTALL) -d '$(PREFIX)/$(TARGET)/.cargo'
9691
(echo '[unstable]'; \
@@ -102,9 +97,6 @@ define $(PKG)_BUILD
10297
echo 'CC_$(TARGET_RUST) = "$(TARGET)-clang"'; \
10398
echo 'RUST_COMPILER_RT_ROOT = "$(PREFIX)/$(BUILD)/lib/rustlib/src/rust/src/llvm-project/compiler-rt"'; \
10499
echo '[target.$(TARGET_RUST)]'; \
105-
echo 'rustflags = ['; \
106-
echo ' "-Clink-self-contained=yes"'; \
107-
echo ']'; \
108100
echo 'linker = "$(TARGET)-clang"'; \
109101
echo 'ar = "$(PREFIX)/$(BUILD)/bin/llvm-ar"';) \
110102
> '$(PREFIX)/$(TARGET)/.cargo/config'

‎build/variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
vips_package=vips
44
vips_version=8.13
5-
vips_patch_version=0
5+
vips_patch_version=1
66
#vips_pre_version=rc2
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.13.0
6-
$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
5+
$(PKG)_VERSION := 8.13.1
6+
$(PKG)_CHECKSUM := ad377b7e561bb2118de9a3864fcaa60c61ba7f47e849f6044d1b339906197702
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
88
$(PKG)_GH_CONF := libvips/libvips/releases,v
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.13.0
6-
$(PKG)_CHECKSUM := b7e1d50dcf571165beecd36adece6eca6701c2a9e131c675143d8b9418dbdd81
5+
$(PKG)_VERSION := 8.13.1
6+
$(PKG)_CHECKSUM := ad377b7e561bb2118de9a3864fcaa60c61ba7f47e849f6044d1b339906197702
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
88
$(PKG)_GH_CONF := libvips/libvips/releases,v
99
$(PKG)_SUBDIR := vips-$($(PKG)_VERSION)

0 commit comments

Comments
 (0)