ffmpeg: Update from 3.0.2 to 3.1

[termux-packages] / packages / ffmpeg / build.sh

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 12081d7..2213476 100644 (file)
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,32 +1,45 @@
 TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
-TERMUX_PKG_VERSION=2.8.3
-TERMUX_PKG_SRCURL=https://github.com/FFmpeg/FFmpeg/archive/n${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_FOLDERNAME=FFmpeg-n$TERMUX_PKG_VERSION
+TERMUX_PKG_VERSION=3.1
+TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, liblzma"
+TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, libmp3lame, liblzma"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"
 
 termux_step_configure () {
        cd $TERMUX_PKG_BUILDDIR
+
+       local _EXTRA_CONFIGURE_FLAGS=""
        if [ $TERMUX_ARCH = "arm" ]; then
                _ARCH="armeabi-v7a"
+               _EXTRA_CONFIGURE_FLAGS="--enable-neon"
        elif [ $TERMUX_ARCH = "i686" ]; then
                _ARCH="x86"
-       else
+               # Specify --disable-asm to prevent text relocations on i686,
+               # see https://trac.ffmpeg.org/ticket/4928
+               _EXTRA_CONFIGURE_FLAGS="--disable-asm"
+       elif [ $TERMUX_ARCH = "x86_64" ]; then
+               _ARCH="x86_64"
+       elif [ $TERMUX_ARCH = "aarch64" ]; then
                _ARCH=$TERMUX_ARCH
+               _EXTRA_CONFIGURE_FLAGS="--enable-neon"
+       else
+               echo "Unsupported arch $TERMUX_ARCH"
+               exit 1
        fi
-        # --disable-asm to prevent text relocations
+
        $TERMUX_PKG_SRCDIR/configure \
                --arch=${_ARCH} \
                --cross-prefix=${TERMUX_HOST_PLATFORM}- \
-                --disable-asm \
+               --disable-avdevice \
                --disable-ffserver \
                --disable-static \
                 --disable-symver \
                --enable-cross-compile \
                --enable-gpl \
+               --enable-libmp3lame \
                --enable-libfaac \
                --enable-libvorbis \
                --enable-libx264 \
@@ -35,6 +48,7 @@ termux_step_configure () {
                --enable-openssl \
                --enable-shared \
                --prefix=$TERMUX_PREFIX \
-               --target-os=linux
+               --target-os=linux \
+               $_EXTRA_CONFIGURE_FLAGS
 }