[X2Go-Commits] [x2gokdrive] 03/03: Recent X.org loads GLX via the mi path

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit faa056d4d5c2d3899b602c6ddfab994b3639ade3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 17 12:22:03 2019 +0200

    Recent X.org loads GLX via the mi path
    
        Backported from Xephyr / X.org:
    
        commit 67c303fff303f94b62f03a76de97116c6ebcfda9
        Author: Adam Jackson <ajax at redhat.com>
        Date:   Wed Jan 10 13:05:46 2018 -0500
    
            miinitext: Load GLX on the mi path
    
            Add a stub for Xnest so it continues to link, but otherwise we support
            GLX on every server so there's no need to make every DDX add it.
    
            Signed-off-by: Adam Jackson <ajax at redhat.com>
    
        Backported-to-X2GoKDrive-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---
 x2gokdriveinit.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c
index 2496f76..e88f194 100644
--- a/x2gokdriveinit.c
+++ b/x2gokdriveinit.c
@@ -66,25 +66,9 @@ InitCard(char *name)
     KdCardInfoAdd(&ephyrFuncs, 0);
 }
 
-static const ExtensionModule ephyrExtensions[] = {
-#ifdef GLXEXT
- { GlxExtensionInit, "GLX", &noGlxExtension },
-#endif
-};
-
-static
-void ephyrExtensionInit(void)
-{
-    LoadExtensionList(ephyrExtensions, ARRAY_SIZE(ephyrExtensions), TRUE);
-}
-
-
 void
 InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
 {
-    if (serverGeneration == 1)
-        ephyrExtensionInit();
-
     remote_selection_init();
 
     KdInitOutput(pScreenInfo, argc, argv);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git