summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorKacper Michajłow <kasper93@gmail.com>2023-06-28 20:44:34 +0200
committersfan5 <sfan5@live.de>2023-07-02 15:15:43 +0200
commitc637beb5223b0af5a671c8829a0e1a42e7e9a411 (patch)
tree4ec03b67929680c75edd6556f11c27cc0eca6f65 /ci
parentb616a6cef17dd77b485c1ae20be8732038535c82 (diff)
downloadmpv-c637beb5223b0af5a671c8829a0e1a42e7e9a411.tar.bz2
mpv-c637beb5223b0af5a671c8829a0e1a42e7e9a411.tar.xz
ci/msys2: double down on running meson through python3.11
Run not only scripts inside build system, but also meson itself with Python 3.11. Fixes: eb4da3400a1c37eea7b258b00297e8b8fcdd8db4
Diffstat (limited to 'ci')
-rwxr-xr-xci/build-msys2.sh4
-rw-r--r--ci/msys2-meson.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
index be3fc96dcf..5f83370077 100755
--- a/ci/build-msys2.sh
+++ b/ci/build-msys2.sh
@@ -1,8 +1,10 @@
#!/bin/sh -e
if [ "$1" = "meson" ]; then
+ python3.11 -m venv venv
+ source ./venv/bin/activate
+ python -m pip install meson
meson setup build \
- --native-file=ci/msys2-meson.txt \
-D cdda=enabled \
-D d3d-hwaccel=enabled \
-D d3d11=enabled \
diff --git a/ci/msys2-meson.txt b/ci/msys2-meson.txt
deleted file mode 100644
index 123131165e..0000000000
--- a/ci/msys2-meson.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[binaries]
-python3 = 'python3.11'