rpms/xorg-x11-server/F-10 xorg-x11-server.spec, 1.383, 1.384 xserver-1.5.3-exa-fix-unneeded-copies.patch, 1.1, 1.2

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-server.spec 
	xserver-1.5.3-exa-fix-unneeded-copies.patch 
Log Message:
* Mon Nov 17 2008 Dave Airlie <airlied at redhat.com> 1.5.3-5
- xserver-1.5.3-exa-fix-unneeded-copies.patch: fix logic error



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -r1.383 -r1.384
--- xorg-x11-server.spec	17 Nov 2008 00:46:17 -0000	1.383
+++ xorg-x11-server.spec	17 Nov 2008 01:22:34 -0000	1.384
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -519,6 +519,9 @@
 
 
 %changelog
+* Mon Nov 17 2008 Dave Airlie <airlied at redhat.com> 1.5.3-5
+- xserver-1.5.3-exa-fix-unneeded-copies.patch: fix logic error
+
 * Mon Nov 17 2008 Dave Airlie <airlied at redhat.com> 1.5.3-4
 - xserver-1.5.3-exa-fix-unneeded-copies.patch: fix some unneeded calls to drivers
 

xserver-1.5.3-exa-fix-unneeded-copies.patch:

Index: xserver-1.5.3-exa-fix-unneeded-copies.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xserver-1.5.3-exa-fix-unneeded-copies.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.5.3-exa-fix-unneeded-copies.patch	17 Nov 2008 00:46:17 -0000	1.1
+++ xserver-1.5.3-exa-fix-unneeded-copies.patch	17 Nov 2008 01:22:34 -0000	1.2
@@ -44,7 +44,7 @@
  
 -		width = pBox[i].x2 - pBox[i].x1;
 -		height = min(pBox[i].y2 - dstY, tileHeight);
-+		if ((dstX < pBox[i].x2) && (dstY < pBox[i].y2))
++		if ((dstX < pBox[i].x2) || (dstY < pBox[i].y2))
 +		    more_copy = TRUE;
 +	    }
 +