pool/xorg-x11-server
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=59

Browse Source
This commit is contained in:
OBS User unknown 2007-12-06 00:45:28 +00:00 committed by Git OBS Bridge
parent 831e6c1707
commit f407e0b60d
4 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pixman.diff Normal file
View File

@ -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;

17
remove_bogus_modeline.diff Normal file
View File

@ -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. */

12
xorg-x11-server.changes
View File

@ -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

12
xorg-x11-server.spec
View File

@ -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.