xorg-server: Changes to 'debian-experimental'
debian/changelog | 10 +++
debian/patches/03_auto_load_driver.diff | 90 ++++++++++++++++++--------------
2 files changed, 61 insertions(+), 39 deletions(-)
New commits:
commit 9432c0b0b099f6f0b0ac3800fc65aeb8db0e09ea
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 13:36:17 2007 -0400
Fix a bug in the previous commit
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 3733b14..73fc121 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:13:56.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 13:06:48.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -118,7 +118,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ chip = -1;
+ } else {
+ /* Handle trailing whitespace */
-+ if (isspace(&line[4])) {
++ if (isspace(line[4])) {
+ chip_str[0] = '\0';
+ chip = -1;
+ } else {
@@ -204,8 +204,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 16:08:47.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 13:05:54.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -240,8 +240,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 16:08:47.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 13:05:54.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -261,8 +261,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 16:08:47.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 13:05:54.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -281,8 +281,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 16:08:47.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 13:05:54.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -302,8 +302,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 16:08:47.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 13:05:23.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 13:05:54.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
commit 312a73f6b9f02cae3182929517bee41f74c2c2ab
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 16:14:36 2007 -0400
Allow trailing whitespace when claiming just a vendor, not chip ID
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 6c3a913..3733b14 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:06:52.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:09:40.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:13:56.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,184 @@
+@@ -287,3 +288,191 @@
return (ret == CONFIG_OK);
}
@@ -117,9 +117,16 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ chip_str[0] = '\0';
+ chip = -1;
+ } else {
-+ strncpy(chip_str, &line[4], 4);
-+ chip_str[4] = '\0';
-+ chip = (int)strtol(chip_str, NULL, 16);
++ /* Handle trailing whitespace */
++ if (isspace(&line[4])) {
++ chip_str[0] = '\0';
++ chip = -1;
++ } else {
++ /* Ok, it's a real ID */
++ strncpy(chip_str, &line[4], 4);
++ chip_str[4] = '\0';
++ chip = (int)strtol(chip_str, NULL, 16);
++ }
+ }
+ if (vendor == info->vendor &&
+ (chip == info->chipType || chip == -1)) {
commit 5f960650d1a32dafc20b6ca316ff1b457e17366b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 16:10:13 2007 -0400
Remove the negative logic in the last commit. Positive logic is easier.
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index fd29971..6c3a913 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:06:41.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:09:40.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -113,13 +113,13 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ strncpy(vendor_str, line, 4);
+ vendor_str[4] = '\0';
+ vendor = (int)strtol(vendor_str, NULL, 16);
-+ if ((strlen(&line[4])) != 0) {
++ if ((strlen(&line[4])) == 0) {
++ chip_str[0] = '\0';
++ chip = -1;
++ } else {
+ strncpy(chip_str, &line[4], 4);
+ chip_str[4] = '\0';
+ chip = (int)strtol(chip_str, NULL, 16);
-+ } else {
-+ chip_str[0] = '\0';
-+ chip = -1;
+ }
+ if (vendor == info->vendor &&
+ (chip == info->chipType || chip == -1)) {
@@ -197,8 +197,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 16:01:55.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 16:08:47.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -233,8 +233,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 16:01:55.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 16:08:47.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -254,8 +254,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 16:01:55.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 16:08:47.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -274,8 +274,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 16:01:55.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 16:08:47.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -295,8 +295,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 16:00:34.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 16:01:55.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 16:06:52.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 16:08:47.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
commit 7ef2eb74a1033a433092e7d0d8fbec145c0c1f68
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 16:08:03 2007 -0400
Allow a driver to claim everything from a specific vendor.
It does so by only specifying a vendor ID and leaving the latter four
digits empty.
diff --git a/debian/changelog b/debian/changelog
index f1245ea..d02eedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ xorg-server (2:1.3.99.0-2) experimental; urgency=low
* Improve 03_auto_load_driver.diff
+ Move memory cleanup and directory closing to after the end label to
prevent leaks. Thanks Julien.
+ + Allow a driver to claim everything from a specific vendor. It does so by
+ only specifying a vendor ID and leaving the latter four digits empty.
- -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 16:00:42 -0400
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 16:06:54 -0400
xorg-server (2:1.3.99.0-1) experimental; urgency=low
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 73e7621..fd29971 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 11:35:59.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:00:21.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:06:41.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,178 @@
+@@ -287,3 +288,184 @@
return (ret == CONFIG_OK);
}
@@ -112,11 +112,17 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+ if (isdigit(line[0])) {
+ strncpy(vendor_str, line, 4);
+ vendor_str[4] = '\0';
-+ strncpy(chip_str, &line[4], 4);
-+ chip_str[4] = '\0';
+ vendor = (int)strtol(vendor_str, NULL, 16);
-+ chip = (int)strtol(chip_str, NULL, 16);
-+ if (vendor == info->vendor && chip == info->chipType) {
++ if ((strlen(&line[4])) != 0) {
++ strncpy(chip_str, &line[4], 4);
++ chip_str[4] = '\0';
++ chip = (int)strtol(chip_str, NULL, 16);
++ } else {
++ chip_str[0] = '\0';
++ chip = -1;
++ }
++ if (vendor == info->vendor &&
++ (chip == info->chipType || chip == -1)) {
+ i = 0;
+ while (matches[i]) {
+ i++;
@@ -191,8 +197,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 11:44:29.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 15:57:31.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 16:01:55.000000000 -0400
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -227,8 +233,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 11:44:29.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 15:57:31.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 16:01:55.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -248,8 +254,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 11:44:29.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 15:57:31.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 16:01:55.000000000 -0400
@@ -347,6 +347,15 @@
}
@@ -268,8 +274,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 11:44:29.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 15:57:31.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 16:01:55.000000000 -0400
@@ -526,15 +526,7 @@
}
}
@@ -289,8 +295,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 11:44:29.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 15:57:31.000000000 -0400
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 16:00:34.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 16:01:55.000000000 -0400
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
commit 4253a8cb0765caf9482c691fbab226231c3500e0
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Aug 19 16:01:37 2007 -0400
Improve 03_auto_load_driver.diff
+ Move memory cleanup and directory closing to after the end label to
prevent leaks. Thanks Julien.
diff --git a/debian/changelog b/debian/changelog
index 68d1cf6..f1245ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.3.99.0-2) experimental; urgency=low
+
+ * Improve 03_auto_load_driver.diff
+ + Move memory cleanup and directory closing to after the end label to
+ prevent leaks. Thanks Julien.
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 19 Aug 2007 16:00:42 -0400
+
xorg-server (2:1.3.99.0-1) experimental; urgency=low
[ Julien Cristau, David Nusinow ]
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
index 59f38a6..73e7621 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 4f6a98a..ff22ea6 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
+Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 11:35:59.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-19 16:00:21.000000000 -0400
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ index 4f6a98a..ff22ea6 100644
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,179 @@ xf86AutoConfig(void)
+@@ -287,3 +288,178 @@
return (ret == CONFIG_OK);
}
@@ -160,8 +160,7 @@ index 4f6a98a..ff22ea6 100644
+ ptr->driver = "vga";
+ #elif defined __sparc__
+ ptr->driver = "sunffb";
-+ #else
-+ ptr->driver = "fbdev";
++ #else ptr->driver = "fbdev";
+ #endif
+ }
+
@@ -182,19 +181,19 @@ index 4f6a98a..ff22ea6 100644
+ }
+ i++;
+ }
-+ xfree(line);
-+ closedir(idsdir);
+
+ ptr->identifier = "Autoconfigured Video Device";
+
+ end:
++ xfree(line);
++ closedir(idsdir);
+ return ptr;
+}
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 3c29497..12b7b3e 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -1928,8 +1928,10 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum,
+Index: xorg-server/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-08-19 11:44:29.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-08-19 15:57:31.000000000 -0400
+@@ -1928,8 +1928,10 @@
return FALSE;
}
screenp->device = xnfcalloc(1, sizeof(GDevRec));
@@ -207,7 +206,7 @@ index 3c29497..12b7b3e 100644
screenp->options = conf_screen->scrn_option_lst;
/*
-@@ -2218,13 +2220,17 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
+@@ -2218,13 +2220,17 @@
{
int i;
@@ -226,10 +225,10 @@ index 3c29497..12b7b3e 100644
devicep->identifier = conf_device->dev_identifier;
devicep->vendor = conf_device->dev_vendor;
devicep->board = conf_device->dev_board;
-diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
-index 7fc161d..a96a3b9 100644
---- a/hw/xfree86/common/xf86Config.h
-+++ b/hw/xfree86/common/xf86Config.h
+Index: xorg-server/hw/xfree86/common/xf86Config.h
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-08-19 11:44:29.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.h 2007-08-19 15:57:31.000000000 -0400
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -239,7 +238,7 @@ index 7fc161d..a96a3b9 100644
#ifdef HAVE_PARSER_DECLS
/*
-@@ -76,5 +78,7 @@ Bool xf86BuiltinInputDriver(const char *);
+@@ -76,5 +78,7 @@
ConfigStatus xf86HandleConfigFile(Bool);
Bool xf86AutoConfig(void);
@@ -247,11 +246,11 @@ index 7fc161d..a96a3b9 100644
+int xchomp(char *line);
#endif /* _xf86_config_h */
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index bf7dac6..65c284f 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -347,6 +347,15 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
+Index: xorg-server/hw/xfree86/common/xf86Init.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-08-19 11:44:29.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Init.c 2007-08-19 15:57:31.000000000 -0400
+@@ -347,6 +347,15 @@
}
/* Load all driver modules specified in the config file */
@@ -267,11 +266,11 @@ index bf7dac6..65c284f 100644
if ((modulelist = xf86DriverlistFromConfig())) {
xf86LoadModules(modulelist, NULL);
xfree(modulelist);
-diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c
-index 79e1d24..4df2b05 100644
---- a/hw/xfree86/parser/Screen.c
-+++ b/hw/xfree86/parser/Screen.c
-@@ -526,15 +526,7 @@ xf86validateScreen (XF86ConfigPtr p)
+Index: xorg-server/hw/xfree86/parser/Screen.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-08-19 11:44:29.000000000 -0400
++++ xorg-server/hw/xfree86/parser/Screen.c 2007-08-19 15:57:31.000000000 -0400
+@@ -526,15 +526,7 @@
}
}
@@ -288,11 +287,11 @@ index 79e1d24..4df2b05 100644
adaptor = screen->scrn_adaptor_lst;
while (adaptor)
-diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
-index 9f79696..308ee03 100644
---- a/hw/xfree86/parser/read.c
-+++ b/hw/xfree86/parser/read.c
-@@ -80,8 +80,8 @@ static xf86ConfigSymTabRec TopLevelTab[] =
+Index: xorg-server/hw/xfree86/parser/read.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-08-19 11:44:29.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-08-19 15:57:31.000000000 -0400
+@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
{
Reply to: