frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1401>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-15 17:59:56 +01:00 committed by Marge Bot
parent 584bbe9988
commit d79432e0d4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xnest/meson.build
View File

@ -33,7 +33,7 @@ executable(
libxserver_xi_stubs, libxserver_xi_stubs,
libxserver_xkb_stubs, libxserver_xkb_stubs,
], ],
c_args: '-DHAVE_XNEST_CONFIG_H', c_args: [ '-DHAVE_XNEST_CONFIG_H', '-DDISABLE_EXT_COMPOSITE', '-DDISABLE_EXT_DPMS', '-DISABLE_EXT_MITSHM' ],
install: true, install: true,
) )

11
mi/miinitext.c
View File

@ -78,12 +78,19 @@ SOFTWARE.
#include "xf86Extensions.h" #include "xf86Extensions.h"
#endif #endif
#ifdef HAVE_XNEST_CONFIG_H /* some DDXes must explicitly prohibit some extensions */
#include <xnest-config.h> #ifdef DISABLE_EXT_COMPOSITE
#undef COMPOSITE #undef COMPOSITE
#endif
#ifdef DISABLE_EXT_DPMS
#undef DPMSExtension #undef DPMSExtension
#endif #endif
#ifdef DISABLE_EXT_MITSHM
#undef MITSHM
#endif
#include "misc.h" #include "misc.h"
#include "extension.h" #include "extension.h"
#include "extinit_priv.h" #include "extinit_priv.h"