summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2021-02-08 11:04:46 +0100
committersfan5 <sfan5@live.de>2021-02-08 11:04:46 +0100
commitabc1380522f81223d09c19f2ad378948f80a9e2b (patch)
tree4c2f5f867f4cf9ab64a4dcd57fe6a77d96db3951
parentecc117e0283f148612f639d05d4dd22b31b679d8 (diff)
downloadmpv-build-abc1380522f81223d09c19f2ad378948f80a9e2b.tar.bz2
mpv-build-abc1380522f81223d09c19f2ad378948f80a9e2b.tar.xz
Explicitly call waf with python3 everywhere
This saves Debian users from installing python-is-python3 and others from accidentally running waf with python2 (unsupported).
-rw-r--r--README.rst5
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules2
-rwxr-xr-xscripts/mpv-build2
4 files changed, 4 insertions, 9 deletions
diff --git a/README.rst b/README.rst
index 3663dd0..0bff815 100644
--- a/README.rst
+++ b/README.rst
@@ -100,11 +100,6 @@ package::
mk-build-deps -s sudo -i
-Debian no longer provides an unversioned "python" binary on its own. You need to
-explicitly tell it to create a symlink to python3 if this is the case::
-
- which python || sudo apt-get install python-is-python3
-
You can now build the mpv Debian package with the following command::
dpkg-buildpackage -uc -us -b -j4
diff --git a/debian/control b/debian/control
index ca73984..b58244b 100644
--- a/debian/control
+++ b/debian/control
@@ -65,8 +65,8 @@ Build-Depends:
libxv-dev,
libxvidcore-dev,
pkg-config,
- python | python2 | python3,
- python-docutils | python3-docutils,
+ python3,
+ python3-docutils,
x11proto-core-dev,
yasm,
zlib1g-dev
diff --git a/debian/rules b/debian/rules
index 9a02f37..70adb9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ DOCDEST=debian/mpv/usr/share/doc/mpv
TOOLSDEST=$(DOCDEST)/TOOLS
# call waf to install to the debian packageing dir
override_dh_auto_install:
- cd mpv && python waf -v install --destdir=../debian/mpv
+ cd mpv && python3 waf -v install --destdir=../debian/mpv
# for manually installed dependencies
override_dh_shlibdeps:
diff --git a/scripts/mpv-build b/scripts/mpv-build
index 1e7ca7b..8b36c49 100755
--- a/scripts/mpv-build
+++ b/scripts/mpv-build
@@ -2,4 +2,4 @@
set -e
cd mpv
-./waf build $@
+python3 ./waf build $@