diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b061b9f..dbcc63c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -248,12 +248,12 @@ jobs: - name: Install dependencies id: install run: | - 7z x winbuild\depends\nasm-2.14.02-win64.zip "-o$env:RUNNER_WORKSPACE\" - echo "$env:RUNNER_WORKSPACE\nasm-2.14.02" >> $env:GITHUB_PATH + 7z x winbuild\depends\nasm-2.16.01-win64.zip "-o$env:RUNNER_WORKSPACE\" + echo "$env:RUNNER_WORKSPACE\nasm-2.16.01" >> $env:GITHUB_PATH - winbuild\depends\gs9533w32.exe /S - echo "C:\Program Files (x86)\gs\gs9.53.3\bin" >> $env:GITHUB_PATH + python -m pip install meson + # make cache key depend on VS version & "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ` | find """catalog_buildVersion""" ` | ForEach-Object { $a = $_.split(" ")[1]; echo "vs=$a" >> $env:GITHUB_OUTPUT } @@ -270,7 +270,7 @@ jobs: - name: Prepare build if: steps.build-cache.outputs.cache-hit != 'true' run: | - & python.exe winbuild\build_prepare.py -v --python=$env:pythonLocation --srcdir + & python.exe winbuild\build_prepare.py -v shell: pwsh - name: Build dependencies / libjpeg-turbo diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index c51136c..ba808a6 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -559,10 +559,6 @@ def build_pillow_avif_plugin(): os.makedirs(path, exist_ok=True) disabled = [] - if args.no_imagequant: - disabled += ["libimagequant"] - if args.no_fribidi: - disabled += ["fribidi"] prefs = { "architecture": args.architecture,