mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 17:10:33 -04:00
8d28aa8db0
- 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
30 lines
974 B
C++
30 lines
974 B
C++
--- gpu/config/gpu_test_config.cc.orig 2017-01-26 00:49:14 UTC
|
|
+++ gpu/config/gpu_test_config.cc
|
|
@@ -24,7 +24,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;
|
|
@@ -255,6 +255,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) {
|
|
@@ -264,6 +268,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
|
|
} else {
|
|
rt = SetGPUInfo(my_gpu_info);
|
|
}
|
|
+#endif
|
|
} else {
|
|
rt = SetGPUInfo(*gpu_info);
|
|
}
|