- fix IDLETIME

- rel 2

Changed files:
    xorg-xserver-server-idletime.patch -> 1.1
    xorg-xserver-server.spec -> 1.193

diff --git a/xorg-xserver-server-idletime.patch b/xorg-xserver-server-idletime.patch
new file mode 100644 (file)
index 0000000..273f298
--- /dev/null
+++ b/xorg-xserver-server-idletime.patch
@@ -0,0 +1,69 @@
+From db568f9eabf3450d8a023597ff007df355b13ea8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@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@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

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 4047c8c6bb2985f90fb22f84edf5b9dee348d0d8..300670377abf7166beb2153a90b65547dbcffc1c 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -18,7 +18,7 @@ Summary:      X.org server
 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
@@ -31,6 +31,7 @@ Patch3:               %{name}-exa.patch
 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
@@ -327,6 +328,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %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