From 91240e6e0d26dcd8e7e4b1272e7d1eceeb657afd Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Sat, 9 Mar 2013 15:40:54 +0100
Subject: [PATCH] xorg-xf86-video-nv: buildfix for xorg-xserver 1.14

---
 xorg-xf86-video-nv/.md5sum        |  1 +
 xorg-xf86-video-nv/Pkgfile        |  6 ++---
 xorg-xf86-video-nv/mibstore.patch | 45 +++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 xorg-xf86-video-nv/mibstore.patch

diff --git a/xorg-xf86-video-nv/.md5sum b/xorg-xf86-video-nv/.md5sum
index 642895fa..56822fe3 100644
--- a/xorg-xf86-video-nv/.md5sum
+++ b/xorg-xf86-video-nv/.md5sum
@@ -1 +1,2 @@
+72a9065bc8a63019acd5eda352dd9a84  mibstore.patch
 e263dd0cd149b5224e92baa5a227bb00  xf86-video-nv-2.1.20.tar.bz2
diff --git a/xorg-xf86-video-nv/Pkgfile b/xorg-xf86-video-nv/Pkgfile
index dc4e2b6c..e2e365a4 100644
--- a/xorg-xf86-video-nv/Pkgfile
+++ b/xorg-xf86-video-nv/Pkgfile
@@ -5,12 +5,12 @@
 
 name=xorg-xf86-video-nv
 version=2.1.20
-release=1
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-$version.tar.bz2)
+release=2
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-$version.tar.bz2 mibstore.patch)
 
 build() {
 	cd xf86-video-nv-$version
-
+	patch -p1 -i $SRC/mibstore.patch
 	./configure --prefix=/usr --mandir=/usr/man
 
 	make
diff --git a/xorg-xf86-video-nv/mibstore.patch b/xorg-xf86-video-nv/mibstore.patch
new file mode 100644
index 00000000..ad177f16
--- /dev/null
+++ b/xorg-xf86-video-nv/mibstore.patch
@@ -0,0 +1,45 @@
+diff -rupN xf86-video-nv-2.1.20-orig/src/g80_driver.c xf86-video-nv-2.1.20/src/g80_driver.c
+--- xf86-video-nv-2.1.20-orig/src/g80_driver.c	2013-03-09 15:22:43.549152630 +0100
++++ xf86-video-nv-2.1.20/src/g80_driver.c	2013-03-09 15:23:08.148993854 +0100
+@@ -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 -rupN xf86-video-nv-2.1.20-orig/src/nv_include.h xf86-video-nv-2.1.20/src/nv_include.h
+--- xf86-video-nv-2.1.20-orig/src/nv_include.h	2013-03-09 15:22:43.549152630 +0100
++++ xf86-video-nv-2.1.20/src/nv_include.h	2013-03-09 15:23:21.828461637 +0100
+@@ -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 -rupN xf86-video-nv-2.1.20-orig/src/riva_include.h xf86-video-nv-2.1.20/src/riva_include.h
+--- xf86-video-nv-2.1.20-orig/src/riva_include.h	2013-03-09 15:22:43.549152630 +0100
++++ xf86-video-nv-2.1.20/src/riva_include.h	2013-03-09 15:23:33.397857262 +0100
+@@ -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"