ffmpeg: Update from 3.2.4 to 3.3

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

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index ccc631b..2e81cd0 100644 (file)
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,18 +1,22 @@
-TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
+TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
-TERMUX_PKG_VERSION=3.1.4
-TERMUX_PKG_BUILD_REVISION=1
+# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
+TERMUX_PKG_VERSION=3.3
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=a80cb378dda5c9bbcdbd62a99bdec0e4eedbcb47f290e72845af4855c1146b5b
+TERMUX_PKG_SHA256=599e7f7c017221c22011c4037b88bdcd1c47cd40c1e466838bc3c465f3e9569d
 TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, libopus"
+# libvpx is the VP8 & VP9 video encoder for WebM, see
+# https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
+TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx"
 TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples"
 TERMUX_PKG_CONFLICTS="libav"
 
 termux_step_configure () {
        cd $TERMUX_PKG_BUILDDIR
 
+       export ASFLAGS="-no-integrated-as"
+
        local _EXTRA_CONFIGURE_FLAGS=""
        if [ $TERMUX_ARCH = "arm" ]; then
                _ARCH="armeabi-v7a"
@@ -28,8 +32,7 @@ termux_step_configure () {
                _ARCH=$TERMUX_ARCH
                _EXTRA_CONFIGURE_FLAGS="--enable-neon"
        else
-               echo "Unsupported arch $TERMUX_ARCH"
-               exit 1
+               termux_error_exit "Unsupported arch: $TERMUX_ARCH"
        fi
 
        # --disable-lzma to avoid problem with shared library clashes, see
@@ -37,6 +40,9 @@ termux_step_configure () {
        # Only used for LZMA compression support for tiff decoder.
        $TERMUX_PKG_SRCDIR/configure \
                --arch=${_ARCH} \
+               --as=$AS \
+               --cc=$CC \
+               --cxx=$CXX \
                --cross-prefix=${TERMUX_HOST_PLATFORM}- \
                --disable-avdevice \
                --disable-ffserver \
@@ -49,7 +55,9 @@ termux_step_configure () {
                --enable-libvorbis \
                --enable-libopus \
                --enable-libx264 \
+               --enable-libx265 \
                --enable-libxvid \
+               --enable-libvpx \
                --enable-nonfree \
                --enable-openssl \
                --enable-shared \