multimedia/{lib,}x264: update to 0.152.2854

Changes:	https://git.videolan.org/?p=x264.git;a=shortlog;h=e9a5903edf8ca59ef20e6f4894c196f135af735e

3 files changed, 20 insertions, 20 deletions

diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 9551de919f40..8f51a2a81f10 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -19,7 +19,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	2 # 0 in libx264
+PORTREVISION?=	0 # 0 in libx264
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -37,11 +37,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS?=	libx264.so:multimedia/libx264
 
-X264_BUILD=	148
-X264_REV=	2795
-X264_COMMIT=	aaa9aa83a111ed6f1db253d5afa91c5fc844583f
+X264_BUILD=	152
+X264_REV=	2854
+X264_COMMIT=	e9a5903edf8ca59ef20e6f4894c196f135af735e
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20170626
+X264_SNAPSHOT=	20171225
 
 USES?=		pkgconfig
 USES+=		gmake localbase shebangfix tar:bzip2
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 3e8d0902f71f..80adc25ac6b9 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1498509905
-SHA256 (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 0fe3e49eb8861b8fc429436070fb2dd525d141904a44487c48d1c2d6ad778eae
-SIZE (x264/x264-snapshot-20170626-2245-stable.tar.bz2) = 736446
+TIMESTAMP = 1514238305
+SHA256 (x264/x264-snapshot-20171225-2245-stable.tar.bz2) = 91143276d18414f1c94ecdc472b063c874308833d57d7353f15286372ba4ba68
+SIZE (x264/x264-snapshot-20171225-2245-stable.tar.bz2) = 750690
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 8234febf8a23..006b273bea6b 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-06-26 20:45:05 UTC
+--- configure.orig	2017-12-25 21:45:05 UTC
 +++ configure
-@@ -682,12 +682,6 @@ case $host_cpu in
+@@ -692,12 +692,6 @@ case $host_cpu in
          AS_EXT=".asm"
          ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
          if [ $compiler = GNU ]; then
@@ -13,16 +13,16 @@
              CFLAGS="-m32 $CFLAGS"
              LDFLAGS="-m32 $LDFLAGS"
          fi
-@@ -702,7 +696,7 @@ case $host_cpu in
+@@ -712,7 +706,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    amd64|x86_64)
          ARCH="X86_64"
-         AS="${AS-yasm}"
+         AS="${AS-nasm}"
          AS_EXT=".asm"
-@@ -776,7 +770,7 @@ case $host_cpu in
+@@ -786,7 +780,7 @@ case $host_cpu in
              AS="${AS-${CC}}"
          fi
          ;;
@@ -31,16 +31,16 @@
          ARCH="AARCH64"
          stack_alignment=16
          AS="${AS-${CC}}"
-@@ -875,7 +869,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
+@@ -888,7 +882,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
      fi
  fi
  
 -if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
 +if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
-     if ! as_check "vpmovzxwd ymm0, xmm0" ; then
+     if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
          VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
          echo "Found $VER"
-@@ -889,9 +883,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
+@@ -901,9 +895,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
  fi
  
  if [ $asm = auto -a $ARCH = ARM ] ; then
@@ -50,7 +50,7 @@
      cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
      if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
          define HAVE_ARMV6
-@@ -902,9 +893,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+@@ -914,9 +905,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
          cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
          ASFLAGS="$ASFLAGS -c"
      else
@@ -62,7 +62,7 @@
      fi
  fi
  
-@@ -931,9 +921,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
+@@ -943,9 +933,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
      if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
          define HAVE_MSA
      else
@@ -74,7 +74,7 @@
      fi
  fi
  
-@@ -1245,10 +1234,6 @@ if cc_check '' -Wshadow ; then
+@@ -1257,10 +1246,6 @@ if cc_check '' -Wshadow ; then
      CFLAGS="-Wshadow $CFLAGS"
  fi
  
@@ -85,7 +85,7 @@
  if [ $compiler = ICC -o $compiler = ICL ] ; then
      if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
          define HAVE_INTEL_DISPATCHER
-@@ -1284,6 +1269,9 @@ if [ "$opencl" = "yes" ]; then
+@@ -1296,6 +1281,9 @@ if [ "$opencl" = "yes" ]; then
          opencl="yes"
          define HAVE_OPENCL
          libdl="-ldl"