[packages/xorg-driver-video-nv] - rel 4; fix build with xserver 1.14

[arekm]

commit db3d2424724014b59c9769a93e70ed505892e355
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 12 09:43:30 2013 +0100

    - rel 4; fix build with xserver 1.14

 build.patch               | 80 +++++++++++++++++++++++++++++++++++++++++++++++
 xorg-driver-video-nv.spec |  4 ++-
 2 files changed, 83 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nv.spec b/xorg-driver-video-nv.spec
index 66ccc0e..041d6c5 100644
--- a/xorg-driver-video-nv.spec
+++ b/xorg-driver-video-nv.spec
@@ -2,11 +2,12 @@ Summary:	X.org video driver for NVIDIA video adapters
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla kart graficznych NVIDIA
 Name:		xorg-driver-video-nv
 Version:	2.1.20
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-%{version}.tar.bz2
 # Source0-md5:	e263dd0cd149b5224e92baa5a227bb00
+Patch0:		build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -75,6 +76,7 @@ zamknięte sterowniki firmy NVIDIA (tylko dla nowszych kart).
 
 %prep
 %setup -q -n xf86-video-nv-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..84a44d9
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,80 @@
+commit fc78fe98222b0204b8a2872a529763d6fe5048da
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Tue Sep 25 08:54:49 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax at 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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nv.git/commitdiff/db3d2424724014b59c9769a93e70ed505892e355