libx264: Avoid linking against ffmpeg libraries

diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh
index 6b7b5b38f710e1d39b4a0b831ec401b02a6b5ca6..9c4fb001c1ca93a271d09a11bc0785e801afc55d 100644 (file)
--- a/packages/libx264/build.sh
+++ b/packages/libx264/build.sh
@@ -3,13 +3,17 @@ TERMUX_PKG_DESCRIPTION="Library for encoding video streams into the H.264/MPEG-4
 TERMUX_PKG_VERSION=20170122
 TERMUX_PKG_SRCURL=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-2245-stable.tar.bz2
 TERMUX_PKG_SHA256=f833239a2ff81629242b1137c797e670516a3af7ce79e6bb7ef234a3e60fd8fd
 TERMUX_PKG_VERSION=20170122
 TERMUX_PKG_SRCURL=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-2245-stable.tar.bz2
 TERMUX_PKG_SHA256=f833239a2ff81629242b1137c797e670516a3af7ce79e6bb7ef234a3e60fd8fd

+# Avoid linking against ffmpeg libraries to avoid circular dependency:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="\
+--disable-swscale
+--disable-lavf"

 
 termux_step_pre_configure () {
        #if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid text relocations on i686, see:
                # https://mailman.videolan.org/pipermail/x264-devel/2016-March/011589.html
 
 termux_step_pre_configure () {
        #if [ $TERMUX_ARCH = "i686" -o $TERMUX_ARCH = "x86_64" ]; then
        if [ $TERMUX_ARCH = "i686" ]; then
                # Avoid text relocations on i686, see:
                # https://mailman.videolan.org/pipermail/x264-devel/2016-March/011589.html

-               TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-asm"
+               TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"

        elif [ $TERMUX_ARCH = "x86_64" ]; then
                AS=yasm
        fi
        elif [ $TERMUX_ARCH = "x86_64" ]; then
                AS=yasm
        fi