Update

3 files changed, 3 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a550c60ff49f..d4cfb3a2dbb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libva-intel-driver-g45-h264
 	pkgdesc = Video Acceleration (VA) API for Linux
 	pkgver = 2.4.1
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://01.org/linuxmedia/vaapi
 	arch = i686
@@ -15,7 +15,6 @@ pkgbase = libva-intel-driver-g45-h264
 	optdepends = libva-utils: Applications and Scripts for libva (vainfo and others)
 	provides = libva-intel-driver
 	conflicts = libva-intel-driver
-	conflicts = intel-gpu-tools
 	replaces = libva-intel-driver
 	source = https://bitbucket.org/alium/g45-h264/downloads/intel-driver-g45-h264-2.4.1.tar.gz
 	sha256sums = f9d18a4b9d5007bc606d125b553a3d053d3295dd295ea477e43396a751e706fd
diff --git a/PKGBUILD b/PKGBUILD
index f54cb0545914..dd9eb04234dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 pkgname=libva-intel-driver-g45-h264
 epoch=1
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="VA-API implementation for Intel G45 chipsets with H264 support."
 arch=('i686' 'x86_64')
 url='https://01.org/linuxmedia/vaapi'
 pkgdesc='Video Acceleration (VA) API for Linux'
 depends=('libdrm' 'libgl' 'glibc' 'libva>=2.0.0')
-conflicts=('libva-intel-driver' 'intel-gpu-tools')
+conflicts=('libva-intel-driver')
 provides=('libva-intel-driver')
 replaces=('libva-intel-driver')
 optdepends=('libva-utils: Applications and Scripts for libva (vainfo and others)')
diff --git a/fix_surface_querys.patch b/fix_surface_querys.patch
deleted file mode 100644
index 288962e73fbd..000000000000
--- a/fix_surface_querys.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- intel-vaapi-driver/src/i965_drv_video.c.orig	2017-04-20 00:11:01.000000000 +0200
-+++ intel-vaapi-driver/src/i965_drv_video.c	2017-04-22 15:33:21.986238617 +0200
-@@ -5459,15 +5459,7 @@
-             attrib_list[i].flags = VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE;
- 
-             if (attrib_list[i].value.value.i == 0) {
--                if (IS_G4X(i965->intel.device_info)) {
--                    if (obj_config->profile == VAProfileMPEG2Simple ||
--                        obj_config->profile == VAProfileMPEG2Main) {
--                        attrib_list[i].value.value.i = VA_FOURCC_I420;
--                    } else {
--                        assert(0);
--                        attrib_list[i].flags = VA_SURFACE_ATTRIB_NOT_SUPPORTED;
--                    }
--                } else if (IS_IRONLAKE(i965->intel.device_info)) {
-+                if (IS_G4X(i965->intel.device_info) || IS_IRONLAKE(i965->intel.device_info)) {
-                     if (obj_config->profile == VAProfileMPEG2Simple ||
-                         obj_config->profile == VAProfileMPEG2Main) {
-                         attrib_list[i].value.value.i = VA_FOURCC_I420;
-@@ -5492,18 +5484,7 @@
-                         attrib_list[i].value.value.i = VA_FOURCC_NV12;
-                 }
-             } else {
--                if (IS_G4X(i965->intel.device_info)) {
--                    if (obj_config->profile == VAProfileMPEG2Simple ||
--                        obj_config->profile == VAProfileMPEG2Main) {
--                        if (attrib_list[i].value.value.i != VA_FOURCC_I420) {
--                            attrib_list[i].value.value.i = 0;
--                            attrib_list[i].flags &= ~VA_SURFACE_ATTRIB_SETTABLE;
--                        }
--                    } else {
--                        assert(0);
--                        attrib_list[i].flags = VA_SURFACE_ATTRIB_NOT_SUPPORTED;
--                    }
--                } else if (IS_IRONLAKE(i965->intel.device_info)) {
-+                if (IS_G4X(i965->intel.device_info) || IS_IRONLAKE(i965->intel.device_info)) {
-                     if (obj_config->profile == VAProfileMPEG2Simple ||
-                         obj_config->profile == VAProfileMPEG2Main) {
-                         if (attrib_list[i].value.value.i != VA_FOURCC_I420) {
-@@ -5649,16 +5630,7 @@
-     if (attribs == NULL)
-         return VA_STATUS_ERROR_ALLOCATION_FAILED;
- 
--    if (IS_G4X(i965->intel.device_info)) {
--        if (obj_config->profile == VAProfileMPEG2Simple ||
--            obj_config->profile == VAProfileMPEG2Main) {
--            attribs[i].type = VASurfaceAttribPixelFormat;
--            attribs[i].value.type = VAGenericValueTypeInteger;
--            attribs[i].flags = VA_SURFACE_ATTRIB_GETTABLE | VA_SURFACE_ATTRIB_SETTABLE;
--            attribs[i].value.value.i = VA_FOURCC_I420;
--            i++;
--        }
--    } else if (IS_IRONLAKE(i965->intel.device_info)) {
-+    if (IS_G4X(i965->intel.device_info) || IS_IRONLAKE(i965->intel.device_info)) {
-         switch (obj_config->profile) {
-         case VAProfileMPEG2Simple:
-         case VAProfileMPEG2Main: