mpv-x: update patches, force-disable wayland, install lua scripts
This commit is contained in:
parent
320abbef31
commit
95562d6839
@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Command-line media player"
|
||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
|
||||
TERMUX_PKG_VERSION=0.30.0
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35
|
||||
TERMUX_PKG_DEPENDS="ffmpeg, libandroid-glob, libandroid-shmem, libarchive, libass, libdrm, littlecms, libjpeg-turbo, libcaca, liblua52, libx11, libxext, libxinerama, libxss, libxrandr, openal-soft, pulseaudio, zlib"
|
||||
@ -32,11 +32,15 @@ termux_step_make_install() {
|
||||
--enable-openal \
|
||||
--enable-caca \
|
||||
--disable-alsa \
|
||||
--enable-x11
|
||||
--enable-x11 \
|
||||
--disable-wayland
|
||||
|
||||
./waf install
|
||||
|
||||
# Use opensles audio out be default:
|
||||
mkdir -p $TERMUX_PREFIX/etc/mpv
|
||||
cp $TERMUX_PKG_BUILDER_DIR/mpv.conf $TERMUX_PREFIX/etc/mpv/mpv.conf
|
||||
|
||||
install -m644 $TERMUX_PKG_SRCDIR/TOOLS/lua/* \
|
||||
-D -t $TERMUX_PREFIX/share/mpv/scripts
|
||||
}
|
||||
|
18
x11-packages/mpv-x/main.c.patch
Normal file
18
x11-packages/mpv-x/main.c.patch
Normal file
@ -0,0 +1,18 @@
|
||||
We don't need a warning every time.
|
||||
|
||||
diff -u -r ../mpv-0.19.0/player/main.c ./player/main.c
|
||||
--- ../mpv-0.19.0/player/main.c 2016-08-15 10:10:59.000000000 -0400
|
||||
+++ ./player/main.c 2016-08-26 18:40:46.624646426 -0400
|
||||
@@ -455,10 +455,12 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifndef __ANDROID__
|
||||
#if !HAVE_LIBASS
|
||||
MP_WARN(mpctx, "Compiled without libass.\n");
|
||||
MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
mpctx->osd = osd_create(mpctx->global);
|
||||
|
@ -17,3 +17,6 @@ ao=opensles
|
||||
# 21 and above), disable them with the following option:
|
||||
|
||||
# audio-format=s16
|
||||
|
||||
# Disable Video Decode and Output. Termux doesn't support video output (with the exception of "tct").
|
||||
vid=no
|
||||
|
22
x11-packages/mpv-x/wscript.patch
Normal file
22
x11-packages/mpv-x/wscript.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/wscript b/wscript
|
||||
index 830201a6bd..543a30feea 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -154,7 +154,7 @@ main_dependencies = [
|
||||
}, {
|
||||
'name': '--android',
|
||||
'desc': 'Android environment',
|
||||
- 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
|
||||
+ 'func': check_cc(lib=['android']),
|
||||
}, {
|
||||
'name': '--tvos',
|
||||
'desc': 'tvOS environment',
|
||||
@@ -167,7 +167,7 @@ main_dependencies = [
|
||||
'desc': 'Android EGL support',
|
||||
'deps': 'android',
|
||||
'groups': [ 'gl' ],
|
||||
- 'func': check_cc(lib=['android', 'EGL']),
|
||||
+ 'func': check_cc(lib=['EGL']),
|
||||
}, {
|
||||
'name': 'posix-or-mingw',
|
||||
'desc': 'development environment',
|
@ -1,12 +0,0 @@
|
||||
diff -uNr mpv-0.30.0/wscript_build.py mpv-0.30.0.mod/wscript_build.py
|
||||
--- mpv-0.30.0/wscript_build.py 2019-10-25 16:08:15.000000000 +0300
|
||||
+++ mpv-0.30.0.mod/wscript_build.py 2019-10-28 16:11:51.777815918 +0200
|
||||
@@ -413,7 +413,7 @@
|
||||
( "video/img_format.c" ),
|
||||
( "video/mp_image.c" ),
|
||||
( "video/mp_image_pool.c" ),
|
||||
- ( "video/out/android_common.c", "android" ),
|
||||
+ ( "video/out/android_common.c", "egl-android" ),
|
||||
( "video/out/aspect.c" ),
|
||||
( "video/out/bitmap_packer.c" ),
|
||||
( "video/out/cocoa/events_view.m", "cocoa" ),
|
Loading…
Reference in New Issue
Block a user