[SCM] x265/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c97c9db115a1c748ed41fb4277ae95f1baa67baf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Feb 6 21:35:33 2016 +0100

    Refresh patches

diff --git a/debian/patches/compile-flags.patch b/debian/patches/compile-flags.patch
index a5b6176..708e7d0 100644
--- a/debian/patches/compile-flags.patch
+++ b/debian/patches/compile-flags.patch
@@ -5,7 +5,7 @@ Last-Update: 2014-11-30
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -156,11 +156,6 @@
+@@ -173,11 +173,6 @@
          else()
              add_definitions(-march=native)
          endif()
diff --git a/debian/patches/fix-x32.patch b/debian/patches/fix-x32.patch
index 37892df..fe3a823 100644
--- a/debian/patches/fix-x32.patch
+++ b/debian/patches/fix-x32.patch
@@ -4,26 +4,26 @@ Last-Update: 2015-07-19
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -45,6 +45,10 @@
- set(POWER_ALIASES ppc64 ppc64le)
- list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+@@ -47,13 +47,17 @@
  if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
-+  if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
-+    message(STATUS "Detected x32 target system")
-+    set(X32 1)
-+  else()
-     message(STATUS "Detected x86 target processor")
      set(X86 1)
      add_definitions(-DX265_ARCH_X86=1)
-@@ -52,6 +56,7 @@
+-    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
++    if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++        message(STATUS "Detected x32 target system")
++        set(X32 1)
++    elseif("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
          set(X64 1)
          add_definitions(-DX86_64=1)
+         message(STATUS "Detected x86_64 target processor")
+     else()
+         message(STATUS "Detected x86 target processor")
      endif()
 +  endif()
  elseif(POWERMATCH GREATER "-1")
      message(STATUS "Detected POWER target processor")
      set(POWER 1)
-@@ -96,6 +101,8 @@
+@@ -102,6 +106,8 @@
  
  if(X64 AND NOT WIN32)
      option(ENABLE_PIC "Enable Position Independent Code" ON)
diff --git a/debian/patches/series b/debian/patches/series
index fa6ef2c..af01a27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 compile-flags.patch
 fix-x32.patch
-fix-linking-with-dl.patch
-fix-version-info.patch

-- 
x265 packaging