[arch-commits] Commit in xorg-server/trunk (PKGBUILD bug30267.patch)

[Jan de Groot]

    Date: Wednesday, October 13, 2010 @ 17:12:44
  Author: jgc
Revision: 95058

upgpkg: xorg-server 1.9.0.901-2
Add last patch from git, fixes mouse issues in SDL games

Added:
  xorg-server/trunk/bug30267.patch
Modified:
  xorg-server/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++++---
 bug30267.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-13 19:18:05 UTC (rev 95057)
+++ PKGBUILD	2010-10-13 21:12:44 UTC (rev 95058)
@@ -4,7 +4,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.9.0.901
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -14,12 +14,14 @@
         xorg-redhat-die-ugly-pattern-die-die-die.patch
         xvfb-run
         xvfb-run.1
-        10-quirks.conf)
+        10-quirks.conf
+        bug30267.patch)
 md5sums=('80b818d189226ad02b53acd81922c324'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
+         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
+         '39c303032537946ad953bb5e58a6b1f2')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -27,6 +29,8 @@
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
 
+  patch -Np1 -i "${srcdir}/bug30267.patch"
+
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \

Added: bug30267.patch
===================================================================
--- bug30267.patch	                        (rev 0)
+++ bug30267.patch	2010-10-13 21:12:44 UTC (rev 95058)
@@ -0,0 +1,34 @@
+From e5b19f14eac609e3c315e14e20ca1935de8de0e3 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed, 13 Oct 2010 00:42:55 +0000
+Subject: Revert "dix: don't create core motion events for non-x/y valuators."
+
+Reverting due to fallout discussed in bug #30267.  See:
+https://bugs.freedesktop.org/show_bug.cgi?id=30267
+
+This reverts commit d4ef63f602325a9920dc1cbf64e3969dfa394d5f.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+diff --git a/dix/eventconvert.c b/dix/eventconvert.c
+index 0f747c1..4e3de0b 100644
+--- a/dix/eventconvert.c
++++ b/dix/eventconvert.c
+@@ -102,15 +102,6 @@ EventToCore(InternalEvent *event, xEvent *core)
+     switch(event->any.type)
+     {
+         case ET_Motion:
+-            {
+-                DeviceEvent *e = &event->device_event;
+-                /* Don't create core motion event if neither x nor y are
+-                 * present */
+-                if (!BitIsOn(e->valuators.mask, 0) &&
+-                    !BitIsOn(e->valuators.mask, 1))
+-                    return BadMatch;
+-            }
+-            /* fallthrough */
+         case ET_ButtonPress:
+         case ET_ButtonRelease:
+         case ET_KeyPress:
+--
+cgit v0.8.3-6-g21f6