diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-01-15 13:56:01 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-01-18 14:56:37 +0000 |
| commit | a5caba288ff9a9b4f5bc63451c4a3cf7abc5d2a1 (patch) | |
| tree | cb220dbd2b7e6b1ebf28ef4b1828bb81ab100c17 /scripts | |
| parent | e04847453088fb2e029af9a5c501ff1b4dea2b0a (diff) | |
| download | mpv-build-a5caba288ff9a9b4f5bc63451c4a3cf7abc5d2a1.tar.bz2 mpv-build-a5caba288ff9a9b4f5bc63451c4a3cf7abc5d2a1.tar.xz | |
configure/build: default to meson
Waf was officially deprecated in mpv, so we should make these scripts
use meson by default instead. Waf support is still there for now via
the BUILDSYSTEM=waf environment variable (meson no longer requires any
special variable to use). The README is adjusted a little to reflect
this.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mpv-build | 6 | ||||
| -rwxr-xr-x | scripts/mpv-config | 6 | ||||
| -rwxr-xr-x | scripts/mpv-install | 6 | ||||
| -rwxr-xr-x | scripts/mpv-uninstall | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/scripts/mpv-build b/scripts/mpv-build index 7515003..9f9f74b 100755 --- a/scripts/mpv-build +++ b/scripts/mpv-build @@ -2,8 +2,8 @@ set -e cd mpv -if [ "$BUILDSYSTEM" = "meson" ]; then - meson compile -C build "$@" -else +if [ "$BUILDSYSTEM" = "waf" ]; then python3 ./waf build "$@" +else + meson compile -C build "$@" fi diff --git a/scripts/mpv-config b/scripts/mpv-config index 8169053..fcbab2c 100755 --- a/scripts/mpv-config +++ b/scripts/mpv-config @@ -24,13 +24,13 @@ echo Using mpv options: "$@" cd "$BUILD"/mpv -if [ "$BUILDSYSTEM" = "meson" ]; then - meson setup build -Dprefer_static=true -Dbuildtype=release "$@" -else +if [ "$BUILDSYSTEM" = "waf" ]; then # add missing private dependencies from libass.pc # this is necessary due to the hybrid static / dynamic nature of the build # need to link against stdc++ in case libplacebo was built with glslang, # which requires that export LDFLAGS="$LDFLAGS $(pkg-config --libs fontconfig harfbuzz fribidi) -lstdc++" python3 ./waf configure "$@" +else + meson setup build -Dprefer_static=true -Dbuildtype=release "$@" fi diff --git a/scripts/mpv-install b/scripts/mpv-install index 0a3a30f..ae321f4 100755 --- a/scripts/mpv-install +++ b/scripts/mpv-install @@ -2,8 +2,8 @@ set -e cd mpv -if [ "$BUILDSYSTEM" = "meson" ]; then - meson install -C build -else +if [ "$BUILDSYSTEM" = "waf" ]; then python3 ./waf install +else + meson install -C build fi diff --git a/scripts/mpv-uninstall b/scripts/mpv-uninstall index 777db4b..7207515 100755 --- a/scripts/mpv-uninstall +++ b/scripts/mpv-uninstall @@ -2,8 +2,8 @@ set -e cd mpv -if [ "$BUILDSYSTEM" = "meson" ]; then - ninja uninstall -C build -else +if [ "$BUILDSYSTEM" = "waf" ]; then python3 ./waf uninstall +else + ninja uninstall -C build fi |