Re: [PATCH xserver 06/12] meson: Add option to set default font path

2018-03-27 Thread Adam Jackson 
On Mon, 2018-03-26 at 18:47 -0600, Keith Packard wrote:
> Adam Jackson  writes:
> 
> > +option('default_font_path', type: 'string',
> > +   value: 'catalogue:/etc/X11/fontpath.d,built-ins')
> 
> This isn't the autotools default; seems like you should probably just
> use that?
> 
> Otherwise,
> 
> Reviewed-by: Keith Packard 

Tsk. But my default's so much better.

Merged the other 11, will respin this one:

remote: I: patch #213076 updated using rev 
6cbefc3e0a33b380c147c533914437c7798d9b93.
remote: I: patch #213084 updated using rev 
2e497bf887aca832dc0dd30d071c5288ab5c1e15.
remote: I: patch #213077 updated using rev 
e3baacacda29afe524b3e4cab78ca057241c0551.
remote: I: patch #213085 updated using rev 
ab063cf96779c521618c022d4f669f69e3d9cc8f.
remote: I: patch #213078 updated using rev 
1e0df64738d6924151adbbd4b040df80178cfa6b.
remote: I: patch #213082 updated using rev 
a1e8dc05163956de9ab73e567f86b91cb8790c0f.
remote: I: patch #213081 updated using rev 
f9ef293cf612e50830ff316d67066ea544905dc9.
remote: I: patch #213079 updated using rev 
9b67303a52f5380bc96862624778b101f6379527.
remote: I: patch #213083 updated using rev 
8c684f59d517db0812fbad5fc6bcd90c7c810493.
remote: I: patch #213086 updated using rev 
84507507ea03db2f6197b94c160bbee9768c4baa.
remote: I: patch #213087 updated using rev 
d3e8af99dc1139fac3307bbcb0046500b3feff11.
remote: I: 11 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   ba0c751772..d3e8af99dc  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 06/12] meson: Add option to set default font path

2018-03-26 Thread Keith Packard 
Adam Jackson  writes:

> +option('default_font_path', type: 'string',
> +   value: 'catalogue:/etc/X11/fontpath.d,built-ins')

This isn't the autotools default; seems like you should probably just
use that?

Otherwise,

Reviewed-by: Keith Packard 

-- 
-keith


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xserver 06/12] meson: Add option to set default font path

2018-03-26 Thread Adam Jackson 
Signed-off-by: Adam Jackson 
---
 include/meson.build | 2 +-
 meson_options.txt   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/meson.build b/include/meson.build
index 69aea80955..654977cb45 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -87,8 +87,8 @@ conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', 
serverconfigdir)
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
 conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), 
get_option('sysconfdir')))
 conf_data.set_quoted('SUID_WRAPPER_DIR', join_paths(get_option('prefix'), 
get_option('libexecdir')))
+conf_data.set_quoted('COMPILEDDEFAULTFONTPATH', 
get_option('default_font_path'))
 
-# XXX: Stopped enumerating at COMPILEDEFAULTFONTPATH
 conf_data.set('XORG_VERSION_CURRENT', release)
 
 conf_data.set('HASXDMAUTH', get_option('xdm-auth-1'))
diff --git a/meson_options.txt b/meson_options.txt
index dede8562a3..143228c5c9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -21,6 +21,8 @@ option('builder_string', type: 'string', description: 
'Additional builder string
 option('log_dir', type: 'string')
 option('module_dir', type: 'string',
description: 'X.Org modules directory')
+option('default_font_path', type: 'string',
+   value: 'catalogue:/etc/X11/fontpath.d,built-ins')
 
 option('glx', type: 'boolean', value: true)
 option('xdmcp', type: 'boolean', value: true)
-- 
2.16.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel