[SCM] x265/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b1896f771404726aeb12aecb5244da892a1404ef
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Oct 12 00:39:59 2015 +0200

    Refresh patches

diff --git a/debian/patches/fix-x32.patch b/debian/patches/fix-x32.patch
index f3636cb..37892df 100644
--- a/debian/patches/fix-x32.patch
+++ b/debian/patches/fix-x32.patch
@@ -4,9 +4,9 @@ Last-Update: 2015-07-19
 
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -43,6 +43,10 @@ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR
- set(X86_ALIASES x86 i386 i686 x86_64 amd64)
- list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+@@ -45,6 +45,10 @@
+ set(POWER_ALIASES ppc64 ppc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
  if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
 +  if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
 +    message(STATUS "Detected x32 target system")
@@ -15,15 +15,15 @@ Last-Update: 2015-07-19
      message(STATUS "Detected x86 target processor")
      set(X86 1)
      add_definitions(-DX265_ARCH_X86=1)
-@@ -50,6 +54,7 @@ if("${SYSPROC}" STREQUAL "" OR X86MATCH
+@@ -52,6 +56,7 @@
          set(X64 1)
          add_definitions(-DX86_64=1)
      endif()
 +  endif()
- elseif(${SYSPROC} STREQUAL "armv6l")
-     message(STATUS "Detected ARM target processor")
-     set(ARM 1)
-@@ -86,6 +91,8 @@ endif(UNIX)
+ elseif(POWERMATCH GREATER "-1")
+     message(STATUS "Detected POWER target processor")
+     set(POWER 1)
+@@ -96,6 +101,8 @@
  
  if(X64 AND NOT WIN32)
      option(ENABLE_PIC "Enable Position Independent Code" ON)
diff --git a/debian/patches/gcc-check.patch b/debian/patches/gcc-check.patch
deleted file mode 100644
index 3d694c6..0000000
--- a/debian/patches/gcc-check.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix gcc detection
-Origin: upstream,
- https://bitbucket.org/multicoreware/x265/commits/98325f22a1bad500e6a0c3372bf8177e81167cae
-Last-Update: 2015-06-18
-
-diff --git a/source/common/vec/vec-primitives.cpp b/source/common/vec/vec-primitives.cpp
---- a/source/common/vec/vec-primitives.cpp
-+++ b/source/common/vec/vec-primitives.cpp
-@@ -32,12 +32,13 @@
- #define HAVE_SSE4
- #define HAVE_AVX2
- #elif defined(__GNUC__)
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
-+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-+#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
- #define HAVE_SSE3
- #define HAVE_SSSE3
- #define HAVE_SSE4
- #endif
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
- #define HAVE_AVX2
- #endif
- #elif defined(_MSC_VER)
diff --git a/debian/patches/highbit-depth-path.patch b/debian/patches/highbit-depth-path.patch
index 58f8a7c..ec79926 100644
--- a/debian/patches/highbit-depth-path.patch
+++ b/debian/patches/highbit-depth-path.patch
@@ -5,7 +5,7 @@ Last-Update: 2015-05-21
 
 --- a/source/encoder/api.cpp
 +++ b/source/encoder/api.cpp
-@@ -288,7 +288,7 @@
+@@ -333,7 +333,7 @@
  #define ext ".dylib"
  #else
  #include <dlfcn.h>
@@ -13,8 +13,8 @@ Last-Update: 2015-05-21
 +#define ext ".so." xstr(X265_BUILD)
  #endif
  
- extern "C"
-@@ -302,9 +302,9 @@
+ static int g_recursion /* = 0 */;
+@@ -359,9 +359,9 @@
          if (bitDepth == 12)
              libname = "libx265_main12" ext;
          else if (bitDepth == 10)
diff --git a/debian/patches/series b/debian/patches/series
index 4c5d643..f5452aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 compile-flags.patch
 highbit-depth-path.patch
-gcc-check.patch
 fix-x32.patch

-- 
x265 packaging