[xorg-x11-server/f15] xserver 1.10.4
Adam Jackson
ajax at fedoraproject.org
Wed Sep 7 16:07:26 UTC 2011
commit 6440728ff412f312bff70e72399c02dc11a51370
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Sep 7 12:07:10 2011 -0400
xserver 1.10.4
.gitignore | 1 +
sources | 2 +-
xorg-x11-server.spec | 7 ++++---
xserver-1.10-pointer-barriers.patch | 33 +++++++++++++++++----------------
4 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32c48b3..6a18fdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.10.1.tar.bz2
/xorg-server-1.10.2.tar.bz2
/xorg-server-1.10.3.tar.bz2
+/xorg-server-1.10.4.tar.bz2
diff --git a/sources b/sources
index ab62917..d9155d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc1bb18a09244cd43a998625a6a1b071 xorg-server-1.10.3.tar.bz2
+94f23d30a77d63e27dd209a57fccfebf xorg-server-1.10.4.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8c7c5fb..2f4cbbd 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -29,7 +29,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.10.3
+Version: 1.10.4
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
@@ -89,8 +89,6 @@ Patch7009: xserver-1.10-bg-none-revert.patch
# not like the upstream patch due to refactoring
Patch7011: xserver-1.10-swrastg.patch
-# sent upstream, should be in soon
-Patch7012: xserver-1.10-dix-only-transform-valuators-when-we-need-them.patch
# ditto
Patch7013: xserver-1.10.1-memcpy-abuse.patch
@@ -561,6 +559,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
+* Wed Sep 07 2011 Adam Jackson <ajax at redhat.com> 1.10.4-1
+- xserver 1.10.4
+
* Mon Jul 11 2011 Adam Jackson <ajax at redhat.com> 1.10.3-1
- xserver 1.10.3
- xserver-1.10.1-fix-bg-set-crash.patch: drop, c5b72fd3
diff --git a/xserver-1.10-pointer-barriers.patch b/xserver-1.10-pointer-barriers.patch
index 0995654..d56f04e 100644
--- a/xserver-1.10-pointer-barriers.patch
+++ b/xserver-1.10-pointer-barriers.patch
@@ -1,8 +1,9 @@
-From 14f1112bec18ccece8e732fe6c200a56546230c7 Mon Sep 17 00:00:00 2001
+From 9a5ab9f00351de63b17bb4e7da1f7220eaadbb6b Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
-Date: Thu, 17 Mar 2011 13:56:17 -0400
+Date: Wed, 7 Sep 2011 11:23:33 -0400
Subject: [PATCH] CRTC confine and pointer barriers
+Signed-off-by: Adam Jackson <ajax at redhat.com>
---
dix/events.c | 7 +
dix/getevents.c | 12 +-
@@ -21,7 +22,7 @@ Subject: [PATCH] CRTC confine and pointer barriers
14 files changed, 658 insertions(+), 16 deletions(-)
diff --git a/dix/events.c b/dix/events.c
-index 07f8b05..d2be84f 100644
+index eefcdef..e714b36 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -328,6 +328,13 @@ IsMaster(DeviceIntPtr dev)
@@ -39,10 +40,10 @@ index 07f8b05..d2be84f 100644
* Max event opcode.
*/
diff --git a/dix/getevents.c b/dix/getevents.c
-index 794df42..c66e516 100644
+index 99a751e..0ab5399 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
-@@ -812,7 +812,11 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
+@@ -816,7 +816,11 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
* miPointerSetPosition() and then scale back into device coordinates (if
* needed). miPSP will change x/y if the screen was crossed.
*
@@ -54,7 +55,7 @@ index 794df42..c66e516 100644
* @param x Pointer to current x-axis value, may be modified.
* @param y Pointer to current y-axis value, may be modified.
* @param x_frac Fractional part of current x-axis value, may be modified.
-@@ -824,7 +828,8 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
+@@ -828,7 +832,8 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms)
* @param screeny_frac Fractional part of screen y coordinate, as above.
*/
static void
@@ -64,7 +65,7 @@ index 794df42..c66e516 100644
ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac)
{
int old_screenx, old_screeny;
-@@ -863,7 +868,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,
+@@ -867,7 +872,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac,
old_screeny = *screeny;
/* This takes care of crossing screens for us, as well as clipping
* to the current screen. */
@@ -73,9 +74,9 @@ index 794df42..c66e516 100644
if (dev->u.master) {
dev->u.master->last.valuators[0] = *screenx;
-@@ -1193,7 +1198,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
-
- set_raw_valuators(raw, &mask, raw->valuators.data);
+@@ -1202,7 +1207,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
+ if ((flags & POINTER_NORAW) == 0)
+ set_raw_valuators(raw, &mask, raw->valuators.data);
- positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac);
+ positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
@@ -109,7 +110,7 @@ index 1d33bdd..1dc66ad 100644
/* X Input */
diff --git a/mi/mipointer.c b/mi/mipointer.c
-index 554397a..85f1949 100644
+index bfe9754..867c660 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -229,6 +229,10 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
@@ -132,7 +133,7 @@ index 554397a..85f1949 100644
{
miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen;
-@@ -529,6 +533,9 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
+@@ -528,6 +532,9 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
if (*y >= pPointer->limits.y2)
*y = pPointer->limits.y2 - 1;
@@ -142,7 +143,7 @@ index 554397a..85f1949 100644
if (pPointer->x == *x && pPointer->y == *y &&
pPointer->pScreen == pScreen)
return;
-@@ -536,6 +543,13 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
+@@ -535,6 +542,13 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
miPointerMoveNoEvent(pDev, pScreen, *x, *y);
}
@@ -209,7 +210,7 @@ index 7ea6080..d8dd37d 100644
extern _X_EXPORT Bool
RRClientKnowsRates (ClientPtr pClient);
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
-index 98206a2..d4d8f2a 100644
+index 31c9510..0437795 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -1,5 +1,6 @@
@@ -914,7 +915,7 @@ index fb608f6..5c55c95 100644
}
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
-index e8c7bf1..a57884b 100644
+index e8c7bf1..de0e4db 100644
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -1,5 +1,6 @@
@@ -1050,5 +1051,5 @@ index d005369..6ba276e 100644
void PanoramiXFixesInit (void);
void PanoramiXFixesReset (void);
--
-1.7.4
+1.7.6
More information about the scm-commits
mailing list