- up to 1.12.1 (patch6 - 110_nvidia_slowdow_fix.patch is back, seems to be still...

Changed files:
    110_nvidia_slowdow_fix.patch -> 1.2
    xorg-xserver-server.spec -> 1.308

diff --git a/110_nvidia_slowdow_fix.patch b/110_nvidia_slowdow_fix.patch
index b9046c5cb88a9db33b742378d51ede9251f0e0d6..13e5aca48c5c756605fcc2e217042fcf33d63c92 100644 (file)
--- a/110_nvidia_slowdow_fix.patch
+++ b/110_nvidia_slowdow_fix.patch
@@ -81,15 +81,15 @@ diff -ru a/render/mipict.c b/render/mipict.c
  Bool
  miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
  {
-@@ -599,7 +660,7 @@
-     ps->Composite     = 0;                    /* requires DDX support */
-     ps->Glyphs                = miGlyphs;
-     ps->CompositeRects        = miCompositeRects;
--    ps->Trapezoids    = 0;
-+    ps->Trapezoids    = miTrapezoids;
-     ps->Triangles     = 0;
-     
-     ps->RasterizeTrapezoid = 0;                       /* requires DDX support */
+@@ -656,7 +656,7 @@
+     ps->Composite = 0;          /* requires DDX support */
+     ps->Glyphs = miGlyphs;
+     ps->CompositeRects = miCompositeRects;
+-    ps->Trapezoids = 0;
++    ps->Trapezoids = miTrapezoids;
+     ps->Triangles = 0;
+ 
+     ps->RasterizeTrapezoid = 0; /* requires DDX support */
 diff -ru a/render/mipict.h b/render/mipict.h
 --- a/render/mipict.h  2011-04-04 05:19:50.000000000 +0200
 +++ b/render/mipict.h  2011-10-05 22:06:19.000000000 +0200

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 33be630c83edebcdb93ec6cfc93fea308f47929d..af8f284c9accc81a4836ff83e3165507b7e331b6 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -23,12 +23,12 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.12.0.902
+Version:       1.12.1
 Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: edefadc81ab0af5116740bbf2504f850
+# Source0-md5: 20e73b422bda6f0d1405af676983cc70
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
@@ -369,9 +369,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-
-# is this finnaly solved in nvidia drivers?
-# %patch6 -p1
+%patch6 -p1
 
 #unfortunately breaks build
 #patch7 -p1