pick: Update from 1.4.0 to 1.5.0

[termux-packages] / packages / mpv / build.sh

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index f0c7a34..e7542a1 100644 (file)
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -1,9 +1,3 @@
-# Does not work with libjpeg-turbo or libpng installed, since
-# linking against libOpenSLES causes indirect linkage against
-# libskia.so, which links against the platform libjpeg.so and
-# libpng.so, which are not compatible with the Termux ones.
-#
-# On Android N also liblzma seems to conflict.
 TERMUX_PKG_HOMEPAGE=https://mpv.io/
 TERMUX_PKG_DESCRIPTION="Command-line media player"
 TERMUX_PKG_VERSION=0.20.0
@@ -14,10 +8,6 @@ TERMUX_PKG_DEPENDS="ffmpeg, openal-soft"
 termux_step_make_install () {
        cd $TERMUX_PKG_SRCDIR
 
-       # Setup rst2man for man page generation of mpv.1:
-       pip install docutils
-       export RST2MAN=$HOME/.local/bin/rst2man.py
-
        ./bootstrap.py
 
        ./waf configure \
@@ -35,6 +25,11 @@ termux_step_make_install () {
        echo "ao=opensles" > $TERMUX_PREFIX/etc/mpv/mpv.conf
 
        # Try to work around OpenSL ES library clashes:
+       # Linking against libOpenSLES causes indirect linkage against
+       # libskia.so, which links against the platform libjpeg.so and
+       # libpng.so, which are not compatible with the Termux ones.
+       #
+       # On Android N also liblzma seems to conflict.
        mkdir -p $TERMUX_PREFIX/libexec
        mv $TERMUX_PREFIX/bin/mpv $TERMUX_PREFIX/libexec