xserver: Branch 'master' - 4 commits

[Adam Jackson]

 hw/xfree86/fbdevhw/meson.build |    2 +-
 include/meson.build            |    2 +-
 meson.build                    |    3 ++-
 meson_options.txt              |    2 +-
 os/meson.build                 |    4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 5f83b951ac7e0e6bbd766a9bb860283e32808c90
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu May 4 13:46:26 2017 +0100

    meson: Fix typo in xephyr option description
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/meson_options.txt b/meson_options.txt
index b89fdaa2c..a5d7de6f4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,7 +1,7 @@
 option('xorg', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
        description: 'Enable Xorg X Server')
 option('xephyr', type: 'boolean', value: false,
-       description: 'Enable Xephyr nexted X server')
+       description: 'Enable Xephyr nested X server')
 option('xwayland', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
        description: 'Enable XWayland X server')
 option('glamor', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
commit ce6741f6ac63493d6b903f8f58b83bf571baf4b9
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu May 4 13:46:25 2017 +0100

    meson: Fix typoed filename
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/hw/xfree86/fbdevhw/meson.build b/hw/xfree86/fbdevhw/meson.build
index 3cb841179..2f82e2d9f 100644
--- a/hw/xfree86/fbdevhw/meson.build
+++ b/hw/xfree86/fbdevhw/meson.build
@@ -1,7 +1,7 @@
 if host_machine.system() == 'linux'
     srcs_fbdevhw = 'fbdevhw.c'
 else
-    srcs_fbdevhw = 'fbdevhwstubs.c'
+    srcs_fbdevhw = 'fbdevhwstub.c'
 endif
 
 shared_module('fbdevhw',
commit 492534813302ef95538f485401fbcf6eccbd0026
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu May 4 13:46:24 2017 +0100

    meson: Make xf86vidmode optional
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/include/meson.build b/include/meson.build
index a2f74ada9..761f158d7 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -162,7 +162,7 @@ conf_data.set('XCSECURITY', build_xsecurity)
 conf_data.set('XDMCP', get_option('xdmcp'))
 conf_data.set('XF86BIGFONT', build_xf86bigfont)
 conf_data.set('XF86DRI', build_dri1)
-conf_data.set('XF86VIDMODE', '1')
+conf_data.set('XF86VIDMODE', build_xf86vidmode)
 conf_data.set('XFIXES	 ', '1')
 conf_data.set('XINERAMA', build_xinerama)
 conf_data.set('XINPUT', '1')
diff --git a/meson.build b/meson.build
index c05249ae9..0a57ad24b 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ dri3proto_dep = dependency('dri3proto', version: '>= 1.0')
 xineramaproto_dep = dependency('xineramaproto')
 xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0')
 xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1')
-xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1')
+xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false)
 windowswmproto_dep = dependency('windowswmproto', required: false)
 applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false)
 xshmfence_dep = dependency('xshmfence', version: '>= 1.1')
@@ -235,6 +235,7 @@ build_xinerama = true
 build_xselinux = false
 build_xv = true
 build_dga = false
+build_xf86vidmode = xf86vidmodeproto_dep.found()
 
 m_dep = cc.find_library('m', required : false)
 dl_dep = cc.find_library('dl', required : false)
commit 3b3ce4a55b0c1f83eff37fb8544156e8961f3fa3
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu May 4 13:46:23 2017 +0100

    meson: Test to build xserver_poll.c was inverted
    
    Test to build xserver_poll.c was inverted compared to autoconf. Build
    xserver_poll.c if poll is missing.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>

diff --git a/os/meson.build b/os/meson.build
index e1741bb50..724e6d1a8 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -42,10 +42,10 @@ endif
 if not cc.has_function('timingsafe_memcmp')
     srcs_libc += 'timingsafe_memcmp.c'
 endif
-
-if cc.has_function('poll')
+if not cc.has_function('poll')
     srcs_os += 'xserver_poll.c'
 endif
+
 if cc.has_function('sigaction')
     srcs_os += 'busfault.c'
 endif