[SCM] x265/master: Refresh again

[sramacher at users.alioth.debian.org]

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

    Refresh again

diff --git a/debian/patches/fix-x32.patch b/debian/patches/fix-x32.patch
index fe3a823..9d76c39 100644
--- a/debian/patches/fix-x32.patch
+++ b/debian/patches/fix-x32.patch
@@ -4,7 +4,7 @@ Last-Update: 2015-07-19
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -47,13 +47,17 @@
+@@ -47,7 +47,10 @@
  if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
      set(X86 1)
      add_definitions(-DX265_ARCH_X86=1)
@@ -16,14 +16,7 @@ Last-Update: 2015-07-19
          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)
-@@ -102,6 +106,8 @@
+@@ -102,6 +105,8 @@
  
  if(X64 AND NOT WIN32)
      option(ENABLE_PIC "Enable Position Independent Code" ON)

-- 
x265 packaging