hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-11 18:42:23 +00:00
Code Issues Projects Releases Wiki Activity

SDK: define BSD console macros unconditionally for driver builds

Browse source 
When building the xserver SDK on Linux (e.g. GitHub Actions Ubuntu runners),
the BSD console macros (CONFIG_BSD_CONSOLE, CSRG_BASED, PCVT_SUPPORT,
SYSCONS_SUPPORT, WSCONS_SUPPORT) were not defined because they were gated
on host_machine.system(). This caused driver builds (e.g. xf86-input-keyboard)
to fail when building against the SDK, as they reference xf86Info.consType
and the PCCONS/SYSCONS/PCVT/WSCONS constants.

Fix by defining these macros unconditionally in conf_data and xorg_data when
build_xorg_sdk is true, so the installed SDK headers contain them regardless
of the build platform. For non-SDK builds, keep the platform-appropriate
conditional values.

Also add CONFIG_BSD_CONSOLE to the xlibre-server.h template.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-09-07 10:24:40 +02:00
commit bdcb3a73e6
2 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
include/meson.build
View file

@ -341,10 +341,27 @@ conf_data.set('XORGSERVER', build_xorg ? '1' : false)
conf_data.set_quoted('XCONFIGFILE', 'xorg.conf')
conf_data.set_quoted('__XSERVERNAME__', 'Xorg')
conf_data.set('WITH_VGAHW', build_vgahw ? '1' : false)
conf_data.set('CSRG_BASED', csrg_based ? '1' : false)
conf_data.set('PCVT_SUPPORT', supports_pcvt ? '1' : false)
conf_data.set('SYSCONS_SUPPORT', supports_syscons ? '1' : false)
conf_data.set('WSCONS_SUPPORT', supports_wscons ? '1' : false)
# BSD console-driver support (the xf86Info.consType machinery + the
# hw/xfree86/os-support/bsd/ console_*.c backends).
# For the SDK (build_xorg_sdk), define these unconditionally so that
# drivers can build against the SDK regardless of the build platform.
# For non-SDK builds, use the platform-appropriate values.
if build_xorg_sdk
conf_data.set('CSRG_BASED', '1')
conf_data.set('CONFIG_BSD_CONSOLE', '1')
conf_data.set('PCVT_SUPPORT', '1')
conf_data.set('SYSCONS_SUPPORT', '1')
conf_data.set('WSCONS_SUPPORT', '1')
else
conf_data.set('CSRG_BASED', csrg_based ? '1' : false)
conf_data.set('CONFIG_BSD_CONSOLE',
(csrg_based or host_machine.system() == 'kfreebsd') ? '1' : false)
conf_data.set('PCVT_SUPPORT', supports_pcvt ? '1' : false)
conf_data.set('SYSCONS_SUPPORT', supports_syscons ? '1' : false)
conf_data.set('WSCONS_SUPPORT', supports_wscons ? '1' : false)
endif
conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false)
conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false)
conf_data.set('XSERVER_SCREEN_VRR', '1')
@ -391,6 +408,17 @@ xorg_data.set_quoted('PCI_TXT_IDS_PATH', '')
xorg_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false)
xorg_data.set('WSCONS_SUPPORT',
host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd' ? '1' : false)
# BSD console support macros (xf86Info.consType machinery + console_*.c backends).
# These are defined unconditionally in the SDK so that drivers can build against
# it regardless of the build platform. The old CSRG_BASED/PCVT/SYSCONS/WSCONS
# macros are kept for backwards compatibility with existing drivers.
xorg_data.set('CONFIG_BSD_CONSOLE', '1')
xorg_data.set('CSRG_BASED', '1')
xorg_data.set('PCVT_SUPPORT', '1')
xorg_data.set('SYSCONS_SUPPORT', '1')
# WSCONS_SUPPORT is already set above for netbsd/openbsd
xorg_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h') ? '1' : false)
xorg_data.set('HAVE_SYS_KD_H', cc.has_header('sys/kd.h') ? '1' : false)
xorg_data.set('HAVE_SYS_VT_H', cc.has_header('sys/vt.h') ? '1' : false)

3
include/xorg-server.h.meson.in
View file

@ -177,6 +177,9 @@
/* System has wscons console */
#mesondefine WSCONS_SUPPORT
/* BSD console support (xf86Info.consType machinery + console_*.c backends) */
#mesondefine CONFIG_BSD_CONSOLE
/* Loadable XFree86 server awesomeness */
#define XFree86LOADER