Skip to content

Commit 61d3dd9

Browse files
committed
Updated xz to 5.8.1, except on Windows x86
1 parent 9f41957 commit 61d3dd9

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

.github/workflows/wheels-dependencies.sh

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ HARFBUZZ_VERSION=11.0.0
4242
LIBPNG_VERSION=1.6.47
4343
JPEGTURBO_VERSION=3.1.0
4444
OPENJPEG_VERSION=2.5.3
45-
XZ_VERSION=5.8.0
45+
XZ_VERSION=5.8.1
4646
TIFF_VERSION=4.7.0
4747
LCMS2_VERSION=2.17
4848
ZLIB_VERSION=1.3.1
@@ -53,20 +53,6 @@ LIBXCB_VERSION=1.17.0
5353
BROTLI_VERSION=1.1.0
5454
LIBAVIF_VERSION=1.2.1
5555

56-
if [[ $MB_ML_VER == 2014 ]]; then
57-
function build_xz {
58-
if [ -e xz-stamp ]; then return; fi
59-
yum install -y gettext-devel
60-
fetch_unpack https://tukaani.org/xz/xz-$XZ_VERSION.tar.gz
61-
(cd xz-$XZ_VERSION \
62-
&& ./autogen.sh --no-po4a \
63-
&& ./configure --prefix=$BUILD_PREFIX \
64-
&& make -j4 \
65-
&& make install)
66-
touch xz-stamp
67-
}
68-
fi
69-
7056
function build_pkg_config {
7157
if [ -e pkg-config-stamp ]; then return; fi
7258
# This essentially duplicates the Homebrew recipe

winbuild/build_prepare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def cmd_msbuild(
122122
"LIBWEBP": "1.5.0",
123123
"OPENJPEG": "2.5.3",
124124
"TIFF": "4.7.0",
125-
"XZ": "5.6.4",
125+
"XZ": "5.6.4" if struct.calcsize("P") == 4 else "5.8.1",
126126
"ZLIBNG": "2.2.4",
127127
}
128128
V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])

0 commit comments

Comments
 (0)