X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7d54055e4f0697d44275e0d3085e12b4d3f47356..7653098a4c16a6e3cd4b8414f8d67a4dc7b9f681:/packages/ffmpeg/build.sh

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 7612434b..f671ed11 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,19 +1,23 @@
-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.2
+# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
+TERMUX_PKG_VERSION=3.3.2
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
+TERMUX_PKG_SHA256=1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785
 TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
 # libbz2 is used by matroska decoder:
-# libvpx is the VP8 & VP9 video encoder for ​WebM, an open, royalty-free media file format.
-# see https://trac.ffmpeg.org/wiki/Encode/VP8 and https://trac.ffmpeg.org/wiki/Encode/VP9
-TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, libopus, libvpx"
+# 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="libbz2, libx264, libx265, xvidcore, libvorbis, libmp3lame, libopus, libvpx, libgnutls"
 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"
@@ -29,8 +33,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
@@ -38,6 +41,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 \
@@ -45,15 +51,15 @@ termux_step_configure () {
 		--disable-symver \
 		--disable-lzma \
 		--enable-cross-compile \
+		--enable-gnutls \
 		--enable-gpl \
 		--enable-libmp3lame \
 		--enable-libvorbis \
 		--enable-libopus \
 		--enable-libx264 \
+		--enable-libx265 \
 		--enable-libxvid \
 		--enable-libvpx \
-		--enable-nonfree \
-		--enable-openssl \
 		--enable-shared \
 		--prefix=$TERMUX_PREFIX \
 		--target-os=android \