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).

*: 3c7ab542c0
This commit is contained in:
Dudemanguy 2022-10-28 21:40:53 -05:00
parent 89bd6ead6c
commit 6ebc4928c5
6 changed files with 7 additions and 7 deletions

View File

@ -82,14 +82,14 @@ located in [build-system-differences][build-system-differences].
### Meson
After creating your build directory (e.g. `meson build`), you can view a list
After creating your build directory (e.g. `meson setup build`), you can view a list
of all the build options via `meson configure build`. You could also just simply
look at the `meson_options.txt` file. Logs are stored in `meson-logs` within
your build directory.
Example:
meson build
meson setup build
meson compile -C build
meson install -C build

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -2,7 +2,7 @@
set -e
if [ "$1" = "meson" ]; then
meson build \
meson setup build \
-Dcdda=enabled \
-Ddvbin=enabled \
-Ddvdnav=enabled \

View File

@ -1590,7 +1590,7 @@ endif
# We can't easily get every single thing a user might have passed on the cli,
# but we might as well add prefix (even if it's not specifically set) since
# it's highly relevant and useful.
configuration = 'meson build '
configuration = 'meson configure build '
configuration += '-Dprefix=' + get_option('prefix')
features += {'cplayer': get_option('cplayer')}