[SCM] x265/master: Apply upstream fix to gcc feature detection

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 802edcfccb20a958ddbfd84026e68e8ed309a505
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jun 18 19:01:59 2015 +0200

    Apply upstream fix to gcc feature detection
    
    This is necessary once gcc 5 is the default.

diff --git a/debian/patches/gcc-check.patch b/debian/patches/gcc-check.patch
new file mode 100644
index 0000000..3d694c6
--- /dev/null
+++ b/debian/patches/gcc-check.patch
@@ -0,0 +1,24 @@
+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/series b/debian/patches/series
index 6120641..ee836f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 compile-flags.patch
 highbit-depth-path.patch
+gcc-check.patch

-- 
x265 packaging