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:22:09 -0800 |
| commit | 07f9689507eee11bdbc2828ac1319fbde91ad27c (patch) | |
| tree | 48aaadeb80f835d8a94df42671f4221edc33a5cc | |
| parent | 8ea43dd8bf8f8f2cb82a2a1f2c004ee873e7810d (diff) | |
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 5f2d652377995c0c0c3cf07463b5018450661d13
(cherry picked from commit 66e7b7349dffda6fef51ed029fdc91b787ca4c08)
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | include/meson.build | 4 | ||||
| -rw-r--r-- | meson.build | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 88c25abce..75d76fb24 100644 --- a/configure.ac +++ b/configure.ac @@ -680,7 +680,6 @@ case $host_os in XVFB=no XNEST=no - COMPOSITE=no DGA=no DPMSExtension=no XF86VIDMODE=no @@ -2135,7 +2134,7 @@ if test "x$XQUARTZ" = xyes; then AC_DEFINE(XQUARTZ,1,[Have Quartz]) 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_CHECK_LIB([Xplugin],[xp_init],[:]) diff --git a/include/meson.build b/include/meson.build index 6b4a69dd4..3521fa3ef 100644 --- a/include/meson.build +++ b/include/meson.build @@ -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('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 e6b6fc6e7..c516726b8 100644 --- a/meson.build +++ b/meson.build @@ -235,10 +235,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 @@ -699,9 +697,7 @@ subdir('fb') subdir('mi') subdir('os') # X extensions -if build_composite - subdir('composite') -endif +subdir('composite') subdir('damageext') subdir('dbe') subdir('miext/damage') @@ -735,6 +731,7 @@ libxserver = [ libxserver_mi, libxserver_dix, + libxserver_composite, libxserver_damageext, libxserver_dbe, libxserver_randr, @@ -751,10 +748,6 @@ libxserver = [ libxserver_os, ] -if build_composite - libxserver += libxserver_composite -endif - libxserver += libxserver_dri3 subdir('hw') |