X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/def4744092409e9c95fe6bb76c1ddc1ecbc7a13e..c1198d1ba862bf588d6331b6a6a5eee48979f75e:/packages/mpv/build.sh

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index f0c7a34e..5e79b520 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -1,23 +1,13 @@
-# 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
+TERMUX_PKG_VERSION=0.21.0
 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 \
@@ -26,7 +16,9 @@ termux_step_make_install () {
 		--disable-jpeg \
 		--disable-lcms2 \
 		--disable-libass \
-		--enable-openal
+		--disable-lua \
+		--enable-openal \
+		--enable-caca
 
 	./waf install
 
@@ -35,6 +27,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