frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 9c03733669.
This commit is contained in:
Jeremy Huddleston Sequoia 2022-11-27 22:25:49 -08:00
parent 2567388a29
commit 66e7b7349d
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/meson.build
View File

@ -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('IPv6', build_ipv6 ? '1' : false)
conf_data.set('BIGREQS', '1') conf_data.set('BIGREQS', '1')
if build_composite conf_data.set('COMPOSITE', '1')
conf_data.set('COMPOSITE', '1')
endif
conf_data.set('DAMAGE', '1') conf_data.set('DAMAGE', '1')
conf_data.set('DBE', '1') conf_data.set('DBE', '1')
conf_data.set('DGA', build_dga ? '1' : false) conf_data.set('DGA', build_dga ? '1' : false)

11
meson.build
View File

@ -276,10 +276,8 @@ else
build_xquartz = get_option('xquartz') == 'true' build_xquartz = get_option('xquartz') == 'true'
endif endif
build_composite = true
build_rootless = false build_rootless = false
if build_xquartz if build_xquartz
build_composite = false
build_rootless = true build_rootless = true
endif endif
@ -770,9 +768,7 @@ subdir('fb')
subdir('mi') subdir('mi')
subdir('os') subdir('os')
# X extensions # X extensions
if build_composite subdir('composite')
subdir('composite')
endif
subdir('damageext') subdir('damageext')
subdir('dbe') subdir('dbe')
subdir('miext/damage') subdir('miext/damage')
@ -806,6 +802,7 @@ libxserver = [
libxserver_mi, libxserver_mi,
libxserver_dix, libxserver_dix,
libxserver_composite,
libxserver_damageext, libxserver_damageext,
libxserver_dbe, libxserver_dbe,
libxserver_randr, libxserver_randr,
@ -822,10 +819,6 @@ libxserver = [
libxserver_os, libxserver_os,
] ]
if build_composite
libxserver += libxserver_composite
endif
libxserver += libxserver_dri3 libxserver += libxserver_dri3
subdir('hw') subdir('hw')