Skip to content

Commit

Permalink
ci/msys2: double down on running meson through python3.11
Browse files Browse the repository at this point in the history
Fixes: eb4da34
  • Loading branch information
kasper93 committed Jun 28, 2023
1 parent f8cb539 commit 661c9cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ jobs:
libjpeg-turbo:p
libplacebo:p
lua51:p
meson:p
ninja:p
pkgconf:p
python3.11:p
Expand Down
6 changes: 4 additions & 2 deletions ci/build-msys2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/sh -e

if [ "$1" = "meson" ]; then
meson setup build \
python3.11 -m ensurepip
python3.11 -m pip install meson
python3.11 -m mesonbuild.mesonmain setup build \
--native-file=ci/msys2-meson.txt \
-D cdda=enabled \
-D d3d-hwaccel=enabled \
Expand All @@ -24,7 +26,7 @@ if [ "$1" = "meson" ]; then
-D uchardet=enabled \
-D vapoursynth=enabled \
-D vulkan=enabled
meson compile -C build
python3.11 -m mesonbuild.mesonmain compile -C build
cp ./build/generated/mpv.com ./build
./build/mpv.com -v --no-config
fi
Expand Down

0 comments on commit 661c9cd

Please sign in to comment.