apksigner: Update from 0.3 to 0.4

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

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index 95216b5..a6f0e6c 100644 (file)
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -1,24 +1,14 @@
-# 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.19.0
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=0.21.0
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_FOLDERNAME=mpv-${TERMUX_PKG_VERSION}
-TERMUX_PKG_DEPENDS="ffmpeg, openal-soft"
+TERMUX_PKG_DEPENDS="ffmpeg, openal-soft, libcaca"
 
 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 \
@@ -27,7 +17,9 @@ termux_step_make_install () {
                --disable-jpeg \
                --disable-lcms2 \
                --disable-libass \
-               --enable-openal
+               --disable-lua \
+               --enable-openal \
+               --enable-caca
 
        ./waf install
 
@@ -36,6 +28,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