xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++
debian/patches/07_autoconfig_screen_with_device_section.diff | 27 +++++++++++
debian/patches/series | 1
3 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit acbcf8b87fadefe2677da706cafe2325e826d27f
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Sep 27 22:22:18 2007 -0400
* Add 07_autoconfig_screen_with_device_section.diff
This patch allows the Screen section to not specify a device section. If
this happens, the server will automatically use the first device section
listed in the xorg.conf instead
diff --git a/debian/changelog b/debian/changelog
index 3256386..7da6907 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
but lack a driver, it'll use the settings. This will allow you to just
have a device section and enable EXA but not have to specify the driver or
anything else.
+ * Add 07_autoconfig_screen_with_device_section.diff
+ This patch allows the Screen section to not specify a device section. If
+ this happens, the server will automatically use the first device section
+ listed in the xorg.conf instead
[ Brice Goglin ]
* Allow building the Xfbdev server in new package xserver-xfbdev, but leave
@@ -50,7 +54,7 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
* Don't build kdrive-based servers we're not shipping.
* Use ${binary:Version} instead of ${Source-Version}.
- -- Julien Cristau <jcristau@debian.org> Thu, 27 Sep 2007 20:47:19 +0200
+ -- David Nusinow <dnusinow@debian.org> Thu, 27 Sep 2007 22:21:10 -0400
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/patches/07_autoconfig_screen_with_device_section.diff b/debian/patches/07_autoconfig_screen_with_device_section.diff
new file mode 100644
index 0000000..2c0127e
--- /dev/null
+++ b/debian/patches/07_autoconfig_screen_with_device_section.diff
@@ -0,0 +1,27 @@
+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/series b/debian/patches/series
index 1a9b468..689e847 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
04_auto_load_driver_no_conf.diff
05_kill_type1.diff
06_use_proc_instead_of_sysfs_for_pci_domains.diff
+07_autoconfig_screen_with_device_section.diff
10_dont_look_in_home_for_config.diff -p0
13_debian_add_xkbpath_env_variable.diff
21_glx_align_fixes.patch
Reply to: