[PATCH] Allow disabling XFree86-DGA, DRI, VidModeExtension extensions

Alan Coopersmith alan.coopersmith at oracle.com
Fri Jul 26 16:53:21 PDT 2013


Code to recognize these in extension enable/disable options was wrapped
in #ifdef XFree86Loader, but that's not defined when building miinitext.c
since the great module merge of 1.13.  Change to an #ifdef that is defined.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 mi/miinitext.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Found while helping a user on #xorg IRC. 

Tested by running Xorg -config xorg.conf.no-dga, with this in xorg.conf.no-dga:
Section "Extensions"
  Option "XFree86-DGA" "Disable"
EndSection

Before this fix:
[1469450.113] (WW) Ignoring unrecognized extension "XFree86-DGA"

After this fix:
[1469526.870] (**) Extension "XFree86-DGA" is disabled


diff --git a/mi/miinitext.c b/mi/miinitext.c
index 81c663a..dbca9f7 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -157,7 +157,7 @@ static ExtensionToggle ExtensionToggleList[] = {
 #ifdef XF86BIGFONT
     {"XFree86-Bigfont", &noXFree86BigfontExtension},
 #endif
-#ifdef XorgLoader
+#ifdef XORGSERVER
 #ifdef XFreeXDGA
     {"XFree86-DGA", &noXFree86DGAExtension},
 #endif
-- 
1.7.9.2



More information about the xorg-devel mailing list