diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2022-11-27 22:25:49 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2023-01-17 15:17:45 -0800 |
| commit | 66e7b7349dffda6fef51ed029fdc91b787ca4c08 (patch) | |
| tree | 116b3e494b43460165cd6d2c30b495fc82a73c1e | |
| parent | 2567388a2957cef526df1b7efb2684aa74feb641 (diff) | |
| download | xserver-66e7b7349dffda6fef51ed029fdc91b787ca4c08.tar.gz | |
Revert "meson: Don't build COMPOSITE for XQuartz"
This will allow us to remove build-time conditionalization on COMPOSITE
while still allowing XQuartz to disable it and use ROOTLESS.
This reverts commit 9c0373366988cc0b909ba31e61c43cc46e054b40.
| -rw-r--r-- | include/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/meson.build b/include/meson.build index 1ca0e76cf..6c1c1dcd4 100644 --- a/include/meson.build +++ b/include/meson.build @@ -199,9 +199,7 @@ conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false) conf_data.set('IPv6', build_ipv6 ? '1' : false) conf_data.set('BIGREQS', '1') -if build_composite - conf_data.set('COMPOSITE', '1') -endif +conf_data.set('COMPOSITE', '1') conf_data.set('DAMAGE', '1') conf_data.set('DBE', '1') conf_data.set('DGA', build_dga ? '1' : false) diff --git a/meson.build b/meson.build index dc77b85a3..fd85ad86a 100644 --- a/meson.build +++ b/meson.build @@ -276,10 +276,8 @@ else build_xquartz = get_option('xquartz') == 'true' endif -build_composite = true build_rootless = false if build_xquartz - build_composite = false build_rootless = true endif @@ -770,9 +768,7 @@ subdir('fb') subdir('mi') subdir('os') # X extensions -if build_composite - subdir('composite') -endif +subdir('composite') subdir('damageext') subdir('dbe') subdir('miext/damage') @@ -806,6 +802,7 @@ libxserver = [ libxserver_mi, libxserver_dix, + libxserver_composite, libxserver_damageext, libxserver_dbe, libxserver_randr, @@ -822,10 +819,6 @@ libxserver = [ libxserver_os, ] -if build_composite - libxserver += libxserver_composite -endif - libxserver += libxserver_dri3 subdir('hw') |