fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-03-30 11:50:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'join-paths' into 'main'

Browse source 
Draft: meson: replace join_paths() with / operator

See merge request xorg/xserver!2150
This commit is contained in:
Alan Coopersmith 2026-03-28 10:02:45 -07:00
commit f58d5fa5d0
18 changed files with 99 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/meson.build
View file

@ -26,7 +26,7 @@ endif
if build_xorg
install_data(
'10-quirks.conf',
install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'),
install_dir: get_option('datadir') / 'X11/xorg.conf.d',
install_tag: 'runtime',
)
endif

18
doc/dtrace/meson.build
View file

@ -9,14 +9,14 @@ if build_docs
output: basename + '.html',
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-xhtml.xsl'),
'--stringparam', 'target.database.document=' + join_paths(doc_sgml_path, 'X11/dbs/masterdb.html.xml'),
'-x', doc_stylesheet_srcdir / 'xorg-xhtml.xsl',
'--stringparam', 'target.database.document=' + (doc_sgml_path / 'X11/dbs/masterdb.html.xml'),
'--stringparam', 'current.docid=' + basename,
'-o', meson.current_build_dir(),
'xhtml-nochunks', '@INPUT0@'],
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_dir: get_option('datadir') / 'doc/xorg-server',
install_tag: 'doc',
)
@ -28,15 +28,15 @@ if build_docs
output: output_fn,
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-fo.xsl'),
'-x', doc_stylesheet_srcdir / 'xorg-fo.xsl',
'--stringparam', 'img.src.path=' + meson.current_build_dir(),
'--stringparam', 'target.database.document=' + join_paths(doc_sgml_path, 'X11/dbs/masterdb.pdf.xml'),
'--stringparam', 'target.database.document=' + (doc_sgml_path / 'X11/dbs/masterdb.pdf.xml'),
'--stringparam', 'current.docid=' + basename,
'-o', meson.current_build_dir(),
'--with-fop', format, '@INPUT0@'],
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_dir: get_option('datadir') / 'doc/xorg-server',
install_tag: 'doc',
)
endforeach
@ -55,12 +55,12 @@ if build_docs
'--stringparam', 'collect.xref.targets', 'only',
'--stringparam', 'olink.base.uri', basename + '.' + format,
'--nonet',
'--output', join_paths(meson.current_build_dir(), output_fn),
'--xinclude', join_paths(doc_stylesheet_srcdir, stylesheet),
'--output', meson.current_build_dir() / output_fn,
'--xinclude', doc_stylesheet_srcdir / stylesheet,
'@INPUT0@'],
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_dir: get_option('datadir') / 'doc/xorg-server',
install_tag: 'doc',
)
endforeach

4
doc/meson.build
View file

@ -9,7 +9,7 @@ if build_docs_devel
output: basename + '.html',
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-xhtml.xsl'),
'-x', doc_stylesheet_srcdir / 'xorg-xhtml.xsl',
'-o', meson.current_build_dir(),
'xhtml-nochunks', '@INPUT0@'],
build_by_default: true,
@ -24,7 +24,7 @@ if build_docs_devel
output: output_fn,
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-fo.xsl'),
'-x', doc_stylesheet_srcdir / 'xorg-fo.xsl',
'--stringparam', 'img.src.path=' + meson.current_build_dir(),
'-o', meson.current_build_dir(),
'--with-fop', format, '@INPUT0@'],

2
hw/xfree86/dixmods/meson.build
View file

@ -38,6 +38,6 @@ if build_glx
link_with: e,
install: true,
install_dir: join_paths(module_dir, 'extensions')
install_dir: module_dir / 'extensions'
)
endif

4
hw/xfree86/doc/meson.build
View file

@ -8,7 +8,7 @@ if build_docs_devel
output: basename + '.html',
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-xhtml.xsl'),
'-x', doc_stylesheet_srcdir / 'xorg-xhtml.xsl',
'-o', meson.current_build_dir(),
'xhtml-nochunks', '@INPUT0@'],
build_by_default: true,
@ -23,7 +23,7 @@ if build_docs_devel
output: output_fn,
input: [input_xml],
command: [xmlto] + docs_xmlto_search_flags + [
'-x', join_paths(doc_stylesheet_srcdir, 'xorg-fo.xsl'),
'-x', doc_stylesheet_srcdir / 'xorg-fo.xsl',
'--stringparam', 'img.src.path=' + meson.current_build_dir(),
'-o', meson.current_build_dir(),
'--with-fop', format, '@INPUT0@'],

2
hw/xfree86/drivers/inputtest/meson.build
View file

@ -12,7 +12,7 @@ shared_module(
dependencies: [common_dep],
install: true,
install_dir: join_paths(module_dir, 'input'),
install_dir: module_dir / 'input',
link_with: e,
)

14
hw/xfree86/drivers/modesetting/meson.build
View file

@ -23,21 +23,21 @@ shared_module(
],
install: true,
install_dir: join_paths(module_dir, 'drivers'),
install_dir: module_dir / 'drivers',
)
# Test that we don't have any unresolved symbols from our module to Xorg.
xorg_build_root = join_paths(meson.project_build_root(), 'hw', 'xfree86')
xorg_build_root = meson.project_build_root() / 'hw' / 'xfree86'
symbol_test_args = []
symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so')
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
symbol_test_args += xorg_build_root / 'libxorgserver.so'
symbol_test_args += xorg_build_root / 'dixmods' / 'libshadow.so'
if build_glx
symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libglx.so')
symbol_test_args += xorg_build_root / 'dixmods' / 'libglx.so'
endif
if gbm_dep.found()
symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
symbol_test_args += xorg_build_root / 'glamor_egl' / 'libglamoregl.so'
endif
symbol_test_args += join_paths(xorg_build_root, 'drivers', 'modesetting', 'modesetting_drv.so')
symbol_test_args += xorg_build_root / 'drivers' / 'modesetting' / 'modesetting_drv.so'
install_man(configure_file(
input: 'modesetting.man',

4
hw/xfree86/meson.build
View file

@ -142,7 +142,7 @@ meson.add_install_script(
'sh', '-c',
'ln -fs Xorg @0@@1@'.format(
'${DESTDIR}',
join_paths(get_option('prefix'), get_option('bindir'), 'X')),
get_option('prefix') / get_option('bindir') / 'X'),
install_tag: 'runtime',
)
@ -168,7 +168,7 @@ if get_option('suid_wrapper')
install_data(
xorg_sh,
install_mode: 'rwxr-xr-x',
install_dir: join_paths(get_option('prefix'), get_option('bindir')),
install_dir: get_option('prefix') / get_option('bindir'),
rename: ['Xorg']
)
endif

2
hw/xfree86/parser/meson.build
View file

@ -25,7 +25,7 @@ xorg_parser = static_library('xorg_parser',
dependencies: common_dep,
c_args: [
xorg_c_args,
'-DDATADIR="' + join_paths(get_option('prefix'), get_option('datadir')) + '"',
'-DDATADIR="' + (get_option('prefix') / get_option('datadir')) + '"',
],
)

18
hw/xquartz/bundle/meson.build
View file

@ -20,21 +20,21 @@ localities = [
'ro','ru','sk','sv','th','tr','uk','zh_CN','zh_TW'
]
foreach lang : localities
install_data(join_paths('Resources', lang + '.lproj', 'Localizable.strings'),
install_dir: join_paths(bundle_root, 'Contents/Resources', lang + '.lproj'),
install_data('Resources' / lang + '.lproj' / 'Localizable.strings',
install_dir: bundle_root / 'Contents/Resources' / lang + '.lproj',
install_mode: 'rw-r--r--')
install_data(join_paths('Resources', lang + '.lproj', 'main.nib/keyedobjects.nib'),
install_dir: join_paths(bundle_root, 'Contents/Resources', lang + '.lproj', 'main.nib'),
install_data('Resources' / lang + '.lproj' / 'main.nib/keyedobjects.nib',
install_dir: bundle_root / 'Contents/Resources' / lang + '.lproj' / 'main.nib',
install_mode: 'rw-r--r--')
endforeach
install_data('Resources/English.lproj/main.nib/designable.nib',
install_dir: join_paths(bundle_root, 'Contents/Resources/English.lproj/main.nib'),
install_dir: bundle_root / 'Contents/Resources/English.lproj/main.nib',
install_mode: 'rw-r--r--')
install_data('Resources/X11.icns',
install_dir: join_paths(bundle_root, 'Contents/Resources'),
install_dir: bundle_root / 'Contents/Resources',
install_mode: 'rw-r--r--')
custom_target('Info.plist',
@ -43,17 +43,17 @@ custom_target('Info.plist',
input: 'Info.plist.cpp',
output: 'Info.plist',
install: true,
install_dir: join_paths(bundle_root, 'Contents'),
install_dir: bundle_root / 'Contents',
install_mode: 'rw-r--r--',
build_by_default: true,
)
install_data('PkgInfo',
install_dir: join_paths(bundle_root, 'Contents'),
install_dir: bundle_root / 'Contents',
install_mode: 'rw-r--r--')
install_data('X11.sh',
install_dir: join_paths(bundle_root, 'Contents/MacOS'),
install_dir: bundle_root / 'Contents/MacOS',
install_mode: 'rwxr-xr-x')
meson.add_install_script('chown-bundle.sh', bundle_root)

4
hw/xquartz/mach-startup/meson.build
View file

@ -20,11 +20,11 @@ mach_startup_dep = declare_dependency(
xquartz_defs = [
bundle_id_def,
'-DXSERVER_VERSION="@0@"'.format(meson.project_version()),
'-DX11BINDIR="@0@"'.format(join_paths(get_option('prefix'), get_option('bindir'))),
'-DX11BINDIR="@0@"'.format(get_option('prefix') / get_option('bindir')),
]
# X11.bin
x11appdir = join_paths(bundle_root, 'Contents/MacOS')
x11appdir = bundle_root / 'Contents/MacOS'
x11_bin_deps = [
meson.get_compiler('c').find_library('Xplugin'),

4
hw/xquartz/meson.build
View file

@ -22,8 +22,8 @@ endif
bundle_id_def = '-DBUNDLE_ID_PREFIX="@0@"'.format(bundle_id_prefix)
bundle_root = join_paths(apple_applications_dir, apple_application_name + '.app')
xquartz_data_dir = join_paths(get_option('prefix'), get_option('datadir'),'X11', 'XQuartz')
bundle_root = apple_applications_dir / apple_application_name + '.app'
xquartz_data_dir = get_option('prefix') / get_option('datadir','X11', 'XQuartz')
# using sparkle update framework?
build_sparkle = xquartz_sparkle_feed_url != '' and xquartz_sparkle_public_edkey != ''

36
hw/xwayland/meson.build
View file

@ -36,22 +36,22 @@ scanner = find_program(scanner_dep.get_variable(pkgconfig : 'wayland_scanner'))
protocols_dep = dependency('wayland-protocols', version: wayland_protocols_req)
protodir = protocols_dep.get_variable(pkgconfig : 'pkgdatadir')
pointer_xml = join_paths(protodir, 'unstable', 'pointer-constraints', 'pointer-constraints-unstable-v1.xml')
relative_xml = join_paths(protodir, 'unstable', 'relative-pointer', 'relative-pointer-unstable-v1.xml')
gestures_xml = join_paths(protodir, 'unstable', 'pointer-gestures', 'pointer-gestures-unstable-v1.xml')
tablet_xml = join_paths(protodir, 'unstable', 'tablet', 'tablet-unstable-v2.xml')
kbgrab_xml = join_paths(protodir, 'unstable', 'xwayland-keyboard-grab', 'xwayland-keyboard-grab-unstable-v1.xml')
xdg_output_xml = join_paths(protodir, 'unstable', 'xdg-output', 'xdg-output-unstable-v1.xml')
dmabuf_xml = join_paths(protodir, 'unstable', 'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml')
viewporter_xml = join_paths(protodir, 'stable', 'viewporter', 'viewporter.xml')
xdg_shell_xml = join_paths(protodir, 'stable', 'xdg-shell', 'xdg-shell.xml')
drm_lease_xml = join_paths(protodir, 'staging', 'drm-lease', 'drm-lease-v1.xml')
shortcuts_inhibit_xml = join_paths(protodir, 'unstable', 'keyboard-shortcuts-inhibit', 'keyboard-shortcuts-inhibit-unstable-v1.xml')
xwayland_shell_xml = join_paths(protodir, 'staging', 'xwayland-shell', 'xwayland-shell-v1.xml')
tearing_xml = join_paths(protodir, 'staging', 'tearing-control', 'tearing-control-v1.xml')
fractional_scale_xml = join_paths(protodir, 'staging', 'fractional-scale', 'fractional-scale-v1.xml')
syncobj_xml = join_paths(protodir, 'staging', 'linux-drm-syncobj', 'linux-drm-syncobj-v1.xml')
system_bell_xml = join_paths(protodir, 'staging', 'xdg-system-bell', 'xdg-system-bell-v1.xml')
pointer_xml = protodir / 'unstable' / 'pointer-constraints' / 'pointer-constraints-unstable-v1.xml'
relative_xml = protodir / 'unstable' / 'relative-pointer' / 'relative-pointer-unstable-v1.xml'
gestures_xml = protodir / 'unstable' / 'pointer-gestures' / 'pointer-gestures-unstable-v1.xml'
tablet_xml = protodir / 'unstable' / 'tablet' / 'tablet-unstable-v2.xml'
kbgrab_xml = protodir / 'unstable' / 'xwayland-keyboard-grab' / 'xwayland-keyboard-grab-unstable-v1.xml'
xdg_output_xml = protodir / 'unstable' / 'xdg-output' / 'xdg-output-unstable-v1.xml'
dmabuf_xml = protodir / 'unstable' / 'linux-dmabuf' / 'linux-dmabuf-unstable-v1.xml'
viewporter_xml = protodir / 'stable' / 'viewporter' / 'viewporter.xml'
xdg_shell_xml = protodir / 'stable' / 'xdg-shell' / 'xdg-shell.xml'
drm_lease_xml = protodir / 'staging' / 'drm-lease' / 'drm-lease-v1.xml'
shortcuts_inhibit_xml = protodir / 'unstable' / 'keyboard-shortcuts-inhibit' / 'keyboard-shortcuts-inhibit-unstable-v1.xml'
xwayland_shell_xml = protodir / 'staging' / 'xwayland-shell' / 'xwayland-shell-v1.xml'
tearing_xml = protodir / 'staging' / 'tearing-control' / 'tearing-control-v1.xml'
fractional_scale_xml = protodir / 'staging' / 'fractional-scale' / 'fractional-scale-v1.xml'
syncobj_xml = protodir / 'staging' / 'linux-drm-syncobj' / 'linux-drm-syncobj-v1.xml'
system_bell_xml = protodir / 'staging' / 'xdg-system-bell' / 'xdg-system-bell-v1.xml'
proto_xml = [
relative_xml,
@ -208,8 +208,8 @@ desktop_file = configure_file(
output: 'org.freedesktop.Xwayland.desktop',
configuration: desktop_data,
)
datadir = join_paths(get_option('prefix'), get_option('datadir'))
desktopdir = join_paths(datadir, 'applications')
datadir = get_option('prefix') / get_option('datadir')
desktopdir = datadir / 'applications'
install_data(desktop_file, install_dir : desktopdir, install_tag : 'runtime')
meson.override_find_program('Xwayland', xwayland_server)

16
hw/xwin/glx/meson.build
View file

@ -14,33 +14,33 @@ gen_gl_wrappers_cmd = ['env', 'PYTHONPATH=' + khronos_spec_dir, py3, files('./ge
wgl_wrappers = custom_target(
'gen_wgl_wrappers',
command: [gen_gl_wrappers_cmd, '-registry', '@INPUT@', '-prefix', 'wgl', '-wrapper', '-preresolve', '-outfile', '@OUTPUT@'],
input: join_paths(khronos_spec_dir, 'wgl.xml'),
input: khronos_spec_dir / 'wgl.xml',
output: 'generated_wgl_wrappers.ic',
depend_files: join_paths(khronos_spec_dir, 'reg.py'),
depend_files: khronos_spec_dir / 'reg.py',
)
gl_shim = custom_target(
'gen_gl_shim',
command: [gen_gl_wrappers_cmd, '-registry', '@INPUT@', '-shim', '-outfile', '@OUTPUT@'],
input: join_paths(khronos_spec_dir, 'gl.xml'),
input: khronos_spec_dir / 'gl.xml',
output: 'generated_gl_shim.ic',
depend_files: join_paths(khronos_spec_dir, 'reg.py'),
depend_files: khronos_spec_dir / 'reg.py',
)
gl_thunks = custom_target(
'gen_gl_thunks',
command: [gen_gl_wrappers_cmd, '-registry', '@INPUT@', '-thunk', '-outfile', '@OUTPUT@'],
input: join_paths(khronos_spec_dir, 'gl.xml'),
input: khronos_spec_dir / 'gl.xml',
output: 'generated_gl_thunks.ic',
depend_files: join_paths(khronos_spec_dir, 'reg.py'),
depend_files: khronos_spec_dir / 'reg.py',
)
gl_thunks_def = custom_target(
'gen_gl_thunks_def',
command: [gen_gl_wrappers_cmd, '-registry', '@INPUT@', '-thunkdefs', '-outfile', '@OUTPUT@'],
input: join_paths(khronos_spec_dir, 'gl.xml'),
input: khronos_spec_dir / 'gl.xml',
output: 'generated_gl_thunks.def',
depend_files: join_paths(khronos_spec_dir, 'reg.py'),
depend_files: khronos_spec_dir / 'reg.py',
)
srcs_windows_glx = [

2
hw/xwin/meson.build
View file

@ -170,7 +170,7 @@ executable(
install_data(
'system.XWinrc',
install_dir: join_paths(get_option('sysconfdir'), 'X11'),
install_dir: get_option('sysconfdir') / 'X11',
install_tag: 'runtime',
)

8
include/meson.build
View file

@ -119,8 +119,8 @@ conf_data.set('GBM_BO_WITH_MODIFIERS2',
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('SYSCONFDIR', get_option('prefix') / get_option('sysconfdir'))
conf_data.set_quoted('SUID_WRAPPER_DIR', get_option('prefix') / get_option('libexecdir'))
conf_data.set_quoted('COMPILEDDEFAULTFONTPATH', default_font_path)
conf_data.set('XORG_VERSION_CURRENT', release)
@ -380,8 +380,8 @@ xorg_data.set_quoted('DEFAULT_XDG_STATE_HOME', '.local/state')
xorg_data.set_quoted('DEFAULT_XDG_STATE_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')))
xorg_data.set_quoted('DEFAULT_MODULE_PATH', get_option('prefix') / module_dir)
xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', get_option('prefix') / get_option('libdir'))
xorg_data.set_quoted('__XSERVERNAME__', 'Xorg')
xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false)
xorg_data.set_quoted('PCI_TXT_IDS_PATH', '')

10
man/meson.build
View file

@ -12,9 +12,9 @@ manpage_config.set('libmansuffix', '3')
manpage_config.set('miscmansuffix', '7')
manpage_config.set('filemansuffix', '5')
manpage_config.set('logdir', log_dir)
manpage_config.set('datadir', join_paths(get_option('prefix'), get_option('datadir')))
manpage_config.set('mandir', join_paths(get_option('prefix'), get_option('mandir')))
manpage_config.set('sysconfdir', join_paths(get_option('prefix'), get_option('sysconfdir')))
manpage_config.set('datadir', get_option('prefix') / get_option('datadir'))
manpage_config.set('mandir', get_option('prefix') / get_option('mandir'))
manpage_config.set('sysconfdir', get_option('prefix') / get_option('sysconfdir'))
manpage_config.set('xconfigdir', 'xorg.conf.d')
manpage_config.set('xkbdir', xkb_dir)
manpage_config.set('XKB_DFLT_RULES', get_option('xkb_default_rules'))
@ -25,8 +25,8 @@ manpage_config.set('XKB_DFLT_OPTIONS', get_option('xkb_default_options'))
manpage_config.set('bundle_id_prefix', '...')
manpage_config.set('modulepath', module_dir)
# wtf doesn't this work
# manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
# manpage_config.set('suid_wrapper_dir', get_option('prefix') / libexecdir)
manpage_config.set('suid_wrapper_dir', get_option('prefix') / 'libexec')
# \: allows nroff to insert a line break at that position
manpage_config.set('default_font_path', default_font_path.replace(',', ',\\:'))

50
meson.build
View file

@ -128,13 +128,13 @@ if xkb_dir == ''
xkb_dir = xkbcomp_dep.get_variable(pkgconfig : 'xkbconfigdir')
endif
if xkb_dir == ''
xkb_dir = join_paths(get_option('prefix'), 'share/X11/xkb')
xkb_dir = get_option('prefix') / 'share/X11/xkb'
endif
endif
xkb_output_dir = get_option('xkb_output_dir')
if xkb_output_dir == ''
xkb_output_dir = join_paths(xkb_dir, 'compiled')
xkb_output_dir = xkb_dir / 'compiled'
endif
xkb_bin_dir = get_option('xkb_bin_dir')
@ -143,7 +143,7 @@ if xkb_bin_dir == ''
xkb_bin_dir = xkbcomp_dep.get_variable(pkgconfig : 'bindir')
endif
if xkb_bin_dir == ''
xkb_bin_dir = join_paths(get_option('prefix'), get_option('bindir'))
xkb_bin_dir = get_option('prefix') / get_option('bindir')
endif
endif
@ -155,16 +155,16 @@ if dfp == ''
if fontutil_dep.found()
fontrootdir = fontutil_dep.get_variable(pkgconfig : 'fontrootdir')
else
fontrootdir = join_paths(get_option('prefix'), get_option('datadir'), 'fonts', 'X11')
fontrootdir = get_option('prefix') / get_option('datadir', 'fonts', 'X11')
endif
endif
dfp_elements = [
join_paths(fontrootdir, 'misc'),
join_paths(fontrootdir, 'TTF'),
join_paths(fontrootdir, 'OTF'),
join_paths(fontrootdir, 'Type1'),
join_paths(fontrootdir, '100dpi'),
join_paths(fontrootdir, '75dpi'),
fontrootdir / 'misc',
fontrootdir / 'TTF',
fontrootdir / 'OTF',
fontrootdir / 'Type1',
fontrootdir / '100dpi',
fontrootdir / '75dpi',
]
if host_machine.system() == 'darwin'
dfp_elements += [
@ -211,7 +211,7 @@ if (host_machine.system() != 'windows')
build_xorg = get_option('xorg') == 'true'
endif
endif
xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
xorgsdkdir = get_option('prefix') / get_option('includedir') / 'xorg'
libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
build_xwayland = false
@ -223,7 +223,7 @@ if (host_machine.system() != 'darwin' and
xwayland_path = get_option('xwayland-path')
if (xwayland_path == '')
xwayland_path = join_paths(get_option('prefix'), get_option('bindir'))
xwayland_path = get_option('prefix') / get_option('bindir')
endif
xwayland_dep = [
@ -360,10 +360,10 @@ endif
log_dir = get_option('log_dir')
if log_dir == ''
log_dir = join_paths(get_option('prefix'), get_option('localstatedir'), 'log')
log_dir = get_option('prefix') / get_option('localstatedir') / 'log'
endif
module_dir = join_paths(get_option('libdir'), get_option('module_dir'))
module_dir = get_option('libdir') / get_option('module_dir')
if glamor_option == 'auto'
build_glamor = build_xorg or build_xwayland
@ -728,7 +728,7 @@ top_dir_inc = include_directories('.')
serverconfigdir = get_option('serverconfigdir')
if serverconfigdir == ''
serverconfigdir = join_paths(get_option('prefix'), get_option('libdir'), 'xorg')
serverconfigdir = get_option('prefix') / get_option('libdir') / 'xorg'
endif
subdir('man')
@ -757,7 +757,7 @@ build_docs_pdf = (get_option('docs-pdf') != 'false' and
if build_docs or build_docs_devel
doc_sgml_path = sgml_doctools_dep.get_variable(pkgconfig : 'sgmlrootdir')
doc_stylesheet_srcdir = join_paths(doc_sgml_path, 'X11')
doc_stylesheet_srcdir = doc_sgml_path / 'X11'
# Meson does not and will not support functions so we are copy-pasting
# documentation build code around which is unfortunate
@ -851,12 +851,12 @@ if build_xorg
sdkconfig.set('prefix', get_option('prefix'))
sdkconfig.set('exec_prefix', '${prefix}')
sdkconfig.set('libdir', join_paths('${exec_prefix}', get_option('libdir')))
sdkconfig.set('includedir', join_paths('${prefix}', get_option('includedir')))
sdkconfig.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
sdkconfig.set('moduledir', join_paths('${exec_prefix}', module_dir))
sdkconfig.set('sdkdir', join_paths('${prefix}', get_option('includedir'), 'xorg'))
sdkconfig.set('sysconfigdir', join_paths('${datarootdir}', 'X11/xorg.conf.d'))
sdkconfig.set('libdir', '${exec_prefix}' / get_option('libdir'))
sdkconfig.set('includedir', '${prefix}' / get_option('includedir'))
sdkconfig.set('datarootdir', '${prefix}' / get_option('datadir'))
sdkconfig.set('moduledir', '${exec_prefix}' / module_dir)
sdkconfig.set('sdkdir', '${prefix}' / get_option('includedir') / 'xorg')
sdkconfig.set('sysconfigdir', '${datarootdir}' / 'X11/xorg.conf.d')
sdkconfig.set('abi_ansic',
run_command(awk, '-F', '[(,)]',
@ -909,14 +909,12 @@ if build_xorg
input: 'xorg-server.pc.in',
output: 'xorg-server.pc',
configuration: sdkconfig,
install_dir: join_paths(get_option('prefix'),
get_option('libdir'),
'pkgconfig'),
install_dir: get_option('prefix') / get_option('libdir') / 'pkgconfig',
)
install_data(
'xorg-server.m4',
install_dir: join_paths(get_option('datadir'), 'aclocal'),
install_dir: get_option('datadir') / 'aclocal',
install_tag: 'devel',
)
endif