RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ci/win32: use upstream meson 

The fix for response files escaping issues has been merged.

See: https://github.com/mesonbuild/meson/pull/11715
This commit is contained in:
Kacper Michajłow 2024-09-24 03:22:02 +02:00
parent ca7006a6a2
commit be9b3ccb41
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -147,13 +147,9 @@ jobs:
key: x86_64-windows-msvc-${{ steps.get_time.outputs.timestamp }} key: x86_64-windows-msvc-${{ steps.get_time.outputs.timestamp }}
restore-keys: x86_64-windows-msvc- restore-keys: x86_64-windows-msvc-
# https://github.com/mesonbuild/meson/pull/11715
- name: Install dependencies - name: Install dependencies
run: | run: |
git clone https://github.com/kasper93/meson --depth 1 -b 8981 python -m pip install meson
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 nasm choco install ccache nasm
- name: Update Meson WrapDB - name: Update Meson WrapDB

8
DOCS/compile-windows.md
View File

@ -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 & "<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): 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. 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. 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. Also explicitly download several wraps as some nested projects may pull older versions of them.