rpms/xorg-x11-drv-vesa/F-9 vesa-1.9-mode-heuristics.patch, 1.1, 1.2 xorg-x11-drv-vesa.spec, 1.33, 1.34

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7060

Modified Files:
	vesa-1.9-mode-heuristics.patch xorg-x11-drv-vesa.spec 
Log Message:
* Fri May 09 2008 Adam Jackson <ajax at redhat.com> 1.3.0-16.20080404
- vesa-1.9-mode-heuristics.patch: Use the mode selection heuristic on all
  device probe paths.


vesa-1.9-mode-heuristics.patch:

Index: vesa-1.9-mode-heuristics.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/vesa-1.9-mode-heuristics.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vesa-1.9-mode-heuristics.patch	13 Nov 2007 23:31:57 -0000	1.1
+++ vesa-1.9-mode-heuristics.patch	9 May 2008 17:50:32 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up xf86-video-vesa-20071113/src/vesa.c.mode-heuristics xf86-video-vesa-20071113/src/vesa.c
---- xf86-video-vesa-20071113/src/vesa.c.mode-heuristics	2007-11-13 18:02:17.000000000 -0500
-+++ xf86-video-vesa-20071113/src/vesa.c	2007-11-13 18:27:47.000000000 -0500
+diff -up xf86-video-vesa-20080404/src/vesa.c.mode-heuristics xf86-video-vesa-20080404/src/vesa.c
+--- xf86-video-vesa-20080404/src/vesa.c.mode-heuristics	2008-04-04 14:26:14.000000000 -0400
++++ xf86-video-vesa-20080404/src/vesa.c	2008-05-09 13:42:18.000000000 -0400
 @@ -296,6 +296,88 @@ VESAIdentify(int flags)
      xf86PrintChipsets(VESA_NAME, "driver for VESA chipsets", VESAChipsets);
  }
@@ -90,7 +90,15 @@
  /*
   * This function is called once, at the start of the first server generation to
   * do a minimal probe for supported hardware.
-@@ -373,6 +455,7 @@ VESAProbe(DriverPtr drv, int flags)
+@@ -320,6 +402,7 @@ VESAPciProbe(DriverPtr drv, int entity_n
+ 	pScrn->PreInit       = VESAPreInit;
+ 	pScrn->ScreenInit    = VESAScreenInit;
+ 	pScrn->SwitchMode    = VESASwitchMode;
++	pScrn->ValidMode     = VESAValidMode;
+ 	pScrn->AdjustFrame   = VESAAdjustFrame;
+ 	pScrn->EnterVT       = VESAEnterVT;
+ 	pScrn->LeaveVT       = VESALeaveVT;
+@@ -373,6 +456,7 @@ VESAProbe(DriverPtr drv, int flags)
  			pScrn->PreInit       = VESAPreInit;
  			pScrn->ScreenInit    = VESAScreenInit;
  			pScrn->SwitchMode    = VESASwitchMode;
@@ -98,7 +106,15 @@
  			pScrn->AdjustFrame   = VESAAdjustFrame;
  			pScrn->EnterVT       = VESAEnterVT;
  			pScrn->LeaveVT       = VESALeaveVT;
-@@ -447,15 +530,6 @@ VESAFindIsaDevice(GDevPtr dev)
+@@ -407,6 +491,7 @@ VESAProbe(DriverPtr drv, int flags)
+ 		pScrn->PreInit       = VESAPreInit;
+ 		pScrn->ScreenInit    = VESAScreenInit;
+ 		pScrn->SwitchMode    = VESASwitchMode;
++		pScrn->ValidMode     = VESAValidMode;
+ 		pScrn->AdjustFrame   = VESAAdjustFrame;
+ 		pScrn->EnterVT       = VESAEnterVT;
+ 		pScrn->LeaveVT       = VESALeaveVT;
+@@ -447,15 +532,6 @@ VESAFindIsaDevice(GDevPtr dev)
      return (int)CHIP_VESA_GENERIC;
  }
  
@@ -114,7 +130,7 @@
  static void
  VESAFreeRec(ScrnInfoPtr pScrn)
  {
-@@ -650,6 +724,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
+@@ -650,6 +726,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
  
      VBESetModeNames(pScrn->modePool);
  
@@ -122,7 +138,7 @@
      i = VBEValidateModes(pScrn, NULL, pScrn->display->modes, 
  			  NULL, NULL, 0, 2048, 1, 0, 2048,
  			  pScrn->display->virtualX,
-@@ -657,6 +732,20 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
+@@ -657,6 +734,20 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags
  			  pVesa->mapSize, LOOKUP_BEST_REFRESH);
  
      if (i <= 0) {
@@ -143,9 +159,9 @@
  	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes\n");
          vbeFree(pVesa->pVbe);
  	return (FALSE);
-diff -up xf86-video-vesa-20071113/src/vesa.h.mode-heuristics xf86-video-vesa-20071113/src/vesa.h
---- xf86-video-vesa-20071113/src/vesa.h.mode-heuristics	2007-11-13 18:02:17.000000000 -0500
-+++ xf86-video-vesa-20071113/src/vesa.h	2007-11-13 18:28:23.000000000 -0500
+diff -up xf86-video-vesa-20080404/src/vesa.h.mode-heuristics xf86-video-vesa-20080404/src/vesa.h
+--- xf86-video-vesa-20080404/src/vesa.h.mode-heuristics	2008-04-04 14:26:14.000000000 -0400
++++ xf86-video-vesa-20080404/src/vesa.h	2008-05-09 13:41:30.000000000 -0400
 @@ -116,7 +116,7 @@ typedef struct _VESARec
      CARD32 *pal, *savedPal;
      CARD8 *fonts;


Index: xorg-x11-drv-vesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vesa/F-9/xorg-x11-drv-vesa.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-vesa.spec	29 Apr 2008 18:00:11 -0000	1.33
+++ xorg-x11-drv-vesa.spec	9 May 2008 17:50:32 -0000	1.34
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 vesa video driver
 Name:      xorg-x11-drv-vesa
 Version:   1.3.0
-Release:   15.%{gitdate}%{?dist}
+Release:   16.%{gitdate}%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{gitdate}.tar.bz2
 License: MIT
@@ -60,6 +60,10 @@
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Fri May 09 2008 Adam Jackson <ajax at redhat.com> 1.3.0-16.20080404
+- vesa-1.9-mode-heuristics.patch: Use the mode selection heuristic on all
+  device probe paths.
+
 * Tue Apr 29 2008 Adam Jackson <ajax at redhat.com> 1.3.0-15.20080404
 - vesa-1.9-32bpp-dammit.patch: Prefer 24+32 instead of 24+24. (#427383)