From be9b3ccb41c45b934374213782f72414a28b4778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Tue, 24 Sep 2024 03:22:02 +0200
Subject: [PATCH] ci/win32: use upstream meson

The fix for response files escaping issues has been merged.

See: https://github.com/mesonbuild/meson/pull/11715
---
 .github/workflows/build.yml | 6 +-----
 DOCS/compile-windows.md     | 8 --------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8c5ff67993..af32713ec3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -147,13 +147,9 @@ jobs:
           key: x86_64-windows-msvc-${{ steps.get_time.outputs.timestamp }}
           restore-keys: x86_64-windows-msvc-
 
-      # https://github.com/mesonbuild/meson/pull/11715
       - name: Install dependencies
         run: |
-          git clone https://github.com/kasper93/meson --depth 1 -b 8981
-          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
+          python -m pip install meson
           choco install ccache nasm
 
       - name: Update Meson WrapDB
diff --git a/DOCS/compile-windows.md b/DOCS/compile-windows.md
index 2f21f9a1c2..4850796a5a 100644
--- a/DOCS/compile-windows.md
+++ b/DOCS/compile-windows.md
@@ -151,14 +151,6 @@ they will be automatically downloaded and built by Meson.
       & "<Visual Studio Path>\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64 -HostArch amd64 -SkipAutomaticLocation | Out-Null
       ```
 2. Install Meson, as outlined in [Getting Meson](https://mesonbuild.com/Getting-meson.html):
-   - **Important**: At the time of writing, there is an issue in Meson with
-     escaping response files.
-
-     See: [mesonbuild/meson#8981](https://github.com/mesonbuild/meson/issues/8981)
-     and [mesonbuild/meson#11715](https://github.com/mesonbuild/meson/pull/11715)
-
-     If you wish to install a fixed version, follow the steps outlined
-     [here](https://github.com/mpv-player/mpv/blob/481e498427fc34956ad24b94157553908f5cd638/.github/workflows/build.yml#L132-L135).
 3. The following build script utilizes the Meson subprojects system to build mpv and its dependencies.
    To make sure all dependency versions are up-to-date, update the subprojects database from Meson's WrapDB.
    Also explicitly download several wraps as some nested projects may pull older versions of them.