xserver: Branch 'master'

[GitLab Mirror]

 include/meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 272e2915fedf9c0262e0ee14ad6f513b2439c37a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 28 18:44:45 2024 +0100

    config: fix wscons backend on NetBSD
    
    Compiler gives warning:
    
        ../config/wscons.c: At top level:
        ../config/wscons.c:262:1: warning: no previous prototype for ‘config_wscons_init’ [-Wmissing-prototypes]
          262 | config_wscons_init(void)
              | ^~~~~~~~~~~~~~~~~~
        ../config/wscons.c:270:1: warning: no previous prototype for ‘config_wscons_fini’ [-Wmissing-prototypes]
          270 | config_wscons_fini(void)
              | ^~~~~~~~~~~~~~~~~~
    
    Problem is: commit bcee84c3e497bee3e76c3f02cdc9e7059efa87ce wanted to enable
    wscons support on NetBSD, but only added compiling config/wscons.c, but didn't
    enable setting the CONFIG_WSCONS symbol, so it won't be called at all.
    
    Fixes: bcee84c3e497bee3e76c3f02cdc9e7059efa87ce
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1450>

diff --git a/include/meson.build b/include/meson.build
index 9a53d2359..30f44c7d7 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -102,7 +102,7 @@ conf_data.set('HAVE_DBUS', build_dbus ? '1' : false)
 conf_data.set('CONFIG_HAL', build_hal ? '1' : false)
 conf_data.set('SYSTEMD_LOGIND', build_systemd_logind ? '1' : false)
 conf_data.set('NEED_DBUS', build_systemd_logind or build_hal ? '1' : false)
-conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd' ? '1' : false)
+conf_data.set('CONFIG_WSCONS', host_machine.system() in ['openbsd', 'netbsd'] ? '1' : false)
 
 conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false)
 conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false)