packages: xorg-xserver-server/xorg-xserver-server.spec, xorg-xserver-server...

[patrys]

Author: patrys                       Date: Fri Aug 14 10:38:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix IDLETIME
- rel 2

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.192 -> 1.193) , xorg-xserver-server-idletime.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.192 packages/xorg-xserver-server/xorg-xserver-server.spec:1.193
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.192	Sat Aug  1 12:02:41 2009
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Fri Aug 14 12:38:01 2009
@@ -19,7 +19,7 @@
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
 Version:	1.6.3
-Release:	1%{?with_multigl:.mgl}
+Release:	2%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 Patch5:		%{name}-xinerama-cursors.patch
 Patch6:		%{name}-less-acpi-brokenness.patch
 Patch7:		%{name}-ac.patch
+Patch8:		%{name}-idletime.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.3
 # for glx headers
@@ -328,6 +329,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p0
+%patch8 -p1
 
 # xserver uses pixman-1 API/ABI so put that explictly here
 sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
@@ -536,6 +538,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.193  2009/08/14 10:38:01  patrys
+- fix IDLETIME
+- rel 2
+
 Revision 1.192  2009/08/01 10:02:41  arekm
 - up to 1.6.3
 

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-idletime.patch
diff -u /dev/null packages/xorg-xserver-server/xorg-xserver-server-idletime.patch:1.1
--- /dev/null	Fri Aug 14 12:38:07 2009
+++ packages/xorg-xserver-server/xorg-xserver-server-idletime.patch	Fri Aug 14 12:38:01 2009
@@ -0,0 +1,69 @@
+From db568f9eabf3450d8a023597ff007df355b13ea8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Thu, 13 Aug 2009 06:37:00 +0000
+Subject: 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>
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+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 */
+--
+cgit v0.8.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.192&r2=1.193&f=u