diff options
-rw-r--r-- | .SRCINFO | 29 | ||||
-rw-r--r-- | 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch | 118 | ||||
-rw-r--r-- | 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch | 35 | ||||
-rw-r--r-- | PKGBUILD | 66 | ||||
-rw-r--r-- | chromium-blink-gcc7.patch | 76 | ||||
-rw-r--r-- | chromium-gn-bootstrap-r2.patch | 13 | ||||
-rw-r--r-- | chromium-system-ffmpeg-r4.patch | 48 | ||||
-rw-r--r-- | chromium-system-ffmpeg-r6.patch | 43 | ||||
-rw-r--r-- | chromium-v8-gcc7.patch | 73 | ||||
-rw-r--r-- | vaapi_patch_r2.patch | 616 |
10 files changed, 1021 insertions, 96 deletions
@@ -1,6 +1,6 @@ pkgbase = chromium-vaapi pkgdesc = Chromium compiled with support for VA-API, allowing GPU accelerated decode of H.264 and other video formats supported by your GPU - pkgver = 58.0.3029.110 + pkgver = 59.0.3071.86 pkgrel = 1 url = https://www.chromium.org/Home install = chromium.install @@ -14,12 +14,12 @@ pkgbase = chromium-vaapi makedepends = ninja makedepends = nodejs makedepends = git - depends = gtk2 + depends = gtk3 depends = nss depends = alsa-lib depends = xdg-utils depends = libxss - depends = libexif + depends = libcups depends = libgcrypt depends = ttf-font depends = systemd @@ -43,22 +43,29 @@ pkgbase = chromium-vaapi optdepends = kdialog: needed for file dialogs in KDE optdepends = gnome-keyring: for storing passwords in GNOME keyring optdepends = kwallet: for storing passwords in KWallet + optdepends = libva-intel-driver: Needed to support VA-API for Intel graphics cards provides = chromium conflicts = chromium - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-58.0.3029.110.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-vaapi-59.0.3071.86.tar.xz source = chromium-launcher-3.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v3.tar.gz source = chromium.desktop - source = chromium-system-ffmpeg-r4.patch - source = chromium-gn-bootstrap-r2.patch + source = chromium-system-ffmpeg-r6.patch + source = 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch + source = 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + source = chromium-blink-gcc7.patch + source = chromium-v8-gcc7.patch source = chromium-widevine.patch - source = vaapi_patch_r0.patch - sha256sums = f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff + source = vaapi_patch_r2.patch + sha256sums = c31431aa9f4ae521d784bee89792e7fa05793cb822bfb8d3fbacaf414b29ace7 sha256sums = 8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28 sha256sums = 028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9 - sha256sums = e3c474dbf3822a0be50695683bd8a2c9dfc82d41c1524a20b4581883c0c88986 - sha256sums = 64d743c78183c302c42d1f289863e34c74832fca57443833e46a0a3157e2b5de + sha256sums = 2fc21f48b95f9f2c2bd8576742fcf8028a8877c6b6e96c04d88184915982234e + sha256sums = 9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9 + sha256sums = 42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6 + sha256sums = f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323 + sha256sums = 46dacc4fa52652b7d99b8996d6a97e5e3bac586f879aefb9fb95020d2c4e5aec sha256sums = d6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808 - sha256sums = fef17ee6b80b9c60e4579ec4afec72fedb6ab1807ecc5903ab6aa2ccbb9fc8b0 + sha256sums = 2c507aa6186e8295cac27a71d409796cb233fdc59737298a92c939d7e259d1b6 pkgname = chromium-vaapi diff --git a/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch b/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch new file mode 100644 index 000000000000..8a1bf2b20eb5 --- /dev/null +++ b/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch @@ -0,0 +1,118 @@ +From 27bab2297187099229a1e4304d8feb866c8da55a Mon Sep 17 00:00:00 2001 +From: "dongseong.hwang" <dongseong.hwang@intel.com> +Date: Tue, 18 Apr 2017 16:44:55 -0700 +Subject: [PATCH] ClientNativePixmapFactoryDmabuf uses ioctl, instead of + drmIoctl. + +DMA_BUF_SYNC ioctl is not drmIoctl, because it uses dma-buf fd, instead of drm +device fd. + +In addition, remove LOCAL_ prefix to fix build failure >= kernel 4.6 + +Actually, ChromeOS doesn't need this local DMA_BUF_SYNC definition as all +verion of kernel for cros has dma-buf.h header. +https://chromium-review.googlesource.com/c/459544/ +However, there is not any way to distinguish real ChromeOS build and +current_os="chromeos" build, so remain the local definition to ChromeOS as +well. + +BUG=584248 +R=reveman@chromium.org + +Review-Url: https://codereview.chromium.org/2805503003 +Cr-Commit-Position: refs/heads/master@{#465425} +--- + ui/gfx/linux/client_native_pixmap_dmabuf.cc | 49 +++++++++++++---------------- + 1 file changed, 21 insertions(+), 28 deletions(-) + +diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +index d656c338f0a6..1bb441dc25ce 100644 +--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc ++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +@@ -7,36 +7,35 @@ + #include <fcntl.h> + #include <linux/version.h> + #include <stddef.h> ++#include <sys/ioctl.h> + #include <sys/mman.h> + #include <xf86drm.h> + + #include "base/debug/crash_logging.h" + #include "base/memory/ptr_util.h" ++#include "base/posix/eintr_wrapper.h" + #include "base/process/memory.h" + #include "base/process/process_metrics.h" + #include "base/strings/stringprintf.h" + #include "base/trace_event/trace_event.h" + +-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#include <linux/dma-buf.h> ++#else + #include <linux/types.h> + +-struct local_dma_buf_sync { ++struct dma_buf_sync { + __u64 flags; + }; + +-#define LOCAL_DMA_BUF_SYNC_READ (1 << 0) +-#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0) +-#define LOCAL_DMA_BUF_SYNC_RW \ +- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE) +-#define LOCAL_DMA_BUF_SYNC_START (0 << 2) +-#define LOCAL_DMA_BUF_SYNC_END (1 << 2) ++#define DMA_BUF_SYNC_READ (1 << 0) ++#define DMA_BUF_SYNC_WRITE (2 << 0) ++#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) ++#define DMA_BUF_SYNC_START (0 << 2) ++#define DMA_BUF_SYNC_END (1 << 2) + +-#define LOCAL_DMA_BUF_BASE 'b' +-#define LOCAL_DMA_BUF_IOCTL_SYNC \ +- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) +- +-#else +-#include <linux/dma-buf.h> ++#define DMA_BUF_BASE 'b' ++#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) + #endif + + namespace gfx { +@@ -44,25 +43,19 @@ namespace gfx { + namespace { + + void PrimeSyncStart(int dmabuf_fd) { +- struct local_dma_buf_sync sync_start = {0}; ++ struct dma_buf_sync sync_start = {0}; + +- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW; +-#if DCHECK_IS_ON() +- int rv = +-#endif +- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start); +- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; ++ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; ++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start)); ++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; + } + + void PrimeSyncEnd(int dmabuf_fd) { +- struct local_dma_buf_sync sync_end = {0}; ++ struct dma_buf_sync sync_end = {0}; + +- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW; +-#if DCHECK_IS_ON() +- int rv = +-#endif +- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end); +- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; ++ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; ++ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end)); ++ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; + } + + } // namespace +-- +2.13.0 + diff --git a/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch b/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch new file mode 100644 index 000000000000..345770000604 --- /dev/null +++ b/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch @@ -0,0 +1,35 @@ +From 63901da067e069e298595618e01c4758c7896ff5 Mon Sep 17 00:00:00 2001 +From: thomasanderson <thomasanderson@google.com> +Date: Fri, 28 Apr 2017 11:56:12 -0700 +Subject: [PATCH] Fix kernel version condition for including dma-buf.h + +Kernel 4.11 merges the commit that added linux/dma-buf.h +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ef96152e6a36e0510387cb174178b7982c1ae879 + +This CL increases the required kernel to include this file to 4.11. + +BUG=707604 +R=danakj@chromium.org + +Review-Url: https://codereview.chromium.org/2851803002 +Cr-Commit-Position: refs/heads/master@{#468078} +--- + ui/gfx/linux/client_native_pixmap_dmabuf.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +index 31ff4f4395b6..4927daf3a61d 100644 +--- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc ++++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc +@@ -19,7 +19,7 @@ + #include "base/strings/stringprintf.h" + #include "base/trace_event/trace_event.h" + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) + #include <linux/dma-buf.h> + #else + #include <linux/types.h> +-- +2.13.0 + @@ -8,13 +8,15 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# +# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py +# Keys are the names in the above script; values are the dependencies in Arch declare -rgA _system_libs=( - #[ffmpeg]=ffmpeg # https://bugs.archlinux.org/task/53796 + #[ffmpeg]=ffmpeg # https://crbug.com/723537 [flac]=flac [harfbuzz-ng]=harfbuzz-icu #[icu]=icu # Enable again when upstream supports ICU 59 + [libdrm]= [libjpeg]=libjpeg [libpng]=libpng #[libvpx]=libvpx # https://bugs.gentoo.org/show_bug.cgi?id=611394 @@ -28,14 +30,14 @@ declare -rgA _system_libs=( ) pkgname=chromium-vaapi -pkgver=58.0.3029.110 +pkgver=59.0.3071.86 pkgrel=1 _launcher_ver=3 pkgdesc="Chromium compiled with support for VA-API, allowing GPU accelerated decode of H.264 and other video formats supported by your GPU" arch=('i686' 'x86_64') url="https://www.chromium.org/Home" license=('BSD') -depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libexif' 'libgcrypt' +depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'libpulse' 'perl' 'perl-file-basedir' 'pciutils' 'desktop-file-utils' 'hicolor-icon-theme') depends+=(${_system_libs[@]}) @@ -44,22 +46,29 @@ conflicts=('chromium') makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git') optdepends=('kdialog: needed for file dialogs in KDE' 'gnome-keyring: for storing passwords in GNOME keyring' - 'kwallet: for storing passwords in KWallet') + 'kwallet: for storing passwords in KWallet' + 'libva-intel-driver: Needed to support VA-API for Intel graphics cards') install=chromium.install -source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz +source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz chromium.desktop - chromium-system-ffmpeg-r4.patch - chromium-gn-bootstrap-r2.patch + chromium-system-ffmpeg-r6.patch + 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch + 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + chromium-blink-gcc7.patch + chromium-v8-gcc7.patch chromium-widevine.patch - vaapi_patch_r0.patch) -sha256sums=('f24cef3dd2acf9dd5ccdeeca47fea42d1c1ddff32b7375dc9e0cd35a4e8d78ff' + vaapi_patch_r2.patch) +sha256sums=('c31431aa9f4ae521d784bee89792e7fa05793cb822bfb8d3fbacaf414b29ace7' '8b01fb4efe58146279858a754d90b49e5a38c9a0b36a1f84cbb7d12f92b84c28' '028a748a5c275de9b8f776f97909f999a8583a4b77fd1cd600b4fc5c0c3e91e9' - 'e3c474dbf3822a0be50695683bd8a2c9dfc82d41c1524a20b4581883c0c88986' - '64d743c78183c302c42d1f289863e34c74832fca57443833e46a0a3157e2b5de' + '2fc21f48b95f9f2c2bd8576742fcf8028a8877c6b6e96c04d88184915982234e' + '9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9' + '42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6' + 'f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323' + '46dacc4fa52652b7d99b8996d6a97e5e3bac586f879aefb9fb95020d2c4e5aec' 'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808' - 'fef17ee6b80b9c60e4579ec4afec72fedb6ab1807ecc5903ab6aa2ccbb9fc8b0') + '2c507aa6186e8295cac27a71d409796cb233fdc59737298a92c939d7e259d1b6') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Arch Linux use ONLY. For your own distribution, please @@ -70,7 +79,7 @@ _google_default_client_id=413772536636.apps.googleusercontent.com _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4 prepare() { - cd "$srcdir/chromium-$pkgver" + cd "$srcdir/$pkgname-$pkgver" # Enable support for the Widevine CDM plugin # libwidevinecdm.so is not included, but can be copied over from Chrome @@ -78,9 +87,18 @@ prepare() { sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch | patch -Np1 + # https://bugs.chromium.org/p/chromium/issues/detail?id=707604 + patch -Np1 -i ../0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch + patch -Np1 -i ../0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347 + patch -Np1 -i ../chromium-blink-gcc7.patch + + # https://bugs.chromium.org/p/chromium/issues/detail?id=614289 + patch -Np1 -i ../chromium-v8-gcc7.patch + # Fixes from Gentoo - #patch -Np1 -i ../chromium-system-ffmpeg-r4.patch - patch -Np1 -i ../chromium-gn-bootstrap-r2.patch + patch -Np1 -i ../chromium-system-ffmpeg-r6.patch # Use Python 2 find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} + @@ -91,16 +109,16 @@ prepare() { mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - + # VA-API patch - patch -p1 -i "${srcdir}/vaapi_patch_r0.patch" + patch -p1 -i "${srcdir}/vaapi_patch_r2.patch" # Fix paths. sed -e 's|i386-linux-gnu/||g' \ -e 's|x86_64-linux-gnu/||g' \ -e 's|/usr/lib/va/drivers|/usr/lib/dri|g' \ -e 's|/usr/lib64/va/drivers|/usr/lib/dri|g' \ -i content/common/sandbox_linux/bpf_gpu_policy_linux.cc - + # Remove bundled libraries for which we will use the system copies; this # *should* do what the remove_bundled_libraries.py script does, with the # added benefit of not having to list all the remaining libraries @@ -116,14 +134,12 @@ prepare() { python2 build/linux/unbundle/replace_gn_files.py \ --system-libraries "${!_system_libs[@]}" - - python2 third_party/libaddressinput/chromium/tools/update-strings.py } build() { - make -C "$srcdir/chromium-launcher-$_launcher_ver" PREFIX=/usr + make -C "$srcdir/chromium-launcher-$_launcher_ver" PREFIX=/usr GTK=3 - cd "$srcdir/chromium-$pkgver" + cd "$srcdir/$pkgname-$pkgver" export PATH="$srcdir/python2-path:$PATH" export TMPDIR="$srcdir/temp" @@ -141,6 +157,7 @@ build() { 'proprietary_codecs=true' 'link_pulseaudio=true' 'linux_use_bundled_binutils=false' + 'use_gtk3=true' 'use_gconf=false' 'use_gnome_keyring=false' 'use_gold=false' @@ -148,6 +165,7 @@ build() { 'enable_hangout_services_extension=true' 'enable_widevine=true' 'enable_nacl=false' + 'enable_swiftshader=false' "google_api_key=\"${_google_api_key}\"" "google_default_client_id=\"${_google_default_client_id}\"" "google_default_client_secret=\"${_google_default_client_secret}\"" @@ -167,7 +185,7 @@ package() { install -Dm644 LICENSE \ "$pkgdir/usr/share/licenses/chromium/LICENSE.launcher" - cd "$srcdir/chromium-$pkgver" + cd "$srcdir/$pkgname-$pkgver" install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" diff --git a/chromium-blink-gcc7.patch b/chromium-blink-gcc7.patch new file mode 100644 index 000000000000..fb6118b30b07 --- /dev/null +++ b/chromium-blink-gcc7.patch @@ -0,0 +1,76 @@ +--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300 ++++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300 +@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked + return *this; + } + ++inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { ++ DCHECK(a.prev_); ++ DCHECK(a.next_); ++ DCHECK(b.prev_); ++ DCHECK(b.next_); ++ swap(a.prev_, b.prev_); ++ swap(a.next_, b.next_); ++ if (b.next_ == &a) { ++ DCHECK_EQ(b.prev_, &a); ++ b.next_ = &b; ++ b.prev_ = &b; ++ } else { ++ b.next_->prev_ = &b; ++ b.prev_->next_ = &b; ++ } ++ if (a.next_ == &b) { ++ DCHECK_EQ(a.prev_, &b); ++ a.next_ = &a; ++ a.prev_ = &a; ++ } else { ++ a.next_->prev_ = &a; ++ a.prev_->next_ = &a; ++ } ++} ++ + template <typename T, typename U, typename V, typename W> + inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) { + impl_.Swap(other.impl_); +@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e + erase(Find(value)); + } + +-inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { +- DCHECK(a.prev_); +- DCHECK(a.next_); +- DCHECK(b.prev_); +- DCHECK(b.next_); +- swap(a.prev_, b.prev_); +- swap(a.next_, b.next_); +- if (b.next_ == &a) { +- DCHECK_EQ(b.prev_, &a); +- b.next_ = &b; +- b.prev_ = &b; +- } else { +- b.next_->prev_ = &b; +- b.prev_->next_ = &b; +- } +- if (a.next_ == &b) { +- DCHECK_EQ(a.prev_, &b); +- a.next_ = &a; +- a.prev_ = &a; +- } else { +- a.next_->prev_ = &a; +- a.prev_->next_ = &a; +- } +-} +- + inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { + DCHECK_NE(a.next_, &a); + DCHECK_NE(b.next_, &b); +--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300 ++++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300 +@@ -5,6 +5,7 @@ + #include "platform/PlatformExport.h" + #include "platform/wtf/ThreadSpecific.h" + ++#include <functional> + #include <memory> + + namespace gpu { diff --git a/chromium-gn-bootstrap-r2.patch b/chromium-gn-bootstrap-r2.patch deleted file mode 100644 index 76287e1a56ec..000000000000 --- a/chromium-gn-bootstrap-r2.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tools/gn/bootstrap/bootstrap.py -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 38cfb117d29c3895291379f00d8dc8c8b0727474..679170e610f8292bcbeb76508fd247d322a69c79 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/base_switches.cc', - 'base/build_time.cc', - 'base/callback_internal.cc', -+ 'base/callback_helpers.cc', - 'base/command_line.cc', - 'base/debug/activity_tracker.cc', - 'base/debug/alias.cc', diff --git a/chromium-system-ffmpeg-r4.patch b/chromium-system-ffmpeg-r4.patch deleted file mode 100644 index 3abfc163e8a2..000000000000 --- a/chromium-system-ffmpeg-r4.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000 -@@ -22,10 +22,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of FFmpeg's --// BUILD.gn file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -35,7 +35,6 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> ---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000 -@@ -1185,24 +1185,6 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/chromium-system-ffmpeg-r6.patch b/chromium-system-ffmpeg-r6.patch new file mode 100644 index 000000000000..d2e0157bfe36 --- /dev/null +++ b/chromium-system-ffmpeg-r6.patch @@ -0,0 +1,43 @@ +--- a/media/ffmpeg/ffmpeg_common.h.orig 2017-04-07 18:17:22.623538889 +0000 ++++ b/media/ffmpeg/ffmpeg_common.h 2017-04-07 18:18:16.780656283 +0000 +@@ -23,10 +23,12 @@ + + // Include FFmpeg header files. + extern "C" { ++#if !defined(USE_SYSTEM_FFMPEG) + // Disable deprecated features which result in spammy compile warnings. This + // list of defines must mirror those in the 'defines' section of FFmpeg's + // BUILD.gn file or the headers below will generate different structures! + #define FF_API_CONVERGENCE_DURATION 0 ++#endif // !defined(USE_SYSTEM_FFMPEG) + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -40,7 +42,9 @@ + MSVC_PUSH_DISABLE_WARNING(4244); + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> ++#if !defined(USE_SYSTEM_FFMPEG) + #include <libavformat/internal.h> ++#endif // !defined(USE_SYSTEM_FFMPEG) + #include <libavformat/avio.h> + #include <libavutil/avutil.h> + #include <libavutil/imgutils.h> +--- a/media/filters/ffmpeg_demuxer.cc.orig 2017-04-07 18:15:14.776901183 +0000 ++++ b/media/filters/ffmpeg_demuxer.cc 2017-04-07 18:15:54.813727201 +0000 +@@ -1223,6 +1223,7 @@ + // If no estimate is found, the stream entry will be kInfiniteDuration. + std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, + kInfiniteDuration); ++#if !defined(USE_SYSTEM_FFMPEG) + const AVFormatInternal* internal = format_context->internal; + if (internal && internal->packet_buffer && + format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { +@@ -1246,6 +1247,7 @@ + packet_buffer = packet_buffer->next; + } + } ++#endif // !defined(USE_SYSTEM_FFMPEG) + + std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); + diff --git a/chromium-v8-gcc7.patch b/chromium-v8-gcc7.patch new file mode 100644 index 000000000000..a63b9a495513 --- /dev/null +++ b/chromium-v8-gcc7.patch @@ -0,0 +1,73 @@ +diff -upr chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h chromium-59.0.3071.86/v8/src/objects/hash-table.h +--- chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects/hash-table.h 2017-06-06 14:35:41.558245559 +0300 +@@ -135,22 +135,10 @@ class HashTable : public HashTableBase { + public: + typedef Shape ShapeT; + +- // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } +- +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ // Wrapper methods. Defined in src/objects-inl.h ++ // to break a cycle with src/heap/heap.h. ++ inline uint32_t Hash(Key key); ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle<Derived> New( +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h chromium-59.0.3071.86/v8/src/objects-body-descriptors.h +--- chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h 2017-06-06 14:35:41.554912132 +0300 +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public + + template <typename StaticVisitor> + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody<StaticVisitor>(obj); + } + }; + +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-inl.h chromium-59.0.3071.86/v8/src/objects-inl.h +--- chromium-59.0.3071.86.orig/v8/src/objects-inl.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-inl.h 2017-06-06 14:35:41.558245559 +0300 +@@ -46,6 +46,27 @@ + namespace v8 { + namespace internal { + ++template <typename Derived, typename Shape, typename Key> ++uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++ ++template <typename Derived, typename Shape, typename Key> ++uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key, ++ Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ ++ + PropertyDetails::PropertyDetails(Smi* smi) { + value_ = smi->value(); + } diff --git a/vaapi_patch_r2.patch b/vaapi_patch_r2.patch new file mode 100644 index 000000000000..1957efb29e99 --- /dev/null +++ b/vaapi_patch_r2.patch @@ -0,0 +1,616 @@ +--- a/chrome/browser/about_flags.cc ++++ b/chrome/browser/about_flags.cc +@@ -1044,7 +1044,7 @@ const FeatureEntry kFeatureEntries[] = { + "disable-accelerated-video-decode", + flag_descriptions::kAcceleratedVideoDecodeName, + flag_descriptions::kAcceleratedVideoDecodeDescription, +- kOsMac | kOsWin | kOsCrOS | kOsAndroid, ++ kOsAll, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, + #if defined(OS_WIN) +--- a/content/common/BUILD.gn ++++ b/content/common/BUILD.gn +@@ -13,6 +13,49 @@ if (is_mac) { + import("//build/config/mac/mac_sdk.gni") + } + ++if ((is_desktop_linux || is_chromeos) && current_cpu != "arm") { ++ action("libva_generate_stubs") { ++ extra_header = "../../media/gpu/va_stub_header.fragment" ++ ++ script = "../../tools/generate_stubs/generate_stubs.py" ++ sources = [ ++ "../../media/gpu/va.sigs", ++ ] ++ inputs = [ ++ extra_header, ++ ] ++ sources += [ "../../media/gpu/va_x11.sigs" ] ++ if (use_ozone) { ++ sources += [ ++ "../../media/gpu/va_drm.sigs", ++ "va_wayland.sigs", ++ ] ++ } ++ stubs_filename_root = "va_stubs" ++ ++ outputs = [ ++ "$target_gen_dir/$stubs_filename_root.cc", ++ "$target_gen_dir/$stubs_filename_root.h", ++ ] ++ args = [ ++ "-i", ++ rebase_path("$target_gen_dir", root_build_dir), ++ "-o", ++ rebase_path("$target_gen_dir", root_build_dir), ++ "-t", ++ "posix_stubs", ++ "-e", ++ rebase_path(extra_header, root_build_dir), ++ "-s", ++ stubs_filename_root, ++ "-p", ++ "content/common", ++ ] ++ ++ args += rebase_path(sources, root_build_dir) ++ } ++} ++ + source_set("common") { + # Targets external to content should always link to the public API. + # In addition, targets outside of the content component (shell and tests) +@@ -525,6 +568,16 @@ source_set("common") { + "sandbox_linux/android/sandbox_bpf_base_policy_android.h", + ] + } ++ } else { ++ if (current_cpu != "arm" && is_desktop_linux) { ++ sources += get_target_outputs(":libva_generate_stubs") ++ deps += [ ":libva_generate_stubs" ] ++ configs += [ "//third_party/libva:libva_config" ] ++ if (use_ozone) { ++ configs += [ "//build/config/linux:x11" ] ++ deps += [ "//third_party/wayland:wayland_client" ] ++ } ++ } + } + + if (is_mac) { +--- a/content/common/sandbox_linux/bpf_gpu_policy_linux.cc ++++ b/content/common/sandbox_linux/bpf_gpu_policy_linux.cc +@@ -25,6 +25,12 @@ + #include "base/memory/ptr_util.h" + #include "base/strings/stringprintf.h" + #include "build/build_config.h" ++ ++#if !defined(__arm__) ++// Auto-generated for dlopen libva libraries ++#include "content/common/va_stubs.h" ++#endif ++ + #include "content/common/sandbox_linux/sandbox_bpf_base_policy_linux.h" + #include "content/common/sandbox_linux/sandbox_seccomp_bpf_linux.h" + #include "content/common/set_process_title.h" +@@ -36,6 +42,28 @@ + #include "sandbox/linux/syscall_broker/broker_process.h" + #include "sandbox/linux/system_headers/linux_syscalls.h" + ++#if !defined(__arm__) ++#include "third_party/libva/va/va.h" ++#include "third_party/libva/va/va_backend.h" ++#if defined(USE_X11) ++#include "third_party/libva/va/va_x11.h" ++#include "ui/gfx/x/x11_types.h" ++#elif defined(USE_OZONE) ++#include "base/files/file.h" ++#include "third_party/libva/va/drm/va_drm.h" ++#include "third_party/libva/va/va_drmcommon.h" ++#endif ++#endif ++ ++#define DRIVER_EXTENSION "_drv_video.so" ++#if defined(__x86_64__) ++#define VA_DRIVERS_PATH "/usr/lib/x86_64-linux-gnu/dri" ++#elif defined(__i386__) ++#define VA_DRIVERS_PATH "/usr/lib/i386-linux-gnu/dri" ++#elif defined(__aarch64__) ++#define VA_DRIVERS_PATH "/usr/lib/aarch64-linux-gnu/dri" ++#endif ++ + using sandbox::arch_seccomp_data; + using sandbox::bpf_dsl::Allow; + using sandbox::bpf_dsl::ResultExpr; +@@ -44,6 +72,17 @@ using sandbox::syscall_broker::BrokerFilePermission; + using sandbox::syscall_broker::BrokerProcess; + using sandbox::SyscallSets; + ++#if !defined(__arm__) ++using content_common::kModuleVa; ++#if defined(USE_X11) ++using content_common::kModuleVa_x11; ++#elif defined(USE_OZONE) ++using content_common::kModuleVa_drm; ++#endif ++using content_common::InitializeStubs; ++using content_common::StubPathMap; ++#endif ++ + namespace content { + + namespace { +@@ -98,7 +137,7 @@ inline bool UseLibV4L2() { + + bool IsAcceleratedVaapiVideoEncodeEnabled() { + bool accelerated_encode_enabled = false; +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) + const base::CommandLine& command_line = + *base::CommandLine::ForCurrentProcess(); + accelerated_encode_enabled = +@@ -290,6 +329,36 @@ ResultExpr GpuProcessPolicy::EvaluateSyscall(int sysno) const { + } + } + ++#if !defined(__arm__) ++static VADisplay VaapiGetVADisplay() { ++ StubPathMap paths; ++ VADisplay va_display; ++ paths[kModuleVa].push_back("libva.so.1"); ++#if defined(USE_OZONE) ++ paths[kModuleVa_drm].push_back("libva-drm.so.1"); ++#elif defined (USE_X11) ++ paths[kModuleVa_x11].push_back("libva-x11.so.1"); ++#endif ++ if (!InitializeStubs(paths)) { ++ return NULL; ++ } ++#if defined(USE_OZONE) ++ const char kDriRenderNode0Path[] = "/dev/dri/renderD128"; ++ base::File drm_file = base::File( ++ base::FilePath::FromUTF8Unsafe(kDriRenderNode0Path), ++ base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE); ++ va_display = vaGetDisplayDRM(drm_file.GetPlatformFile()); ++#elif defined(USE_X11) ++ va_display = vaGetDisplay(gfx::GetXDisplay()); ++#endif ++ if (!vaDisplayIsValid(va_display)) { ++ LOG(WARNING) << "Unable to get display."; ++ return NULL; ++ } ++ return va_display; ++} ++#endif ++ + bool GpuProcessPolicy::PreSandboxHook() { + // Warm up resources needed by the policy we're about to enable and + // eventually start a broker process. +@@ -303,32 +372,75 @@ bool GpuProcessPolicy::PreSandboxHook() { + GpuBrokerProcessPolicy::Create, + std::vector<BrokerFilePermission>()); // No extra files in whitelist. + ++#if !defined(__arm__) + if (IsArchitectureX86_64() || IsArchitectureI386()) { + // Accelerated video dlopen()'s some shared objects + // inside the sandbox, so preload them now. + if (IsAcceleratedVaapiVideoEncodeEnabled() || + IsAcceleratedVideoDecodeEnabled()) { +- const char* I965DrvVideoPath = NULL; +- const char* I965HybridDrvVideoPath = NULL; +- +- if (IsArchitectureX86_64()) { +- I965DrvVideoPath = "/usr/lib64/va/drivers/i965_drv_video.so"; +- I965HybridDrvVideoPath = "/usr/lib64/va/drivers/hybrid_drv_video.so"; +- } else if (IsArchitectureI386()) { +- I965DrvVideoPath = "/usr/lib/va/drivers/i965_drv_video.so"; +- } +- +- dlopen(I965DrvVideoPath, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); +- if (I965HybridDrvVideoPath) +- dlopen(I965HybridDrvVideoPath, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); +- dlopen("libva.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); ++ // Init a VA Context, get driver name (and path), close context and preload ++#if defined(USE_OZONE) || defined(USE_X11) ++ VADisplay va_display = VaapiGetVADisplay(); ++ if (va_display) { ++ char *va_search_path = getenv("LIBVA_DRIVERS_PATH"); ++ char *va_driver_name = getenv("LIBVA_DRIVER_NAME"); ++ char *saveptr, *driver_dir; ++ if (!va_driver_name) { ++ VADisplayContextP pDisplayContext = ++ static_cast<VADisplayContextP>(va_display); ++ pDisplayContext->vaGetDriverName(pDisplayContext, &va_driver_name); ++ } ++ ++ if (!va_driver_name) { ++ return true; ++ } ++ ++ if (!va_search_path) { ++ va_search_path = strdup(VA_DRIVERS_PATH); ++ } ++ ++ driver_dir = strtok_r(va_search_path, ":", &saveptr); ++ while (driver_dir) { ++ std::string driver_path = base::StringPrintf("%s/%s%s", driver_dir, ++ va_driver_name, DRIVER_EXTENSION); ++ ++ // attempt to dlopen() the va driver ++ LOG(INFO) << "Looking for " << driver_path << "..."; ++ if (access(driver_path.c_str(), R_OK) != -1) { ++ LOG(WARNING) << "Attempting to pre-load " << va_driver_name << " VA driver..."; ++ if (dlopen(driver_path.c_str(), RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) { ++ LOG(WARNING) << "VA driver \"" << driver_path << "\" opened!"; ++ ++ if (strcmp(va_driver_name, "nvidia") == 0) { ++ LOG(WARNING) << "Pre-loading NVIDIA VDPAU driver libraries..."; ++ if (dlopen("libvdpau_nvidia.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) { ++ LOG(WARNING) << "Loaded libvdpau_nvidia.so"; ++ } ++ ++ if (dlopen("libvdpau.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE)) { ++ LOG(WARNING) << "Loaded libvdpau.so"; ++ } ++ } ++ LOG(WARNING) << "Loading libva libraries..."; ++ dlopen("libva.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); + #if defined(USE_OZONE) +- dlopen("libva-drm.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); ++ dlopen("libva-drm.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); + #elif defined(USE_X11) +- dlopen("libva-x11.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); ++ dlopen("libva-x11.so.1", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); ++#endif ++ break; ++ } ++ LOG(ERROR) << "VA driver failed to open!"; ++ } ++ ++ driver_dir = strtok_r(NULL, ":", &saveptr); ++ } ++ free(va_search_path); ++ } + #endif + } + } ++#endif + + return true; + } +--- /dev/null ++++ b/content/common/va_wayland.sigs +@@ -0,0 +1,8 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++//------------------------------------------------ ++// Functions from libva-wayland used in chromium code. ++//------------------------------------------------ ++VADisplay vaGetDisplayWl(struct wl_display *display); +--- a/content/gpu/BUILD.gn ++++ b/content/gpu/BUILD.gn +@@ -92,7 +92,7 @@ target(link_target_type, "gpu_sources") { + ] + } + +- if (is_chromeos && current_cpu != "arm") { ++ if ((is_desktop_linux || is_chromeos) && current_cpu != "arm") { + configs += [ "//third_party/libva:libva_config" ] + } + +--- a/content/gpu/gpu_main.cc ++++ b/content/gpu/gpu_main.cc +@@ -85,7 +85,7 @@ + #include "ui/ozone/public/ozone_platform.h" + #endif + +-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY) + #include "media/gpu/vaapi_wrapper.h" + #endif + +@@ -141,7 +141,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHelper { + (void)base::RandUint64(); + } + +-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY) + media::VaapiWrapper::PreSandboxInitialization(); + #endif + #if defined(OS_WIN) +--- a/content/public/common/content_switches.cc ++++ b/content/public/common/content_switches.cc +@@ -1000,7 +1000,9 @@ const char kDisableAudioSupportForDesktopShare[] = + #if defined(OS_CHROMEOS) + // Disables panel fitting (used for mirror mode). + const char kDisablePanelFitting[] = "disable-panel-fitting"; ++#endif + ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) + // Disables VA-API accelerated video encode. + const char kDisableVaapiAcceleratedVideoEncode[] = + "disable-vaapi-accelerated-video-encode"; +--- a/content/public/common/content_switches.h ++++ b/content/public/common/content_switches.h +@@ -291,6 +291,8 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[]; + + #if defined(OS_CHROMEOS) + CONTENT_EXPORT extern const char kDisablePanelFitting[]; ++#endif ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) + CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[]; + #endif + +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -395,17 +395,6 @@ const char kSoftwareRenderingListJson[] = LONG_STRING_CONST( + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247], +- "os": { +- "type": "linux" +- }, +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +--- a/media/BUILD.gn ++++ b/media/BUILD.gn +@@ -396,7 +396,7 @@ component("media") { + allow_circular_includes_from = [ "//media/base/android" ] + } + +- if (current_cpu != "arm" && is_chromeos) { ++ if (current_cpu != "arm" && (is_chromeos || is_desktop_linux)) { + sources += [ + "filters/h264_bitstream_buffer.cc", + "filters/h264_bitstream_buffer.h", +@@ -667,7 +667,7 @@ source_set("unit_tests") { + } + } + +- if (current_cpu != "arm" && is_chromeos) { ++ if (current_cpu != "arm" && (is_chromeos || is_desktop_linux)) { + sources += [ "filters/h264_bitstream_buffer_unittest.cc" ] + } + +--- a/media/gpu/BUILD.gn ++++ b/media/gpu/BUILD.gn +@@ -18,7 +18,7 @@ if (is_mac) { + import("//build/config/mac/mac_sdk.gni") + } + +-if (is_chromeos && current_cpu != "arm") { ++if ((is_desktop_linux || is_chromeos) && current_cpu != "arm") { + action("libva_generate_stubs") { + extra_header = "va_stub_header.fragment" + +@@ -212,7 +212,7 @@ component("gpu") { + } + } + +- if (is_chromeos || is_win) { ++ if (is_linux || is_win) { + sources += [ + "accelerated_video_decoder.h", + "h264_decoder.cc", +@@ -221,7 +221,7 @@ component("gpu") { + "h264_dpb.h", + ] + } +- if (is_chromeos) { ++ if (is_linux) { + sources += [ + "vp8_decoder.cc", + "vp8_decoder.h", +@@ -269,7 +269,7 @@ + "GLESv2", + ] + } +- 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 @@ + #include "media/gpu/dxva_video_decode_accelerator_win.h" + #elif defined(OS_MACOSX) + #include "media/gpu/vt_video_decode_accelerator_mac.h" +-#elif defined(OS_CHROMEOS) ++#elif defined(OS_CHROMEOS) || defined(OS_LINUX) + #if defined(USE_V4L2_CODEC) + #include "media/gpu/v4l2_device.h" + #include "media/gpu/v4l2_slice_video_decode_accelerator.h" +@@ -86,7 +86,7 @@ + capabilities.supported_profiles = + 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(); +@@ -139,7 +139,7 @@ + &GpuVideoDecodeAcceleratorFactory::CreateV4L2VDA, + &GpuVideoDecodeAcceleratorFactory::CreateV4L2SVDA, + #endif +-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) ++#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY) + &GpuVideoDecodeAcceleratorFactory::CreateVaapiVDA, + #endif + #if defined(OS_MACOSX) +@@ -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> + GpuVideoDecodeAcceleratorFactory::CreateVaapiVDA( + const gpu::GpuDriverBugWorkarounds& workarounds, + const gpu::GpuPreferences& gpu_preferences) const { ++ VLOG(1) << "Creating new VAAPI video decode accelerator."; + std::unique_ptr<VideoDecodeAccelerator> decoder; + decoder.reset(new VaapiVideoDecodeAccelerator(make_context_current_cb_, + bind_image_cb_)); +--- a/media/gpu/gpu_video_decode_accelerator_factory.h ++++ b/media/gpu/gpu_video_decode_accelerator_factory.h +@@ -101,7 +101,7 @@ class MEDIA_GPU_EXPORT GpuVideoDecodeAcceleratorFactory { + const gpu::GpuDriverBugWorkarounds& workarounds, + const gpu::GpuPreferences& gpu_preferences) const; + #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> CreateVaapiVDA( + const gpu::GpuDriverBugWorkarounds& workarounds, + const gpu::GpuPreferences& gpu_preferences) const; +--- a/media/gpu/ipc/service/BUILD.gn ++++ b/media/gpu/ipc/service/BUILD.gn +@@ -47,7 +47,7 @@ target(link_target_type, "service") { + + configs += [ "//media/gpu:gpu_config" ] + +- if (is_chromeos && current_cpu != "arm") { ++ if ((is_desktop_linux || is_chromeos) && current_cpu != "arm") { + configs += [ "//third_party/libva:libva_config" ] + } + +--- a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc ++++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc +@@ -58,7 +58,7 @@ static bool MakeDecoderContextCurrent( + return true; + } + +-#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY)) || \ + defined(OS_MACOSX) || defined(OS_WIN) + static bool BindImage(const base::WeakPtr<gpu::GpuCommandBufferStub>& stub, + uint32_t client_texture_id, +@@ -172,7 +172,7 @@ GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator( + get_gl_context_cb_ = base::Bind(&GetGLContext, stub_->AsWeakPtr()); + make_context_current_cb_ = + base::Bind(&MakeDecoderContextCurrent, stub_->AsWeakPtr()); +-#if (defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)) || \ ++#if ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ARCH_CPU_X86_FAMILY)) || \ + defined(OS_MACOSX) || defined(OS_WIN) + bind_image_cb_ = base::Bind(&BindImage, stub_->AsWeakPtr()); + #endif +--- a/media/gpu/va_stub_header.fragment ++++ b/media/gpu/va_stub_header.fragment +@@ -5,8 +5,9 @@ extern "C" { + + #include "third_party/libva/va/drm/va_drm.h" + #include "third_party/libva/va/va.h" +-#if defined(USE_X11) + #include "third_party/libva/va/va_x11.h" ++#if defined(USE_OZONE) ++#include "third_party/libva/va/wayland/va_wayland.h" + #endif + + } +--- a/media/gpu/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi_video_decode_accelerator.cc +@@ -358,17 +358,17 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config, + + base::AutoLock auto_lock(lock_); + DCHECK_EQ(state_, kUninitialized); +- DVLOG(2) << "Initializing VAVDA, profile: " << GetProfileName(profile); ++ VLOG(1) << "Initializing VAVDA, profile: " << GetProfileName(profile); + + #if defined(USE_X11) + if (gl::GetGLImplementation() != gl::kGLImplementationDesktopGL) { +- DVLOG(1) << "HW video decode acceleration not available without " ++ VLOG(1) << "HW video decode acceleration not available without " + "DesktopGL (GLX)."; + return false; + } + #elif defined(USE_OZONE) + if (gl::GetGLImplementation() != gl::kGLImplementationEGLGLES2) { +- DVLOG(1) << "HW video decode acceleration not available without " ++ VLOG(1) << "HW video decode acceleration not available without " + << "EGLGLES2."; + return false; + } +@@ -378,7 +378,7 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config, + VaapiWrapper::kDecode, profile, base::Bind(&ReportToUMA, VAAPI_ERROR)); + + if (!vaapi_wrapper_.get()) { +- DVLOG(1) << "Failed initializing VAAPI for profile " ++ VLOG(1) << "Failed initializing VAAPI for profile " + << GetProfileName(profile); + return false; + } +@@ -394,7 +394,7 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config, + vp9_accelerator_.reset(new VaapiVP9Accelerator(this, vaapi_wrapper_.get())); + decoder_.reset(new VP9Decoder(vp9_accelerator_.get())); + } else { +- DLOG(ERROR) << "Unsupported profile " << GetProfileName(profile); ++ VLOG(1) << "Unsupported profile " << GetProfileName(profile); + return false; + } + +--- a/media/gpu/vaapi_wrapper.cc ++++ b/media/gpu/vaapi_wrapper.cc +@@ -188,7 +188,7 @@ scoped_refptr<VaapiWrapper> VaapiWrapper::Create( + VAProfile va_profile, + const base::Closure& report_error_to_uma_cb) { + if (!GetProfileInfos()->IsProfileSupported(mode, va_profile)) { +- DVLOG(1) << "Unsupported va_profile: " << va_profile; ++ VLOG(1) << "Unsupported va_profile: " << va_profile; + return nullptr; + } + +@@ -340,15 +340,17 @@ VaapiWrapper::GetSupportedProfileInfosForCodecModeInternal(CodecMode mode) { + bool VaapiWrapper::VaInitialize(const base::Closure& report_error_to_uma_cb) { + static bool vaapi_functions_initialized = PostSandboxInitialization(); + if (!vaapi_functions_initialized) { +- bool running_on_chromeos = false; +-#if defined(OS_CHROMEOS) ++ bool error_level_logging = false; ++#if defined(OS_LINUX) ++ error_level_logging = true; ++#elif defined(OS_CHROMEOS) + // When chrome runs on linux with chromeos=1, do not log error message + // without VAAPI libraries. +- running_on_chromeos = base::SysInfo::IsRunningOnChromeOS(); ++ error_level_logging = base::SysInfo::IsRunningOnChromeOS(); + #endif + static const char kErrorMsg[] = "Failed to initialize VAAPI libs"; +- if (running_on_chromeos) +- LOG(ERROR) << kErrorMsg; ++ if (error_level_logging) ++ VLOG(1) << kErrorMsg; + else + DVLOG(1) << kErrorMsg; + return false; +@@ -407,7 +409,7 @@ bool VaapiWrapper::IsEntrypointSupported_Locked(VAProfile va_profile, + + if (std::find(supported_entrypoints.begin(), supported_entrypoints.end(), + entrypoint) == supported_entrypoints.end()) { +- DVLOG(1) << "Unsupported entrypoint"; ++ VLOG(1) << "Unsupported entrypoint"; + return false; + } + return true; +@@ -431,8 +433,8 @@ bool VaapiWrapper::AreAttribsSupported_Locked( + if (attribs[i].type != required_attribs[i].type || + (attribs[i].value & required_attribs[i].value) != + required_attribs[i].value) { +- DVLOG(1) << "Unsupported value " << required_attribs[i].value +- << " for attribute type " << required_attribs[i].type; ++ VLOG(1) << "Unsupported value " << required_attribs[i].value ++ << " for attribute type " << required_attribs[i].type; + return false; + } + } |