Update to 49.0.2587.3

4 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fe288c6ea08..84495885704a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-dev
 	pkgdesc = The open-source project behind Google Chrome (Dev Channel)
-	pkgver = 48.0.2564.22
+	pkgver = 49.0.2587.3
 	pkgrel = 1
 	url = http://www.chromium.org
 	install = chromium-dev.install
@@ -52,22 +52,22 @@ pkgbase = chromium-dev
 	optdepends = ttf-font: For some typography
 	optdepends = libappindicator-gtk3: Needed for show systray icon in the panel in plasma-next (KF5)
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-48.0.2564.22.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-49.0.2587.3.tar.xz
 	source = chromium-launcher-3.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v3.tar.gz
 	source = chromium-dev.desktop
 	source = chromium-dev.xml
 	source = chromium-dev.svg
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-jinja-r7.patch
 	source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
-	source = enable_vaapi_on_linux-r2.diff
-	sha1sums = 0abcd50b0ec8fd3cd8217cc745b3d9a908045dd9
+	source = enable_vaapi_on_linux-r3.diff
+	sha1sums = 165f91422adc314c217b2d030be1d3871e368330
 	sha1sums = d18f8d96e80be9c31d994cc6362d7d8041c53319
 	sha1sums = 0acc45b901418f270d0b2068502e39c407c74ea4
 	sha1sums = 2b98c549332e7337307ce287e150930cfc1dfa5f
 	sha1sums = 336976cb66bf8df71fc7f2e92aa723891b6efb53
 	sha1sums = c24d14029714d2295f3220a7173a5a7362f578a2
 	sha1sums = 6c25b8e8b6bd17d64606dd14353c43a7728daf03
-	sha1sums = d114dc0d1d9379f1ab08fc015541922c34db21fa
+	sha1sums = aab4fa1f9aad1a80fdb35545eb74739a240fe0ae
 	makedepends_x86_64 = lib32-gcc-libs
 	makedepends_x86_64 = lib32-zlib
 
diff --git a/.gitignore b/.gitignore
index 80d3aa91c2e5..5a270a77324a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 !chromium-dev.install
 !chromium-dev.xml
 !chromium-dev.svg
-!enable_vaapi_on_linux-r2.diff
+!enable_vaapi_on_linux-r3.diff
diff --git a/PKGBUILD b/PKGBUILD
index c55be515a14c..a41202446c7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _use_gtk3=1            # If set 1, then build with GTK3 support, if set 0, then
 ## -- Package and components information -- ##
 ##############################################
 pkgname=chromium-dev
-pkgver=48.0.2564.22
+pkgver=49.0.2587.3
 _launcher_ver=3
 pkgrel=1
 pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
@@ -82,7 +82,7 @@ source=("https://commondatastorage.googleapis.com/chromium-browser-official/chro
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-jinja-r7.patch'
         'https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-ffmpeg-r1.patch'
         # Misc Patches
-        'enable_vaapi_on_linux-r2.diff'
+        'enable_vaapi_on_linux-r3.diff'
         # Patch from crbug (chromium bugtracker)
         )
 sha1sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/?marker=chromium-${pkgver}.tar.x | awk -v FS='<td>"' -v RS='"</td>' '$0=$2' | head -n1)"
@@ -95,7 +95,7 @@ sha1sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/?m
           'c24d14029714d2295f3220a7173a5a7362f578a2'
           '6c25b8e8b6bd17d64606dd14353c43a7728daf03'
           # Misc Patches
-          'd114dc0d1d9379f1ab08fc015541922c34db21fa'
+          'aab4fa1f9aad1a80fdb35545eb74739a240fe0ae'
           # Patch from crbug (chromium bugtracker)
           )
 options=('!strip')
@@ -275,6 +275,7 @@ _necesary=('base/third_party/dmg_fp'
            'third_party/webdriver'
            'third_party/webrtc'
            'third_party/widevine'
+           'third_party/woff2'
            'third_party/x86inc'
            'third_party/zlib/google'
            'url/third_party/mozilla'
@@ -328,6 +329,7 @@ _flags=("-Dclang=${_use_clang}"
         "-Duse_gnome_keyring=${_use_gnome_keyring}"
         "-Duse_gtk3=${_use_gtk3}"
         "-Duse_pulseaudio=${_use_pulseaudio}"
+        '-Duse_sysroot=0'
         '-Dwerror='
         )
 
@@ -426,7 +428,7 @@ prepare() {
   patch -p1 -i ../chromium-system-ffmpeg-r1.patch
 
   # Misc Patches:
-  patch -p1 -i ../enable_vaapi_on_linux-r2.diff
+  patch -p1 -i ../enable_vaapi_on_linux-r3.diff
 
   # Patch from crbug (chromium bugtracker)
   # fix the missing define (if not, fail build) (need upstream fix) # https://crbug.com/473866
@@ -441,6 +443,8 @@ prepare() {
   # Remove most bundled libraries. Some are still needed.
   msg2 "Removing unnecessary components to save space"
   python2 build/linux/unbundle/remove_bundled_libraries.py ${_necesary[@]} --do-remove
+  rm -fr native_client/toolchain
+  rm -fr build/linux/debian*
 
   if [ "${_build_pnacl}" = "1" ]; then
     msg2 "Setup NaCl/PNaCl SDK: Download and install NaCl/PNaCl toolchains"
diff --git a/enable_vaapi_on_linux-r2.diff b/enable_vaapi_on_linux-r3.diff
index e2490b169659..2baebc955798 100644
--- a/enable_vaapi_on_linux-r2.diff
+++ b/enable_vaapi_on_linux-r3.diff
@@ -7,7 +7,7 @@ Index: beta.vivid/content/common/gpu/media/gpu_video_decode_accelerator.cc
 @@ -33,7 +33,7 @@
  #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
  #elif defined(OS_MACOSX)
- #include "content/common/gpu/media/vt_video_decode_accelerator.h"
+ #include "content/common/gpu/media/vt_video_decode_accelerator_mac.h"
 -#elif defined(OS_CHROMEOS)
 +#elif defined(OS_CHROMEOS) || defined(OS_LINUX)
  #if defined(USE_V4L2_CODEC)
@@ -252,11 +252,11 @@ Index: dev.vivid/chrome/browser/about_flags.cc
 +++ dev.vivid/chrome/browser/about_flags.cc	2015-06-02 15:12:59.292303758 -0400
 @@ -1072,7 +1072,7 @@
       "disable-accelerated-video-decode",
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
-      IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+      IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
 -     kOsMac | kOsWin | kOsCrOS,
 +     kOsAll,
-      SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
      },
  #if defined(USE_ASH)
 Index: dev.vivid/content/common/gpu/media/vaapi_wrapper.cc