Update vaapi patch

4 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf9e1f008e67..88a0f8efa7a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu May 18 00:00:55 UTC 2017
+# Thu May 18 13:28:24 UTC 2017
 pkgbase = chromium-dev
 	pkgdesc = The open-source project behind Google Chrome (Dev Channel)
 	pkgver = 60.0.3100.0
@@ -59,7 +59,7 @@ pkgbase = chromium-dev
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-libpng-r1.patch
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-libwebp-r1.patch
 	source = minizip.patch
-	source = vaapi_patch_r1.patch
+	source = vaapi_patch_r2.patch
 	source = chromium-widevine-r1.patch
 	sha256sums = 5e03a5a9146bc1efefe3246d79eef9341a12429fb54e952633e2a62e374ad944
 	sha256sums = 8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28
@@ -72,7 +72,7 @@ pkgbase = chromium-dev
 	sha256sums = 72162373321acdc3d1fc4ab4d14a05f8103e066579e364a18c2e7ee3f66db9bf
 	sha256sums = 71321092ee15738386d839312dba32aa407682a38ea158c9b13b3dca3114bb78
 	sha256sums = 95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840
-	sha256sums = 8123da80906d2150fd7e0da84d3fa5928b0c05c1c1c7b8f5dca30615f105405f
+	sha256sums = 4ec8b2df4859b9d26b8ea4afc205f563f59844c54a6659bb279776b93163a0ce
 	sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880
 
 pkgname = chromium-dev
diff --git a/.gitignore b/.gitignore
index 7b2e660894dd..8bf68fc5d782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 !chromium-widevine-r1.patch
 !BUILD.gn
 !minizip.patch
-!vaapi_patch_r1.patch
+!vaapi_patch_r2.patch
diff --git a/PKGBUILD b/PKGBUILD
index d73071ae6620..e1b987f8b1b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -92,7 +92,7 @@ source=( #"https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgv
 #         "enable_vaapi_on_linux_${pkgver}.diff::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/25539edd06a0ac9bf4010c4ad9b936d349ebc974/debian/patches/enable_vaapi_on_linux.diff"
 #         "specify-max-resolution_${pkgver}.patch::https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/25539edd06a0ac9bf4010c4ad9b936d349ebc974/debian/patches/specify-max-resolution.patch"
         'minizip.patch'
-        'vaapi_patch_r1.patch'
+        'vaapi_patch_r2.patch'
         # Patch from crbug (chromium bugtracker)
         'chromium-widevine-r1.patch'
         )
@@ -113,7 +113,7 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
 #             '14377408f34e2d97b7cd5219e8363fbda249faa5534e30d9226cdf308915b9ad'
 #             'f98818c933042ce61f3940d7c8880f3edc0f300d7e0a92a6ab7c5c7fd0bf8709'
             '95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840'
-            '8123da80906d2150fd7e0da84d3fa5928b0c05c1c1c7b8f5dca30615f105405f'
+            '4ec8b2df4859b9d26b8ea4afc205f563f59844c54a6659bb279776b93163a0ce'
             # Patch from crbug (chromium bugtracker)
             '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
             )
@@ -411,7 +411,7 @@ prepare() {
   if [ "${_enable_vaapi}" = 1 ]; then
 #     patch -p1 -i "${srcdir}/enable_vaapi_on_linux_${pkgver}.diff"
 #     patch -p1 -i "${srcdir}/specify-max-resolution_${pkgver}.patch"
-    patch -p1 -i "${srcdir}/vaapi_patch_r1.patch"
+    patch -p1 -i "${srcdir}/vaapi_patch_r2.patch"
   fi
 
   # Fix paths.
diff --git a/vaapi_patch_r1.patch b/vaapi_patch_r2.patch
index 85e06152704e..ec4651a38818 100644
--- a/vaapi_patch_r1.patch
+++ b/vaapi_patch_r2.patch
@@ -432,16 +432,16 @@
  #if defined(USE_V4L2_CODEC)
  #include "media/gpu/v4l2_device.h"
  #include "media/gpu/v4l2_slice_video_decode_accelerator.h"
-@@ -82,7 +82,7 @@ GpuVideoDecodeAcceleratorFactory::GetDecoderCapabilities(
- #if defined(OS_WIN)
+@@ -86,7 +86,7 @@
    capabilities.supported_profiles =
-       DXVAVideoDecodeAccelerator::GetSupportedProfiles(gpu_preferences);
+       DXVAVideoDecodeAccelerator::GetSupportedProfiles(gpu_preferences,
+                                                        workarounds);
 -#elif defined(OS_CHROMEOS)
 +#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
    VideoDecodeAccelerator::SupportedProfiles vda_profiles;
  #if defined(USE_V4L2_CODEC)
    vda_profiles = V4L2VideoDecodeAccelerator::GetSupportedProfiles();
-@@ -135,7 +135,7 @@ GpuVideoDecodeAcceleratorFactory::CreateVDA(
+@@ -139,7 +139,7 @@
      &GpuVideoDecodeAcceleratorFactory::CreateV4L2VDA,
      &GpuVideoDecodeAcceleratorFactory::CreateV4L2SVDA,
  #endif
@@ -450,10 +450,10 @@
      &GpuVideoDecodeAcceleratorFactory::CreateVaapiVDA,
  #endif
  #if defined(OS_MACOSX)
-@@ -218,11 +218,12 @@ GpuVideoDecodeAcceleratorFactory::CreateV4L2SVDA(
+@@ -222,11 +222,12 @@
  }
  #endif
- 
+
 -#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
 +#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY)
  std::unique_ptr<VideoDecodeAccelerator>