From 2943dca86d3416e29c06fe7db4c1d3449b1eec83 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 14 Oct 2024 16:30:29 +0200 Subject: [PATCH] meson.build: separate option for installing the xfree86 SDK There are scenarios where one either only wants to install the SDK headers (e.g. just compiling drivers) or install Xorg w/ the headers. Thus adding a new option for controlling this. By default (auto) the SDK will be enabled when Xorg is enabled. Signed-off-by: Enrico Weigelt, metux IT consult --- Xext/meson.build | 2 +- composite/meson.build | 2 +- dri3/meson.build | 2 +- exa/meson.build | 2 +- fb/meson.build | 2 +- glamor/meson.build | 2 +- glx/meson.build | 2 +- include/meson.build | 4 ++-- meson.build | 7 ++++++- meson_options.txt | 2 ++ mi/meson.build | 2 +- miext/damage/meson.build | 2 +- miext/shadow/meson.build | 2 +- miext/sync/meson.build | 2 +- present/meson.build | 2 +- randr/meson.build | 2 +- render/meson.build | 2 +- 17 files changed, 24 insertions(+), 17 deletions(-) diff --git a/Xext/meson.build b/Xext/meson.build index bfe40b7f3..40d6bb51a 100644 --- a/Xext/meson.build +++ b/Xext/meson.build @@ -73,6 +73,6 @@ libxserver_xext_vidmode = static_library('libxserver_xext_vidmode', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_xext, install_dir: xorgsdkdir) endif diff --git a/composite/meson.build b/composite/meson.build index 4f3303e20..757add51c 100644 --- a/composite/meson.build +++ b/composite/meson.build @@ -16,6 +16,6 @@ libxserver_composite = static_library('libxserver_composite', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_composite, install_dir: xorgsdkdir) endif diff --git a/dri3/meson.build b/dri3/meson.build index 91bd68d87..2d2b03855 100644 --- a/dri3/meson.build +++ b/dri3/meson.build @@ -17,6 +17,6 @@ if build_dri3 ) endif -if build_xorg +if build_xorg_sdk install_data(hdrs_dri3, install_dir: xorgsdkdir) endif diff --git a/exa/meson.build b/exa/meson.build index 832363d27..6041a7c4f 100644 --- a/exa/meson.build +++ b/exa/meson.build @@ -19,6 +19,6 @@ libxserver_exa = static_library('libxserver_exa', c_args: '-DHAVE_XORG_CONFIG_H' ) -if build_xorg +if build_xorg_sdk install_data('exa.h', install_dir: xorgsdkdir) endif diff --git a/fb/meson.build b/fb/meson.build index e4e311ff4..a4de05dc9 100644 --- a/fb/meson.build +++ b/fb/meson.build @@ -55,6 +55,6 @@ libxserver_wfb = static_library('libxserver_wfb', build_by_default: false, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_fb, install_dir: xorgsdkdir) endif diff --git a/glamor/meson.build b/glamor/meson.build index 2ae522aec..b3e5d3300 100644 --- a/glamor/meson.build +++ b/glamor/meson.build @@ -51,6 +51,6 @@ glamor = static_library('glamor', ], ) -if build_xorg +if build_xorg_sdk install_data('glamor.h', install_dir: xorgsdkdir) endif diff --git a/glx/meson.build b/glx/meson.build index 2ec00ce22..cb06d7b33 100644 --- a/glx/meson.build +++ b/glx/meson.build @@ -79,7 +79,7 @@ if build_glx ], ) - if build_xorg + if build_xorg_sdk install_data(hdrs_vnd, install_dir : xorgsdkdir) endif endif diff --git a/include/meson.build b/include/meson.build index 6d39bf603..75e2fceca 100644 --- a/include/meson.build +++ b/include/meson.build @@ -333,7 +333,7 @@ configure_file(output : 'dix-config.h', configure_file(output : 'xorg-server.h', input : 'xorg-server.h.meson.in', configuration : conf_data, - install: build_xorg, + install: build_xorg_sdk, install_dir: xorgsdkdir) version_data = configuration_data() @@ -438,7 +438,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 35f84ff07..7c144ee61 100644 --- a/meson.build +++ b/meson.build @@ -212,6 +212,11 @@ endif xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg') libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: build_xorg) +build_xorg_sdk = get_option('xorg_sdk') == 'true' +if get_option('xorg_sdk') == 'auto' + build_xorg_sdk = build_xorg +endif + build_xwayland = false if (host_machine.system() != 'darwin' and host_machine.system() != 'windows' and @@ -824,7 +829,7 @@ if host_machine.system() != 'windows' subdir('test') endif -if build_xorg +if build_xorg_sdk sdkconfig = configuration_data() awk = find_program('awk') diff --git a/meson_options.txt b/meson_options.txt index 94698f218..61f16b6df 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: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', + description: 'Enable Xorg X Server SDK') option('xephyr', type: 'boolean', value: false, description: 'Enable Xephyr nested X server') option('xwayland', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', diff --git a/mi/meson.build b/mi/meson.build index cccdb06eb..22aa85385 100644 --- a/mi/meson.build +++ b/mi/meson.build @@ -49,6 +49,6 @@ libxserver_mi = static_library('libxserver_mi', ], ) -if build_xorg +if build_xorg_sdk install_data(hdrs_mi, install_dir: xorgsdkdir) endif diff --git a/miext/damage/meson.build b/miext/damage/meson.build index c7ec10938..06688ef3e 100644 --- a/miext/damage/meson.build +++ b/miext/damage/meson.build @@ -13,6 +13,6 @@ libxserver_miext_damage = static_library('libxserver_miext_damage', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_miext_damage, install_dir: xorgsdkdir) endif diff --git a/miext/shadow/meson.build b/miext/shadow/meson.build index f91accd69..a63ccd793 100644 --- a/miext/shadow/meson.build +++ b/miext/shadow/meson.build @@ -35,6 +35,6 @@ libxserver_miext_shadow = static_library('libxserver_miext_shadow', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_miext_shadow, install_dir: xorgsdkdir) endif diff --git a/miext/sync/meson.build b/miext/sync/meson.build index 0892fd807..f36ea7fc9 100644 --- a/miext/sync/meson.build +++ b/miext/sync/meson.build @@ -23,6 +23,6 @@ libxserver_miext_sync = static_library('libxserver_miext_sync', ], ) -if build_xorg +if build_xorg_sdk install_data(hdrs_miext_sync, install_dir: xorgsdkdir) endif diff --git a/present/meson.build b/present/meson.build index bc806a668..cb75966ce 100644 --- a/present/meson.build +++ b/present/meson.build @@ -26,6 +26,6 @@ libxserver_present = static_library('libxserver_present', ], ) -if build_xorg +if build_xorg_sdk install_data(hdrs_present, install_dir: xorgsdkdir) endif diff --git a/randr/meson.build b/randr/meson.build index 9bd751bf2..770de9b81 100644 --- a/randr/meson.build +++ b/randr/meson.build @@ -31,6 +31,6 @@ libxserver_randr = static_library('libxserver_randr', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_randr, install_dir: xorgsdkdir) endif diff --git a/render/meson.build b/render/meson.build index b95b082b3..94b6c911f 100644 --- a/render/meson.build +++ b/render/meson.build @@ -25,6 +25,6 @@ libxserver_render = static_library('libxserver_render', dependencies: common_dep, ) -if build_xorg +if build_xorg_sdk install_data(hdrs_render, install_dir: xorgsdkdir) endif