xserver update 19/10/2010

1 files changed, 7 insertions, 47 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 3a8380121..faeda92ee 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -78,19 +78,19 @@ extern DeviceAssocRec mouse_assoc;
 			"/etc/X11/%R," "%P/etc/X11/%R," \

 			"%E," "%F," \

 			"/etc/X11/%F," "%P/etc/X11/%F," \

-			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \

-			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \

+			"/etc/X11/%X," "/etc/%X," \

+			"%P/etc/X11/%X.%H," \

 			"%P/etc/X11/%X," \

-			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \

+			"%P/lib/X11/%X.%H," \

 			"%P/lib/X11/%X"

 #endif

 #ifndef USER_CONFIGPATH

 #define USER_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \

 			"/etc/X11/%G," "%P/etc/X11/%G," \

-			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \

-			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \

+			"/etc/X11/%X," "/etc/%X," \

+			"%P/etc/X11/%X.%H," \

 			"%P/etc/X11/%X," \

-			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \

+			"%P/lib/X11/%X.%H," \

 			"%P/lib/X11/%X"

 #endif

 #ifndef ROOT_CONFIGDIRPATH

@@ -524,24 +524,6 @@ fixup_video_driver_list(char **drivers)
             }

         }

     }

-    /*

-     * since the ati wrapper driver is gross and awful, sort ati before

-     * atimisc, which makes sure all the ati symbols are visible in xorgcfg.

-     */

-    for (drv = drivers; drv != end; drv++) {

-        if (!strcmp(*drv, "atimisc")) {

-            atimisc = drv;

-            for (drv = atimisc; drv != end; drv++) {

-                if (!strcmp(*drv, "ati")) {

-                    ati = drv;

-                    x = *ati; *ati = *atimisc; *atimisc = x;

-                    return;

-                }

-            }

-            /* if we get here, ati was already ahead of atimisc */

-            return;

-        }

-    }

 }

 

 static char **

@@ -549,7 +531,7 @@ GenerateDriverlist(char * dirname)
 {

     char **ret;

     const char *subdirs[] = { dirname, NULL };

-    static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};

+    static const char *patlist[] = {"(.*)_drv\\.so", NULL};

     ret = LoaderListDirs(subdirs, patlist);

     

     /* fix up the probe order for video drivers */

@@ -2229,15 +2211,11 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
 static void

 configDRI(XF86ConfDRIPtr drip)

 {

-    int                count = 0;

-    XF86ConfBuffersPtr bufs;

     int                i;

     struct group       *grp;

 

     xf86ConfigDRI.group      = -1;

     xf86ConfigDRI.mode       = 0;

-    xf86ConfigDRI.bufs_count = 0;

-    xf86ConfigDRI.bufs       = NULL;

 

     if (drip) {

 	if (drip->dri_group_name) {

@@ -2248,24 +2226,6 @@ configDRI(XF86ConfDRIPtr drip)
 		xf86ConfigDRI.group = drip->dri_group;

 	}

 	xf86ConfigDRI.mode = drip->dri_mode;

-	for (bufs = drip->dri_buffers_lst; bufs; bufs = bufs->list.next)

-	    ++count;

-	

-	xf86ConfigDRI.bufs_count = count;

-	xf86ConfigDRI.bufs = xnfalloc(count * sizeof(*xf86ConfigDRI.bufs));

-	

-	for (i = 0, bufs = drip->dri_buffers_lst;

-	     i < count;

-	     i++, bufs = bufs->list.next) {

-	    

-	    xf86ConfigDRI.bufs[i].count = bufs->buf_count;

-	    xf86ConfigDRI.bufs[i].size  = bufs->buf_size;

-				/* FIXME: Flags not implemented.  These

-                                   could be used, for example, to specify a

-                                   contiguous block and/or write-combining

-                                   cache policy. */

-	    xf86ConfigDRI.bufs[i].flags = 0;

-	}

     }

 }

 #endif