From 05c63aeecdd7c3682d64b3420a587ecd755be58d Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 15 Feb 2024 17:59:56 +0100
Subject: [PATCH] Xnest: tidy up extension blacklisting in miinitext.c

The DDX'es sometimes need to disable certain extensions. Instead of complex
include cascades with ifdef'ed ddx-specific include from dix code, it's
more clean to add some clear and explicit knobs set by the DDX'es individual
meson.build.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xnest/meson.build |  1 +
 mi/miinitext.c       | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build
index ef260a13a..c1095552f 100644
--- a/hw/xnest/meson.build
+++ b/hw/xnest/meson.build
@@ -44,6 +44,7 @@ executable(
         libxserver_xi_stubs,
         libxserver_xkb_stubs,
     ],
+    c_args: [ '-DDISABLE_EXT_COMPOSITE', '-DDISABLE_EXT_DPMS', '-DISABLE_EXT_MITSHM' ],
     install: true,
 )
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 3af6145b4..0ebf76bc8 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -79,6 +79,19 @@ SOFTWARE.
 
 #include "miext/extinit_priv.h"
 
+/* some DDXes must explicitly prohibit some extensions */
+#ifdef DISABLE_EXT_COMPOSITE
+#undef COMPOSITE
+#endif
+
+#ifdef DISABLE_EXT_DPMS
+#undef DPMSExtension
+#endif
+
+#ifdef DISABLE_EXT_MITSHM
+#undef MITSHM
+#endif
+
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"