xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Nov 27 23:14:40 UTC 2022
include/meson.build | 4 +++-
meson.build | 11 +++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 9c0373366988cc0b909ba31e61c43cc46e054b40
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Nov 27 15:04:13 2022 -0800
meson: Don't build COMPOSITE for XQuartz
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/include/meson.build b/include/meson.build
index 6c1c1dcd4..1ca0e76cf 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -199,7 +199,9 @@ conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false)
conf_data.set('IPv6', build_ipv6 ? '1' : false)
conf_data.set('BIGREQS', '1')
-conf_data.set('COMPOSITE', '1')
+if build_composite
+ conf_data.set('COMPOSITE', '1')
+endif
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 ff5d27196..546bb4e4b 100644
--- a/meson.build
+++ b/meson.build
@@ -269,8 +269,10 @@ else
build_xquartz = get_option('xquartz') == 'true'
endif
+build_composite = true
build_rootless = false
if build_xquartz
+ build_composite = false
build_rootless = true
endif
@@ -761,7 +763,9 @@ subdir('fb')
subdir('mi')
subdir('os')
# X extensions
-subdir('composite')
+if build_composite
+ subdir('composite')
+endif
subdir('damageext')
subdir('dbe')
subdir('miext/damage')
@@ -795,7 +799,6 @@ libxserver = [
libxserver_mi,
libxserver_dix,
- libxserver_composite,
libxserver_damageext,
libxserver_dbe,
libxserver_randr,
@@ -812,6 +815,10 @@ libxserver = [
libxserver_os,
]
+if build_composite
+ libxserver += libxserver_composite
+endif
+
libxserver += libxserver_dri3
subdir('hw')
More information about the xorg-commit
mailing list