From f407e0b60d8f58dc06d294095d256f08614c8ec25936101fcb34fd71254c07a5 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 6 Dec 2007 00:45:28 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=59

---
 pixman.diff                | 11 +++++++++++
 remove_bogus_modeline.diff | 17 +++++++++++++++++
 xorg-x11-server.changes    | 12 ++++++++++++
 xorg-x11-server.spec       | 12 +++++++++++-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 pixman.diff
 create mode 100644 remove_bogus_modeline.diff

diff --git a/pixman.diff b/pixman.diff
new file mode 100644
index 0000000..eb31f2f
--- /dev/null
+++ b/pixman.diff
@@ -0,0 +1,11 @@
+--- include/miscstruct.h.orig	2007-11-30 22:14:17.372752750 +0100
++++ include/miscstruct.h	2007-11-30 22:14:59.483384500 +0100
+@@ -51,7 +51,7 @@
+ #include "misc.h"
+ #include <X11/Xprotostr.h>
+ #include "gc.h"
+-#include <pixman.h>
++#include <pixman-1/pixman.h>
+ 
+ typedef xPoint DDXPointRec;
+ 
diff --git a/remove_bogus_modeline.diff b/remove_bogus_modeline.diff
new file mode 100644
index 0000000..e78524a
--- /dev/null
+++ b/remove_bogus_modeline.diff
@@ -0,0 +1,17 @@
+diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
+index 2f26a64..9489947 100644
+--- a/hw/xfree86/modes/xf86EdidModes.c
++++ b/hw/xfree86/modes/xf86EdidModes.c
+@@ -327,6 +327,12 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
+     Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;
+     Mode->VTotal = timing->v_active + timing->v_blanking;
+ 
++    /* perform basic check on the detail timing */
++    if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {
++	xfree(Mode);
++	return NULL;
++    }
++
+     xf86SetModeDefaultName(Mode);
+ 
+     /* We ignore h/v_size and h/v_border for now. */
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 601ceed..18fe661 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 30 22:29:25 CET 2007 - sndirsch@suse.de
+
+- pixman.diff
+  * fixed include path for pixman.h
+
+-------------------------------------------------------------------
+Thu Nov 29 19:45:14 CET 2007 - sndirsch@suse.de
+
+- remove_bogus_modeline.diff
+  * remove bogus monitor modelines provided by DDC (Bug #335540) 
+
 -------------------------------------------------------------------
 Tue Nov 27 19:03:27 CET 2007 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 27ccd36..72b0248 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        34
+Release:        36
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -96,6 +96,8 @@ Patch88:        commit-f6401f9.diff
 Patch89:        commit-184e571.diff
 Patch90:        commit-fa19e84.diff
 Patch91:        commit-f7dd0c7.diff
+Patch92:        remove_bogus_modeline.diff
+Patch93:        pixman.diff
 
 %description
 This package contains the X.Org Server.
@@ -219,6 +221,8 @@ popd
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1
+%patch92 -p1
+%patch93
 
 %build
 pushd xorg-docs-*
@@ -549,6 +553,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Nov 30 2007 - sndirsch@suse.de
+- pixman.diff
+  * fixed include path for pixman.h
+* Thu Nov 29 2007 - sndirsch@suse.de
+- remove_bogus_modeline.diff
+  * remove bogus monitor modelines provided by DDC (Bug #335540)
 * Tue Nov 27 2007 - sndirsch@suse.de
 - commit-184e571.diff
   * Adjust offsets of modes that do not fit virtual screen size.