diff --git a/.github/dependencies.json b/.github/dependencies.json index cc6e74fbac5..f2331bff8a1 100644 --- a/.github/dependencies.json +++ b/.github/dependencies.json @@ -4,7 +4,7 @@ "freetype": "2.14.3", "fribidi": "1.0.16", "harfbuzz": "14.2.1", - "jpegturbo": "3.1.4.1", + "jpegturbo": "3.2.0", "lcms2": "2.19.1", "libavif": "1.4.2", "libimagequant": "4.4.1", diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 8f47b3dea6a..238fa89edda 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -269,7 +269,9 @@ function build { fi build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib - build_libjpeg_turbo + # -DCMAKE_POSITION_INDEPENDENT_CODE=1 is a workaround from https://github.com/libjpeg-turbo/libjpeg-turbo/issues/898 + HOST_CMAKE_FLAGS="-DCMAKE_POSITION_INDEPENDENT_CODE=1 $HOST_CMAKE_FLAGS" build_libjpeg_turbo + if [[ -n "$IS_MACOS" ]]; then # Custom tiff build to include jpeg; by default, configure won't include # headers/libs in the custom macOS/iOS prefix. Explicitly disable webp, diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index b69d1486e0d..587e08b2159 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -133,7 +133,7 @@ def cmd_msbuild( "patch": { r"CMakeLists.txt": { # libjpeg-turbo does not detect MSVC x86_arm64 cross-compiler correctly - 'if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64")': "if({architecture} STREQUAL ARM64)", # noqa: E501 + 'elseif(CMAKE_GENERATOR_PLATFORM_LC MATCHES "arm64")': "elseif({architecture} STREQUAL ARM64)", # noqa: E501 }, }, "build": [