7 files changed, 18 insertions, 114 deletions

diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 2e8406704925..878b3a38075c 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -19,7 +19,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	4
+PORTREVISION?=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -38,11 +38,11 @@ BUILD_DEPENDS=	yasm>=1.2.0:devel/yasm \
 		bash:shells/bash
 LIB_DEPENDS?=	libx264.so:multimedia/libx264
 
-X264_BUILD=	144
-X264_REV=	2533
-X264_COMMIT=	c8a773ebfca148ef04f5a60d42cbd7336af0baf6
+X264_BUILD=	148
+X264_REV=	2708
+X264_COMMIT=	86b71982e131eaa70125f8d0e725fcade9c4c677
 X264_GITVER=	${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT=	20150629
+X264_SNAPSHOT=	20160921
 
 USES?=		pkgconfig
 USES+=		gmake localbase shebangfix tar:bzip2
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 254cc02a8c0f..8cb0f25fa7d6 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,4 +1,5 @@
-SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340
-SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453
+TIMESTAMP = 1474449136
+SHA256 (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 340045020a79e44784ec158d9d2f73ec4248b6923393f6d5fbb683ec63db6d2f
+SIZE (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 731264
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264/files/patch-common_cpu.c b/multimedia/x264/files/patch-common_cpu.c
deleted file mode 100644
index 08ddb9e34a07..000000000000
--- a/multimedia/x264/files/patch-common_cpu.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- common/cpu.c.orig	2015-06-29 20:45:09 UTC
-+++ common/cpu.c
-@@ -316,7 +316,7 @@ uint32_t x264_cpu_detect( void )
- 
- #elif ARCH_PPC
- 
--#if SYS_MACOSX || SYS_OPENBSD
-+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
- #include <sys/sysctl.h>
- uint32_t x264_cpu_detect( void )
- {
-@@ -324,12 +324,16 @@ uint32_t x264_cpu_detect( void )
-     uint32_t cpu = 0;
- #if SYS_OPENBSD
-     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
--#else
-+#elif SYS_MACOSX
-     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
- #endif
-     int      has_altivec = 0;
-     size_t   length = sizeof( has_altivec );
-+#if SYS_MACOSX || SYS_OPENBSD
-     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
-+#else
-+    int      error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
-+#endif
- 
-     if( error == 0 && has_altivec != 0 )
-         cpu |= X264_CPU_ALTIVEC;
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 02d7738a9a5a..6ca2a5b9487a 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,46 +1,37 @@
 --- configure.orig	2015-06-29 20:45:09 UTC
 +++ configure
-@@ -604,12 +604,6 @@ case $host_cpu in
+@@ -677,12 +677,6 @@ case $host_cpu in
          AS_EXT=".asm"
-         ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
+         ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
          if [ $compiler = GNU ]; then
 -            if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
 -                CFLAGS="$CFLAGS -march=i686"
 -            fi
 -            if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
--                CFLAGS="$CFLAGS -mfpmath=sse -msse"
+-                CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
 -            fi
              CFLAGS="-m32 $CFLAGS"
              LDFLAGS="-m32 $LDFLAGS"
-         elif [ $compiler = ICC ]; then
-@@ -639,7 +639,7 @@ case $host_cpu in
-             ASFLAGS="$ASFLAGS -f elf"
+         fi
+@@ -697,7 +691,7 @@ case $host_cpu in
+             ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    x86_64|amd64)
          ARCH="X86_64"
-         AS="yasm"
+         AS="${AS-yasm}"
          AS_EXT=".asm"
-@@ -678,7 +678,7 @@ case $host_cpu in
-     sparc)
-         ARCH="SPARC"
-         ;;
--    mips|mipsel|mips64|mips64el)
-+    mips|mipsel|mips64|mips64el|mipsn32)
-         ARCH="MIPS"
-         ;;
-     arm*)
-@@ -695,7 +695,7 @@ case $host_cpu in
+@@ -761,7 +755,7 @@ case $host_cpu in
              AS="${AS-${CC}}"
          fi
          ;;
 -    aarch64)
 +    aarch64|arm64)
          ARCH="AARCH64"
+         stack_alignment=16
          if [ "$SYS" = MACOSX ] ; then
-             AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}"
-@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then
+@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then
      CFLAGS="-Wshadow $CFLAGS"
  fi
  
diff --git a/multimedia/x264/files/patch-deblock-a.S b/multimedia/x264/files/patch-deblock-a.S
deleted file mode 100644
index 9a068a40dbf2..000000000000
--- a/multimedia/x264/files/patch-deblock-a.S
+++ /dev/null
@@ -1,20 +0,0 @@
---- common/aarch64/deblock-a.S.orig	2016-01-04 11:21:40.265233000 +0000
-+++ common/aarch64/deblock-a.S	2016-01-04 11:27:19.291080000 +0000
-@@ -538,7 +538,7 @@
-     ret
- endfunc
- 
--.macro h264_loop_filter_chroma_intra, width=16
-+.macro h264_loop_filter_chroma_intra width=16
-     uabd            v26.16b, v16.16b, v17.16b  // abs(p0 - q0)
-     uabd            v27.16b, v18.16b, v16.16b  // abs(p1 - p0)
-     uabd            v28.16b, v19.16b, v17.16b  // abs(q1 - q0)
-@@ -604,7 +604,7 @@
- 
-     transpose4x4.h  v18, v16, v17, v19, v26, v27, v28, v29
- 
--    h264_loop_filter_chroma_intra, width=8
-+    h264_loop_filter_chroma_intra width=8
- 
-     st2             {v16.h,v17.h}[0], [x0], x1
-     st2             {v16.h,v17.h}[1], [x0], x1
diff --git a/multimedia/x264/files/patch-quant-a.S b/multimedia/x264/files/patch-quant-a.S
deleted file mode 100644
index ea712a329e8f..000000000000
--- a/multimedia/x264/files/patch-quant-a.S
+++ /dev/null
@@ -1,24 +0,0 @@
---- common/aarch64/quant-a.S.orig	2016-01-04 11:28:55.378084000 +0000
-+++ common/aarch64/quant-a.S	2016-01-04 11:30:55.055050000 +0000
-@@ -546,12 +546,10 @@
-     sub         x0,  x0,  #2
- .endif
- .if         \size < 15
--    .equ        shiftw, 3
-     ld1         {v0.8h}, [x0]
-     uqxtn       v0.8b,  v0.8h
-     cmtst       v0.8b,  v0.8b,  v0.8b
- .else
--    .equ        shiftw, 2
-     ld1         {v0.8h,v1.8h}, [x0]
-     uqxtn       v0.8b,  v0.8h
-     uqxtn2      v0.16b, v1.8h
-@@ -565,7 +563,7 @@
- 
-     coeff_level_run_start \size
- 
--    coeff_level_run shiftw
-+    coeff_level_run (4 - (\size + 1) / 8)
- 
-     ret
- endfunc
diff --git a/multimedia/x264/files/patch-x264.h b/multimedia/x264/files/patch-x264.h
deleted file mode 100644
index a6d1ea730ba8..000000000000
--- a/multimedia/x264/files/patch-x264.h
+++ /dev/null
@@ -1,15 +0,0 @@
-Our stdint.h is a symlink to sys/stdint.h so we need to teach x264
-the header guard of the sys/stdint.h file.
-
-Accepted upstream, see https://reviews.freebsd.org/D2863 for details.
---- x264.h.orig	2015-06-19 08:05:22.728325000 +0200
-+++ x264.h	2015-06-19 08:05:39.433879000 +0200
-@@ -29,7 +29,7 @@
- #define X264_X264_H
- 
- #if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) && !defined(_STDINT) &&\
--    !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES)
-+    !defined(_SYS_STDINT_H_) && !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES)
- # ifdef _MSC_VER
- #  pragma message("You must include stdint.h or inttypes.h before x264.h")
- # else