mpv: remove waf support

Waf was deprecated in mpv 0.36.0, and will be removed in 0.37.0, so
remove waf support in mpv-build as well.

8 files changed, 8 insertions, 55 deletions

diff --git a/README.rst b/README.rst
index 21943b5..a48ebbd 100644
--- a/README.rst
+++ b/README.rst
@@ -43,26 +43,13 @@ data files either.
 in order to get a non-ancient version. Alternatively, you can install it from
 PyPi.
 
-Waf Support
-=============
-
-These scripts do have support for building with mpv's deprecated waf build. It is
-not used by default. To invoke it, you must pass an additional environment variable,
-BUILDSYSTEM=waf to your commands. For example::
-
-    BUILDSYSTEM=waf ./rebuild -j4
-
-The arguments that you pass should conform to waf conventions and not the meson
-ones.
-
 Dependencies
 ============
 
 Essential dependencies (incomplete list):
 
-- gcc or clang, yasm, git
+- gcc or clang, yasm, git, meson, ninja
 - autoconf/autotools (for libass)
-- meson, ninja (libplacebo)
 - X development headers (xlib, X extensions, vdpau, GL, Xv, ...)
 - Audio output development headers (libasound, pulseaudio)
 - fribidi, freetype, fontconfig development headers (for libass)
diff --git a/scripts/mpv-bootstrap b/scripts/mpv-bootstrap
deleted file mode 100755
index 4e9b8cc..0000000
--- a/scripts/mpv-bootstrap
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-
-cd mpv
-
-if [ -x "bootstrap.py" ]; then
-  ./bootstrap.py $@
-fi
-
diff --git a/scripts/mpv-build b/scripts/mpv-build
index 9f9f74b..5e208fa 100755
--- a/scripts/mpv-build
+++ b/scripts/mpv-build
@@ -2,8 +2,4 @@
 set -e
 
 cd mpv
-if [ "$BUILDSYSTEM" = "waf" ]; then
-    python3 ./waf build "$@"
-else
-    meson compile -C build "$@"
-fi
+meson compile -C build "$@"
diff --git a/scripts/mpv-clean b/scripts/mpv-clean
index 91b27dc..e39d800 100755
--- a/scripts/mpv-clean
+++ b/scripts/mpv-clean
@@ -2,5 +2,4 @@
 test -e mpv || exit 0
 
 cd mpv
-python3 ./waf distclean # waf clean
-rm -rf build # meson clean
+rm -rf build
diff --git a/scripts/mpv-config b/scripts/mpv-config
index bd8a258..5d6aa17 100755
--- a/scripts/mpv-config
+++ b/scripts/mpv-config
@@ -11,9 +11,8 @@ if test -f "$BUILD"/mpv_options ; then
     unset -v IFS
 fi
 
-OPTIONS=""
-if "$BUILD"/scripts/test-libmpv && [ "$BUILDSYSTEM" != "waf" ]; then
-    OPTIONS="$OPTIONS -Dc_link_args='-Wl,-Bsymbolic'"
+if "$BUILD"/scripts/test-libmpv; then
+    OPTIONS="-Dc_link_args='-Wl,-Bsymbolic'"
 fi
 
 case "$PKG_CONFIG_PATH" in
@@ -34,8 +33,4 @@ cd "$BUILD"/mpv
 # 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++"
-if [ "$BUILDSYSTEM" = "waf" ]; then
-    python3 ./waf configure "$@"
-else
-    meson setup build -Dbuildtype=release $OPTIONS "$@"
-fi
+meson setup build -Dbuildtype=release $OPTIONS "$@"
diff --git a/scripts/mpv-install b/scripts/mpv-install
index ad337bc..10a245a 100755
--- a/scripts/mpv-install
+++ b/scripts/mpv-install
@@ -2,8 +2,4 @@
 set -e
 
 cd mpv
-if [ "$BUILDSYSTEM" = "waf" ]; then
-    python3 ./waf install "$@"
-else
-    meson install -C build "$@"
-fi
+meson install -C build "$@"
diff --git a/scripts/mpv-uninstall b/scripts/mpv-uninstall
index 7207515..e6e58ba 100755
--- a/scripts/mpv-uninstall
+++ b/scripts/mpv-uninstall
@@ -2,8 +2,4 @@
 set -e
 
 cd mpv
-if [ "$BUILDSYSTEM" = "waf" ]; then
-    python3 ./waf uninstall
-else
-    ninja uninstall -C build
-fi
+ninja uninstall -C build
diff --git a/update b/update
index 8b06d61..7edc609 100755
--- a/update
+++ b/update
@@ -103,11 +103,6 @@ checkout_all()
     checkout mpv $checkout_mpv
 }
 
-do_bootstrap()
-{
-  scripts/mpv-bootstrap
-}
-
 do_update_debian_versions()
 {
   scripts/debian-update-versions $1
@@ -147,5 +142,3 @@ esac
 checkout_all
 
 do_update_debian_versions
-
-do_bootstrap