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 5f2d652377

(cherry picked from commit 66e7b7349d)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-11-27 22:25:49 -08:00
parent 8ea43dd8bf
commit 07f9689507
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -680,7 +680,6 @@ case $host_os in
XVFB=no XVFB=no
XNEST=no XNEST=no
COMPOSITE=no
DGA=no DGA=no
DPMSExtension=no DPMSExtension=no
XF86VIDMODE=no XF86VIDMODE=no
@ -2135,7 +2134,7 @@ if test "x$XQUARTZ" = xyes; then
AC_DEFINE(XQUARTZ,1,[Have Quartz]) AC_DEFINE(XQUARTZ,1,[Have Quartz])
AC_DEFINE(ROOTLESS,1,[Build Rootless code]) AC_DEFINE(ROOTLESS,1,[Build Rootless code])
XQUARTZ_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB" XQUARTZ_LIBS="$COMPOSITE_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB"
AC_SUBST([XQUARTZ_LIBS]) AC_SUBST([XQUARTZ_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:]) AC_CHECK_LIB([Xplugin],[xp_init],[:])

2
include/meson.build
View File

@ -201,9 +201,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)

9
meson.build
View File

@ -235,10 +235,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
@ -699,9 +697,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')
@ -735,6 +731,7 @@ libxserver = [
libxserver_mi, libxserver_mi,
libxserver_dix, libxserver_dix,
libxserver_composite,
libxserver_damageext, libxserver_damageext,
libxserver_dbe, libxserver_dbe,
libxserver_randr, libxserver_randr,
@ -751,10 +748,6 @@ libxserver = [
libxserver_os, libxserver_os,
] ]
if build_composite
libxserver += libxserver_composite
endif
libxserver += libxserver_dri3 libxserver += libxserver_dri3
subdir('hw') subdir('hw')