Update to 2.10.4-2

* Provides new xf86-input-evdev 2.10.4-1 ("xorg-server-1.19 rebuild")
* Still sources old ahm patch for 2.10.3, which works with offset

2 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a98615d33f67..fcb1932f9a0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,29 @@
 # Generated by mksrcinfo v8
-# Sat Oct  1 10:52:04 UTC 2016
+# Thu Jan 12 08:59:14 UTC 2017
 pkgbase = xf86-input-evdev-ahm
 	pkgdesc = X.org evdev input driver + at-home-modifier patch
 	pkgver = 2.10.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/at-home-modifier/at-home-modifier-evdev/wikis/home
 	arch = i686
 	arch = x86_64
 	groups = xorg-drivers
-	groups = xorg
 	license = custom
 	makedepends = xorg-server-devel
+	makedepends = X-ABI-XINPUT_VERSION=24.1
 	makedepends = resourceproto
 	makedepends = scrnsaverproto
-	depends = glibc
-	depends = systemd
+	depends = libsystemd
 	depends = mtdev
 	depends = libevdev
-	provides = xf86-input-driver
-	provides = xf86-input-evdev=2.10.4-1
-	conflicts = xorg-server<1.18.0
-	conflicts = X-ABI-XINPUT_VERSION<22
-	conflicts = X-ABI-XINPUT_VERSION>=23
+	provides = xf86-input-evdev=2.10.4-2
+	conflicts = xorg-server<1.19.0
+	conflicts = X-ABI-XINPUT_VERSION<24.1
+	conflicts = X-ABI-XINPUT_VERSION>=25
 	conflicts = xf86-input-evdev
 	options = !makeflags
-	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.4.tar.bz2
-	source = http://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.4.tar.bz2.sig
+	source = https://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.4.tar.bz2
+	source = https://xorg.freedesktop.org//releases/individual/driver/xf86-input-evdev-2.10.4.tar.bz2.sig
 	source = https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-2.10.3.patch
 	sha256sums = bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ae2730716098..d3c745cf3d7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,18 +7,18 @@ pkgname=xf86-input-evdev-ahm
 _pkgname_orig=xf86-input-evdev
 pkgver=2.10.4
 _ahmver=2.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc='X.org evdev input driver + at-home-modifier patch'
 arch=(i686 x86_64)
 url='https://gitlab.com/at-home-modifier/at-home-modifier-evdev/wikis/home'
-_url_orig='http://xorg.freedesktop.org/'
+_url_orig='https://xorg.freedesktop.org/'
 license=('custom')
-depends=('glibc' 'systemd' 'mtdev' 'libevdev')
-makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
-provides=('xf86-input-driver' 'xf86-input-evdev=2.10.4-1')
-conflicts=('xorg-server<1.18.0' 'X-ABI-XINPUT_VERSION<22' 'X-ABI-XINPUT_VERSION>=23' 'xf86-input-evdev')
+depends=('libsystemd' 'mtdev' 'libevdev')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=24.1' 'resourceproto' 'scrnsaverproto')
+provides=('xf86-input-evdev=2.10.4-2')
+conflicts=('xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<24.1' 'X-ABI-XINPUT_VERSION>=25' 'xf86-input-evdev')
 options=('!makeflags')
-groups=('xorg-drivers' 'xorg')
+groups=('xorg-drivers')
 source=(${_url_orig}/releases/individual/driver/${_pkgname_orig}-${pkgver}.tar.bz2{,.sig}
         https://gitlab.com/at-home-modifier/download/raw/master/patch/ahm-${_ahmver}.patch)
 sha256sums=('bbf6a03fbce1a6c0c7d874eef519fd0a854bf01b515c745d41fa551ce6490cc2'