X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e73b00672e343bdce98d48142606aca3fa30f34f..318a000b927dbf5b07d76c0bc899ba86836c1e14:/packages/ffmpeg/build.sh

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index e3ea724f..8d007a9f 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,12 +1,14 @@
-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.3
-TERMUX_PKG_BUILD_REVISION=1
+# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
+TERMUX_PKG_VERSION=3.2.2
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822
+TERMUX_PKG_SHA256=3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
 TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, liblzma, 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"
 
@@ -32,6 +34,9 @@ termux_step_configure () {
 		exit 1
 	fi
 
+	# --disable-lzma to avoid problem with shared library clashes, see
+	# https://github.com/termux/termux-packages/issues/511
+	# Only used for LZMA compression support for tiff decoder.
 	$TERMUX_PKG_SRCDIR/configure \
 		--arch=${_ARCH} \
 		--cross-prefix=${TERMUX_HOST_PLATFORM}- \
@@ -39,13 +44,16 @@ termux_step_configure () {
 		--disable-ffserver \
 		--disable-static \
 		--disable-symver \
+		--disable-lzma \
 		--enable-cross-compile \
 		--enable-gpl \
 		--enable-libmp3lame \
 		--enable-libvorbis \
 		--enable-libopus \
 		--enable-libx264 \
+		--enable-libx265 \
 		--enable-libxvid \
+		--enable-libvpx \
 		--enable-nonfree \
 		--enable-openssl \
 		--enable-shared \