mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 15:51:51 -04:00
21a6834bf3
Note that chromium is currently broken on 9.X due to some obscure compiler error caused possibly caused by Ports GCC. Submitted by: LeFroid Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/25 MFH: 2015Q3 Security: http://vuxml.freebsd.org/freebsd/9d732078-32c7-11e5-b263-00262d5ed8ee.html
45 lines
1.9 KiB
C++
45 lines
1.9 KiB
C++
--- content/gpu/gpu_main.cc.orig 2015-07-15 16:30:03.000000000 -0400
|
|
+++ content/gpu/gpu_main.cc 2015-07-22 06:59:18.148443000 -0400
|
|
@@ -81,7 +81,7 @@
|
|
const base::CommandLine& command_line);
|
|
bool WarmUpSandbox(const base::CommandLine& command_line);
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
|
|
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
|
|
#endif
|
|
|
|
@@ -163,13 +163,13 @@
|
|
// Use a UI message loop because ANGLE and the desktop GL platform can
|
|
// create child windows to render to.
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
|
|
-#elif defined(OS_LINUX) && defined(USE_X11)
|
|
+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
|
|
// We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
|
|
// and https://crbug.com/326995.
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
|
|
scoped_ptr<ui::PlatformEventSource> event_source =
|
|
ui::PlatformEventSource::CreateDefault();
|
|
-#elif defined(OS_LINUX)
|
|
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
|
base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
|
|
#elif defined(OS_MACOSX)
|
|
// This is necessary for CoreAnimation layers hosted in the GPU process to be
|
|
@@ -274,7 +274,7 @@
|
|
// and we already registered them through SetGpuInfo() above.
|
|
base::TimeTicks before_collect_context_graphics_info =
|
|
base::TimeTicks::Now();
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
|
|
if (!CollectGraphicsInfo(gpu_info))
|
|
dead_on_arrival = true;
|
|
|
|
@@ -408,7 +408,7 @@
|
|
return true;
|
|
}
|
|
|
|
-#if !defined(OS_MACOSX)
|
|
+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD
|
|
bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
|
|
bool res = true;
|
|
gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
|