rpms/xorg-x11-server/F-11 xserver-1.6.3-sync-conditions.patch, NONE, 1.1 xorg-x11-server.spec, 1.455, 1.456

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.3-sync-conditions.patch 
Log Message:
* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-2
- xserver-1.6.3-sync-conditions.patch: Fix conditions when checking
  negative transition triggers in the sync extension (#501601)


xserver-1.6.3-sync-conditions.patch:
 sync.c |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

--- NEW FILE xserver-1.6.3-sync-conditions.patch ---
>From d6a3e574497b8f4855a0bb9e5c1eb3e1b6ebb770 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 13 Aug 2009 16:37:00 +1000
Subject: [PATCH] Xext: fix up wrong conditions for negative sync transitions.

If the counter had a value higher than the trigger value for a negative
transition, the trigger value did not get set.

The correct sequence of checks is:
if (positive transition)
   if (counter value < trigger value)
      set up trigger
if (negative transition)
   if (counter value > trigger value)
      set up trigger

Red Hat Bug 501601 <https://bugzilla.redhat.com/show_bug.cgi?id=501601>
---
 Xext/sync.c |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Xext/sync.c b/Xext/sync.c
index 5f4ce56..667f8ab 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -962,28 +962,24 @@ SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver)
 		pnewltval = &psci->bracket_less;
 	    }
 	}
-	else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+	else if (pTrigger->test_type == XSyncNegativeTransition &&
 		   ct != XSyncCounterNeverIncreases)
-		 ||
-		 (pTrigger->test_type == XSyncNegativeTransition &&
+	{
+	    if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+	    {
+		psci->bracket_less = pTrigger->test_value;
+		pnewltval = &psci->bracket_less;
+	    }
+	}
+        else if (pTrigger->test_type == XSyncPositiveTransition &&
 		  ct != XSyncCounterNeverDecreases)
-		 )
 	{
-	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+	    if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+		XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
 	    {
-		if (XSyncValueLessThan(pTrigger->test_value,
-				       psci->bracket_greater))
-		{
-		    psci->bracket_greater = pTrigger->test_value;
-		    pnewgtval = &psci->bracket_greater;
-		}
-		else
-		if (XSyncValueGreaterThan(pTrigger->test_value,
-					  psci->bracket_less))
-		{
-		    psci->bracket_less = pTrigger->test_value;
-		    pnewltval = &psci->bracket_less;
-		}
+		psci->bracket_greater = pTrigger->test_value;
+		pnewgtval = &psci->bracket_greater;
 	    }
 	}
     } /* end for each trigger */
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -p -r1.455 -r1.456
--- xorg-x11-server.spec	13 Aug 2009 07:04:14 -0000	1.455
+++ xorg-x11-server.spec	13 Aug 2009 21:56:11 -0000	1.456
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -111,6 +111,9 @@ Patch6046: xserver-1.6.1-fix-glx-drawabl
 # #510238, already upstream
 Patch6047: xserver-1.6.2-vboxvideo.patch
 
+# 501601, upstream, nominated for 1.6.4
+Patch6048: xserver-1.6.3-sync-conditions.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -527,6 +530,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-2
+- xserver-1.6.3-sync-conditions.patch: Fix conditions when checking
+  negative transition triggers in the sync extension (#501601)
+
 * Thu Aug 13 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.3-1
 - xserver 1.6.3
 - xserver-1.6.0-selinux-less.patch: Drop