Cleanup

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

3 files changed, 28 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d932725d528..671f9e028b52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,17 @@
 pkgbase = xf86-video-nouveau-git
-	pkgdesc = Open Source 2D acceleration driver for nVidia cards
-	pkgver = 1.0.13+7+g1516d35
+	pkgdesc = Open Source 3D acceleration driver for nVidia cards
+	pkgver = 1.0.16+0+gec2b45d
 	pkgrel = 1
 	url = http://nouveau.freedesktop.org/
-	install = xf86-video-nouveau-git.install
 	arch = i686
 	arch = x86_64
 	groups = xorg-drivers
-	groups = xorg
 	license = GPL
 	makedepends = xorg-server-devel
 	makedepends = git
-	depends = libdrm
-	depends = systemd
-	depends = mesa-dri
-	conflicts = xorg-server<1.19
-	conflicts = X-ABI-VIDEODRV_VERSION<23
-	conflicts = X-ABI-VIDEODRV_VERSION>=24,
+	makedepends = systemd
+	depends = systemd-libs
+	depends = mesa
 	conflicts = xf86-video-nouveau
 	source = git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 126cded4468b..e21eceaa227e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,48 @@
-# $Id$
-# Maintainer: Andreas Rammhold <andreas@rammhold.de>
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Contributor: Andreas Rammhold <andreas@rammhold.de>
+# Contributor: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau-git
 _pkgname=xf86-video-nouveau
-pkgver=1.0.13+7+g1516d35
+pkgver=1.0.16+0+gec2b45d
 pkgrel=1
-pkgdesc="Open Source 2D acceleration driver for nVidia cards"
+pkgdesc="Open Source 3D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
 license=('GPL')
-depends=('libdrm' 'systemd' 'mesa-dri')
-makedepends=('xorg-server-devel' 'git')
-conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 'X-ABI-VIDEODRV_VERSION>=24', 'xf86-video-nouveau')
-groups=('xorg-drivers' 'xorg')
-install=$pkgname.install
-#source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
+depends=('systemd-libs' 'mesa')
+makedepends=('xorg-server-devel' 'git' 'systemd')
+conflicts=('xf86-video-nouveau')
+groups=('xorg-drivers')
 source=('git://anongit.freedesktop.org/nouveau/xf86-video-nouveau')
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
+  cd "${_pkgname}"
   git describe --long | sed 's/xf86-video-nouveau-//' | sed 's/-/+/g'
 }
 
 prepare() {
-  cd $_pkgname
+  cd "${_pkgname}"
   NOCONFIGURE=1 ./autogen.sh
-
-#  mkdir $pkgname-$pkgver
 }
 
 build() {
-#  cd $pkgname-$pkgver
-  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.
+  # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+  export CFLAGS="${CFLAGS/-fno-plt}"
+  export CXXFLAGS="${CXXFLAGS/-fno-plt}"
+  export LDFLAGS="${LDFLAGS/,-z,now}"
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-#  cd $pkgname-$pkgver
-  cd $_pkgname
-  make DESTDIR="$pkgdir" install
+  cd "${_pkgname}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/xf86-video-nouveau-git.install b/xf86-video-nouveau-git.install
deleted file mode 100644
index 23cc4cd5be6a..000000000000
--- a/xf86-video-nouveau-git.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}