From eb6b201c2303241833e9d2233e89e7aab6c2e0f4 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 12 Feb 2026 19:59:46 +0100
Subject: [PATCH] meson.build: separate option for only installing xorg sdk

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 include/meson.build |  2 +-
 meson.build         | 11 +++++++++--
 meson_options.txt   |  2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index 3e0e7ee6c9..775364cf13 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -410,7 +410,7 @@ if with_dtrace
     dtrace_hdr += dtrace_header.process(dtrace_tmpl)
 endif
 
-if build_xorg
+if build_xorg_sdk
     install_data(
         [
             'Xprintf.h',
diff --git a/meson.build b/meson.build
index 0b26eef318..c3824449de 100644
--- a/meson.build
+++ b/meson.build
@@ -236,6 +236,8 @@ if with_dtrace
     dtrace = find_program('dtrace', required: true)
 endif
 
+build_xorg_sdk = get_option('xorg-sdk')
+
 build_xorg = false
 if (host_machine.system() != 'windows')
     if get_option('xorg') == 'auto'
@@ -245,6 +247,11 @@ if (host_machine.system() != 'windows')
         build_xorg = get_option('xorg') == 'true'
     endif
 endif
+
+if build_xorg
+    build_xorg_sdk = true
+endif
+
 xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg')
 libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg)
 
@@ -937,14 +944,14 @@ configure_file(output : 'dix-config.h',
 configure_file(output : 'xorg-server.h',
                input : 'hw/xfree86/xlibre-server.h.meson.in',
                configuration : conf_data,
-               install: build_xorg,
+               install: build_xorg_sdk,
                install_dir: xorgsdkdir)
 
 # new config include file for drivers
 configure_file(output : 'xlibre-server.h',
                input : 'hw/xfree86/xlibre-server.h.meson.in',
                configuration : conf_data,
-               install: build_xorg,
+               install: build_xorg_sdk,
                install_dir: xorgsdkdir)
 
 configure_file(output : 'xorg-config.h',
diff --git a/meson_options.txt b/meson_options.txt
index a375ac7835..3d76658c8e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,7 @@
 option('xorg', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
        description: 'Enable Xorg X Server')
+option('xorg-sdk', type: 'boolean', value: 'false',
+       description: 'Enable Xorg X Server SDK (enabled with xorg)')
 option('xephyr', type: 'boolean', value: false,
        description: 'Enable Xephyr nested X server')
 option('xfbdev', type: 'boolean', value: false,