From 200d27e0fed58d43fffe7a903bb221b5f6bcc711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Fri, 10 May 2024 15:35:57 +0200 Subject: [PATCH] ci/win32: enable all available projects from meson's wrapdb Rubber Band is disabled because it pulls more dependencies and it is not worth build. Might be reconsidered later. --- .github/workflows/build.yml | 7 +++++++ ci/build-win32.ps1 | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 985282c3c7b12..12046a9e37484 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,6 +114,13 @@ jobs: - name: Update Meson WrapDB run: | meson wrap update-db + # Explicitly download wraps, as nested projects may have older versions of them. + meson wrap install expat + meson wrap install harfbuzz + meson wrap install libpng + meson wrap install zlib + # https://github.com/mesonbuild/wrapdb/issues/1510 + choco install gperf - name: Build id: build diff --git a/ci/build-win32.ps1 b/ci/build-win32.ps1 index 90528bec0d3df..b77e64c47b418 100644 --- a/ci/build-win32.ps1 +++ b/ci/build-win32.ps1 @@ -130,7 +130,7 @@ clone-recursive = true } meson setup build ` - --force-fallback-for=zlib ` + --wrap-mode=forcefallback ` -Ddefault_library=static ` -Dlibmpv=true ` -Dtests=true ` @@ -138,15 +138,27 @@ meson setup build ` -Dffmpeg:gpl=enabled ` -Dffmpeg:tests=disabled ` -Dffmpeg:programs=disabled ` + -Dffmpeg:sdl2=disabled ` + -Dffmpeg:vulkan=auto ` -Dlcms2:fastfloat=true ` + -Dlcms2:jpeg=disabled ` + -Dlcms2:tiff=disabled ` + -Dlibusb:tests=false ` + -Dlibusb:examples=false ` -Dlibplacebo:demos=false ` -Dlibplacebo:lcms=enabled ` -Dlibplacebo:shaderc=enabled ` -Dlibplacebo:vulkan=enabled ` -Dlibplacebo:d3d11=enabled ` + -Dxxhash:inline-all=true ` + -Dxxhash:cli=false ` -Dluajit:amalgam=true ` + -Drubberband=disabled ` -Dd3d11=enabled ` -Djavascript=enabled ` - -Dlua=luajit + -Dlua=luajit ` + -Dwayland=disabled ` + -Ddrm=disabled ` + -Dx11=disabled ninja -C build mpv.exe mpv.com libmpv.a ./build/mpv.com -v --no-config