diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2014-10-08 08:41:51 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2014-10-08 08:41:51 +0000 |
| commit | 935f403d3f46a7c7804a6d99e2bb53171db157c1 (patch) | |
| tree | c797b39fa9e90549727670b9173ba6b02a5df0a1 /www/chromium/files/patch-gpu__config__gpu_test_config.cc | |
| parent | Document new vulnerabilities in www/chromium < 38.0.2125.101 (diff) | |
www/chromium: Update to 38.0.2125.101 and clean up pkg-plist
Thanks to all contributors: "tomek", "pavoropaev", Carlos Medina
Obtained from: https://github.com/gliaskos/freebsd-chromium/
MFH: 2014Q4
Security: http://www.vuxml.org/freebsd/d2bbcc01-4ec3-11e4-ab3f-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-gpu__config__gpu_test_config.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu__config__gpu_test_config.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index 2f8ac611623b..bb5d0db1aecf 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,5 +1,5 @@ ---- ./gpu/config/gpu_test_config.cc.orig 2014-08-20 21:02:37.000000000 +0200 -+++ ./gpu/config/gpu_test_config.cc 2014-08-22 15:06:26.000000000 +0200 +--- gpu/config/gpu_test_config.cc.orig 2014-10-02 17:39:47 UTC ++++ gpu/config/gpu_test_config.cc @@ -23,8 +23,6 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) @@ -18,3 +18,22 @@ #endif return GPUTestConfig::kOsUnknown; } +@@ -234,6 +234,10 @@ + if (gpu_info == NULL) { + GPUInfo my_gpu_info; + GpuIDResult result; ++#if defined(OS_FREEBSD) ++ rt = false; ++ LOG(WARNING) << "CollectGpuID not present on FreeBSD"; ++#else + result = CollectGpuID(&my_gpu_info.gpu.vendor_id, + &my_gpu_info.gpu.device_id); + if (result == kGpuIDNotSupported) { +@@ -243,6 +247,7 @@ + } else { + rt = SetGPUInfo(my_gpu_info); + } ++#endif + } else { + rt = SetGPUInfo(*gpu_info); + } |