rpms/xorg-x11-drv-vmware/F-12 vmware-10.16.7-default-mode.patch, NONE, 1.1 xorg-x11-drv-vmware.spec, 1.26, 1.27

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vmware/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26110

Modified Files:
	xorg-x11-drv-vmware.spec 
Added Files:
	vmware-10.16.7-default-mode.patch 
Log Message:
* Wed Nov 18 2009 Adam Jackson <ajax at redhat.com> 10.16.7-3
- vmware-10.16.7-default-mode.patch: Default to 1024x768 like qemu cirrus.


vmware-10.16.7-default-mode.patch:
 vmware.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

--- NEW FILE vmware-10.16.7-default-mode.patch ---
diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
--- xf86-video-vmware-10.16.7/src/vmware.c.jx	2009-11-18 15:23:15.000000000 -0500
+++ xf86-video-vmware-10.16.7/src/vmware.c	2009-11-18 15:31:34.969278575 -0500
@@ -932,6 +932,17 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
      */
     vmwareGetSupportedModelines(&pScrn->monitor->Modes);
 
+    /* default mode hack */
+    if (!pScrn->monitor->nHsync && !pScrn->monitor->nVrefresh) {
+	pScrn->monitor->nHsync = 1;
+	pScrn->monitor->hsync[0].lo = 31.5;
+	pScrn->monitor->hsync[0].hi = 48.0;
+	pScrn->monitor->nVrefresh = 1;
+	pScrn->monitor->vrefresh[0].lo = 56.0;
+	pScrn->monitor->vrefresh[0].hi = 60.1;
+	/* pScrn->monitor->maxPixClock = 65000; */
+    }
+
     i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, pScrn->display->modes,
                           clockRanges, NULL, 256, pVMWARE->maxWidth, 32 * 32,
                           128, pVMWARE->maxHeight,


Index: xorg-x11-drv-vmware.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmware/F-12/xorg-x11-drv-vmware.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xorg-x11-drv-vmware.spec	7 Aug 2009 20:26:30 -0000	1.26
+++ xorg-x11-drv-vmware.spec	18 Nov 2009 20:37:59 -0000	1.27
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 vmware video driver
 Name:	    xorg-x11-drv-vmware
 Version:    10.16.7
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -15,6 +15,7 @@ Source0:   ftp://ftp.x.org/pub/individua
 Source1:    vmware.xinf
 Patch0: abi.patch
 Patch1: abi2.patch
+Patch2: vmware-10.16.7-default-mode.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -33,6 +34,7 @@ X.Org X11 vmware video driver.
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .abi
 %patch1 -p1 -b .abi2
+%patch2 -p1 -b .default-mode
 
 %build
 %if 0%{?gitdate}
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vmware.4*
 
 %changelog
+* Wed Nov 18 2009 Adam Jackson <ajax at redhat.com> 10.16.7-3
+- vmware-10.16.7-default-mode.patch: Default to 1024x768 like qemu cirrus.
+
 * Fri Aug 07 2009 Adam Jackson <ajax at redhat.com> 10.16.7-2
 - fix for symbol list removal.