X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/b55a2fee69de089157b9045bc745768af81e96f9..f45367c4a5776eb56d1f0a66d737f94dedce8d0e:/packages/ffmpeg/build.sh diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh index 01a167fd..3fcde117 100644 --- a/packages/ffmpeg/build.sh +++ b/packages/ffmpeg/build.sh @@ -1,10 +1,11 @@ TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols" -TERMUX_PKG_VERSION=3.0.2 +TERMUX_PKG_VERSION=3.1.3 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=f8575c071e2a64437aeb70c8c030b385cddbe0b5cde20c9b18a6def840128822 TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION # libbz2 is used by matroska decoder: -TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, libmp3lame, liblzma" +TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libmp3lame, liblzma" TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="share/ffmpeg/examples" TERMUX_PKG_CONFLICTS="libav" @@ -20,6 +21,8 @@ termux_step_configure () { # Specify --disable-asm to prevent text relocations on i686, # see https://trac.ffmpeg.org/ticket/4928 _EXTRA_CONFIGURE_FLAGS="--disable-asm" + elif [ $TERMUX_ARCH = "x86_64" ]; then + _ARCH="x86_64" elif [ $TERMUX_ARCH = "aarch64" ]; then _ARCH=$TERMUX_ARCH _EXTRA_CONFIGURE_FLAGS="--enable-neon" @@ -38,7 +41,6 @@ termux_step_configure () { --enable-cross-compile \ --enable-gpl \ --enable-libmp3lame \ - --enable-libfaac \ --enable-libvorbis \ --enable-libx264 \ --enable-libxvid \ @@ -46,7 +48,7 @@ termux_step_configure () { --enable-openssl \ --enable-shared \ --prefix=$TERMUX_PREFIX \ - --target-os=linux \ + --target-os=android \ $_EXTRA_CONFIGURE_FLAGS }