This should make most linux-solo drivers work again. Mainly a fix

for changing SAREA size form DRM_PAGE_SIZE to SAREA_MAX. fb driver
is still broken.

2 files changed, 1 insertions, 37 deletions

diff --git a/src/glx/mini/miniglx.c b/src/glx/mini/miniglx.c
index 31bd9cc034e..1a0acf832f0 100644
--- a/src/glx/mini/miniglx.c
+++ b/src/glx/mini/miniglx.c
@@ -911,24 +911,6 @@ static int __read_config_file( Display *dpy )
 
 static int InitDriver( Display *dpy )
 {
-   char * str;
-   char * srvLibname = NULL;
-
-   srvLibname = strdup(dpy->clientDriverName);
-   if (!srvLibname) {
-      goto failed;
-   }
-
-   /*
-    * Construct server library name. Assume clientDriverName ends
-    * with dri.so. Replace dri.so with srv.so.
-    */
-   str = strstr(srvLibname, "dri.so");
-   if (!str) {
-       goto failed;
-   }
-   strcpy(str, "srv.so");
-
    /*
     * Begin DRI setup.
     * We're kind of combining the per-display and per-screen information
@@ -941,16 +923,9 @@ static int InitDriver( Display *dpy )
       goto failed;
    }
 
-   dpy->dlHandleSrv = dlopen(srvLibname, RTLD_NOW | RTLD_GLOBAL);
-   if (!dpy->dlHandleSrv) {
-      fprintf(stderr, "Unable to open %s: %s\n", dpy->clientDriverName,
-	      dlerror());
-      goto failed;
-   }
-
    /* Pull in Mini GLX specific hooks:
     */
-   dpy->driver = (struct DRIDriverRec *) dlsym(dpy->dlHandleSrv,
+   dpy->driver = (struct DRIDriverRec *) dlsym(dpy->dlHandle,
                                                "__driDriver");
    if (!dpy->driver) {
       fprintf(stderr, "Couldn't find __driDriver in %s\n",
@@ -971,13 +946,6 @@ static int InitDriver( Display *dpy )
    return GL_TRUE;
 
 failed:
-   if (srvLibname) {
-       free(srvLibname);
-   }
-   if (dpy->dlHandleSrv) {
-       dlclose(dpy->dlHandleSrv);
-       dpy->dlHandleSrv = 0;
-   }
    if (dpy->dlHandle) {
        dlclose(dpy->dlHandle);
        dpy->dlHandle = 0;
diff --git a/src/glx/mini/miniglxP.h b/src/glx/mini/miniglxP.h
index ce0eafe17e3..9169f7ece17 100644
--- a/src/glx/mini/miniglxP.h
+++ b/src/glx/mini/miniglxP.h
@@ -166,10 +166,6 @@ struct MiniGLXDisplayRec {
 				   * \brief handle to the client dynamic
 				   * library 
 				   */
-   void *dlHandleSrv;             /**<
-				   * \brief handle to the server dynamic
-				   * library 
-				   */
    /*@}*/
 
    /**