rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.348, 1.349 xserver-1.5.0-projector-fb-size.patch, 1.1, 1.2

[Soren Sandmann Pedersen]

Author: ssp

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29424

Modified Files:
	xorg-x11-server.spec xserver-1.5.0-projector-fb-size.patch 
Log Message:
Fix up the projector patch to key off of amount of video ram


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- xorg-x11-server.spec	11 Sep 2008 13:31:53 -0000	1.348
+++ xorg-x11-server.spec	11 Sep 2008 14:51:35 -0000	1.349
@@ -500,6 +500,9 @@
 
 %changelog
 * Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
+- Change the external monitor patch to base off of amount of video ram.
+
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-3
 - Change the default screen limits to include room for a 1280 wide
   projector.
 

xserver-1.5.0-projector-fb-size.patch:

Index: xserver-1.5.0-projector-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.5.0-projector-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 13:31:53 -0000	1.1
+++ xserver-1.5.0-projector-fb-size.patch	11 Sep 2008 14:51:35 -0000	1.2
@@ -1,22 +1,29 @@
-From ef49675e8d7dc829032bf6e586d55f9985d06844 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x at fedoraproject.org>
-Date: Thu, 11 Sep 2008 09:25:18 -0400
-Subject: [PATCH] Make room for a 1280 wide projector in the default screen limits
+From ff21ec16fc05cc5fd0d60e466b7175fb2a33f8d2 Mon Sep 17 00:00:00 2001
+From: Soren Sandmann <sandmann at redhat.com>
+Date: Thu, 11 Sep 2008 10:47:03 -0400
+Subject: [PATCH] Make room for an external monitor if we have enough video ram
 
 ---
- hw/xfree86/modes/xf86Crtc.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ hw/xfree86/modes/xf86Crtc.c |    9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4de7e05..ee7e412 100644
+index 4de7e05..afb70a7 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -987,6 +987,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
+@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
  	if (crtc_height > height)
  	    height = crtc_height;
      }
-+    /* Make room for a projector */
-+    width += 1280;
++
++    /* Make room for an external monitor if we have enough video ram */
++    if (scrn->VideoRam >= 65536)
++        width += 1920;
++    else if (scrn->VideoRam >= 32768)
++        width += 1280;
++    else if (scrn->VideoRam >= 16384)
++        width += 1024;
++    
      if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
      if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
      if (config->minWidth && width < config->minWidth) width = config->minWidth;