X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..478c8f9ec06a8752cf8f5c3589f0994f738fb4e2:/packages/libav/build.sh diff --git a/packages/libav/build.sh b/packages/libav/build.sh index 78b92be0..86a28f52 100644 --- a/packages/libav/build.sh +++ b/packages/libav/build.sh @@ -1,9 +1,10 @@ TERMUX_PKG_HOMEPAGE=http://libav.org/ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols" -TERMUX_PKG_VERSION=11.3 +TERMUX_PKG_VERSION=11.6 TERMUX_PKG_SRCURL=http://libav.org/releases/libav-${TERMUX_PKG_VERSION}.tar.xz # libbz2 is used by matroska decoder: TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac" +TERMUX_PKG_CONFLICTS="ffmpeg" termux_step_configure () { cd $TERMUX_PKG_BUILDDIR @@ -12,8 +13,7 @@ termux_step_configure () { elif [ $TERMUX_ARCH = "i686" ]; then _ARCH="x86" else - echo "Unsupported arch: $TERMUX_ARCH" - exit 1 + _ARCH=$TERMUX_ARCH fi # --disable-asm to prevent text relocations $TERMUX_PKG_SRCDIR/configure \