Cleanup and update Vaapi patch(?)

4 files changed, 21 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e51d776e13..c19accb49329 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat Apr 29 21:20:45 UTC 2017
+# Wed May  3 13:56:02 UTC 2017
 pkgbase = chromium-dev
 	pkgdesc = The open-source project behind Google Chrome (Dev Channel)
 	pkgver = 60.0.3080.5
@@ -32,7 +32,6 @@ pkgbase = chromium-dev
 	depends = pciutils
 	depends = re2
 	depends = snappy
-	depends = speech-dispatcher
 	depends = xdg-utils
 	depends = libcups
 	depends = harfbuzz-icu
@@ -59,7 +58,7 @@ pkgbase = chromium-dev
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-gn-bootstrap-r5.patch
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-clang-r1.patch
 	source = minizip.patch
-	source = vaapi_patch_r0.patch
+	source = vaapi_patch_r1.patch
 	source = chromium-widevine-r1.patch
 	sha256sums = 7d6cc16eba14b4417b02f8533707b6ea910574402b2f92463f831eb7c19eb536
 	sha256sums = 8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28
@@ -72,7 +71,7 @@ pkgbase = chromium-dev
 	sha256sums = 5e327f41d0be88ee3b1fac727bc8de8bed3502f0df6e63c87f95997da7a39884
 	sha256sums = c584567f073d3eecdbcbaf49d797516f35ab33bdca3bbfe9afebf1810c5103c1
 	sha256sums = 95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840
-	sha256sums = fef17ee6b80b9c60e4579ec4afec72fedb6ab1807ecc5903ab6aa2ccbb9fc8b0
+	sha256sums = 8123da80906d2150fd7e0da84d3fa5928b0c05c1c1c7b8f5dca30615f105405f
 	sha256sums = 0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880
 
 pkgname = chromium-dev
diff --git a/.gitignore b/.gitignore
index 4f843b634feb..7b2e660894dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
 !chromium-widevine-r1.patch
 !BUILD.gn
 !minizip.patch
-!vaapi_patch_r0.patch
+!vaapi_patch_r1.patch
diff --git a/PKGBUILD b/PKGBUILD
index f59c2e92549b..2d95e31bcfa5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,6 @@ depends=(
          'pciutils'
          're2'
          'snappy'
-         'speech-dispatcher'
          'xdg-utils'
          'libcups'
          'harfbuzz-icu'
@@ -93,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_r0.patch'
+        'vaapi_patch_r1.patch'
         # Patch from crbug (chromium bugtracker)
         'chromium-widevine-r1.patch'
         )
@@ -113,7 +112,7 @@ sha256sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/
 #             '14377408f34e2d97b7cd5219e8363fbda249faa5534e30d9226cdf308915b9ad'
 #             'f98818c933042ce61f3940d7c8880f3edc0f300d7e0a92a6ab7c5c7fd0bf8709'
             '95ba939b9372e533ecbcc9ca034f3e9fc6621d3bddabb57c4d092ea69fa6c840'
-            'fef17ee6b80b9c60e4579ec4afec72fedb6ab1807ecc5903ab6aa2ccbb9fc8b0'
+            '8123da80906d2150fd7e0da84d3fa5928b0c05c1c1c7b8f5dca30615f105405f'
             # Patch from crbug (chromium bugtracker)
             '0d537830944814fe0854f834b5dc41dc5fc2428f77b2ad61d4a5e76b0fe99880'
             )
@@ -406,7 +405,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_r0.patch"
+    patch -p1 -i "${srcdir}/vaapi_patch_r1.patch"
   fi
 
   # Fix paths.
diff --git a/vaapi_patch_r0.patch b/vaapi_patch_r1.patch
index 4b4b003a192b..85e06152704e 100644
--- a/vaapi_patch_r0.patch
+++ b/vaapi_patch_r1.patch
@@ -2,13 +2,13 @@
 +++ b/chrome/browser/about_flags.cc
 @@ -1044,7 +1044,7 @@ const FeatureEntry kFeatureEntries[] = {
          "disable-accelerated-video-decode",
-         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
-         IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+         flag_descriptions::kAcceleratedVideoDecodeName,
+         flag_descriptions::kAcceleratedVideoDecodeDescription,
 -        kOsMac | kOsWin | kOsCrOS | kOsAndroid,
 +        kOsAll,
          SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
- #if defined(USE_ASH)
+ #if defined(OS_WIN)
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
 @@ -13,6 +13,49 @@ if (is_mac) {
@@ -21,15 +21,15 @@
 +
 +    script = "../../tools/generate_stubs/generate_stubs.py"
 +    sources = [
-+      "../../media/gpu/va.sigs",
++      "../../media/gpu/vaapi/va.sigs",
 +    ]
 +    inputs = [
 +      extra_header,
 +    ]
-+    sources += [ "../../media/gpu/va_x11.sigs" ]
++    sources += [ "../../media/gpu/vaapi/va_x11.sigs" ]
 +    if (use_ozone) {
 +      sources += [
-+        "../../media/gpu/va_drm.sigs",
++        "../../media/gpu/vaapi/va_drm.sigs",
 +        "va_wayland.sigs",
 +      ]
 +    }
@@ -343,8 +343,8 @@
  CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
  #endif
  
---- a/gpu/config/software_rendering_list_json.cc
-+++ b/gpu/config/software_rendering_list_json.cc
+--- a/gpu/config/software_rendering_list.json
++++ b/gpu/config/software_rendering_list.json
 @@ -395,17 +395,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST(
        ]
      },
@@ -413,14 +413,14 @@
        "vp8_decoder.cc",
        "vp8_decoder.h",
 @@ -259,7 +259,7 @@ component("gpu") {
+         "EGL",
          "GLESv2",
        ]
-     }
--    if (current_cpu == "arm") {
-+    if (current_cpu == "arm" && is_chromeos) {
-       sources += [
-         "tegra_v4l2_device.cc",
-         "tegra_v4l2_device.h",
+-      if (current_cpu == "arm") {
++      if (current_cpu == "arm" && is_chromeos) {
+         sources += [
+           "tegra_v4l2_device.cc",
+           "tegra_v4l2_device.h",
 --- a/media/gpu/gpu_video_decode_accelerator_factory.cc
 +++ b/media/gpu/gpu_video_decode_accelerator_factory.cc
 @@ -16,7 +16,7 @@