mariadb: Update from 10.2.9 to 10.2.10

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

diff --git a/packages/libx264/build.sh b/packages/libx264/build.sh
index 97335ea..d8d7e49 100644 (file)
--- a/packages/libx264/build.sh
+++ b/packages/libx264/build.sh
@@ -1,13 +1,20 @@
-TERMUX_PKG_HOMEPAGE=http://www.videolan.org/developers/x264.html
+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="20160503-2245"
-TERMUX_PKG_SRCURL=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_VERSION=20170714
+TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-2245-stable.tar.bz2
+TERMUX_PKG_SHA256=5ac659849dbf11935a236910730768b7efca6d61e967dbefbb62b5f8108ac033
+# 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
-               # Avoid text relocations. Only needed on i686, see:
+       #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
-               # Also disable on x86_64 for now due to build errors.
-               TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-asm"
+               TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-asm"
+       elif [ $TERMUX_ARCH = "x86_64" ]; then
+               AS=yasm
        fi
 }