summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072019-07-25 12:21:46 +0200
committersL1pKn072019-07-25 12:21:46 +0200
commit09cce879fab16cfa432d1e864f2810acf9220e72 (patch)
tree353dd6082c5559a2ddb408fa6ae2cd7b7c935b46
parent1de3149345c13ee2e6adc076af21ebdc4695d382 (diff)
downloadaur-09cce879fab16cfa432d1e864f2810acf9220e72.tar.gz
Update to 77.0.3860.5
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD46
-rw-r--r--enable-vaapi.patch71
3 files changed, 75 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37057cc181d..24b5041ea17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-dev
pkgdesc = The open-source project behind Google Chrome (Dev Channel)
- pkgver = 77.0.3824.6
+ pkgver = 77.0.3860.5
pkgrel = 1
url = http://www.chromium.org
install = chromium-dev.install
@@ -24,7 +24,6 @@ pkgbase = chromium-dev
depends = minizip
depends = nss
depends = pciutils
- depends = re2
depends = snappy
depends = xdg-utils
depends = gtk3
@@ -41,18 +40,24 @@ pkgbase = chromium-dev
optdepends = libva-vdpau-driver-chromium: HW video acceleration for NVIDIA users
optdepends = libva-mesa-driver: HW video acceleration for Nouveau, R600 and RadeonSI users
optdepends = libva-intel-driver: HW video acceleration for Intel G45 and HD users
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3824.6.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3860.5.tar.xz
source = git+https://github.com/foutrelis/chromium-launcher.git
source = chromium-dev.svg
source = enable-vaapi.patch
source = chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium
source = chromium-skia-harmony-r1.patch
- sha256sums = f7025bc7954df55373c695898f86c0f89d11ff61d594ee466b99e78edeb5f505
+ source = vaapi.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713435/revisions/1/patch?download
+ source = memory.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713037/revisions/1/patch?download
+ source = system_harfbuzz.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1715288/revisions/1/patch?download
+ sha256sums = dc068cf0c8fb1bdf4b0998f1c8c1254701ac70f9ee540face10ff7c6b82d6297
sha256sums = SKIP
sha256sums = dd2b5c4191e468972b5ea8ddb4fa2e2fa3c2c94c79fc06645d0efc0e63ce7ee1
- sha256sums = 36e78ad3e6fdd4b8c402d3dd5e38413fd1f33fb992c6522af29a02b0f617ee22
+ sha256sums = 3cf77d5c90f46fa25f51a6c355f637395e2af84d584350fca406ebf5c3866e76
sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b
sha256sums = 0dd2fea50a93b26debce63c762c0291737b61816ba5b127ef923999494142b78
+ sha256sums = 43810f59d73d6660b1b52989e15a02a3103ac2ab8f8561716cb67e0e0acce109
+ sha256sums = d8bec3a727488ab3d0d2a5215537075aa63cd244052a1ac2c37c402fc4f31265
+ sha256sums = c02a9701382b47391f7cd77529e5bf69a06461b503b50f64c60b8e16760a22aa
pkgname = chromium-dev
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 191e6dc60d5..a82eacb7065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _use_wayland=0 # Build Wayland NOTE: extremely experimental and don't
## -- Package and components information -- ##
##############################################
pkgname=chromium-dev
-pkgver=77.0.3824.6
+pkgver=77.0.3860.5
pkgrel=1
pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
arch=('x86_64')
@@ -28,7 +28,7 @@ depends=(
'minizip'
'nss'
'pciutils'
- 're2'
+# 're2'
'snappy'
'xdg-utils'
# 'protobuf'
@@ -79,10 +79,13 @@ source=(
# Patch form Gentoo.
# Misc Patches.
- 'enable-vaapi.patch' # Use Saikrishna Arcot patch again :https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/4d40b58013b518373b2544d486d3de40796edd36/debian/patches/enable_vaapi_on_linux_2.diff'
+ 'enable-vaapi.patch' # Use Saikrishna Arcot patch again :https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/a996c32c7ae7b369799b528daddb7be3c8b67de4/debian/patches/enable_vaapi_on_linux_2.diff'
# Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
'chromium-widevine-r4.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium'
'chromium-skia-harmony-r1.patch'
+ 'vaapi.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713435/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1713435
+ 'memory.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1713037/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1713037
+ 'system_harfbuzz.diff.base64::https://chromium-review.googlesource.com/changes/chromium%2Fsrc~1715288/revisions/1/patch?download' # https://chromium-review.googlesource.com/c/chromium/src/+/1715288
)
sha256sums=(
#"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes | grep sha256 | cut -d ' ' -f3)"
@@ -92,10 +95,13 @@ sha256sums=(
# Patch form Gentoo
# Misc Patches
- '36e78ad3e6fdd4b8c402d3dd5e38413fd1f33fb992c6522af29a02b0f617ee22'
+ '3cf77d5c90f46fa25f51a6c355f637395e2af84d584350fca406ebf5c3866e76'
# Patch from crbug (chromium bugtracker) or Arch chromium package
'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b'
'0dd2fea50a93b26debce63c762c0291737b61816ba5b127ef923999494142b78'
+ '43810f59d73d6660b1b52989e15a02a3103ac2ab8f8561716cb67e0e0acce109'
+ 'd8bec3a727488ab3d0d2a5215537075aa63cd244052a1ac2c37c402fc4f31265'
+ 'c02a9701382b47391f7cd77529e5bf69a06461b503b50f64c60b8e16760a22aa'
)
install=chromium-dev.install
@@ -113,9 +119,9 @@ _google_default_client_secret="0ZChLK6AxeA3Isu96MkwqDR4"
# List of third-party components needed for build chromium. The rest is remove by remove_bundled_libraries srcipt in prepare().
_keeplibs=(
+ 'base/third_party/cityhash'
'base/third_party/dmg_fp'
'base/third_party/dynamic_annotations'
- 'base/third_party/cityhash'
'base/third_party/icu'
'base/third_party/nspr'
'base/third_party/superfasthash'
@@ -131,7 +137,7 @@ _keeplibs=(
'native_client_sdk/src/libraries/third_party/newlib-extras'
'net/third_party/mozilla_security_manager'
'net/third_party/nss'
- 'net/third_party/quic'
+ 'net/third_party/quiche'
'net/third_party/uri_template'
'third_party/abseil-cpp'
'third_party/angle'
@@ -178,8 +184,8 @@ _keeplibs=(
'third_party/crc32c'
'third_party/cros_system_api'
'third_party/dav1d'
- 'third_party/devscripts'
'third_party/dawn'
+ 'third_party/devscripts'
'third_party/dom_distiller_js'
'third_party/emoji-segmenter'
'third_party/ffmpeg'
@@ -246,13 +252,14 @@ _keeplibs=(
'third_party/protobuf/third_party/six'
'third_party/pyjson5'
'third_party/qcms'
+ 'third_party/re2'
'third_party/rnnoise'
'third_party/s2cellid'
'third_party/sfntly'
'third_party/shaderc'
'third_party/skia'
- 'third_party/skia/include/third_party/vulkan'
'third_party/skia/include/third_party/skcms'
+ 'third_party/skia/include/third_party/vulkan'
'third_party/skia/third_party/gif'
'third_party/skia/third_party/skcms'
'third_party/skia/third_party/vulkan'
@@ -325,7 +332,7 @@ _flags=(
'treat_warnings_as_errors=false'
'enable_nacl=true'
'enable_nacl_nonsfi=true'
- 'use_custom_libcxx=false'
+ 'use_custom_libcxx=true' # use true if you want use bundled RE2
'use_jumbo_build=false' # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
# 'jumbo_file_merge_limit=30' # NOTE: test. more than 40 gets OOM in my dual xeon (64Gb ram) machine :/
'use_vaapi=true'
@@ -368,7 +375,7 @@ _use_system=(
'libxslt'
'openh264'
'opus'
- 're2'
+# 're2'
'snappy'
'yasm'
# 'zlib'
@@ -488,6 +495,15 @@ prepare() {
patch -p1 -i "${srcdir}/enable-vaapi.patch"
sed 's|/dri/|/|g' -i media/gpu/vaapi/vaapi_wrapper.cc
+ # Fix https://chromium-review.googlesource.com/c/chromium/src/+/1713435
+ base64 -d "${srcdir}/vaapi.diff.base64" | patch -p1 -i -
+
+ # Fix https://chromium-review.googlesource.com/c/chromium/src/+/1713037/
+ base64 -d "${srcdir}/memory.diff.base64" | patch -p1 -i -
+
+ # https://chromium-review.googlesource.com/c/chromium/src/+/1715288
+ base64 -d "${srcdir}/system_harfbuzz.diff.base64" | patch -p1 -i -
+
# # Patch from crbug.com (chromium bugtracker), chromium-review.googlesource.com / Gerrit or Arch chromium package.
# https://crbug.com/skia/6663#c10.
@@ -549,7 +565,6 @@ build() {
# Build all.
# Work around broken deps.
- LC_ALL=C ninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
LC_ALL=C ninja -C out/Release -v chrome chrome_sandbox chromedriver
}
@@ -591,13 +606,9 @@ package() {
'libEGL.so'
'libGLESv2.so'
'libVkICD_mock_icd.so'
- 'libVkLayer_core_validation.so'
- 'libVkLayer_object_lifetimes.so'
- 'libVkLayer_stateless_validation.so'
- 'libVkLayer_thread_safety.so'
- 'libVkLayer_unique_objects.so'
'swiftshader/libEGL.so'
'swiftshader/libGLESv2.so'
+ 'swiftshader/libvulkan.so'
)
for i in "${_libs[@]}"; do
install -Dm755 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
@@ -611,6 +622,7 @@ package() {
'icudtl.dat' # https://crbug.com/678661.
'MEIPreload/manifest.json'
'MEIPreload/preloaded_data.pb'
+ 'angledata/VkICD_mock_icd.json'
)
for i in "${_blobs[@]}"; do
install -Dm644 "${i}" "${pkgdir}/usr/lib/chromium-dev/${i}"
@@ -663,7 +675,7 @@ package() {
find locales -type f -name "*.pak" -exec install -Dm644 '{}' "${pkgdir}/usr/lib/chromium-dev/{}" \;
# Install icons.
- for _size in 16 22 24 32 48 128 256; do
+ for _size in 16 22_mono 24 32 48 128 256; do
case "${_size}" in
16|32) _branding="${srcdir}/chromium-${pkgver}/chrome/app/theme/default_100_percent/chromium" ;;
*) _branding="${srcdir}/chromium-${pkgver}/chrome/app/theme/chromium" ;;
diff --git a/enable-vaapi.patch b/enable-vaapi.patch
index 45dd1563afe..1ad3196e3e8 100644
--- a/enable-vaapi.patch
+++ b/enable-vaapi.patch
@@ -40,7 +40,7 @@ Index: dev/chrome/browser/about_flags.cc
===================================================================
--- dev.orig/chrome/browser/about_flags.cc
+++ dev/chrome/browser/about_flags.cc
-@@ -1443,7 +1443,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1420,7 +1420,7 @@ const FeatureEntry kFeatureEntries[] = {
"disable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
flag_descriptions::kAcceleratedVideoDecodeDescription,
@@ -48,8 +48,8 @@ Index: dev/chrome/browser/about_flags.cc
+ kOsAll,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
},
- #if defined(OS_WIN)
-@@ -2000,10 +2000,10 @@ const FeatureEntry kFeatureEntries[] = {
+ {
+@@ -1867,10 +1867,10 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
#endif // ENABLE_ISOLATED_XR_SERVICE
#endif // ENABLE_VR
@@ -61,12 +61,12 @@ Index: dev/chrome/browser/about_flags.cc
+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
#endif // OS_CHROMEOS
- {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
+ {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
Index: dev/chrome/browser/flag_descriptions.cc
===================================================================
--- dev.orig/chrome/browser/flag_descriptions.cc
+++ dev/chrome/browser/flag_descriptions.cc
-@@ -2972,9 +2972,7 @@ const char kMacViewsTaskManagerDescripti
+@@ -2789,9 +2789,7 @@ const char kMacSystemMediaPermissionsInf
#endif
@@ -77,7 +77,7 @@ Index: dev/chrome/browser/flag_descriptions.cc
const char kAcceleratedMjpegDecodeName[] =
"Hardware-accelerated mjpeg decode for captured frame";
-@@ -2982,6 +2980,12 @@ const char kAcceleratedMjpegDecodeDescri
+@@ -2799,6 +2797,12 @@ const char kAcceleratedMjpegDecodeDescri
"Enable hardware-accelerated mjpeg decode for captured frame where "
"available.";
@@ -94,7 +94,7 @@ Index: dev/chrome/browser/flag_descriptions.h
===================================================================
--- dev.orig/chrome/browser/flag_descriptions.h
+++ dev/chrome/browser/flag_descriptions.h
-@@ -1755,13 +1755,17 @@ extern const char kPermissionPromptPersi
+@@ -1659,13 +1659,17 @@ extern const char kPermissionPromptPersi
#endif // defined(OS_MACOSX)
@@ -127,7 +127,7 @@ Index: dev/content/gpu/BUILD.gn
import("//ui/ozone/ozone.gni")
# See //content/BUILD.gn for how this works.
-@@ -136,4 +137,8 @@ target(link_target_type, "gpu_sources")
+@@ -128,4 +129,8 @@ target(link_target_type, "gpu_sources")
(!is_chromecast || is_cast_desktop_build)) {
configs += [ "//build/config/linux/dri" ]
}
@@ -140,7 +140,7 @@ Index: dev/gpu/config/software_rendering_list.json
===================================================================
--- dev.orig/gpu/config/software_rendering_list.json
+++ dev/gpu/config/software_rendering_list.json
-@@ -370,17 +370,6 @@
+@@ -369,17 +369,6 @@
]
},
{
@@ -162,8 +162,8 @@ Index: dev/media/base/media_switches.cc
===================================================================
--- dev.orig/media/base/media_switches.cc
+++ dev/media/base/media_switches.cc
-@@ -506,7 +506,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
- switches::kUseFakeJpegDecodeAccelerator)) {
+@@ -528,7 +528,7 @@ bool IsVideoCaptureAcceleratedJpegDecodi
+ switches::kUseFakeMjpegDecodeAccelerator)) {
return true;
}
-#if defined(OS_CHROMEOS)
@@ -183,7 +183,7 @@ Index: dev/media/filters/BUILD.gn
jumbo_source_set("filters") {
# Do not expand the visibility here without double-checking with OWNERS, this
-@@ -212,7 +213,7 @@ jumbo_source_set("filters") {
+@@ -196,7 +197,7 @@ jumbo_source_set("filters") {
deps += [ "//media/base/android" ]
}
@@ -196,7 +196,7 @@ Index: dev/media/gpu/BUILD.gn
===================================================================
--- dev.orig/media/gpu/BUILD.gn
+++ dev/media/gpu/BUILD.gn
-@@ -577,6 +577,7 @@ if (is_chromeos || is_linux) {
+@@ -521,6 +521,7 @@ if (use_v4l2_codec || use_vaapi || is_ma
if (use_ozone) {
deps += [ "//ui/ozone" ]
}
@@ -208,7 +208,7 @@ Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
===================================================================
--- dev.orig/media/gpu/gpu_video_decode_accelerator_factory.cc
+++ dev/media/gpu/gpu_video_decode_accelerator_factory.cc
-@@ -183,6 +183,8 @@ GpuVideoDecodeAcceleratorFactory::Create
+@@ -171,6 +171,8 @@ GpuVideoDecodeAcceleratorFactory::Create
vda = (this->*create_vda_function)(workarounds, gpu_preferences, media_log);
if (vda && vda->Initialize(config, client))
return vda;
@@ -217,7 +217,7 @@ Index: dev/media/gpu/gpu_video_decode_accelerator_factory.cc
}
return nullptr;
-@@ -241,6 +243,7 @@ GpuVideoDecodeAcceleratorFactory::Create
+@@ -229,6 +231,7 @@ GpuVideoDecodeAcceleratorFactory::Create
const gpu::GpuDriverBugWorkarounds& workarounds,
const gpu::GpuPreferences& gpu_preferences,
MediaLog* media_log) const {
@@ -249,24 +249,24 @@ Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
===================================================================
--- dev.orig/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+++ dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -74,6 +74,7 @@ void CloseGpuMemoryBufferHandle(const gf
+@@ -64,6 +64,7 @@ void ReportToUMA(VAVDADecoderFailure fai
+ VAVDA_DECODER_FAILURES_MAX + 1);
}
- #endif
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
// Returns true if the CPU is an Intel Gemini Lake or later (including Kaby
// Lake) Cpu platform id's are referenced from the following file in kernel
// source arch/x86/include/asm/intel-family.h
-@@ -103,6 +104,7 @@ bool IsSkyLakeOrLater() {
- cpuid.model() >= kFirstSkyLakeModelId;
- return is_sky_lake_or_later;
+@@ -76,6 +77,7 @@ bool IsGeminiLakeOrLater() {
+ cpuid.model() >= kGeminiLakeModelId;
+ return is_geminilake_or_later;
}
+#endif
} // namespace
-@@ -652,6 +654,10 @@ void VaapiVideoDecodeAccelerator::Assign
- const unsigned int va_format = GetVaFormatForVideoCodecProfile(profile_);
+@@ -635,6 +637,10 @@ void VaapiVideoDecodeAccelerator::Assign
+ va_surface_format_ = GetVaFormatForVideoCodecProfile(profile_);
std::vector<VASurfaceID> va_surface_ids;
+ // Nvidia doesn't support VAProfileNone, so don't try to create a temporary
@@ -276,7 +276,7 @@ Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
// If we aren't in BufferAllocationMode::kNone, we have to allocate a
// |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
// internal decoded frame.
-@@ -665,6 +671,7 @@ void VaapiVideoDecodeAccelerator::Assign
+@@ -648,6 +654,7 @@ void VaapiVideoDecodeAccelerator::Assign
NotifyError(PLATFORM_FAILURE);
}
}
@@ -284,7 +284,7 @@ Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
for (size_t i = 0; i < buffers.size(); ++i) {
DCHECK(requested_pic_size_ == buffers[i].size());
-@@ -673,9 +680,13 @@ void VaapiVideoDecodeAccelerator::Assign
+@@ -656,9 +663,13 @@ void VaapiVideoDecodeAccelerator::Assign
// only used as a copy destination. Therefore, the VaapiWrapper used and
// owned by |picture| is |vpp_vaapi_wrapper_|.
std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
@@ -298,7 +298,7 @@ Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
make_context_current_cb_, bind_image_cb_, buffers[i]);
RETURN_AND_NOTIFY_ON_FAILURE(picture, "Failed creating a VaapiPicture",
PLATFORM_FAILURE, );
-@@ -1091,6 +1102,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
+@@ -1077,6 +1088,9 @@ VaapiVideoDecodeAccelerator::GetSupporte
VaapiVideoDecodeAccelerator::BufferAllocationMode
VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
@@ -308,9 +308,9 @@ Index: dev/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
// TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
// |output_mode_| as well.
if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
-@@ -1123,6 +1137,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
+@@ -1109,6 +1123,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
return BufferAllocationMode::kReduced;
-
+
return BufferAllocationMode::kSuperReduced;
+#endif
}
@@ -320,7 +320,7 @@ Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
===================================================================
--- dev.orig/media/gpu/vaapi/vaapi_wrapper.cc
+++ dev/media/gpu/vaapi/vaapi_wrapper.cc
-@@ -252,6 +252,11 @@ void VADisplayState::PreSandboxInitializ
+@@ -250,6 +250,11 @@ void VADisplayState::PreSandboxInitializ
base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE);
if (drm_file.IsValid())
VADisplayState::Get()->SetDrmFd(drm_file.GetPlatformFile());
@@ -332,17 +332,18 @@ Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
}
VADisplayState::VADisplayState()
-@@ -279,9 +284,6 @@ bool VADisplayState::Initialize() {
+@@ -277,10 +282,6 @@ bool VADisplayState::Initialize() {
}
bool VADisplayState::InitializeOnce() {
-- static_assert(VA_MAJOR_VERSION >= 1 && VA_MINOR_VERSION >= 1,
-- "Requires VA-API >= 1.1.0");
+- static_assert(
+- VA_MAJOR_VERSION >= 2 || (VA_MAJOR_VERSION == 1 && VA_MINOR_VERSION >= 1),
+- "Requires VA-API >= 1.1.0");
-
switch (gl::GetGLImplementation()) {
case gl::kGLImplementationEGLGLES2:
va_display_ = vaGetDisplayDRM(drm_fd_.get());
-@@ -289,10 +291,10 @@ bool VADisplayState::InitializeOnce() {
+@@ -287,10 +289,10 @@ bool VADisplayState::InitializeOnce() {
case gl::kGLImplementationDesktopGL:
#if defined(USE_X11)
va_display_ = vaGetDisplay(gfx::GetXDisplay());
@@ -356,7 +357,7 @@ Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
break;
// Cannot infer platform from GL, try all available displays
case gl::kGLImplementationNone:
-@@ -325,8 +327,19 @@ bool VADisplayState::InitializeOnce() {
+@@ -323,8 +325,19 @@ bool VADisplayState::InitializeOnce() {
int major_version, minor_version;
VAStatus va_res = vaInitialize(va_display_, &major_version, &minor_version);
if (va_res != VA_STATUS_SUCCESS) {
@@ -378,7 +379,7 @@ Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
}
va_initialized_ = true;
-@@ -334,7 +347,7 @@ bool VADisplayState::InitializeOnce() {
+@@ -332,7 +345,7 @@ bool VADisplayState::InitializeOnce() {
va_vendor_string_ = vaQueryVendorString(va_display_);
DLOG_IF(WARNING, va_vendor_string_.empty())
<< "Vendor string empty or error reading.";
@@ -387,7 +388,7 @@ Index: dev/media/gpu/vaapi/vaapi_wrapper.cc
<< va_vendor_string_;
// The VAAPI version is determined from what is loaded on the system by
-@@ -638,7 +651,7 @@ bool VASupportedProfiles::AreAttribsSupp
+@@ -665,7 +678,7 @@ bool VASupportedProfiles::AreAttribsSupp
if (attribs[i].type != required_attribs[i].type ||
(attribs[i].value & required_attribs[i].value) !=
required_attribs[i].value) {