xserver: Branch 'master' - 2 commits

[Adam Jackson]

 hw/xfree86/os-support/meson.build |   17 ++++++++++++++++-
 meson.build                       |   24 ++++++++++++++++++++++--
 meson_options.txt                 |    4 ++++
 3 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit fb212f2c1bcfb015112aa665dd1f25d9b80f86fc
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sat Jun 17 14:32:30 2017 +0100

    meson: Make VBE and VGAHW modules optional
    
    Don't build them on platforms where they aren't meaningful.
    
    Note that autoconf defines WITH_VGAHW when building the VGAHW module, but
    that doesn't seem to be used anywhere, so we just drop that.
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/meson.build b/meson.build
index f0b1ef0a2..79da23740 100644
--- a/meson.build
+++ b/meson.build
@@ -260,6 +260,28 @@ if libdrm_dep.found()
   build_modesetting = libdrm_dep.version().version_compare('>= 2.4.46')
 endif
 
+build_vbe = false
+if get_option('vbe') == 'auto'
+    if (host_machine.system() != 'darwin' and
+        host_machine.system() != 'windows' and
+        host_machine.system() != 'cygwin')
+        build_vbe = true
+    endif
+else
+    build_vbe = get_option('vbe') == 'yes'
+endif
+
+build_vgahw = false
+if get_option('vgahw') == 'auto'
+    if (host_machine.system() != 'darwin' and
+        host_machine.system() != 'windows' and
+        host_machine.system() != 'cygwin')
+        build_vgahw = true
+    endif
+else
+    build_vgahw = get_option('vgahw') == 'yes'
+endif
+
 # XXX: Allow configuration of these.
 build_apm = false
 build_acpi = false
@@ -267,8 +289,6 @@ build_dpms = true
 build_mitshm = true
 build_res = true
 build_screensaver = true
-build_vbe = true
-build_vgahw = true
 build_xace = true
 build_xsecurity = true
 build_xf86bigfont = true
diff --git a/meson_options.txt b/meson_options.txt
index 56d5afa19..fc66f9f08 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,6 +49,10 @@ option('hal', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
        description: 'Enable HAL integration')
 option('systemd_logind', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
        description: 'Enable systemd-logind integration')
+option('vbe', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
+       description: 'Xorg VBE module')
+option('vgahw', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
+       description: 'Xorg VGA access module')
 
 option('dri1', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
 option('dri2', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
commit 6d2b7d33678e7a881ebdb5ceb4a32509ad3ee930
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Thu May 4 14:08:48 2017 +0100

    meson: Restore stub ossupport
    
    Don't build BSD ossupport when there is no specific support, build stubs
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index e48944761..dfb613e32 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -73,7 +73,7 @@ elif host_machine.system() == 'solaris'
     endif
 
     os_support_flags += '-DHAVE_SYSV_IPC'
-else
+elif host_machine.system().endswith('bsd')
     srcs_xorg_os_support += [
         'bsd/bsd_VTsw.c',
         'bsd/bsd_bell.c',
@@ -109,6 +109,21 @@ else
     else
         srcs_xorg_os_support += 'shared/agp_noop.c'
     endif
+else
+    # stub ossupport
+    srcs_xorg_os_support += [
+        'shared/VTsw_noop.c',
+        'shared/agp_noop.c',
+        'shared/ioperm_noop.c',
+        'shared/kmod_noop.c',
+        'shared/pm_noop.c',
+        'shared/vidmem.c',
+        'shared/posix_tty.c',
+        'shared/sigio.c',
+        'stub/stub_bell.c',
+        'stub/stub_init.c',
+        'stub/stub_video.c',
+    ]
 endif
 
 xorg_os_support = static_library('xorg_os_support',