diff options
author | Dudemanguy <random342@airmail.cc> | 2022-10-28 21:40:53 -0500 |
---|---|---|
committer | Dudemanguy <random342@airmail.cc> | 2022-10-29 17:55:33 +0000 |
commit | 6ebc4928c52f14a762a2872e4960289cade364e5 (patch) | |
tree | d80acc385c6dc82dfe9e3856af7ef78a1b11d55f /ci | |
parent | 89bd6ead6c6f710c42ce2f6f4c5abdb157090761 (diff) | |
download | mpv-6ebc4928c52f14a762a2872e4960289cade364e5.tar.bz2 mpv-6ebc4928c52f14a762a2872e4960289cade364e5.tar.xz |
ci: use meson setup build instead of meson build
The old "meson build" build command was actually deprecated a few months
ago*. It turns out that you're supposed to use "meson setup build"
instead which has been around for years. Go ahead and be a good citizen
and update this in the CI. Also replace any mention of "meson build"
with "meson setup build" in the documentation as well and change the one
random hardcoded string we have in meson.build to "meson configure
build" (might as well).
*: https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0
Diffstat (limited to 'ci')
-rwxr-xr-x | ci/build-freebsd.sh | 2 | ||||
-rwxr-xr-x | ci/build-macos.sh | 2 | ||||
-rwxr-xr-x | ci/build-mingw64.sh | 2 | ||||
-rwxr-xr-x | ci/build-tumbleweed.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index 37fb10c5e8..b5bc3b4cd4 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -5,7 +5,7 @@ export CFLAGS="$CFLAGS -isystem/usr/local/include" export CXXFLAGS="$CXXFLAGS -isystem/usr/local/include" export LDFLAGS="$LDFLAGS -L/usr/local/lib" -meson build \ +meson setup build \ -Dlibmpv=true \ -Dlua=enabled \ -Degl-drm=enabled \ diff --git a/ci/build-macos.sh b/ci/build-macos.sh index 6e6456c154..938eff7251 100755 --- a/ci/build-macos.sh +++ b/ci/build-macos.sh @@ -12,7 +12,7 @@ fi if [[ $1 = "meson" ]]; then PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" CC="${CC}" CXX="${CXX}" \ - meson build \ + meson setup build \ -Dprefix="${MPV_INSTALL_PREFIX}" \ -Dlibmpv=true \ -D{gl,iconv,lcms2,lua,jpeg,plain-gl,zlib}=enabled \ diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index d50d317d13..0647376b14 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -187,7 +187,7 @@ if [ $1 = "meson" ]; then mkdir -p "${TARGET}_mingw_build" && pushd "${TARGET}_mingw_build" CFLAGS="-I'$prefix_dir/include'" LDFLAGS="-L'$prefix_dir/lib'" \ - meson .. --cross-file "${prefix_dir}/crossfile" --libdir lib \ + meson setup .. --cross-file "${prefix_dir}/crossfile" --libdir lib \ -D{libmpv,tests}=true -Dlua=luajit \ -D{shaderc,spirv-cross,d3d11,libplacebo}=enabled diff --git a/ci/build-tumbleweed.sh b/ci/build-tumbleweed.sh index 2b27149310..1fd8ef4314 100755 --- a/ci/build-tumbleweed.sh +++ b/ci/build-tumbleweed.sh @@ -2,7 +2,7 @@ set -e if [ "$1" = "meson" ]; then - meson build \ + meson setup build \ -Dcdda=enabled \ -Ddvbin=enabled \ -Ddvdnav=enabled \ |