summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2022-11-11 18:21:08 -0600
committerDudemanguy <random342@airmail.cc>2022-11-11 18:38:47 -0600
commite04847453088fb2e029af9a5c501ff1b4dea2b0a (patch)
tree898a6deed945058eb80efaaf23ab6a568f7cd809
parent94366313b2b18afe7f90af5150987fec398905c8 (diff)
downloadmpv-build-e04847453088fb2e029af9a5c501ff1b4dea2b0a.tar.bz2
mpv-build-e04847453088fb2e029af9a5c501ff1b4dea2b0a.tar.xz
configure scripts: use meson setup build
The old usage of "meson build" for configuration was deprecated in meson 0.64*. You're meant to use "meson setup build" instead so just replace the couple of instances of "meson build" that we have in the scripts. https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0
-rwxr-xr-xscripts/libplacebo-config2
-rwxr-xr-xscripts/mpv-config2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/libplacebo-config b/scripts/libplacebo-config
index 345c672..480c6a2 100755
--- a/scripts/libplacebo-config
+++ b/scripts/libplacebo-config
@@ -27,4 +27,4 @@ cd "$BUILD"/libplacebo
test -d build && OPTIONS="$OPTIONS --wipe"
echo Using libplacebo options: $OPTIONS "$@"
-meson build --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@"
+meson setup build --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" $OPTIONS "$@"
diff --git a/scripts/mpv-config b/scripts/mpv-config
index 55c181f..8169053 100755
--- a/scripts/mpv-config
+++ b/scripts/mpv-config
@@ -25,7 +25,7 @@ echo Using mpv options: "$@"
cd "$BUILD"/mpv
if [ "$BUILDSYSTEM" = "meson" ]; then
- meson build -Dprefer_static=true -Dbuildtype=release "$@"
+ meson setup build -Dprefer_static=true -Dbuildtype=release "$@"
else
# add missing private dependencies from libass.pc
# this is necessary due to the hybrid static / dynamic nature of the build