xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 ++++
debian/patches/14_default_screen_section.diff | 44 ++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 52 insertions(+), 1 deletion(-)
New commits:
commit 4c3e67eec9edfcc5e4b689428868445588f84a6c
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Sep 30 21:43:11 2007 -0400
Add 14_default_screen_section.diff.
This allows you to not have a screen section in your xorg.conf. A basic
default one with a simple identifier will be created for you in this case
using all default values
diff --git a/debian/changelog b/debian/changelog
index c95e521..8b64211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
xorg-server (2:1.4-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core.
That driver is built against the old ABI, but doesn't provide
xserver-xorg-input.
- -- Julien Cristau <jcristau@debian.org> Sun, 30 Sep 2007 01:03:20 +0200
+ [ David Nusinow ]
+ * Add 14_default_screen_section.diff. This allows you to not have a screen
+ section in your xorg.conf. A basic default one with a simple identifier
+ will be created for you in this case using all default values
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 30 Sep 2007 19:51:49 -0400
xorg-server (2:1.4-3) unstable; urgency=low
diff --git a/debian/patches/14_default_screen_section.diff b/debian/patches/14_default_screen_section.diff
new file mode 100644
index 0000000..77e0637
--- /dev/null
+++ b/debian/patches/14_default_screen_section.diff
@@ -0,0 +1,44 @@
+Index: xorg-server/hw/xfree86/common/xf86Config.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-30 19:55:22.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-30 20:48:02.000000000 -0400
+@@ -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);
+ /*
+Index: xorg-server/hw/xfree86/parser/read.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000 -0400
++++ xorg-server/hw/xfree86/parser/read.c 2007-09-30 19:55:22.000000000 -0400
+@@ -82,8 +82,8 @@
+ {
+ /*if (!xf86validateDevice (p))
+ return FALSE;*/
+- if (!xf86validateScreen (p))
+- return FALSE;
++ /*if (!xf86validateScreen (p))
++ return FALSE;*/
+ if (!xf86validateInput (p))
+ return FALSE;
+ if (!xf86validateLayout (p))
diff --git a/debian/patches/series b/debian/patches/series
index 73f34fb..1706d24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@
11_exa_no_negative_tile_offsets.diff
12_bgPixel_fix_64bit_issue.diff
13_debian_add_xkbpath_env_variable.diff
+14_default_screen_section.diff
21_glx_align_fixes.patch
41_vbe_filter_less.diff
42_fix_RemoveGeneralSocket_crash_from_dbus.diff
Reply to: