diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk index d700f358e4..7b1f663d92 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk @@ -2,30 +2,42 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="x264" -PKG_VERSION="20181120" -PKG_SHA256="03ea83026c999d30bc8724eb7c230303ff94897abf759b6fc6829d303b74bcc3" +PKG_VERSION="545de2ffec6ae9a80738de1b2c8cf820249a2530" +PKG_SHA256="74725cf7036b2c96387c2c014ef00d181942d00230f21e16277f11d2d9683adc" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/x264.html" -PKG_URL="https://download.videolan.org/x264/snapshots/$PKG_NAME-snapshot-$PKG_VERSION-2245.tar.bz2" +PKG_URL="http://repo.or.cz/x264.git/snapshot/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="x264 codec" +if [ "$TARGET_ARCH" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" nasm:host" +fi + pre_configure_target() { cd $PKG_BUILD rm -rf .$TARGET_NAME + + if [ "$TARGET_ARCH" = "x86_64" ]; then + export AS="$TOOLCHAIN/bin/nasm" + PKG_X264_ASM="--enable-asm" + else + PKG_X264_ASM="--disable-asm" + fi } configure_target() { ./configure \ - --prefix="/usr" \ + --cross-prefix="$TARGET_PREFIX" \ --extra-cflags="$CFLAGS" \ --extra-ldflags="$LDFLAGS" \ - --disable-cli \ - --enable-static \ - --enable-strip \ - --disable-asm \ - --enable-pic \ --host="$TARGET_NAME" \ - --cross-prefix="$TARGET_PREFIX" \ - --sysroot="$SYSROOT_PREFIX" + --prefix="/usr" \ + --sysroot="$SYSROOT_PREFIX" \ + $PKG_X264_ASM \ + --disable-cli \ + --enable-lto \ + --enable-pic \ + --enable-static \ + --enable-strip }