fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 22:48:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: add install_tags to files meson couldnt guess on its own

Browse source 
Clears up a number of "Failed to guess install tag" messages from
meson-logs/meson-log.txt

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2149>
This commit is contained in:
Alan Coopersmith 2026-03-22 14:55:03 -07:00 • committed by Marge Bot
parent fbff1312ce
commit 16ca2c7a11
7 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/meson.build
View file

@ -24,8 +24,11 @@ if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
endif
if build_xorg
install_data('10-quirks.conf',
install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'))
install_data(
'10-quirks.conf',
install_dir: join_paths(get_option('datadir'), 'X11/xorg.conf.d'),
install_tag: 'runtime',
)
endif
libxserver_config = static_library('libxserver_config',

1
dix/meson.build
View file

@ -61,4 +61,5 @@ libxserver_main = static_library('libxserver_main',
install_data(
'protocol.txt',
install_dir: serverconfigdir,
install_tag: 'runtime',
)

3
doc/dtrace/meson.build
View file

@ -17,6 +17,7 @@ if build_docs
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_tag: 'doc',
)
if build_docs_pdf
@ -36,6 +37,7 @@ if build_docs
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_tag: 'doc',
)
endforeach
endif
@ -59,6 +61,7 @@ if build_docs
build_by_default: true,
install: true,
install_dir: join_paths(get_option('datadir'), 'doc/xorg-server'),
install_tag: 'doc',
)
endforeach
endif

4
hw/xfree86/meson.build
View file

@ -142,7 +142,9 @@ meson.add_install_script(
'sh', '-c',
'ln -fs Xorg @0@@1@'.format(
'${DESTDIR}',
join_paths(get_option('prefix'), get_option('bindir'), 'X')))
join_paths(get_option('prefix'), get_option('bindir'), 'X')),
install_tag: 'runtime',
)
if get_option('suid_wrapper')
executable('Xorg.wrap',

2
hw/xwayland/meson.build
View file

@ -210,7 +210,7 @@ desktop_file = configure_file(
)
datadir = join_paths(get_option('prefix'), get_option('datadir'))
desktopdir = join_paths(datadir, 'applications')
install_data(desktop_file, install_dir : desktopdir)
install_data(desktop_file, install_dir : desktopdir, install_tag : 'runtime')
meson.override_find_program('Xwayland', xwayland_server)
meson.override_dependency('xwayland', declare_dependency(

3
hw/xwin/meson.build
View file

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

9
meson.build
View file

@ -4,7 +4,7 @@ project('xserver', 'c',
'c_std=gnu99',
],
version: '21.1.99.1',
meson_version: '>= 0.58.0',
meson_version: '>= 0.60.0',
)
release_date = '2021-07-05'
@ -914,8 +914,11 @@ if build_xorg
'pkgconfig'),
)
install_data('xorg-server.m4',
install_dir: join_paths(get_option('datadir'), 'aclocal'))
install_data(
'xorg-server.m4',
install_dir: join_paths(get_option('datadir'), 'aclocal'),
install_tag: 'devel',
)
endif
if build_docs or build_docs_devel