1.4.0.r0

4 files changed, 121 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b38167e12718..565f342a6efd 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = xf86-input-libinput-git
 	pkgdesc = Generic input driver for the X.Org server based on libinput
-	pkgver = 0.28.1.1.r250.g4985de5
+	pkgver = 1.4.0.r0.g46af622
 	pkgrel = 1
-	url = http://xorg.freedesktop.org/
+	url = https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
 	arch = x86_64
-	groups = xorg-drivers
-	license = custom
-	makedepends = xorg-server-devel
-	makedepends = libxi
+	license = MIT
+	makedepends = X-ABI-XINPUT_VERSION=24.4
 	makedepends = libx11
+	makedepends = libxi
+	makedepends = xorg-server-devel
 	makedepends = xorgproto
+	makedepends = git
+	depends = glibc
 	depends = libinput
-	optdepends = xorg-xinput: input configuration for X
-	provides = xf86-input-libinput
+	provides = xf86-input-libinput=1.4.0
 	conflicts = xf86-input-libinput
-	source = git+https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
-	validpgpkeys = SKIP
-	sha512sums = SKIP
+	source = xf86-input-libinput::git+https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput.git
+	sha256sums = SKIP
 
 pkgname = xf86-input-libinput-git
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 4d77450b2680..0b8dad243d65 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,98 @@
-# Maintainer: Vincent Grande <shoober420@gmail.com>
+# Maintainer:
+# Contributor: Vincent Grande <shoober420@gmail.com>
 # Contributor: Det <thatone>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
-pkgname=xf86-input-libinput-git
-pkgver=0.28.1.1.r250.g4985de5
+_pkgname="xf86-input-libinput"
+pkgname="$_pkgname-git"
+pkgver=1.4.0.r0.g46af622
 pkgrel=1
 pkgdesc="Generic input driver for the X.Org server based on libinput"
-arch=('x86_64')
-license=('custom')
 url="http://xorg.freedesktop.org/"
-depends=('libinput')
-makedepends=('xorg-server-devel' 'libxi' 'libx11' 'xorgproto')
-optdepends=('xorg-xinput: input configuration for X')
-conflicts=('xorg-server<1.19.0' 'X-ABI-XINPUT_VERSION<24' 'X-ABI-XINPUT_VERSION>=25')
-provides=('xf86-input-libinput')
-conflicts=('xf86-input-libinput')
-groups=('xorg-drivers')
-source=("git+https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput")
-sha512sums=('SKIP')
-validpgpkeys=('SKIP') # Peter Hutterer (Who-T) <office@who-t.net>
-
-pkgver() {
-  cd xf86-input-libinput
-  
-  echo $(git describe --long | cut -d "-" -f4-5 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f6)
-}
+license=('MIT')
+arch=('x86_64')
+
+depends=(
+  'glibc'
+  'libinput'
+)
+makedepends=(
+  'X-ABI-XINPUT_VERSION=24.4'
+  'libx11'
+  'libxi'
+  'xorg-server-devel'
+  'xorgproto'
+)
+conflicts=(
+  'xorg-server<1.19.0'
+  'X-ABI-XINPUT_VERSION<24'
+  'X-ABI-XINPUT_VERSION>=25'
+)
+
+if [ x"$pkgname" == x"$_pkgname" ] ; then
+  # normal package
+
+  _pkgsrc="$_pkgname-${pkgver%%.r*}"
+  _pkgext="tar.xz"
+  source+=(
+    "$_pkgsrc.$_pkgext"::"https://xorg.freedesktop.org/releases/individual/driver/$_pkgsrc.$pkgext"{,.sig}
+  )
+  sha256sums+=(
+    '3a3d14cd895dc75b59ae2783b888031956a0bac7a1eff16d240dbb9d5df3e398'
+    'SKIP'
+  )
+  validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
+
+  _config_cmd="configure"
+
+  pkgver() {
+    echo "${pkgver%%.r*}"
+  }
+else
+  # git package
+  url="https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput"
+
+  makedepends+=('git')
+
+  provides=("$_pkgname=${pkgver%%.r*}")
+  conflicts=("$_pkgname")
+
+  _pkgsrc="$_pkgname"
+  source+=("$_pkgsrc"::"git+$url.git")
+  sha256sums+=('SKIP')
+
+  _config_cmd="autogen.sh"
+
+  pkgver() (
+    set -o pipefail
+
+    cd "$_pkgsrc"
+    git describe --long --tags 2>/dev/null \
+      | sed -E 's/^xf86-[^0-9]+//;s/([^-]*-g)/r\1/;s/-/./g' \
+    || printf "r%s.%s" \
+      "$(git rev-list --count HEAD)" \
+      "$(git rev-parse --short=7 HEAD)"
+  )
+fi
 
 build() {
-  cd xf86-input-libinput
+  local _config_options=(
+    --prefix=/usr
+    --disable-static
+  )
+
+  cd "$_pkgsrc"
+  ./"${_config_cmd:?}" "${_config_options[@]}"
+
+  [ -f libtool ] && sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' -i libtool
 
-  ./autogen.sh  --prefix=/usr \
-                --disable-static
   make
 }
 
 package() {
-  cd xf86-input-libinput
-
-  make DESTDIR="${pkgdir}" install
+  cd "$_pkgsrc"
+  make DESTDIR="${pkgdir:?}" install
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/xf86-input-libinput"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xf86-input-libinput/"
+  install -Dm644 COPYING "${pkgdir:?}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/keys/pgp/3C2C43D9447D5938EF4551EBE23B7E70B467F0BF.asc b/keys/pgp/3C2C43D9447D5938EF4551EBE23B7E70B467F0BF.asc
new file mode 100644
index 000000000000..767d86a96c3a
--- /dev/null
+++ b/keys/pgp/3C2C43D9447D5938EF4551EBE23B7E70B467F0BF.asc
@@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBD8b0wYRBACph9kRJmP+4+JGsCgFlFoy4vFO0DCG+jmkQN0n1wdInt/N/UtA
+sZToO72AUmfmYizA+IEbzBrx0UnUo3w3BDmHxUWf/akZiPUz9AA/YFY4xC3MY2OK
+VN2Jz6YSce4zJ5jd2ZRobHm4HuIf/8yqSCcsv7FNfrLaTNIFRs5gYYsqZwCgwmkp
+RSLRc8WAnHrTWNQDaEFM2rUEAKTjrTjMN8+KGd0BxNX7HiTSqQP++nXNwAYs1oWB
+Yt82YHj9SvRCqCzD1pzJQivYnlNoWDza1VeMnfdAvkdia8z4lYbO/RunXZJvra3Z
+VDm+izq+uwUAyvFuEYnNz09VSqwXKT6+XW0Xtz2vHq52r6DS6mK8cGJHZ5OhrRjq
+UEYxA/9STh+QfA98xtNoRcf52E/46r7IpCj440oRVc9lMfxQZrLGQNqp7sPdIhGQ
+CCo2NUII5hkhdAG71kpbfSXU4Sh32p1cU1KYCAkDFfb49bKuAs+Pff8v6FGZxTdd
+AinPZr4BbsYJatk818aTCnu0+s7L8jL5GPfeyuyEMKwzVBx2mLQpUGV0ZXIgSHV0
+dGVyZXIgKFdoby1UKSA8b2ZmaWNlQHdoby10Lm5ldD6IWQQTEQIAGQUCPxvTBgQL
+BwMCAxUCAwMWAgECHgECF4AACgkQ4jt+cLRn8L/0RACfWo3KTMUg+uPRqA6RXxk0
+4CWjXaMAoJeIxOpZLB3RBltPnSi7PyVQIkHFuQENBD8b0wgQBACTnqOYOWYVR8O1
+D73J6nbdAeZCbXrUkyXIuyqBOdKmX/0QJmSs7Wfsa+hPfDhj6ai0Gs2C8Qg/0Pzk
+86b4p9DLkf0M6RaYjUtCJBpS59xrsV6nz6xZzQa4RRdf1YJmw2tia1MMXzxbwQU2
+bKpYEm8NsGaBURMGd02EvsMN2wI2uwADBQP/e9MjVr/85XDzAlUBN8HwYW5szTyP
+8ZVcQOqOmNebkTWGLvkPrBdXmxpzrWjxPolO1WcWQjUL0bN/rbdqefT65iVHJHJZ
+/cpTtgGlCPhL5JTA50ltd0I13CABYWLFmswonXES/6tcglf4rr3Nri2sOrY5HggP
+ipEzOo5vdKOow/qIRgQYEQIABgUCPxvTCAAKCRDiO35wtGfwv68jAKCDvL2gkrg1
+4NfV7rNc057K1nL2GgCeKApWRgGVzaOkAp0P5tQulaDD6zM=
+=7uBX
+-----END PGP PUBLIC KEY BLOCK-----