xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3e4e70db10a4b2d531ccd649c18317ea2a49d256
Author: George Matsumura <gmmatsumura01 at bvsd.org>
Date:   Wed Apr 7 17:28:46 2021 -0600

    meson: Fix DragonFly BSD identifier in meson build files
    
    This changes the operating system identifier tested against
    host_machine.system() in meson build files from "dragonflybsd"
    to the officially stable "dragonfly".
    
    Signed-off-by: George Matsumura <gmmatsumura01 at bvsd.org>

diff --git a/include/meson.build b/include/meson.build
index 270d2f397..a58baea8e 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -268,7 +268,7 @@ supports_syscons = false
 supports_wscons = false
 csrg_based = false
 
-if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
+if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
   supports_pccons = true
   supports_pcvt = true
   supports_syscons = true
@@ -366,7 +366,7 @@ xorg_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h'))
 xorg_data.set('HAVE_SYS_KD_H', cc.has_header('sys/kd.h'))
 xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h'))
 
-if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
+if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonfly'
     if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
         xorg_data.set('USE_DEV_IO', true)
     endif