X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/56862a32d530fc920c08807b691c1530bbbf1a0a..cf8e75df4246b910af33e1e67d67d805b1329e1f:/packages/ffmpeg/build.sh?ds=sidebyside

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 552f53ee..ef1c745c 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -1,19 +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.5
+# NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
+TERMUX_PKG_VERSION=3.3.4
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SHA256=98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a
-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, libandroid-glob"
 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 +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
@@ -38,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 \
@@ -45,18 +50,19 @@ 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 \
+		--extra-libs="-landroid-glob" \
 		$_EXTRA_CONFIGURE_FLAGS
 }