From 7a764a784f6618801bb43b802cd362afcc143f1e Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun, 22 Mar 2026 14:55:03 -0700
Subject: [PATCH] meson: add install_tags to files meson couldnt guess on its
 own

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>
---
 config/meson.build     |  7 +++++--
 dix/meson.build        |  1 +
 doc/dtrace/meson.build |  3 +++
 hw/xfree86/meson.build |  4 +++-
 hw/xwin/meson.build    |  3 ++-
 meson.build            | 10 +++++++++-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index 15f21a053..2d8dd7fed 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -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('xserver_config',
diff --git a/dix/meson.build b/dix/meson.build
index 55f092892..9ddefa0da 100644
--- a/dix/meson.build
+++ b/dix/meson.build
@@ -73,4 +73,5 @@ libxserver_main = static_library('xserver_main',
 install_data(
     'protocol.txt',
     install_dir: serverconfigdir,
+    install_tag: 'runtime',
 )
diff --git a/doc/dtrace/meson.build b/doc/dtrace/meson.build
index 09b606990..a11f66362 100644
--- a/doc/dtrace/meson.build
+++ b/doc/dtrace/meson.build
@@ -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
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index f2fc34ce2..cfe5da2c9 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -148,7 +148,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',
diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build
index 7c2ec792e..867fdd973 100644
--- a/hw/xwin/meson.build
+++ b/hw/xwin/meson.build
@@ -166,7 +166,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(
diff --git a/meson.build b/meson.build
index 3cc3e38e4..c95749410 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('xserver', 'c',
             'c_std=gnu99',
         ],
         version: '25.0.0.21',
-        meson_version: '>= 0.58.0',
+        meson_version: '>= 0.60.0',
 )
 release_date = '2026-02-10'
 
@@ -865,6 +865,7 @@ if build_xorg
                                 'pkgconfig'),
     )
 
+<<<<<<< HEAD
     configure_file(
         input: 'xlibre-server.pc.in',
         output: 'xlibre-server.pc',
@@ -876,6 +877,13 @@ if build_xorg
 
     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',
+    )
+>>>>>>> 16ca2c7a1 (meson: add install_tags to files meson couldnt guess on its own)
 endif
 
 if build_docs or build_docs_devel