From 29cc25065bc2dfa3fb2cf608fe7f4b1479d51e57 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 15 Jun 2026 15:10:26 +0200 Subject: [PATCH] xnest: no need for DISABLE_EXT_DPMS anymore All the other DDX'es (except xfree86) are already handling it the same way: the extension is present, but the ScreenRec->DPMS() pointer left NULL (callers already checking for that), so no need for any special magic for Xnest. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xnest/meson.build | 2 +- mi/miinitext.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build index d01b871db7..332278aa46 100644 --- a/hw/xnest/meson.build +++ b/hw/xnest/meson.build @@ -45,7 +45,7 @@ executable( libxserver_xi_stubs, libxserver_xkb_stubs, ], - c_args: [ '-DHAVE_XNEST_CONFIG_H', '-DDISABLE_EXT_COMPOSITE', '-DDISABLE_EXT_DPMS', '-DISABLE_EXT_MITSHM' ], + c_args: [ '-DHAVE_XNEST_CONFIG_H', '-DDISABLE_EXT_COMPOSITE', '-DISABLE_EXT_MITSHM' ], install: true, ) diff --git a/mi/miinitext.c b/mi/miinitext.c index a5882787b6..91120c3833 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -79,10 +79,6 @@ SOFTWARE. #endif /* some DDXes must explicitly prohibit some extensions */ -#ifdef DISABLE_EXT_DPMS -#undef DPMSExtension -#endif - #ifdef DISABLE_EXT_MITSHM #undef MITSHM #undef CONFIG_MITSHM