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

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index 9140e9c3..a6f0e6c8 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -1,23 +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_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"
+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 \
@@ -25,17 +16,29 @@ termux_step_make_install () {
 		--disable-gl \
 		--disable-jpeg \
 		--disable-lcms2 \
-		--disable-libass
+		--disable-libass \
+		--disable-lua \
+		--enable-openal \
+		--enable-caca
 
 	./waf install
 
+	# Use opensles audio out be default:
+	mkdir -p $TERMUX_PREFIX/etc/mpv
+	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
 
 	local SYSTEM_LIBFOLDER=lib64
 	if [ $TERMUX_ARCH_BITS = 32 ]; then SYSTEM_LIBFOLDER=lib; fi
 	echo "#!/bin/sh" > $TERMUX_PREFIX/bin/mpv
-	echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIBFOLDER:$TERMUX_PREFIX/lib $TERMUX_PREFIX/libexec/mpv \$@" >> $TERMUX_PREFIX/bin/mpv
+	echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIBFOLDER:$TERMUX_PREFIX/lib $TERMUX_PREFIX/libexec/mpv \"\$@\"" >> $TERMUX_PREFIX/bin/mpv
 	chmod +x $TERMUX_PREFIX/bin/mpv
 }