[SCM] x265/master: Reduce upstream diff

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0689ac72366b92b61e4b949e12f5c5c7d653d935
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Aug 18 21:10:37 2016 +0200

    Reduce upstream diff
    
    i686 is now the default on i386, so we do not care about -march=i686 there.

diff --git a/debian/patches/compile-flags.patch b/debian/patches/compile-flags.patch
index 9f6ee1c..1df8bba 100644
--- a/debian/patches/compile-flags.patch
+++ b/debian/patches/compile-flags.patch
@@ -5,16 +5,10 @@ Last-Update: 2014-11-30
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -180,22 +180,6 @@
-         else()
-             add_definitions(-march=native)
+@@ -186,17 +186,6 @@
+             add_definitions(-march=i686)
          endif()
--    elseif(X86 AND NOT X64)
--        string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)
--        if(marchPos LESS "0")
--            add_definitions(-march=i686)
--        endif()
--    endif()
+     endif()
 -    if(ARM AND CROSS_COMPILE_ARM)
 -        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
 -    elseif(ARM)
@@ -25,6 +19,7 @@ Last-Update: 2014-11-30
 -        else()
 -            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
 -        endif()
-     endif()
+-    endif()
      add_definitions(${ARM_ARGS})
      if(FPROFILE_GENERATE)
+         if(INTEL_CXX)
diff --git a/debian/patches/fix-x32.patch b/debian/patches/fix-x32.patch
index 64572b4..7e90a52 100644
--- a/debian/patches/fix-x32.patch
+++ b/debian/patches/fix-x32.patch
@@ -25,3 +25,12 @@ Last-Update: 2015-07-19
  else()
      option(ENABLE_PIC "Enable Position Independent Code" OFF)
  endif(X64 AND NOT WIN32)
+@@ -180,7 +185,7 @@
+         else()
+             add_definitions(-march=native)
+         endif()
+-    elseif(X86 AND NOT X64)
++    elseif(X86 AND NOT X64 AND NOT X32)
+         string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos)
+         if(marchPos LESS "0")
+             add_definitions(-march=i686)

-- 
x265 packaging