xserver: Branch 'master'

[GitLab Mirror]

 Xext/geext.c           |    2 --
 include/extinit_priv.h |    1 -
 mi/miinitext.c         |    2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 00843efafb9cf8f86af948c169f34e7df0b394a0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 18 16:15:07 2025 +0100

    Xext: drop disable flag for GE extension
    
    There's really no practical use for disabling GEEext, would just
    cause the Xserver misbehaviour (eg. missing byte swapping)
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1812>

diff --git a/Xext/geext.c b/Xext/geext.c
index 30e4dd317..96352ee0b 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -33,8 +33,6 @@
 
 #define MAXEXTENSIONS   128
 
-Bool noGEExtension = FALSE;
-
 DevPrivateKeyRec GEClientPrivateKeyRec;
 
 #define GEClientPrivateKey (&GEClientPrivateKeyRec)
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index 7ecbb55d5..71e7f295d 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -11,7 +11,6 @@
 extern Bool noDamageExtension;
 extern Bool noDbeExtension;
 extern Bool noDPMSExtension;
-extern Bool noGEExtension;
 extern Bool noGlxExtension;
 extern Bool noMITShmExtension;
 extern Bool noRenderExtension;
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 67fd33fab..1864e28c5 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -102,7 +102,7 @@ SOFTWARE.
 
 /* List of built-in (statically linked) extensions */
 static const ExtensionModule staticExtensions[] = {
-    {GEExtensionInit, "Generic Event Extension", &noGEExtension},
+    {GEExtensionInit, "Generic Event Extension", NULL},
     {ShapeExtensionInit, "SHAPE", &noShapeExtension},
 #ifdef MITSHM
     {ShmExtensionInit, "MIT-SHM", &noMITShmExtension},