XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Pull DEFAULT_LOGDIR into dix-config.h

Browse Source 
With this, X servers don't have to parse this option separately,
and can just use it after including dix-config.h

Linux kdrive servers (currently Xfbdev only) now support logging.

Signed-off-by: stefan11111 <stefan11111@shitposting.expert>
This commit is contained in:
stefan11111
2026-03-16 23:43:07 +02:00
committed by Enrico Weigelt
parent 16fe763707
commit a2976e3023
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/linux/linux.c
View File

@@ -32,6 +32,7 @@
#include "os/osdep.h"
#include "os/ddx_priv.h"
#include "os/log_priv.h"
#ifdef KDRIVE_MOUSE
extern KdPointerDriver LinuxMouseDriver;
@@ -370,5 +371,6 @@ KdOsFuncs LinuxFuncs = {
void
OsVendorInit(void)
{
LogInit(DEFAULT_LOGDIR "/Xkdrive.log", ".old");
KdOsInit(&LinuxFuncs);
}

3
hw/xfree86/xorg-config.h.meson.in
View File

@@ -42,9 +42,6 @@
/* Path to installed libraries. */
#mesondefine DEFAULT_LIBRARY_PATH
/* Default log location */
#mesondefine DEFAULT_LOGDIR
/* Default logfile prefix */
#mesondefine DEFAULT_LOGPREFIX

4
include/meson.build
View File

@@ -330,6 +330,8 @@ 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')
conf_data.set_quoted('DEFAULT_LOGDIR', log_dir)
version_data = configuration_data()
version_data.set('VENDOR_RELEASE', '@0@'.format(release))
version_data.set_quoted('VENDOR_MAN_VERSION', 'Version @0@.@1@.@2@'.format(major, minor, patch))
@@ -359,7 +361,6 @@ xorg_data.set_quoted('XCONFIGFILE', 'xorg.conf')
xorg_data.set_quoted('XCONFIGDIR', 'xorg.conf.d')
xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME', '.local/share')
xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME_LOGDIR', 'xorg')
xorg_data.set_quoted('DEFAULT_LOGDIR', log_dir)
xorg_data.set_quoted('DEFAULT_LOGPREFIX', 'Xorg.')
xorg_data.set_quoted('DEFAULT_MODULE_PATH', join_paths(get_option('prefix'), module_dir))
xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', join_paths(get_option('prefix'), get_option('libdir')))
@@ -388,7 +389,6 @@ elif host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
endif
xwin_data = configuration_data()
xwin_data.set_quoted('DEFAULT_LOGDIR', log_dir)
xwin_data.set('HAS_DEVWINDOWS', host_machine.system() == 'cygwin' ? '1' : false,
description: 'Has /dev/windows for signaling new win32 messages')
xwin_data.set('RELOCATE_PROJECTROOT', host_machine.system() == 'windows' ? '1' : false,

3
include/xwin-config.h.meson.in
View File

@@ -16,9 +16,6 @@
/* Switch on debug messages */
#mesondefine ENABLE_DEBUG
/* Default log location */
#mesondefine DEFAULT_LOGDIR
/* Whether we should re-locate the root to where the executable lives */
#mesondefine RELOCATE_PROJECTROOT