xprint: Changes to 'debian-unstable'
debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch | 63 -
debian/patches/02_libvgahw_gcc4_volatile_fix.diff | 70 --
debian/patches/03_auto_load_driver.diff | 335 ----------
debian/patches/04_auto_load_driver_no_conf.diff | 28
debian/patches/05_kill_type1.diff | 160 ----
debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff | 36 -
debian/patches/07_autoconfig_screen_with_device_section.diff | 27
debian/patches/08_better_dpms_logging.diff | 31
debian/patches/10_dont_look_in_home_for_config.diff | 12
debian/patches/11_dont_crash_on_bad_dri_mode.diff | 66 -
debian/patches/14_default_screen_section.diff | 57 -
debian/patches/15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch | 190 -----
debian/patches/16_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch | 96 --
debian/patches/17_x86emu_handle_cpuid.patch | 230 ------
debian/patches/40_default_dpi_96.patch | 19
debian/patches/41_vbe_filter_less.diff | 46 -
debian/patches/43_allow_override_BIOS_EDID_preferred_mode.diff | 125 ---
debian/patches/44_preferredmode_infinite_loop.diff | 31
debian/patches/45_only_XF86_APM_CAPABILITY_CHANGED_for_video_change_acpi_events.diff | 56 -
debian/patches/47_fbdevhw_magic_numbers.diff | 17
debian/patches/94_xprint_XSERVER_LIBS | 21
debian/patches/95_xprint_disable_dbus | 30
debian/patches/series | 22
23 files changed, 1768 deletions(-)
New commits:
commit 8b7fee52426b4e269e4e8ffc60fd105aae9bc7a6
Author: Drew Parsons <dparsons@debian.org>
Date: Wed May 14 01:24:08 2008 +1000
Clean up patches for lone xprint.
Remove patches affecting hw/xfree86.
Xprint patches 94_xprint_XSERVER_LIBS and 95_xprint_disable_dbus are
now incorporated in the upstream (1.6) code.
diff --git a/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch b/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch
deleted file mode 100644
index 19f8ff4..0000000
--- a/debian/patches/001_ubuntu_add_extra_modelines_from_xorg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- foo/hw/xfree86/common/extramodes.orig 2005-03-28 14:40:18.784980424 +1000
-+++ bar/hw/xfree86/common/extramodes 2005-03-28 15:04:04.731203648 +1000
-@@ -7,27 +7,53 @@
- # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz
- ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync
-
-+# 1280x768 @ 60Hz (LCD native res) hsync: 47.70kHz
-+ModeLine "1280x768" 80.14 1280 1344 1480 1680 768 769 772 795
-+
-+# 1280x800 @ 60Hz (LCD native res) hsync: 49.68kHz
-+ModeLine "1280x800" 83.46 1280 1344 1480 1680 800 801 804 828
-+
- # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
--ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
-+ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync
-+
-+# 1152x864 @ 85Hz (Red Hat custom modeline)
-+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync
-
- # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
- ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync
-
-+# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz
-+ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync
-+
- # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
- ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync
-
-+# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
-+ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync
-+
-+# 1440x900 @ 100Hz (17" iMac LCD) hsync: 67 kHz
-+ModeLine "1440x900" 108.84 1440 1472 1880 1912 900 918 927 946 +hsync +vsync
-+
- # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
--Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
-+ModeLine "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync
-+
-+# 1680x1050 @ 60Hz (LCD native res) hsync: 64.22kHz
-+ModeLine "1680x1050" 147.14 1680 1784 1968 2256 1050 1051 1054 1087
-+
-+# 1920x1200 @ 60Hz (LCD native res) hsync: 74.52kHz
-+ModeLine "1920x1200" 193.16 1920 2048 2256 2592 1200 1201 1204 1242
-+
-+# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz
-+ModeLine "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync
-
- # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
--Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
-+ModeLine "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync
-
- # 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz
--Modeline "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync
-+ModeLine "2048x1536" 266.95 2048 2200 2424 2800 1536 1537 1540 1589 -hsync +vsync
-
- # 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz
--Modeline "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync
-+ModeLine "2048x1536" 340.48 2048 2216 2440 2832 1536 1537 1540 1603 -hsync +vsync
-
- # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz
--Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync
--
-+ModeLine "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync
diff --git a/debian/patches/02_libvgahw_gcc4_volatile_fix.diff b/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
deleted file mode 100644
index d6824a8..0000000
--- a/debian/patches/02_libvgahw_gcc4_volatile_fix.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-gcc4 has issues with libvgahw.a. This patch is a workaround stolen from
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=161242 (by Olivier
-Baudron). See also Debian #318218 and bugs merged to it
-
-Index: xorg-server/hw/xfree86/vgahw/vgaHW.c
-===================================================================
---- xorg-server.orig/hw/xfree86/vgahw/vgaHW.c 2006-11-26 01:24:48.000000000 +0100
-+++ xorg-server/hw/xfree86/vgahw/vgaHW.c 2006-11-26 01:25:44.000000000 +0100
-@@ -434,12 +434,16 @@
- static void
- mmioWriteAttr(vgaHWPtr hwp, CARD8 index, CARD8 value)
- {
-+ volatile CARD8 tmp;
-+
- if (hwp->paletteEnabled)
- index &= ~0x20;
- else
- index |= 0x20;
-
-- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
-+ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+
- moutb(VGA_ATTR_INDEX, index);
- moutb(VGA_ATTR_DATA_W, value);
- }
-@@ -447,12 +451,16 @@
- static CARD8
- mmioReadAttr(vgaHWPtr hwp, CARD8 index)
- {
-+ volatile CARD8 tmp;
-+
- if (hwp->paletteEnabled)
- index &= ~0x20;
- else
- index |= 0x20;
-
-- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
-+ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+
- moutb(VGA_ATTR_INDEX, index);
- return minb(VGA_ATTR_DATA_R);
- }
-@@ -472,7 +480,11 @@
- static void
- mmioEnablePalette(vgaHWPtr hwp)
- {
-- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+ volatile CARD8 tmp;
-+
-+ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
-+ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+
- moutb(VGA_ATTR_INDEX, 0x00);
- hwp->paletteEnabled = TRUE;
- }
-@@ -480,7 +492,11 @@
- static void
- mmioDisablePalette(vgaHWPtr hwp)
- {
-- (void) minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+ volatile CARD8 tmp;
-+
-+ /* gcc-4.0 -O2 is broken : needs a volatile assignment */
-+ tmp = minb(hwp->IOBase + VGA_IN_STAT_1_OFFSET);
-+
- moutb(VGA_ATTR_INDEX, 0x20);
- hwp->paletteEnabled = FALSE;
- }
diff --git a/debian/patches/03_auto_load_driver.diff b/debian/patches/03_auto_load_driver.diff
deleted file mode 100644
index 971b4ac..0000000
--- a/debian/patches/03_auto_load_driver.diff
+++ /dev/null
@@ -1,335 +0,0 @@
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-20 23:00:23.000000000 -0400
-@@ -39,6 +39,7 @@
- #include "xf86Config.h"
- #include "xf86Priv.h"
- #include "xf86_OSlib.h"
-+#include "dirent.h"
-
- /* Sections for the default built-in configuration. */
-
-@@ -287,3 +288,207 @@
-
- return (ret == CONFIG_OK);
- }
-+
-+int
-+xchomp(char *line)
-+{
-+ size_t len = 0;
-+
-+ if (!line) {
-+ return 1;
-+ }
-+
-+ len = strlen(line);
-+ if (line[len - 1] == '\n' && len > 0) {
-+ line[len - 1] = '\0';
-+ return 0;
-+ }
-+}
-+
-+GDevPtr
-+autoConfigDevice(GDevPtr preconf_device)
-+{
-+ GDevPtr ptr = NULL;
-+ confScreenPtr scrn = NULL;
-+
-+ if (!xf86configptr) {
-+ return NULL;
-+ }
-+
-+ /* If there's a configured section with no driver chosen, use it */
-+ if (preconf_device) {
-+ ptr = preconf_device;
-+ } else {
-+ ptr = (GDevPtr)xalloc(sizeof(GDevRec));
-+ if (!ptr) {
-+ return NULL;
-+ }
-+ memset((GDevPtr)ptr, 0, sizeof(GDevRec));
-+ ptr->chipID = -1;
-+ ptr->chipRev = -1;
-+ ptr->irq = -1;
-+
-+ ptr->active = TRUE;
-+ ptr->claimed = FALSE;
-+ ptr->identifier = "Autoconfigured Video Device";
-+ ptr->driver = NULL;
-+ }
-+ if (!ptr->driver) {
-+ ptr->driver = chooseVideoDriver();
-+ }
-+
-+ /* TODO Handle multiple screen sections */
-+ if (xf86ConfigLayout.screens && !xf86ConfigLayout.screens->screen->device) {
-+ xf86ConfigLayout.screens->screen->device = ptr;
-+ ptr->myScreenSection = xf86ConfigLayout.screens->screen;
-+ }
-+ xf86Msg(X_DEFAULT, "Assigned the driver to the xf86ConfigLayout\n");
-+
-+ return ptr;
-+}
-+
-+char*
-+chooseVideoDriver(void)
-+{
-+ pciVideoPtr *pciptr, info = NULL;
-+ DIR *idsdir;
-+ FILE *fp;
-+ struct dirent *direntry;
-+ char *line = NULL;
-+ char *chosen_driver = NULL;
-+ size_t len;
-+ ssize_t read;
-+ char path_name[256], vendor_str[5], chip_str[5];
-+ int vendor, chip;
-+ int i, j;
-+ char *matches[20]; /* If we have more than 20 drivers we're in trouble */
-+
-+ for (i=0 ; i<20 ; i++)
-+ matches[i] = NULL;
-+
-+ /* Find the primary device, and get some information about it. */
-+ if (xf86PciVideoInfo) {
-+ for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) {
-+ if (xf86IsPrimaryPci(info)) {
-+ break;
-+ }
-+ }
-+ if (!info) {
-+ ErrorF("Primary device is not PCI\n");
-+ }
-+ } else {
-+ ErrorF("xf86PciVideoInfo is not set\n");
-+ }
-+
-+ if (!info) {
-+ ErrorF("Could not get primary PCI info\n");
-+ goto end;
-+ }
-+
-+ idsdir = opendir("/usr/share/xserver-xorg/pci");
-+ if (idsdir) {
-+ direntry = readdir(idsdir);
-+ /* Read the directory */
-+ while (direntry) {
-+ if (direntry->d_name[0] == '.') {
-+ direntry = readdir(idsdir);
-+ continue;
-+ }
-+ len = strlen(direntry->d_name);
-+ /* A tiny bit of sanity checking. We should probably do better */
-+ if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
-+ /* We need the full path name to open the file */
-+ strncpy(path_name, "/usr/share/xserver-xorg/pci/", 256);
-+ strncat(path_name, direntry->d_name, (256 - strlen(path_name)));
-+ fp = fopen(path_name, "r");
-+ if (fp == NULL) {
-+ xf86Msg(X_ERROR, "Could not open %s for reading. Exiting.\n", path_name);
-+ goto end;
-+ }
-+ /* Read the file */
-+ while ((read = getline(&line, &len, fp)) != -1) {
-+ xchomp(line);
-+ if (isdigit(line[0])) {
-+ strncpy(vendor_str, line, 4);
-+ vendor_str[4] = '\0';
-+ vendor = (int)strtol(vendor_str, NULL, 16);
-+ if ((strlen(&line[4])) == 0) {
-+ chip_str[0] = '\0';
-+ chip = -1;
-+ } else {
-+ /* 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)) {
-+ i = 0;
-+ while (matches[i]) {
-+ i++;
-+ }
-+ matches[i] = (char*)xalloc(sizeof(char) * strlen(direntry->d_name) - 3);
-+ if (!matches[i]) {
-+ xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");
-+ goto end;
-+ }
-+ /* hack off the .ids suffix. This should guard
-+ * against other problems, but it will end up
-+ * taking off anything after the first '.' */
-+ for (j = 0; j < (strlen(direntry->d_name) - 3) ; j++) {
-+ if (direntry->d_name[j] == '.') {
-+ matches[i][j] = '\0';
-+ break;
-+ } else {
-+ matches[i][j] = direntry->d_name[j];
-+ }
-+ }
-+ xf86Msg(X_INFO, "Matched %s from file name %s in autoconfig\n", matches[i], direntry->d_name);
-+
-+ }
-+ } else {
-+ /* TODO Handle driver overrides here */
-+ }
-+ }
-+ fclose(fp);
-+ }
-+ direntry = readdir(idsdir);
-+ }
-+ }
-+
-+ /* TODO Handle multiple drivers claiming to support the same PCI ID */
-+ if (matches[0]) {
-+ chosen_driver = matches[0];
-+ } else {
-+ #if defined __i386__ || defined __amd64__ || defined __hurd__
-+ chosen_driver = "vesa";
-+ #elif defined __alpha__
-+ chosen_driver = "vga";
-+ #elif defined __sparc__
-+ chosen_driver = "sunffb";
-+ #else
-+ chosen_driver = "fbdev";
-+ #endif
-+ }
-+
-+ xf86Msg(X_DEFAULT, "Matched %s for the autoconfigured driver\n", chosen_driver);
-+
-+ end:
-+ i = 0;
-+ while (matches[i]) {
-+ if (matches[i] != chosen_driver) {
-+ xfree(matches[i]);
-+ }
-+ i++;
-+ }
-+ xfree(line);
-+ closedir(idsdir);
-+
-+ return chosen_driver;
-+}
-Index: xorg-server/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-20 23:00:23.000000000 -0400
-@@ -1928,8 +1928,10 @@
- return FALSE;
- }
- screenp->device = xnfcalloc(1, sizeof(GDevRec));
-- configDevice(screenp->device,conf_screen->scrn_device, TRUE);
-- screenp->device->myScreenSection = screenp;
-+ if (configDevice(screenp->device,conf_screen->scrn_device, TRUE))
-+ screenp->device->myScreenSection = screenp;
-+ else
-+ screenp->device = NULL;
- screenp->options = conf_screen->scrn_option_lst;
-
- /*
-@@ -2218,13 +2220,17 @@
- {
- int i;
-
-+ if (!conf_device) {
-+ return FALSE;
-+ }
-+
- if (active)
- xf86Msg(X_CONFIG, "| |-->Device \"%s\"\n",
- conf_device->dev_identifier);
- else
- xf86Msg(X_CONFIG, "|-->Inactive Device \"%s\"\n",
- conf_device->dev_identifier);
--
-+
- devicep->identifier = conf_device->dev_identifier;
- devicep->vendor = conf_device->dev_vendor;
- devicep->board = conf_device->dev_board;
-Index: xorg-server/hw/xfree86/common/xf86Config.h
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-20 21:41:57.000000000 -0400
-@@ -34,6 +34,8 @@
- #define _xf86_config_h
-
- #include "xf86Optrec.h"
-+#include "xf86Parser.h"
-+#include "xf86str.h"
-
- #ifdef HAVE_PARSER_DECLS
- /*
-@@ -76,5 +78,8 @@
- ConfigStatus xf86HandleConfigFile(Bool);
-
- Bool xf86AutoConfig(void);
-+GDevPtr autoConfigDevice(GDevPtr preconf_device);
-+char* chooseVideoDriver(void);
-+int xchomp(char *line);
-
- #endif /* _xf86_config_h */
-Index: xorg-server/hw/xfree86/common/xf86Init.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-20 23:00:15.000000000 -0400
-@@ -347,6 +347,16 @@
- }
-
- /* Load all driver modules specified in the config file */
-+ /* If there aren't any specified in the config file, autoconfig them */
-+ /* FIXME: Does not handle multiple active screen sections, but I'm not
-+ * sure if we really want to handle that case*/
-+ GDevPtr configured_device = xf86ConfigLayout.screens->screen->device;
-+ if ((!configured_device) || (!configured_device->driver)) {
-+ if (!autoConfigDevice(configured_device)) {
-+ xf86Msg(X_ERROR, "Automatic driver configuration failed\n");
-+ return ;
-+ }
-+ }
- if ((modulelist = xf86DriverlistFromConfig())) {
- xf86LoadModules(modulelist, NULL);
- xfree(modulelist);
-Index: xorg-server/hw/xfree86/parser/Screen.c
-===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-20 21:41:57.000000000 -0400
-@@ -526,15 +526,7 @@
- }
- }
-
-- device = xf86findDevice (screen->scrn_device_str, p->conf_device_lst);
-- if (!device)
-- {
-- xf86validationError (UNDEFINED_DEVICE_MSG,
-- screen->scrn_device_str, screen->scrn_identifier);
-- return (FALSE);
-- }
-- else
-- screen->scrn_device = device;
-+ screen->scrn_device= xf86findDevice (screen->scrn_device_str, p->conf_device_lst);
-
- adaptor = screen->scrn_adaptor_lst;
- while (adaptor)
-Index: xorg-server/hw/xfree86/parser/read.c
-===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-20 21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-20 21:41:57.000000000 -0400
-@@ -80,8 +80,8 @@
- static int
- xf86validateConfig (XF86ConfigPtr p)
- {
-- if (!xf86validateDevice (p))
-- return FALSE;
-+ /*if (!xf86validateDevice (p))
-+ return FALSE;*/
- if (!xf86validateScreen (p))
- return FALSE;
- if (!xf86validateInput (p))
diff --git a/debian/patches/04_auto_load_driver_no_conf.diff b/debian/patches/04_auto_load_driver_no_conf.diff
deleted file mode 100644
index 445fcf4..0000000
--- a/debian/patches/04_auto_load_driver_no_conf.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 22:28:33.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-23 22:30:10.000000000 -0400
-@@ -220,22 +220,7 @@
- char *driver = NULL;
- ConfigStatus ret;
-
-- /* Find the primary device, and get some information about it. */
-- if (xf86PciVideoInfo) {
-- for (pciptr = xf86PciVideoInfo; (info = *pciptr); pciptr++) {
-- if (xf86IsPrimaryPci(info)) {
-- break;
-- }
-- }
-- if (!info) {
-- ErrorF("Primary device is not PCI\n");
-- }
-- } else {
-- ErrorF("xf86PciVideoInfo is not set\n");
-- }
--
-- if (info)
-- driver = videoPtrToDriverName(info);
-+ driver = chooseVideoDriver();
-
- AppendToConfig(BUILTIN_MODULE_SECTION);
- AppendToConfig(BUILTIN_MONITOR_SECTION);
diff --git a/debian/patches/05_kill_type1.diff b/debian/patches/05_kill_type1.diff
deleted file mode 100644
index 990ffbf..0000000
--- a/debian/patches/05_kill_type1.diff
+++ /dev/null
@@ -1,160 +0,0 @@
-From 13949f997289068354e83bc83e50d97b8232efb1 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Thu, 23 Aug 2007 11:27:33 +0200
-Subject: [PATCH] Get rid of the type1 font module.
-
-It is completely replaced by freetype these days.
----
- hw/xfree86/common/xf86AutoConfig.c | 1 -
- hw/xfree86/common/xf86Config.c | 1 -
- hw/xfree86/dixmods/Makefile.am | 6 +--
- hw/xfree86/dixmods/type1mod.c | 75 ----------------------------------
- hw/xfree86/doc/man/xorg.conf.man.pre | 4 +-
- 5 files changed, 3 insertions(+), 84 deletions(-)
- delete mode 100644 hw/xfree86/dixmods/type1mod.c
-
-Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:01:37.000000000 +0200
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-18 21:02:26.000000000 +0200
-@@ -49,7 +49,6 @@
- "\tLoad\t\"dbe\"\n" \
- "\tLoad\t\"glx\"\n" \
- "\tLoad\t\"freetype\"\n" \
-- "\tLoad\t\"type1\"\n" \
- "\tLoad\t\"record\"\n" \
- "\tLoad\t\"dri\"\n" \
- "EndSection\n\n"
-Index: xorg-server/hw/xfree86/common/xf86Config.h
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-18 21:01:37.000000000 +0200
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-18 21:02:26.000000000 +0200
-@@ -61,7 +61,6 @@
- {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
- {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
- {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
-- {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
- {.name = "record", .toLoad = TRUE, .load_opt=NULL},
- {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
- {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
-Index: xorg-server/hw/xfree86/dixmods/Makefile.am
-===================================================================
---- xorg-server.orig/hw/xfree86/dixmods/Makefile.am 2007-09-18 20:57:33.000000000 +0200
-+++ xorg-server/hw/xfree86/dixmods/Makefile.am 2007-09-18 21:02:26.000000000 +0200
-@@ -40,8 +40,7 @@
- $(XTRAPMOD)
-
- fontsmoduledir = $(moduledir)/fonts
--fontsmodule_LTLIBRARIES = libfreetype.la \
-- libtype1.la
-+fontsmodule_LTLIBRARIES = libfreetype.la
-
- AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
- INCLUDES = @XORG_INCS@ \
-@@ -104,9 +103,6 @@
- libfreetype_la_LDFLAGS = -avoid-version
- libfreetype_la_SOURCES = ftmodule.c
-
--libtype1_la_LDFLAGS = -avoid-version
--libtype1_la_SOURCES = type1mod.c
--
- libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
- libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
-
-Index: xorg-server/hw/xfree86/dixmods/type1mod.c
-===================================================================
---- xorg-server.orig/hw/xfree86/dixmods/type1mod.c 2007-09-10 14:32:05.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,75 +0,0 @@
--/*
-- * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
-- *
-- * Permission is hereby granted, free of charge, to any person obtaining a copy
-- * of this software and associated documentation files (the "Software"), to
-- * deal in the Software without restriction, including without limitation the
-- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-- * sell copies of the Software, and to permit persons to whom the Software is
-- * furnished to do so, subject to the following conditions:
-- *
-- * The above copyright notice and this permission notice shall be included in
-- * all copies or substantial portions of the Software.
-- *
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-- * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-- *
-- * Except as contained in this notice, the name of the XFree86 Project shall
-- * not be used in advertising or otherwise to promote the sale, use or other
-- * dealings in this Software without prior written authorization from the
-- * XFree86 Project.
-- */
--
--#ifdef HAVE_XORG_CONFIG_H
--#include <xorg-config.h>
--#endif
--
--#include "misc.h"
--
--#include <X11/fonts/fontmod.h>
--#include "xf86Module.h"
--
--static MODULESETUPPROTO(type1Setup);
--
-- /*
-- * This is the module data function that is accessed when loading
-- * libtype1 as a module.
-- */
--
--static XF86ModuleVersionInfo VersRec =
--{
-- "type1",
-- MODULEVENDORSTRING,
-- MODINFOSTRING1,
-- MODINFOSTRING2,
-- XORG_VERSION_CURRENT,
-- 1, 0, 2,
-- ABI_CLASS_FONT, /* Font module */
-- ABI_FONT_VERSION,
-- MOD_CLASS_FONT,
-- {0,0,0,0} /* signature, to be patched into the file by a tool */
--};
--
--_X_EXPORT XF86ModuleData type1ModuleData = { &VersRec, type1Setup, NULL };
--
--extern void Type1RegisterFontFileFunctions(void);
--
--FontModule type1Module = {
-- Type1RegisterFontFileFunctions,
-- "Type1",
-- NULL
--};
--
--static pointer
--type1Setup(pointer module, pointer opts, int *errmaj, int *errmin)
--{
-- type1Module.module = module;
-- LoadFont(&type1Module);
--
-- /* Need a non-NULL return */
-- return (pointer)1;
--}
-Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
-===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 20:51:46.000000000 +0200
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-09-18 21:02:26.000000000 +0200
-@@ -700,10 +700,10 @@
- prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
- .PP
- .RS 7
--Example: the Type 1 font rasteriser can be loaded with the following entry:
-+Example: the FreeType font rasteriser can be loaded with the following entry:
- .PP
- .RS 4
--.B "Load \*qtype1\*q"
-+.B "Load \*qfreetype\*q"
- .RE
- .RE
- .TP 7
diff --git a/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff b/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff
deleted file mode 100644
index faf6557..0000000
--- a/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to
-only avoid multiple scans of the PCI devices, but it actually also added
-an "optimization" based on using sysfs files instead of /proc. However,
-this code is broken, for instance because there are no ioctl handler on
-/sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/*
-
-It breaks the Xserver on architectures that require such ioctls to scan
-the PCI devices and/or deal with PCI domains:
-#422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed
-#422095: xserver-xorg-core: fails to start on powerpc, no devices detected
-
-The following patch forces the server to behave as if we were running on
-a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled.
-
-Upstream doesn't apply this patch since they want to fix the sysfs-code.
-See https://bugs.freedesktop.org/show_bug.cgi?id=7248
-
-Thanks to Jim Watson for testing!
-
----
- hw/xfree86/os-support/bus/linuxPci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c
-===================================================================
---- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:51:55.000000000 +0200
-+++ xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c 2007-05-10 21:52:13.000000000 +0200
-@@ -148,7 +148,7 @@
- int domain, bus, dev, func;
- char file[64];
- struct stat ignored;
-- static int is26 = -1;
-+ static int is26 = 0;
-
- domain = PCI_DOM_FROM_TAG(tag);
- bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));
diff --git a/debian/patches/07_autoconfig_screen_with_device_section.diff b/debian/patches/07_autoconfig_screen_with_device_section.diff
deleted file mode 100644
index 2c0127e..0000000
--- a/debian/patches/07_autoconfig_screen_with_device_section.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: xorg-server/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-27 22:18:22.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-27 22:20:32.000000000 -0400
-@@ -1927,11 +1927,20 @@
- if (!configMonitor(screenp->monitor,conf_screen->scrn_monitor))
- return FALSE;
- }
-+ /* Configure the device. If there isn't one configured, attach to the
-+ * first inactive one that we can configure. If there's none that work,
-+ * set it to NULL so that the section can be autoconfigured later */
- screenp->device = xnfcalloc(1, sizeof(GDevRec));
-- if (configDevice(screenp->device,conf_screen->scrn_device, TRUE))
-+ if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) {
-+ conf_screen->scrn_device = xf86configptr->conf_device_lst;
-+ xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
-+ "\tUsing the first device section listed.\n", screenp->id);
-+ }
-+ if (configDevice(screenp->device,conf_screen->scrn_device, TRUE)) {
- screenp->device->myScreenSection = screenp;
-- else
-+ } else {
- screenp->device = NULL;
-+ }
- screenp->options = conf_screen->scrn_option_lst;
-
- /*
diff --git a/debian/patches/08_better_dpms_logging.diff b/debian/patches/08_better_dpms_logging.diff
deleted file mode 100644
index 7b7c4cc..0000000
--- a/debian/patches/08_better_dpms_logging.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: xorg-server/hw/xfree86/common/xf86DPMS.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:19:47.000000000 -0500
-+++ xorg-server/hw/xfree86/common/xf86DPMS.c 2008-01-07 20:28:11.000000000 -0500
-@@ -61,6 +61,7 @@
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- DPMSPtr pDPMS;
- pointer DPMSOpt;
-+ MessageType enabled_from = X_INFO;
-
- if (serverGeneration != DPMSGeneration) {
- if ((DPMSIndex = AllocateScreenPrivateIndex()) < 0)
-@@ -82,8 +83,8 @@
- = xf86SetBoolOption(pScrn->options, "dpms", FALSE))
- && !DPMSDisabledSwitch)
- DPMSEnabled = TRUE;
-+ enabled_from = X_CONFIG;
- xf86MarkOptionUsed(DPMSOpt);
-- xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
- } else if (DPMSEnabledSwitch) {
- if (!DPMSDisabledSwitch)
- DPMSEnabled = TRUE;
-@@ -92,6 +93,8 @@
- else {
- pDPMS->Enabled = defaultDPMSEnabled;
- }
-+ if (pDPMS->Enabled)
-+ xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
- pDPMS->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = DPMSClose;
- DPMSCount++;
diff --git a/debian/patches/10_dont_look_in_home_for_config.diff b/debian/patches/10_dont_look_in_home_for_config.diff
deleted file mode 100644
index 5b27e7f..0000000
--- a/debian/patches/10_dont_look_in_home_for_config.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: hw/xfree86/common/xf86Config.c
-===================================================================
---- hw/xfree86/common/xf86Config.c.orig 2007-08-16 22:47:18.000000000 -0400
-+++ hw/xfree86/common/xf86Config.c 2007-08-16 22:47:21.000000000 -0400
-@@ -92,7 +92,6 @@
- "/etc/X11/%R," "%P/etc/X11/%R," \
- "%E," "%F," \
- "/etc/X11/%F," "%P/etc/X11/%F," \
-- "%D/%X," \
- "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
- "%P/etc/X11/%X," \
diff --git a/debian/patches/11_dont_crash_on_bad_dri_mode.diff b/debian/patches/11_dont_crash_on_bad_dri_mode.diff
deleted file mode 100644
index f17afb3..0000000
--- a/debian/patches/11_dont_crash_on_bad_dri_mode.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: xorg-server/hw/xfree86/parser/Configint.h
-===================================================================
---- xorg-server.orig/hw/xfree86/parser/Configint.h 2008-03-02 17:09:50.000000000 -0500
-+++ xorg-server/hw/xfree86/parser/Configint.h 2008-03-02 18:33:14.000000000 -0500
-@@ -71,11 +71,14 @@
- #include <stddef.h>
- #include "xf86Parser.h"
-
-+typedef enum { PARSE_DECIMAL, PARSE_OCTAL, PARSE_HEX } ParserNumType;
-+
- typedef struct
- {
- int num; /* returned number */
- char *str; /* private copy of the return-string */
- double realnum; /* returned number as a real */
-+ ParserNumType numType; /* used to enforce correct number formatting */
- }
- LexRec, *LexPtr;
-
-@@ -215,6 +218,8 @@
- "\ta numerical group id."
- #define MULTIPLE_MSG \
- "Multiple \"%s\" lines."
-+#define MUST_BE_OCTAL_MSG \
-+"The number \"%d\" given in this section must be in octal (0xxx) format."
-
- /* Warning messages */
- #define OBSOLETE_MSG \
-Index: xorg-server/hw/xfree86/parser/DRI.c
-===================================================================
---- xorg-server.orig/hw/xfree86/parser/DRI.c 2008-03-02 17:09:50.000000000 -0500
-+++ xorg-server/hw/xfree86/parser/DRI.c 2008-03-02 18:33:14.000000000 -0500
-@@ -117,6 +117,8 @@
- case MODE:
- if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
- Error (NUMBER_MSG, "Mode");
-+ if (val.numType != PARSE_OCTAL)
-+ Error (MUST_BE_OCTAL_MSG, val.num);
- ptr->dri_mode = val.num;
- break;
- case BUFFERS:
-Index: xorg-server/hw/xfree86/parser/scan.c
-===================================================================
---- xorg-server.orig/hw/xfree86/parser/scan.c 2008-03-02 18:33:23.000000000 -0500
-+++ xorg-server/hw/xfree86/parser/scan.c 2008-03-02 18:33:29.000000000 -0500
-@@ -379,11 +379,20 @@
- if (c == '0')
- if ((configBuf[configPos] == 'x') ||
- (configBuf[configPos] == 'X'))
-+ {
- base = 16;
-+ val.numType = PARSE_HEX;
-+ }
- else
-+ {
- base = 8;
-+ val.numType = PARSE_OCTAL;
-+ }
- else
-+ {
- base = 10;
-+ val.numType = PARSE_DECIMAL;
-+ }
-
- configRBuf[0] = c;
- i = 1;
diff --git a/debian/patches/14_default_screen_section.diff b/debian/patches/14_default_screen_section.diff
deleted file mode 100644
index 709261b..0000000
--- a/debian/patches/14_default_screen_section.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- xorg-server.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server/hw/xfree86/common/xf86Config.c
-@@ -1800,11 +1800,6 @@
- if (!servlayoutp)
- return FALSE;
-
-- if (conf_screen == NULL) {
-- xf86ConfigError("No Screen sections present\n");
-- return FALSE;
-- }
--
- /*
- * which screen section is the active one?
- *
-@@ -1892,6 +1887,12 @@
- XF86ConfAdaptorLinkPtr conf_adaptor;
- Bool defaultMonitor = FALSE;
-
-+ if (!conf_screen) {
-+ conf_screen = xnfcalloc(1, sizeof(XF86ConfScreenRec));
-+ conf_screen->scrn_identifier = "Default Screen Section";
-+ xf86Msg(X_DEFAULT, "No screen section available. Using defaults.\n");
-+ }
-+
- xf86Msg(from, "|-->Screen \"%s\" (%d)\n", conf_screen->scrn_identifier,
- scrnum);
- /*
---- xorg-server.orig/hw/xfree86/parser/Screen.c
-+++ xorg-server/hw/xfree86/parser/Screen.c
-@@ -498,12 +498,6 @@
- XF86ConfDevicePtr device;
- XF86ConfAdaptorLinkPtr adaptor;
-
-- if (!screen)
-- {
-- xf86validationError ("At least one Screen section is required.");
-- return (FALSE);
-- }
--
- while (screen)
- {
- if (screen->scrn_obso_driver && !screen->scrn_identifier)
-@@ -512,13 +506,7 @@
- monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
- if (screen->scrn_monitor_str)
- {
-- if (!monitor)
-- {
-- xf86validationError (UNDEFINED_MONITOR_MSG,
-- screen->scrn_monitor_str, screen->scrn_identifier);
-- return (FALSE);
-- }
-- else
-+ if (monitor)
- {
- screen->scrn_monitor = monitor;
- if (!xf86validateMonitor(p, screen))
diff --git a/debian/patches/15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch b/debian/patches/15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch
deleted file mode 100644
index e883d92..0000000
--- a/debian/patches/15_X86EMU-added-blacklist-for-I-O-port-in-0-0xFF-range.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 6061612987ebba7ca65835e658b8d969be13a22d Mon Sep 17 00:00:00 2001
-From: Bart Trojanowski <bart@symbio-technologies.com>
-Date: Fri, 11 Jan 2008 11:52:59 -0500
-Subject: [PATCH] X86EMU: added blacklist for I/O port in 0-0xFF range
-
-Signed-off-by: Bart Trojanowski <bart@jukie.net>
-
Reply to: