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

meson: add fontrootdir option to drop font-utils dependency

Browse source 
The only reason we still depend on xorg/font/utils is because we pull a
pkgconfig variable from that .pc file. Let's drop that dependency by
providing that option ourselves.

And where the option isn't specified and font-utils isn't found, default
to $datadir/fonts/X11, same path it's always been.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2022-11-23 14:13:55 +10:00
commit a60799aed6
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson_options.txt
View file

@ -25,6 +25,8 @@ option('log_dir', type: 'string')
option('module_dir', type: 'string', value: 'xorg/modules',
description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)')
option('default_font_path', type: 'string')
option('fontrootdir', type: 'string',
description: 'Root directory for legacy fonts. Default: from font-utils.pc or $datadir/fonts/X11')
option('glx', type: 'boolean', value: true)
option('xdmcp', type: 'boolean', value: true)