aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_config_gpu__control__list.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2017-02-06 19:29:36 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2017-02-06 19:29:36 +0000
commit8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch)
treeae8b6c930932585d45e586480457898519baa1ce /www/chromium/files/patch-gpu_config_gpu__control__list.cc
parente6deb13ae02980aee974916b1e5cd188e07aff92 (diff)
downloadports-8d28aa8db0c717bef863b7a7630f48cf3870ffb1.tar.gz
ports-8d28aa8db0c717bef863b7a7630f48cf3870ffb1.zip
www/chromium: update to 56.0.2924.87
- Use system FFmpeg instead of embedded code copy [1] - Disable PULSEAUDIO option [2] - Sort _DEPENDS variables - Regenerate patches with make makepatch PR: 215271 [1], 216327 [2] Reported by: jbeich [1] Approved by: rene MFH: 2017Q1 Security: https://vuxml.freebsd.org/freebsd/4b9ca994-e3d9-11e6-813d-e8e0b747a45a.html
Notes
Notes: svn path=/head/; revision=433510
Diffstat (limited to 'www/chromium/files/patch-gpu_config_gpu__control__list.cc')
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__control__list.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index 37b43f3f02d4..c6e7a7854994 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list.cc.orig 2016-07-20 22:03:25.000000000 +0300
-+++ gpu/config/gpu_control_list.cc 2016-08-11 00:15:11.700069000 +0300
-@@ -17,7 +17,11 @@
+--- gpu/config/gpu_control_list.cc.orig 2017-01-26 00:49:14 UTC
++++ gpu/config/gpu_control_list.cc
+@@ -19,7 +19,11 @@
#include "base/sys_info.h"
#include "gpu/config/gpu_info.h"
#include "gpu/config/gpu_util.h"
@@ -9,10 +9,10 @@
+#else
#include "third_party/re2/src/re2/re2.h"
+#endif
-
+
namespace gpu {
namespace {
-@@ -1137,7 +1141,7 @@
+@@ -1154,7 +1158,7 @@ GpuControlList::GpuControlListEntry::GLT
GpuControlList::GpuControlListEntry::GetDefaultGLType() {
#if defined(OS_CHROMEOS)
return kGLTypeGL;
@@ -21,7 +21,7 @@
return kGLTypeGL;
#elif defined(OS_MACOSX)
return kGLTypeGL;
-@@ -1575,7 +1579,7 @@
+@@ -1606,7 +1610,7 @@ GpuControlList::OsType GpuControlList::G
return kOsWin;
#elif defined(OS_ANDROID)
return kOsAndroid;