missed a patch

This commit is contained in:
Adam Jackson 2007-03-05 22:51:57 +00:00
parent 0f2c2e4f40
commit 708d7faf98
2 changed files with 17 additions and 0 deletions

View File

@ -51,6 +51,7 @@ Patch1009: xorg-x11-server-1.2.0-maxpixclock-option.patch
Patch2001: xserver-1.2.0-geode-mmx.patch
Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch
Patch2003: xserver-1.2.0-vfprintf.patch
Patch2004: xserver-1.2.0-honor-displaysize.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@ -270,6 +271,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch2001 -p1 -b .geode-mmx
%patch2002 -p1 -b .xephyr-keysym
%patch2003 -p1 -b .vfprintf
%patch2004 -p1 -b .displaysize
%build

View File

@ -0,0 +1,15 @@
--- xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c.jx 2007-02-26 13:39:00.000000000 -0500
+++ xorg-server-1.2.0/hw/xfree86/ddc/ddcProperty.c 2007-02-26 14:37:33.000000000 -0500
@@ -313,8 +313,10 @@
preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
- Monitor->widthmm = 10 * DDC->features.hsize;
- Monitor->heightmm = 10 * DDC->features.vsize;
+ if (Monitor->widthmm <= 0 && Monitor->heightmm <= 0) {
+ Monitor->widthmm = 10 * DDC->features.hsize;
+ Monitor->heightmm = 10 * DDC->features.vsize;
+ }
/* If this is a digital display, then we can use reduced blanking */
if (DDC->features.input_type)