From fe4bc433a41747dea140ecd2dd72a89a1f2d184e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 19 Jun 2025 11:16:47 +0200 Subject: [PATCH] sdk: reinstate COMPOSITE symbol Composite extension is always enabled for pretty long time now, but some drivers (eg. xf86-video-intel) still relying on this symbol being set, otherwise assuming to run w/o composite and doing crazy things. Fixes: d708b28adcd7c0a20599be03ee5d7df6f9ce5876 Signed-off-by: Enrico Weigelt, metux IT consult --- include/meson.build | 3 +++ include/xorg-server.h.meson.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/meson.build b/include/meson.build index 8dda8c0fd..1e9ed1950 100644 --- a/include/meson.build +++ b/include/meson.build @@ -204,6 +204,9 @@ conf_data.set('TCPCONN', '1') conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false) conf_data.set('IPv6', build_ipv6 ? '1' : false) +# some drivers (eg. xf86-video-intel) still relying on this symbol being set +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/include/xorg-server.h.meson.in b/include/xorg-server.h.meson.in index 4c0a01c14..1d3096c3c 100644 --- a/include/xorg-server.h.meson.in +++ b/include/xorg-server.h.meson.in @@ -23,6 +23,9 @@ /* Default font path */ #mesondefine COMPILEDDEFAULTFONTPATH +/* Support Composite Extension */ +#mesondefine COMPOSITE + /* Build DPMS extension */ #mesondefine DPMSExtension