[PATCH xserver 5/6] meson: Try to hook up BSD APM build configuration.

Eric Anholt eric at anholt.net
Wed Aug 1 20:49:53 UTC 2018


I don't have a BSD to test on, but this should do the same as what
autotools did.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 hw/xfree86/os-support/meson.build | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 0e021dbe17c9..fb282be82a36 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -85,10 +85,17 @@ elif host_machine.system().endswith('bsd')
         'bsd/bsd_VTsw.c',
         'bsd/bsd_bell.c',
         'bsd/bsd_init.c',
-        'shared/pm_noop.c',
     ]
 
-    # XXX: APM
+    if cc.has_header('machine/apmvar.h')
+        if cc.has_header('sys/event.h')
+            srcs_xorg_os_support += 'bsd/bsd_kqueue_apm.c'
+        else
+            srcs_xorg_os_support += 'bsd/bsd_apm.c'
+        endif
+    else
+        srcs_xorg_os_support += 'shared/pm_noop.c'
+    endif
 
     if host_machine.cpu_family() == 'x86_64'
         srcs_xorg_os_support += 'bsd/i386_video.c'
-- 
2.18.0



More information about the xorg-devel mailing list