Merge pull request #8868 from radarhere/xz_upgrade

Updated xz to 5.8.1

Author: hugovk

.github/workflows/wheels-dependencies.sh

@@ -42,7 +42,7 @@ HARFBUZZ_VERSION=11.0.1
 LIBPNG_VERSION=1.6.47
 JPEGTURBO_VERSION=3.1.0
 OPENJPEG_VERSION=2.5.3
-XZ_VERSION=5.8.0
+XZ_VERSION=5.8.1
 TIFF_VERSION=4.7.0
 LCMS2_VERSION=2.17
 ZLIB_VERSION=1.3.1
@@ -53,20 +53,6 @@ LIBXCB_VERSION=1.17.0
 BROTLI_VERSION=1.1.0
 LIBAVIF_VERSION=1.2.1
 
-if [[ $MB_ML_VER == 2014 ]]; then
- function build_xz {
- if [ -e xz-stamp ]; then return; fi
- yum install -y gettext-devel
- fetch_unpack https://tukaani.org/xz/xz-$XZ_VERSION.tar.gz
- (cd xz-$XZ_VERSION \
- && ./autogen.sh --no-po4a \
- && ./configure --prefix=$BUILD_PREFIX \
- && make -j4 \
- && make install)
- touch xz-stamp
- }
-fi
-
 function build_pkg_config {
  if [ -e pkg-config-stamp ]; then return; fi
  # This essentially duplicates the Homebrew recipe

winbuild/build_prepare.py

@@ -122,7 +122,7 @@ def cmd_msbuild(
  "LIBWEBP": "1.5.0",
  "OPENJPEG": "2.5.3",
  "TIFF": "4.7.0",
- "XZ": "5.6.4",
+ "XZ": "5.8.1",
  "ZLIBNG": "2.2.4",
 }
 V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2])
@@ -181,7 +181,11 @@ def cmd_msbuild(
  "filename": f"xz-{V['XZ']}.tar.gz",
  "license": "COPYING",
  "build": [
- *cmds_cmake("liblzma", "-DBUILD_SHARED_LIBS:BOOL=OFF"),
+ *cmds_cmake(
+ "liblzma",
+ "-DBUILD_SHARED_LIBS:BOOL=OFF"
+ + (" -DXZ_CLMUL_CRC:BOOL=OFF" if struct.calcsize("P") == 4 else ""),
+ ),
  cmd_mkdir(r"{inc_dir}\lzma"),
  cmd_copy(r"src\liblzma\api\lzma\*.h", r"{inc_dir}\lzma"),
  ],