sync with extra/xf86-video-nouveau

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 24 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be69be01b4e3..798529c8e317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = xf86-video-nouveau-git
-	pkgdesc = Open Source 3D acceleration driver for nVidia cards
-	pkgver = 1.0.16+0+gec2b45d
-	pkgrel = 2
-	url = http://nouveau.freedesktop.org/
-	arch = i686
+	pkgdesc = Open Source 3D acceleration driver for nVidia cards (git version)
+	pkgver = 1.0.17.r2.g3ee7cbc
+	pkgrel = 1
+	url = https://nouveau.freedesktop.org/
 	arch = x86_64
 	groups = xorg-drivers
 	license = GPL
-	makedepends = xorg-server-devel
 	makedepends = git
+	makedepends = xorg-server-devel
+	makedepends = xorg-server
 	makedepends = systemd
 	depends = systemd-libs
 	depends = mesa
 	conflicts = xf86-video-nouveau
-	source = git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
+	source = xf86-video-nouveau-git::git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
 	sha256sums = SKIP
 
 pkgname = xf86-video-nouveau-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5f873f730841..c98961829a20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,31 +5,31 @@
 
 pkgname=xf86-video-nouveau-git
 _pkgname=xf86-video-nouveau
-pkgver=1.0.16+0+gec2b45d
-pkgrel=2
-pkgdesc="Open Source 3D acceleration driver for nVidia cards"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/"
+pkgver=1.0.17.r2.g3ee7cbc
+pkgrel=1
+pkgdesc='Open Source 3D acceleration driver for nVidia cards (git version)'
+arch=('x86_64')
+url="https://nouveau.freedesktop.org/"
 license=('GPL')
 depends=('systemd-libs' 'mesa')
-makedepends=('xorg-server-devel' 'git' 'systemd')
+makedepends=('git' 'xorg-server-devel' 'xorg-server' 'systemd')
 conflicts=('xf86-video-nouveau')
 groups=('xorg-drivers')
-source=('git://anongit.freedesktop.org/nouveau/xf86-video-nouveau')
+source=("${pkgname}::git://anongit.freedesktop.org/nouveau/xf86-video-nouveau")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${_pkgname}"
-  git describe --long | sed 's/xf86-video-nouveau-//' | sed 's/-/+/g'
+  cd "${pkgname}"
+  git describe --long | sed 's/^xf86-video-nouveau-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
 
   # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
   # With them, module fail to load with undefined symbol.
@@ -42,7 +42,12 @@ build() {
   make
 }
 
+check() {
+  cd "${pkgname}"
+  make check
+}
+
 package() {
-  cd "${_pkgname}"
+  cd "${pkgname}"
   make DESTDIR="${pkgdir}" install
 }