(un)zip: fix bip2 support (#2364)

[termux-packages] / packages / libx264 / build.sh

diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh
index cb315a5..f724a25 100644 (file)
--- a/packages/libx264/build.sh
+++ b/packages/libx264/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.videolan.org/developers/x264.html
 TERMUX_PKG_DESCRIPTION="Library for encoding video streams into the H.264/MPEG-4 AVC format"
-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=20180211
+TERMUX_PKG_SHA256=cc9eaecaa7acc450120330979a53dbf8479c21ce7f4ab1aecc245d42384894bd
+TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-2245-stable.tar.bz2
 # Avoid linking against ffmpeg libraries to avoid circular dependency:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-swscale
@@ -14,7 +14,11 @@ termux_step_pre_configure () {
                # Avoid text relocations on i686, see:
                # https://mailman.videolan.org/pipermail/x264-devel/2016-March/011589.html
                TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
+               # Avoid errors such as "relocation R_386_GOTOFF against preemptible symbol
+               # x264_significant_coeff_flag_offset cannot be used when making a shared object":
+               LDFLAGS+=" -fuse-ld=bfd"
        elif [ $TERMUX_ARCH = "x86_64" ]; then
-               AS=yasm
+               # Avoid requiring nasm for now:
+               TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
        fi
 }