[arch-commits] Commit in xf86-input-libinput/repos (10 files)
Laurent Carlier
lcarlier at archlinux.org
Fri Sep 4 18:06:40 UTC 2015
Date: Friday, September 4, 2015 @ 20:06:40
Author: lcarlier
Revision: 245300
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xf86-input-libinput/repos/extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
(from rev 245299, xf86-input-libinput/trunk/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
xf86-input-libinput/repos/extra-i686/90-libinput.conf
(from rev 245299, xf86-input-libinput/trunk/90-libinput.conf)
xf86-input-libinput/repos/extra-i686/PKGBUILD
(from rev 245299, xf86-input-libinput/trunk/PKGBUILD)
xf86-input-libinput/repos/extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
(from rev 245299, xf86-input-libinput/trunk/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
xf86-input-libinput/repos/extra-x86_64/90-libinput.conf
(from rev 245299, xf86-input-libinput/trunk/90-libinput.conf)
xf86-input-libinput/repos/extra-x86_64/PKGBUILD
(from rev 245299, xf86-input-libinput/trunk/PKGBUILD)
Deleted:
xf86-input-libinput/repos/extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
xf86-input-libinput/repos/extra-i686/PKGBUILD
xf86-input-libinput/repos/extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
xf86-input-libinput/repos/extra-x86_64/PKGBUILD
------------------------------------------------------------------------+
/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch | 54 +++++
/PKGBUILD | 96 ++++++++++
extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch | 27 --
extra-i686/90-libinput.conf | 30 +++
extra-i686/PKGBUILD | 46 ----
extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch | 27 --
extra-x86_64/90-libinput.conf | 30 +++
extra-x86_64/PKGBUILD | 46 ----
8 files changed, 210 insertions(+), 146 deletions(-)
Deleted: extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
===================================================================
--- extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:31 UTC (rev 245299)
+++ extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:40 UTC (rev 245300)
@@ -1,27 +0,0 @@
-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/xf86libinput.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/xf86libinput.c
-+++ b/src/xf86libinput.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
-
Copied: xf86-input-libinput/repos/extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch (from rev 245299, xf86-input-libinput/trunk/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
===================================================================
--- extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch (rev 0)
+++ extra-i686/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:40 UTC (rev 245300)
@@ -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/xf86libinput.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/xf86libinput.c
++++ b/src/xf86libinput.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
+
Copied: xf86-input-libinput/repos/extra-i686/90-libinput.conf (from rev 245299, xf86-input-libinput/trunk/90-libinput.conf)
===================================================================
--- extra-i686/90-libinput.conf (rev 0)
+++ extra-i686/90-libinput.conf 2015-09-04 18:06:40 UTC (rev 245300)
@@ -0,0 +1,30 @@
+# Match on all types of devices but tablet devices and joysticks
+
+Section "InputClass"
+ Identifier "libinput pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-04 18:06:31 UTC (rev 245299)
+++ extra-i686/PKGBUILD 2015-09-04 18:06:40 UTC (rev 245300)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-
-pkgname=xf86-input-libinput
-pkgver=0.14.0
-pkgrel=2
-pkgdesc="Generic input driver for the X.Org server based on libinput"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libinput')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-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}
- 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
-sha256sums=('e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265'
- 'SKIP'
- 'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # FS#45229 - not merged upstream
- patch -Np1 -i../0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
- install -m644 conf/99-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/90-libinput.conf"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
Copied: xf86-input-libinput/repos/extra-i686/PKGBUILD (from rev 245299, xf86-input-libinput/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-04 18:06:40 UTC (rev 245300)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+
+pkgname=xf86-input-libinput
+pkgver=0.14.0
+pkgrel=3
+pkgdesc="Generic input driver for the X.Org server based on libinput"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libinput')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+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
+ 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
+sha256sums=('e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265'
+ 'SKIP'
+ 'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75'
+ 'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # FS#45229 - not merged upstream
+ patch -Np1 -i../0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
+ install -m644 ${srcdir}/90-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
Deleted: extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
===================================================================
--- extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:31 UTC (rev 245299)
+++ extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:40 UTC (rev 245300)
@@ -1,27 +0,0 @@
-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/xf86libinput.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/xf86libinput.c
-+++ b/src/xf86libinput.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
-
Copied: xf86-input-libinput/repos/extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch (from rev 245299, xf86-input-libinput/trunk/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
===================================================================
--- extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch (rev 0)
+++ extra-x86_64/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch 2015-09-04 18:06:40 UTC (rev 245300)
@@ -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/xf86libinput.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/xf86libinput.c
++++ b/src/xf86libinput.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
+
Copied: xf86-input-libinput/repos/extra-x86_64/90-libinput.conf (from rev 245299, xf86-input-libinput/trunk/90-libinput.conf)
===================================================================
--- extra-x86_64/90-libinput.conf (rev 0)
+++ extra-x86_64/90-libinput.conf 2015-09-04 18:06:40 UTC (rev 245300)
@@ -0,0 +1,30 @@
+# Match on all types of devices but tablet devices and joysticks
+
+Section "InputClass"
+ Identifier "libinput pointer catchall"
+ MatchIsPointer "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
+Section "InputClass"
+ Identifier "libinput touchscreen catchall"
+ MatchIsTouchscreen "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+EndSection
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-04 18:06:31 UTC (rev 245299)
+++ extra-x86_64/PKGBUILD 2015-09-04 18:06:40 UTC (rev 245300)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-
-pkgname=xf86-input-libinput
-pkgver=0.14.0
-pkgrel=2
-pkgdesc="Generic input driver for the X.Org server based on libinput"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libinput')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-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}
- 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
-sha256sums=('e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265'
- 'SKIP'
- 'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # FS#45229 - not merged upstream
- patch -Np1 -i../0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
- install -m644 conf/99-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/90-libinput.conf"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
Copied: xf86-input-libinput/repos/extra-x86_64/PKGBUILD (from rev 245299, xf86-input-libinput/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-04 18:06:40 UTC (rev 245300)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+
+pkgname=xf86-input-libinput
+pkgver=0.14.0
+pkgrel=3
+pkgdesc="Generic input driver for the X.Org server based on libinput"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libinput')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=21.1' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+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
+ 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch)
+sha256sums=('e8d05798a556e5ea0d9f1823bb632e425487e8bcf89711ed93b079bbee742265'
+ 'SKIP'
+ 'd4a728caadb7924852dcdc0da4de950c6fb9ebd8999d4e3af3d0baaa51cd0e75'
+ 'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
+validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office at who-t.net>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # FS#45229 - not merged upstream
+ patch -Np1 -i../0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
+ install -m644 ${srcdir}/90-libinput.conf "${pkgdir}/usr/share/X11/xorg.conf.d/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
+
More information about the arch-commits
mailing list