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

diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index 95216b52..2fe4d782 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -1,24 +1,15 @@
-# 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.22.0
 TERMUX_PKG_BUILD_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6
 TERMUX_PKG_FOLDERNAME=mpv-${TERMUX_PKG_VERSION}
 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 \
@@ -27,7 +18,9 @@ termux_step_make_install () {
 		--disable-jpeg \
 		--disable-lcms2 \
 		--disable-libass \
-		--enable-openal
+		--disable-lua \
+		--enable-openal \
+		--disable-caca
 
 	./waf install
 
@@ -36,12 +29,19 @@ 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
 
 	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
+	# /system/vendor/lib(64) needed for libqc-opt.so on
+	# a xperia z5 c, reported by BrainDamage on #termux.
+	echo "LD_LIBRARY_PATH=/system/$SYSTEM_LIBFOLDER:/system/vendor/$SYSTEM_LIBFOLDER:$TERMUX_PREFIX/lib $TERMUX_PREFIX/libexec/mpv \"\$@\"" >> $TERMUX_PREFIX/bin/mpv
 	chmod +x $TERMUX_PREFIX/bin/mpv
 }