mirror of
https://git.freebsd.org/ports.git
synced 2025-07-05 11:29:15 -04:00
45d3cc73dc
A lot of patch files are renamed in this update. Submitted by: Timothy Vaccarelli Obtained from: https://github.com/LeFroid/ MFH: 2016Q2 Security: http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html Security: http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html
30 lines
974 B
C++
30 lines
974 B
C++
--- gpu/config/gpu_test_config.cc.orig 2016-05-11 19:02:23 UTC
|
|
+++ gpu/config/gpu_test_config.cc
|
|
@@ -26,7 +26,7 @@ namespace {
|
|
GPUTestConfig::OS GetCurrentOS() {
|
|
#if defined(OS_CHROMEOS)
|
|
return GPUTestConfig::kOsChromeOS;
|
|
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
|
return GPUTestConfig::kOsLinux;
|
|
#elif defined(OS_WIN)
|
|
int32_t major_version = 0;
|
|
@@ -252,6 +252,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
|
|
bool rt;
|
|
if (gpu_info == NULL) {
|
|
GPUInfo my_gpu_info;
|
|
+#if defined(OS_FREEBSD)
|
|
+ rt = false;
|
|
+ LOG(WARNING) << "CollectGpuID not present on FreeBSD";
|
|
+#else
|
|
CollectInfoResult result = CollectGpuID(
|
|
&my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
|
|
if (result != kCollectInfoSuccess) {
|
|
@@ -261,6 +265,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
|
|
} else {
|
|
rt = SetGPUInfo(my_gpu_info);
|
|
}
|
|
+#endif
|
|
} else {
|
|
rt = SetGPUInfo(*gpu_info);
|
|
}
|