- fix building with xserver 1.14

- rel 3

diff --git a/mibstore.patch b/mibstore.patch
new file mode 100644 (file)
index 0000000..0ce9a03
--- /dev/null
+++ b/mibstore.patch
@@ -0,0 +1,36 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Jan 2013 22:21:52 -0500
+Subject: [PATCH] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/i740_driver.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+-- 
+1.8.0.2
+

diff --git a/xorg-driver-video-i740.spec b/xorg-driver-video-i740.spec
index 9bfcdc0fbcc79f44dec8079f9afdddc55ec299a5..72870544d43c3d4917c8001d794ca29e583b4138 100644 (file)
--- a/xorg-driver-video-i740.spec
+++ b/xorg-driver-video-i740.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for Intel i740 video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych Intel i740
 Name:          xorg-driver-video-i740
 Version:       1.3.4
-Release:       2
+Release:       3
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-%{version}.tar.bz2
 # Source0-md5: 11c0aa1036ba8c203a03d1f00bbec195
+Patch0:                mibstore.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -38,6 +39,7 @@ i740.
 
 %prep
 %setup -q -n xf86-video-i740-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}