Index: branches/2016Q4/multimedia/x264/files/patch-configure
===================================================================
--- branches/2016Q4/multimedia/x264/files/patch-configure	(revision 424888)
+++ branches/2016Q4/multimedia/x264/files/patch-configure	(revision 424889)
@@ -1,54 +1,78 @@
 --- configure.orig	2015-06-29 20:45:09 UTC
 +++ configure
 @@ -677,12 +677,6 @@ case $host_cpu in
          AS_EXT=".asm"
          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 -msse2"
 -            fi
              CFLAGS="-m32 $CFLAGS"
              LDFLAGS="-m32 $LDFLAGS"
          fi
 @@ -697,7 +691,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
 -    x86_64)
 +    x86_64|amd64)
          ARCH="X86_64"
          AS="${AS-yasm}"
          AS_EXT=".asm"
 @@ -761,7 +755,7 @@ case $host_cpu in
              AS="${AS-${CC}}"
          fi
          ;;
 -    aarch64)
 +    aarch64|arm64)
          ARCH="AARCH64"
          stack_alignment=16
          if [ "$SYS" = MACOSX ] ; then
-@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then
+@@ -882,9 +876,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+         cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
+         ASFLAGS="$ASFLAGS -c"
+     else
+-        echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
+-        echo "If you really want to run on such a CPU, configure with --disable-asm."
+-        exit 1
++        echo "No usable SIMD found, adding --disable-asm."
++        asm="no"
+     fi
+ fi
+ 
+@@ -911,9 +904,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+     if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
+         define HAVE_MSA
+     else
+-        echo "You specified a pre-MSA CPU in your CFLAGS."
+-        echo "If you really want to run on such a CPU, configure with --disable-asm."
+-        exit 1
++        echo "No usable SIMD found, adding --disable-asm."
++        asm="no"
+     fi
+ fi
+ 
+@@ -1225,10 +1217,6 @@ if cc_check '' -Wshadow ; then
      CFLAGS="-Wshadow $CFLAGS"
  fi
  
 -if cc_check '' -Wmaybe-uninitialized ; then
 -    CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
 -fi
 -
  if [ $compiler = ICC -o $compiler = ICL ] ; then
      if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
          define HAVE_INTEL_DISPATCHER
 @@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then
          opencl="yes"
          define HAVE_OPENCL
          libdl="-ldl"
 +    else
 +        opencl="yes"
 +        define HAVE_OPENCL
      fi
      LDFLAGS="$LDFLAGS $libdl"
  fi
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 424888)
+++ branches/2016Q4	(revision 424889)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r424888