[arch-commits] Commit in xf86-input-libinput/trunk (2 files)

Laurent Carlier lcarlier at archlinux.org
Mon Jul 13 13:09:59 UTC 2015


    Date: Monday, July 13, 2015 @ 15:09:59
  Author: lcarlier
Revision: 242163

upgpkg: xf86-input-libinput 0.11.0-3

add a fix from Fedora for FS#45229

Added:
  xf86-input-libinput/trunk/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
Modified:
  xf86-input-libinput/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch |   27 ++++++++++++
 PKGBUILD                                                  |   16 +++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

Added: 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
===================================================================
--- 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch	                        (rev 0)
+++ 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch	2015-07-13 13:09:59 UTC (rev 242163)
@@ -0,0 +1,27 @@
+From cf8b629ebf30d6aa57dd405ce450fb0f33136626 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Mon, 13 Jul 2015 08:30:43 +1000
+Subject: [PATCH xf86-input-libinput] Fedora: use unaccelerated vmask on input
+ ABI > 21
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/libinput.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libinput.c b/src/libinput.c
+index a06e44f..5eb5adf 100644
+--- a/src/libinput.c
++++ b/src/libinput.c
+@@ -47,7 +47,7 @@
+ #define XI86_SERVER_FD 0x20
+ #endif
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 + GET_ABI_MINOR(ABI_XINPUT_VERSION) > 22000
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 + GET_ABI_MINOR(ABI_XINPUT_VERSION) > 21000
+ #define HAVE_VMASK_UNACCEL 1
+ #else
+ #undef HAVE_VMASK_UNACCEL
+--
+2.4.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-13 04:29:36 UTC (rev 242162)
+++ PKGBUILD	2015-07-13 13:09:59 UTC (rev 242163)
@@ -3,7 +3,7 @@
 
 pkgname=xf86-input-libinput
 pkgver=0.11.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Generic input driver for the X.Org server based on libinput"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,14 +13,24 @@
 conflicts=('xorg-server<1.16' 'X-ABI-XINPUT_VERSION<21.1' 'X-ABI-XINPUT_VERSION>=22')
 groups=('xorg-drivers' 'xorg')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        90-libinput.conf)
+        90-libinput.conf
+        0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
 sha256sums=('56babf46c13d15fbd15c9d43815e9220e63acd9ed28095e7d68ad03f9148bbda'
             'SKIP'
-            'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75')
+            'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75'
+            'd7cf26243c2dca5628ab154a45c2aab6135899aec22dc2f8d02c70731fdde319')
 validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # FS#45229
+  patch -Np1 -i../0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
+
   ./configure --prefix=/usr --disable-static
   make
 }



More information about the arch-commits mailing list