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

[Laurent Carlier]

    Date: Tuesday, November 10, 2015 @ 20:25:12
  Author: lcarlier
Revision: 250559

upgpkg: xf86-input-libinput 0.15.0-2

xorg 1.18 rebuild, now provides xf86-input-driver

Modified:
  xf86-input-libinput/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-10 18:52:02 UTC (rev 250558)
+++ PKGBUILD	2015-11-10 19:25:12 UTC (rev 250559)
@@ -3,29 +3,21 @@
 
 pkgname=xf86-input-libinput
 pkgver=0.15.0
-pkgrel=1
+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')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=22.1' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+provides=('xf86-input-driver')
+conflicts=('xorg-server<1.18.0' 'X-ABI-XINPUT_VERSION<22' 'X-ABI-XINPUT_VERSION>=23')
 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)
+source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('28707c504194648b11a1e26acf13039b60bf344efa6aa9788afed6d47f019a41'
-            'SKIP'
-            'e76d54a6d077c20069b99182f174b0f95a8668ba511e6e5d1b8a498dc6b6d96b')
+            'SKIP')
 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}
 
@@ -42,4 +34,3 @@
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-