From e4134c31d949738e675d2d388838fd294bd79633 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 7 Feb 2017 13:45:25 +0000
Subject: x265: update to 2.2

---
 abs/core/x265/PKGBUILD                             |  6 ++---
 .../x265/x265-1.7-fix-slowness-with-gcc-5.1.patch  | 28 ----------------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch

diff --git a/abs/core/x265/PKGBUILD b/abs/core/x265/PKGBUILD
index bee22f5..1a728d7 100644
--- a/abs/core/x265/PKGBUILD
+++ b/abs/core/x265/PKGBUILD
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: kfgz <kfgz@interia.pl>
 
 pkgname=x265
-pkgver=1.9
+pkgver=2.2
 pkgrel=1
 pkgdesc='Open Source H265/HEVC video encoder'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('gcc-libs')
 makedepends=('yasm' 'cmake')
 provides=('libx265.so')
 source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz")
-md5sums=('f34a1c4c660ff07511365cb0983cf164')
+sha256sums=('b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b')
 
 prepare() {
   cd x265_${pkgver}
diff --git a/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch b/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch
deleted file mode 100644
index 6aa679d..0000000
--- a/abs/core/x265/x265-1.7-fix-slowness-with-gcc-5.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Deepthi Nandakumar <deepthi@multicorewareinc.com>
-# Date 1434559454 -19800
-#      Wed Jun 17 22:14:14 2015 +0530
-# Branch stable
-# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
-# Parent  e0738af788da598a3cdf4458dbb46fbb07563534
-fix issue #143 x265 is slow when it is build with GCC 5.1
-
-diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
---- a/source/common/vec/vec-primitives.cpp	Wed May 20 10:29:09 2015 -0500
-+++ b/source/common/vec/vec-primitives.cpp	Wed Jun 17 22:14:14 2015 +0530
-@@ -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)
-- 
cgit v0.12

