rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-vbe-filter-less.patch, NONE, 1.1 xorg-x11-server.spec, 1.172, 1.173

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29920

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-vbe-filter-less.patch 
Log Message:
* Fri Sep 22 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-41.fc6
- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting
  VESA modes early, since xf86ValidateModes should handle them just fine.


xorg-x11-server-1.1.1-vbe-filter-less.patch:
 vbeModes.c |   28 ----------------------------
 1 files changed, 28 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-vbe-filter-less.patch ---
--- xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c.jx	2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c	2006-09-22 15:29:34.000000000 -0400
@@ -153,34 +153,6 @@
 	xf86ErrorFVerb(DEBUG_VERB, "*");
     }
 
-    /*
-     * Check if there's a valid monitor mode that this one can be matched
-     * up with.  The actual matching is done later.
-     */
-    if (modeOK) {
-	Bool sizeMatch = FALSE;
-	modeOK = FALSE;
-	for (p = pScrn->monitor->Modes; p != NULL; p = p->next) {
-	    if ((p->HDisplay != mode->XResolution) ||
-		(p->VDisplay != mode->YResolution) ||
-		(p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2)))
-		continue;
-	    sizeMatch = TRUE;
-	    /* XXX could support the various V_ flags */
-	    status = xf86CheckModeForMonitor(p, pScrn->monitor);
-	    if (status == MODE_OK) {
-		modeOK = TRUE;
-		break;
-	    }
-	}
-	if (sizeMatch && !modeOK) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-		       "Not using built-in mode \"%dx%d\" (%s)\n",
-		        mode->XResolution, mode->YResolution,
-		        xf86ModeStatusToString(status));
-	}
-    }
-
     xf86ErrorFVerb(DEBUG_VERB,
 	    "Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution);
     xf86ErrorFVerb(DEBUG_VERB,


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- xorg-x11-server.spec	20 Sep 2006 22:50:54 -0000	1.172
+++ xorg-x11-server.spec	22 Sep 2006 21:53:42 -0000	1.173
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   40%{?dist}
+Release:   41%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -22,6 +22,7 @@
 Patch7:    xorg-x11-server-1.1.1-xkb-in-xnest.patch
 Patch8:    xorg-x11-server-1.1.1-xvfb-composite-crash.patch
 Patch9:	   xorg-x11-server-1.1.1-pclose-confusion.patch
+Patch10:   xorg-x11-server-1.1.1-vbe-filter-less.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -343,6 +344,7 @@
 %patch7 -p1 -b .xkb-in-xnest
 %patch8 -p1 -b .xvfb-render-fix
 %patch9 -p1 -b .pclose
+%patch10 -p1 -b .vbe-filter
 
 %patch100 -p0 -b .no-move-damage
 %patch101 -p0 -b .dont-backfill-bg-none
@@ -386,6 +388,7 @@
 %patch3016 -p1 -b .pci-paranoia
 %patch3017 -p1 -b .reduced-blanking
 
+
 %build
 #FONTDIR="${datadir}/X11/fonts"
 #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
@@ -714,6 +717,10 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Fri Sep 22 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-41.fc6
+- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting
+  VESA modes early, since xf86ValidateModes should handle them just fine.
+
 * Wed Sep 20 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-40.fc6
 - xorg-x11-server-1.1.1-pclose-confusion.patch: Be sure to call Pclose()
   on pipes created with Popen(), since the additional magic done by Popen()