[arch-commits] Commit in xf86-video-nv/repos (6 files)

2016-11-21 Thread Laurent Carlier 
Date: Monday, November 21, 2016 @ 14:51:44
  Author: lcarlier
Revision: 281754

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 281753, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 281753, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 281753, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 281753, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   37 
 staging-i686/git-fixes.patch   |  341 +++
 staging-x86_64/PKGBUILD|   37 
 staging-x86_64/git-fixes.patch |  341 +++
 4 files changed, 756 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 281753, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2016-11-21 14:51:44 UTC (rev 281754)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer:Jan de Groot 
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=8
+pkgdesc="X.org nv video driver"
+arch=('i686' 'x86_64')
+license=('custom')
+url="https://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=23')
+conflicts=('xorg-server<1.19' 'X-ABI-VIDEODRV_VERSION<23' 
'X-ABI-VIDEODRV_VERSION>=24')
+groups=('xorg-drivers')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'f4deb2b8f8acbbe901a25a8e9e0f29de80a63b62189ea00c95143be69f5fa87b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 281753, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2016-11-21 14:51:44 UTC (rev 281754)
@@ -0,0 +1,341 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 25 Sep 2012 08:54:49 -0400
+Subject: [PATCH 1/5] Remove mibstore.h
+
+Signed-off-by: Adam Jackson 
+---
+ src/g80_driver.c   | 2 --
+ src/nv_driver.c| 1 -
+ src/nv_include.h   | 3 ---
+ src/riva_driver.c  | 1 -
+ src/riva_include.h | 3 ---
+ 5 files changed, 10 deletions(-)
+
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include 
+ #endif
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv->NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva->NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2015-11-11 Thread Andreas Radke 
Date: Wednesday, November 11, 2015 @ 10:28:11
  Author: andyrtr
Revision: 250704

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 250703, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 250703, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 250703, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 250703, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   37 +
 staging-i686/git-fixes.patch   |   81 +++
 staging-x86_64/PKGBUILD|   37 +
 staging-x86_64/git-fixes.patch |   81 +++
 4 files changed, 236 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 250703, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-11-11 09:28:11 UTC (rev 250704)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: AndyRTR 
+# Maintainer:Jan de Groot 
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=7
+pkgdesc="X.org nv video driver"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=20')
+conflicts=('xorg-server<1.16' 'X-ABI-VIDEODRV_VERSION<20' 
'X-ABI-VIDEODRV_VERSION>=21')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 250703, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2015-11-11 09:28:11 UTC (rev 250704)
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson 
+Date: Tue, 25 Sep 2012 12:54:49 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson 
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include 
+ #endif
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv->NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva->NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-nv/repos/staging-x86_64/PKGBUILD (from rev 250703,

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2015-02-05 Thread Laurent Carlier 
Date: Thursday, February 5, 2015 @ 21:04:32
  Author: lcarlier
Revision: 230827

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 230826, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 230826, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 230826, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 230826, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   37 +
 staging-i686/git-fixes.patch   |   81 +++
 staging-x86_64/PKGBUILD|   37 +
 staging-x86_64/git-fixes.patch |   81 +++
 4 files changed, 236 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 230826, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-02-05 20:04:32 UTC (rev 230827)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=6
+pkgdesc=X.org nv video driver
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=19')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION19' 
'X-ABI-VIDEODRV_VERSION=20')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 230826, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2015-02-05 20:04:32 UTC (rev 230827)
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:54:49 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include xf86Resources.h
+ #endif
+ #include mipointer.h
+-#include mibstore.h
+ #include micmap.h
+ #include xf86cmap.h
+ #include fb.h
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv-NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva-NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-nv/repos/staging-x86_64/PKGBUILD (from rev 230826,

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2014-07-18 Thread Laurent Carlier 
Date: Friday, July 18, 2014 @ 13:21:29
  Author: lcarlier
Revision: 217044

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 217043, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 217043, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 217043, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 217043, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   37 +
 staging-i686/git-fixes.patch   |   81 +++
 staging-x86_64/PKGBUILD|   37 +
 staging-x86_64/git-fixes.patch |   81 +++
 4 files changed, 236 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 217043, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-07-18 11:21:29 UTC (rev 217044)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=5
+pkgdesc=X.org nv video driver
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=18')
+conflicts=('xorg-server1.16' 'X-ABI-VIDEODRV_VERSION18' 
'X-ABI-VIDEODRV_VERSION=19')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 217043, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2014-07-18 11:21:29 UTC (rev 217044)
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:54:49 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include xf86Resources.h
+ #endif
+ #include mipointer.h
+-#include mibstore.h
+ #include micmap.h
+ #include xf86cmap.h
+ #include fb.h
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv-NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva-NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-nv/repos/staging-x86_64/PKGBUILD (from rev 217043,

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2013-12-28 Thread Andreas Radke 
Date: Saturday, December 28, 2013 @ 19:17:05
  Author: andyrtr
Revision: 202857

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 202856, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 202856, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 202856, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 202856, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   33 +++
 staging-i686/git-fixes.patch   |   81 +++
 staging-x86_64/PKGBUILD|   33 +++
 staging-x86_64/git-fixes.patch |   81 +++
 4 files changed, 228 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 202856, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-12-28 18:17:05 UTC (rev 202857)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=4
+pkgdesc=X.org nv video driver
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
+conflicts=('xorg-server1.15.0' 'X-ABI-VIDEODRV_VERSION15' 
'X-ABI-VIDEODRV_VERSION=16')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 202856, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2013-12-28 18:17:05 UTC (rev 202857)
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:54:49 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include xf86Resources.h
+ #endif
+ #include mipointer.h
+-#include mibstore.h
+ #include micmap.h
+ #include xf86cmap.h
+ #include fb.h
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv-NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva-NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+--
+cgit v0.9.0.2-2-gbebe

Copied: xf86-video-nv/repos/staging-x86_64/PKGBUILD (from rev 202856, 
xf86-video-nv/trunk/PKGBUILD)

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2013-03-09 Thread Andreas Radke 
Date: Saturday, March 9, 2013 @ 16:40:12
  Author: andyrtr
Revision: 179733

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  xf86-video-nv/repos/staging-i686/
  xf86-video-nv/repos/staging-i686/PKGBUILD
(from rev 179732, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-i686/git-fixes.patch
(from rev 179732, xf86-video-nv/trunk/git-fixes.patch)
  xf86-video-nv/repos/staging-x86_64/
  xf86-video-nv/repos/staging-x86_64/PKGBUILD
(from rev 179732, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/staging-x86_64/git-fixes.patch
(from rev 179732, xf86-video-nv/trunk/git-fixes.patch)

+
 staging-i686/PKGBUILD  |   34 
 staging-i686/git-fixes.patch   |   81 +++
 staging-x86_64/PKGBUILD|   34 
 staging-x86_64/git-fixes.patch |   81 +++
 4 files changed, 230 insertions(+)

Copied: xf86-video-nv/repos/staging-i686/PKGBUILD (from rev 179732, 
xf86-video-nv/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-03-09 15:40:12 UTC (rev 179733)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: AndyRTR andy...@archlinux.org
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=3
+pkgdesc=X.org nv video driver
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 
'scrnsaverproto')
+conflicts=('xorg-server1.14.0' 'X-ABI-VIDEODRV_VERSION14' 
'X-ABI-VIDEODRV_VERSION=15')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 
git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+'0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-nv/repos/staging-i686/git-fixes.patch (from rev 179732, 
xf86-video-nv/trunk/git-fixes.patch)
===
--- staging-i686/git-fixes.patch(rev 0)
+++ staging-i686/git-fixes.patch2013-03-09 15:40:12 UTC (rev 179733)
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson a...@redhat.com
+Date: Tue, 25 Sep 2012 12:54:49 +
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson a...@redhat.com
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
 b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include xf86Resources.h
+ #endif
+ #include mipointer.h
+-#include mibstore.h
+ #include micmap.h
+ #include xf86cmap.h
+ #include fb.h
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+ }
+ }
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
 b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pNv-NoAccel)
+   NVAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
 b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
 b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pRiva-NoAccel)
+   RivaAccelInit(pScreen);
+ 
+-miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
 b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include mipointer.h
+ 
+-/* All drivers implementing backing store need this */
+-#include mibstore.h
+-
+ #include micmap.h
+ 
+ #include xf86DDC.h
+--
+cgit v0.9.0.2-2-gbebe

Copied:

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2012-07-17 Thread andyrtr 
Date: Tuesday, July 17, 2012 @ 12:58:02
  Author: andyrtr
Revision: 163675

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-nv/repos/extra-i686/PKGBUILD
(from rev 163674, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/extra-x86_64/PKGBUILD
(from rev 163674, xf86-video-nv/trunk/PKGBUILD)
Deleted:
  xf86-video-nv/repos/extra-i686/PKGBUILD
  xf86-video-nv/repos/extra-i686/git_fixes.patch
  xf86-video-nv/repos/extra-x86_64/PKGBUILD
  xf86-video-nv/repos/extra-x86_64/git_fixes.patch

--+
 extra-i686/PKGBUILD  |   65 +--
 extra-i686/git_fixes.patch   |  234 -
 extra-x86_64/PKGBUILD|   65 +--
 extra-x86_64/git_fixes.patch |  234 -
 4 files changed, 62 insertions(+), 536 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-07-17 16:57:24 UTC (rev 163674)
+++ extra-i686/PKGBUILD 2012-07-17 16:58:02 UTC (rev 163675)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-nv
-pkgver=2.1.18
-pkgrel=6
-pkgdesc=X.org nv video driver
-arch=(i686 x86_64)
-license=('custom')
-url=http://xorg.freedesktop.org/;
-depends=('glibc')
-makedepends=('xorg-server-devel=1.11.99.903')
-conflicts=('xorg-server1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-git_fixes.patch)
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2'
-  '07469140e20751a7366017b116a8c4d7d39eaac0')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/git_fixes.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-nv/repos/extra-i686/PKGBUILD (from rev 163674, 
xf86-video-nv/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-17 16:58:02 UTC (rev 163675)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.20
+pkgrel=1
+pkgdesc=X.org nv video driver
+arch=('i686' 'x86_64')
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Deleted: extra-i686/git_fixes.patch
===
--- extra-i686/git_fixes.patch  2012-07-17 16:57:24 UTC (rev 163674)
+++ extra-i686/git_fixes.patch  2012-07-17 16:58:02 UTC (rev 163675)
@@ -1,234 +0,0 @@
-From cb93a9b513b5814b18594de7a3b67bb225fb9c34 Mon Sep 17 00:00:00 2001
-From: Jesse Adkins jesserayadk...@gmail.com
-Date: Tue, 28 Sep 2010 20:29:51 +
-Subject: Purge cvs tags.
-
-Signed-off-by: Jesse Adkins jesserayadk...@gmail.com
-Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

-diff --git a/man/nv.man b/man/nv.man
-index 228f1da..c679803 100644
 a/man/nv.man
-+++ b/man/nv.man
-@@ -1,4 +1,3 @@
--.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,v 1.30 
2006/06/16 00:19:32 mvojkovi Exp $ 
- .\ shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH NV __drivermansuffix__ __vendorversion__
---
-cgit v0.9.0.2-2-gbebe
-From d7727e5307c5c3fd0dbc51394893385cb3b01101 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith alan.coopersm...@oracle.com
-Date: Sat, 30 Oct 2010 16:39:39 +
-Subject: Sun's copyrights now belong to Oracle
-
-Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

-diff --git a/man/Makefile.am b/man/Makefile.am
-index b3688ce..e39d1fc 100644
 a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,5 +1,5 @@
- #
--# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- #
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the Software),
-@@ -19,7 +19,7 @@
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- #

[arch-commits] Commit in xf86-video-nv/repos (6 files)

2012-04-07 Thread andyrtr 
Date: Saturday, April 7, 2012 @ 10:46:07
  Author: andyrtr
Revision: 155841

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xf86-video-nv/repos/extra-i686/PKGBUILD
(from rev 155840, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/extra-i686/git_fixes.patch
(from rev 155840, xf86-video-nv/trunk/git_fixes.patch)
  xf86-video-nv/repos/extra-x86_64/PKGBUILD
(from rev 155840, xf86-video-nv/trunk/PKGBUILD)
  xf86-video-nv/repos/extra-x86_64/git_fixes.patch
(from rev 155840, xf86-video-nv/trunk/git_fixes.patch)
Deleted:
  xf86-video-nv/repos/extra-i686/PKGBUILD
  xf86-video-nv/repos/extra-x86_64/PKGBUILD

--+
 extra-i686/PKGBUILD  |   65 +--
 extra-i686/git_fixes.patch   |  234 +
 extra-x86_64/PKGBUILD|   65 +--
 extra-x86_64/git_fixes.patch |  234 +
 4 files changed, 536 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-04-07 14:45:31 UTC (rev 155840)
+++ extra-i686/PKGBUILD 2012-04-07 14:46:07 UTC (rev 155841)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer:Jan de Groot j...@archlinux.org
-
-pkgname=xf86-video-nv
-pkgver=2.1.18
-pkgrel=5
-pkgdesc=X.org nv video driver
-arch=(i686 x86_64)
-license=('custom')
-url=http://xorg.freedesktop.org/;
-depends=('glibc')
-makedepends=('xorg-server-devel=1.11.99.903')
-conflicts=('xorg-server1.11.99.903')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
-}

Copied: xf86-video-nv/repos/extra-i686/PKGBUILD (from rev 155840, 
xf86-video-nv/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-07 14:46:07 UTC (rev 155841)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer:Jan de Groot j...@archlinux.org
+
+pkgname=xf86-video-nv
+pkgver=2.1.18
+pkgrel=6
+pkgdesc=X.org nv video driver
+arch=(i686 x86_64)
+license=('custom')
+url=http://xorg.freedesktop.org/;
+depends=('glibc')
+makedepends=('xorg-server-devel=1.11.99.903')
+conflicts=('xorg-server1.11.99.903')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git_fixes.patch)
+sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2'
+  '07469140e20751a7366017b116a8c4d7d39eaac0')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/git_fixes.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}

Copied: xf86-video-nv/repos/extra-i686/git_fixes.patch (from rev 155840, 
xf86-video-nv/trunk/git_fixes.patch)
===
--- extra-i686/git_fixes.patch  (rev 0)
+++ extra-i686/git_fixes.patch  2012-04-07 14:46:07 UTC (rev 155841)
@@ -0,0 +1,234 @@
+From cb93a9b513b5814b18594de7a3b67bb225fb9c34 Mon Sep 17 00:00:00 2001
+From: Jesse Adkins jesserayadk...@gmail.com
+Date: Tue, 28 Sep 2010 20:29:51 +
+Subject: Purge cvs tags.
+
+Signed-off-by: Jesse Adkins jesserayadk...@gmail.com
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+---
+diff --git a/man/nv.man b/man/nv.man
+index 228f1da..c679803 100644
+--- a/man/nv.man
 b/man/nv.man
+@@ -1,4 +1,3 @@
+-.\ $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv.man,v 1.30 
2006/06/16 00:19:32 mvojkovi Exp $ 
+ .\ shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH NV __drivermansuffix__ __vendorversion__
+--
+cgit v0.9.0.2-2-gbebe
+From d7727e5307c5c3fd0dbc51394893385cb3b01101 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith alan.coopersm...@oracle.com
+Date: Sat, 30 Oct 2010 16:39:39 +
+Subject: Sun's copyrights now belong to Oracle
+
+Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
+---
+diff --git a/man/Makefile.am b/man/Makefile.am
+index b3688ce..e39d1fc 100644
+--- a/man/Makefile.am
 b/man/Makefile.am
+@@ -1,5 +1,5 @@
+ #
+-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
++# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a
+ # copy of this software and associated documentation files (the Software),
+@@ -19,7 +19,7