- up to 1.13.1 rc1

diff --git a/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/0001-dix-fix-zaphod-screen-scrossing-54654.patch
deleted file mode 100644 (file)
index e3e42d4..0000000
--- a/0001-dix-fix-zaphod-screen-scrossing-54654.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 15:11:31 +1000
-Subject: [PATCH] dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
--- 
-1.7.11.7
-

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 6607f48bff5f0d051ad8cee9b76cf40378c34ed9..3443272233842f16e211d5e9b2b04daf1337d458 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -15,7 +15,7 @@
 %define        xorg_xserver_server_ansic_abi           0.4
 %define        xorg_xserver_server_extension_abi       7.0
 %define        xorg_xserver_server_font_abi            0.6
-%define        xorg_xserver_server_videodrv_abi        13.0
+%define        xorg_xserver_server_videodrv_abi        13.1
 %define        xorg_xserver_server_xinput_abi          18.0
 #
 %define        pixman_ver      0.28.0
@@ -23,12 +23,12 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.13.0
-Release:       4
+Version:       1.13.0.901
+Release:       0.1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: bde3d178b756597d2ec2a19ef60d2e1f
+# Source0-md5: 8da850ca5d6f6aab8c620abb0ad21675
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
@@ -41,8 +41,6 @@ Patch4:               %{name}-builtin-SHA1.patch
 Patch5:                %{name}-export-GetMaster.patch
 Patch6:                110_nvidia_slowdow_fix.patch
 Patch7:                %{name}-include-defs.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=54654
-Patch8:                0001-dix-fix-zaphod-screen-scrossing-54654.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel >= 7.8.1
 # for glx headers
@@ -367,8 +365,6 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 #unfortunately breaks build
 #patch7 -p1
 
-%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