[arch-commits] Commit in xf86-video-sis/trunk (PKGBUILD Xi.patch)

[Andreas Radke]

    Date: Sunday, March 10, 2013 @ 14:02:35
  Author: andyrtr
Revision: 179850

upgpkg: xf86-video-sis 0.10.7-4

rebuild for new X-ABI-VIDEODRV_VERSION=14; add a build fix

Added:
  xf86-video-sis/trunk/Xi.patch
Modified:
  xf86-video-sis/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++++---
 Xi.patch |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-10 13:01:58 UTC (rev 179849)
+++ PKGBUILD	2013-03-10 13:02:35 UTC (rev 179850)
@@ -12,19 +12,22 @@
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('sis-dri: DRI1 support from community repo')
-options=('!libtool' '!makeflags')
+options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
-	git-fixes.patch)
+	git-fixes.patch
+	Xi.patch)
 sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
             '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b'
-            '7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217')
+            '7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217'
+            '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
   patch -Np1 -i ${srcdir}/git-fixes.patch
+  patch -Np1 -i ${srcdir}/Xi.patch
   ./configure --prefix=/usr
   make
 }

Added: Xi.patch
===================================================================
--- Xi.patch	                        (rev 0)
+++ Xi.patch	2013-03-10 13:02:35 UTC (rev 179850)
@@ -0,0 +1,19 @@
+--- xf86-video-sis-0.10.7/src/sis_driver.c	2013-03-10 13:57:50.000000000 +0100
++++ xf86-video-sis-0.10.7/src/sis_driver.c.new	2013-03-10 13:54:48.645203559 +0100
+@@ -9378,7 +9378,15 @@
+      }
+      if(doit) {
+ 	sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
++                NULL, NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);