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

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 8d007a9f..0086140d 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,20 +1,23 @@
 TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
-TERMUX_PKG_VERSION=3.2.2
+TERMUX_PKG_VERSION=3.3.2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
+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, 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_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"
@@ -30,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
@@ -39,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 \
@@ -46,6 +51,7 @@ termux_step_configure () {
 		--disable-symver \
 		--disable-lzma \
 		--enable-cross-compile \
+		--enable-gnutls \
 		--enable-gpl \
 		--enable-libmp3lame \
 		--enable-libvorbis \
@@ -54,8 +60,6 @@ termux_step_configure () {
 		--enable-libx265 \
 		--enable-libxvid \
 		--enable-libvpx \
-		--enable-nonfree \
-		--enable-openssl \
 		--enable-shared \
 		--prefix=$TERMUX_PREFIX \
 		--target-os=android \