libvpx: Pull from upstream

generate_gypi.sh

 #!/bin/bash -e
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is used to generate .gypi files and files in the config/platform
 # directories needed to build libvpx.
 # Every time libvpx source code is updated just run this script.
 #
@@ skipping 86 matching lines @@
 # $2 - Output file
 function write_special_flags {
   declare -a file_list=("${!1}")
 
   local mmx_sources=$(echo "$file_list" | grep '_mmx\.c$')
   local sse2_sources=$(echo "$file_list" | grep '_sse2\.c$')
   local sse3_sources=$(echo "$file_list" | grep '_sse3\.c$')
   local ssse3_sources=$(echo "$file_list" | grep '_ssse3\.c$')
   local sse4_1_sources=$(echo "$file_list" | grep '_sse4\.c$')
 
-  local extra_sources=$(comm -23 <(echo "$file_list") <(echo "$mmx_sources"))
-  extra_sources=$(comm -23 <(echo "$extra_sources") <(echo "$sse2_sources"))
-  extra_sources=$(comm -23 <(echo "$extra_sources") <(echo "$sse3_sources"))
-  extra_sources=$(comm -23 <(echo "$extra_sources") <(echo "$ssse3_sources"))
-  extra_sources=$(comm -23 <(echo "$extra_sources") <(echo "$sse4_1_sources"))
-
   write_gypi_header $2
 
   echo "  'targets': [" >> $2
 
   write_target_definition mmx_sources[@] $2 libvpx_intrinsics_mmx mmx
   write_target_definition sse2_sources[@] $2 libvpx_intrinsics_sse2 sse2
   write_target_definition sse3_sources[@] $2 libvpx_intrinsics_sse3 sse3
   write_target_definition ssse3_sources[@] $2 libvpx_intrinsics_ssse3 ssse3
   write_target_definition sse4_1_sources[@] $2 libvpx_intrinsics_sse4_1 sse4.1
-#CATCHALL
-# Apply the highest level of optimization. These files need to be fixed
-# upstream by having the different opt targets broken out.
-  write_target_definition extra_sources[@] $2 libvpx_intrinsics_extra sse4.1
 
   echo "  ]," >> $2
 
   write_gypi_footer $2
 }
 
 # Convert a list of source files into gypi file.
 # $1 - Input file.
 # $2 - Output gypi file base. Will generate additional .gypi files when
 #      different compilation flags are required.
@@ skipping 12 matching lines @@
 
   # Not sure why vpx_config is not included.
   source_list=$(echo "$source_list" | grep -v 'vpx_config\.c')
 
   # The actual ARM files end in .asm. We have rules to translate them to .S
   source_list=$(echo "$source_list" | sed s/\.asm\.s$/.asm/)
 
   # Select all x86 files ending with .c
   local x86_intrinsic_list=$(echo "$source_list" | \
     egrep 'vp[89]/(encoder|decoder|common)/x86/'  | \
-    grep -e '.c$')
+    egrep '(mmx|sse2|sse3|ssse3|sse4).c$')
 
   # Remove these files from the main list.
   source_list=$(comm -23 <(echo "$source_list") <(echo "$x86_intrinsic_list"))
 
   write_file_list source_list $BASE_DIR/$2.gypi
 
   # All the files are in a single "element." Check if the first element has
   # length 0.
   if [ 0 -ne ${#x86_intrinsic_list} ]; then
     write_special_flags x86_intrinsic_list[@] $BASE_DIR/$2_intrinsics.gypi
@@ skipping 192 matching lines @@
 make_clean
 make libvpx_srcs.txt target=libs $config > /dev/null
 convert_srcs_to_gypi libvpx_srcs.txt libvpx_srcs_mips
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR
 
 # TODO(fgalligan): Is "--disable-fast-unaligned" needed on mipsel?
 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel?