From 08935d5d211b7b496b80d6fee2a655a3c8e622f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Fri, 16 Aug 2024 12:35:10 +0200 Subject: [PATCH] ci/{mingw,win32}: specify nasm as it seems to be required now by libass Fixes mingw and win32 builds after https://github.com/libass/libass/commit/1774117b8048d6296c79425cfbb1086bcd2ac2fa --- .github/workflows/build.yml | 2 +- ci/build-mingw64.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42646f6386..bb385e532d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -163,7 +163,7 @@ jobs: python -m pip install build wheel python -m build --wheel --no-isolation meson python -m pip install (Get-Item ./meson/dist/meson-*-py3-none-any.whl).FullName - choco install ccache + choco install ccache nasm - name: Update Meson WrapDB run: | diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index c96c87a810..4d24c34309 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -46,6 +46,7 @@ pkgconfig = 'pkg-config' pkg-config = 'pkg-config' windres = '${TARGET}-windres' dlltool = '${TARGET}-dlltool' +nasm = 'nasm' exe_wrapper = '${WINE}' [host_machine] system = 'windows'