diff --git a/x11-packages/mpv-x/build.sh b/x11-packages/mpv-x/build.sh index 81cb3581c..42bf0ea01 100644 --- a/x11-packages/mpv-x/build.sh +++ b/x11-packages/mpv-x/build.sh @@ -2,22 +2,19 @@ TERMUX_PKG_HOMEPAGE=https://mpv.io/ TERMUX_PKG_DESCRIPTION="Command-line media player" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=0.29.1 -TERMUX_PKG_REVISION=13 +TERMUX_PKG_VERSION=0.30.0 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623 - -TERMUX_PKG_DEPENDS="ffmpeg, libandroid-glob, libandroid-shmem, libass, libdrm, littlecms, libjpeg-turbo, libcaca, liblua52, libx11, libxext, libxinerama, libxss, libxrandr, openal-soft, pulseaudio, zlib" +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" TERMUX_PKG_CONFLICTS="mpv" TERMUX_PKG_REPLACES="mpv" - TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications" termux_step_pre_configure() { LDFLAGS+=" -landroid-glob -landroid-shmem" } -termux_step_make_install () { +termux_step_make_install() { cd $TERMUX_PKG_SRCDIR ./bootstrap.py @@ -25,9 +22,9 @@ termux_step_make_install () { ./waf configure \ --prefix=$TERMUX_PREFIX \ --disable-gl \ - --disable-libarchive \ --enable-jpeg \ --enable-lcms2 \ + --enable-libarchive \ --enable-libass \ --enable-lua \ --enable-pulse \ @@ -41,33 +38,4 @@ termux_step_make_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 - - # 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 - - # Work around issues on devices having ffmpeg libraries - # in a system vendor dir, reported by live_the_dream on #termux: - local FFMPEG_LIBS="" lib - for lib in avcodec avfilter avformat avutil postproc swresample swscale; do - if [ -n "$FFMPEG_LIBS" ]; then FFMPEG_LIBS+=":"; fi - FFMPEG_LIBS+="$TERMUX_PREFIX/lib/lib${lib}.so" - done - echo "export LD_PRELOAD=$FFMPEG_LIBS" >> $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 exec $TERMUX_PREFIX/libexec/mpv \"\$@\"" >> $TERMUX_PREFIX/bin/mpv - - chmod +x $TERMUX_PREFIX/bin/mpv }