Updated: PKGBUILD

2 files changed, 44 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51a357ecd0ca..4292843c387e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,29 @@
 pkgbase = xf86-input-evdev-git
-	pkgdesc = X.org evdev input driver - Git version
-	pkgver = 2.10.6.2.r685.g7103611
-	pkgrel = 1
-	url = https://cgit.freedesktop.org/xorg/driver/xf86-input-evdev/
+	pkgdesc = X.org evdev input driver (Git)
+	pkgver = 2.10.6.r2.g7103611
+	pkgrel = 2
+	url = https://xorg.freedesktop.org/
+	arch = i686
 	arch = x86_64
-	groups = xorg
-	groups = xorg-drivers
 	license = custom
 	makedepends = xorg-server-devel
-	makedepends = xorgproto-git
+	makedepends = X-ABI-XINPUT_VERSION=24.1
+	makedepends = xorgproto
 	makedepends = git
-	makedepends = libevdev
-	depends = glibc
-	depends = systemd
+	depends = systemd-libs
 	depends = mtdev
-	provides = xf86-input-evdev=2.10.6.2.r685.g7103611
-	provides = xf86-input-driver
-	conflicts = xorg-server<1.18.0
-	conflicts = X-ABI-XINPUT_VERSION<22
-	conflicts = xf86-input-evdev
-	options = !libtool
+	depends = libevdev
+	provides = xorg-xf86-input-evdev=2.10.6.r2.g7103611
+	provides = xorg-server
+	provides = X-ABI-XINPUT_VERSION
+	provides = X-ABI-XINPUT_VERSION
+	conflicts = xorg-server<1.19.0
+	conflicts = X-ABI-XINPUT_VERSION<24.1
+	conflicts = X-ABI-XINPUT_VERSION>=25
+	conflicts = xorg-xf86-input-evdev
 	options = !makeflags
-	source = git://anongit.freedesktop.org/xorg/driver/xf86-input-evdev
-	md5sums = SKIP
+	source = git+https://github.com/freedesktop/xorg-xf86-input-evdev.git
+	sha512sums = SKIP
 
 pkgname = xf86-input-evdev-git
 
diff --git a/PKGBUILD b/PKGBUILD
index adbee4d24862..a39ba2c16cc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,42 @@
-# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Maintainer:
+# Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: Det <nimetonmaili g-mail>
 # Contributor: <Eugeny Borisov flekst@gmail.com>
 # Based on [extra]'s xf86-input-evdev: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/xf86-input-evdev
 
-_pkgname=xf86-input-evdev
-pkgname=$_pkgname-git
-pkgver=2.10.6.2.r685.g7103611
-pkgrel=1
-pkgdesc="X.org evdev input driver - Git version"
-arch=('x86_64')
-url="https://cgit.freedesktop.org/xorg/driver/$_pkgname/"
+_pkgname=xorg-xf86-input-evdev
+pkgname=xf86-input-evdev-git
+pkgver=2.10.6.r2.g7103611
+pkgrel=2
+pkgdesc="X.org evdev input driver (Git)"
+arch=('i686' 'x86_64')
+url="https://xorg.freedesktop.org/"
 license=('custom')
-groups=('xorg' 'xorg-drivers')
-depends=('glibc' 'systemd' 'mtdev')
-makedepends=('xorg-server-devel' 'xorgproto-git' 'git' 'libevdev')
-provides=("$_pkgname=$pkgver" 'xf86-input-driver')
-conflicts=('xorg-server<1.18.0' 'X-ABI-XINPUT_VERSION<22' "$_pkgname")
-options=('!libtool' '!makeflags')
-source=("git://anongit.freedesktop.org/xorg/driver/$_pkgname")
-md5sums=('SKIP')
+depends=('systemd-libs' 'mtdev' 'libevdev')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=24.1' 'xorgproto' 'git')
+provides=("$_pkgname=$pkgver" 'xorg-server' 'X-ABI-XINPUT_VERSION' 'X-ABI-XINPUT_VERSION')
+conflicts=('xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<24.1' 'X-ABI-XINPUT_VERSION>=25' "$_pkgname")
+options=('!makeflags')
+source=("git+https://github.com/freedesktop/xorg-xf86-input-evdev.git")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
-  echo $(git describe --long | cut -d "-" -f4-5 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f6)
+  cd $srcdir/$_pkgname
+  # cutting off 'xf86.input.evdev.' prefix that presents in the git tag
+  git describe --long | sed 's/^xf86.input.evdev.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd $_pkgname
-
-  msg2 "Starting autogen.sh..."
+  cd $srcdir/$_pkgname
   ./autogen.sh --prefix=/usr
-
-  msg2 "Starting make..."
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $_pkgname
-
-  msg2 "Starting make install..."
-  make DESTDIR="$pkgdir" install
+  cd $srcdir/$_pkgname
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/"
 
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
 }