- rel 4; fix build with xserver 1.14

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..e6092bf
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,31 @@
+commit 10498d2730c651eb7a1890eb9e728269732e9dad
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Tue Sep 25 08:54:59 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index ddd5431..412da07 100644
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -62,10 +62,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"
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 

diff --git a/xorg-driver-video-tdfx.spec b/xorg-driver-video-tdfx.spec
index 03c345ff84f7a66f31ca89c85b4ea540bbf293bc..c06dcb66708d6835f727e8f5bac4c60e53cd03e4 100644 (file)
--- a/xorg-driver-video-tdfx.spec
+++ b/xorg-driver-video-tdfx.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for 3Dfx video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych 3Dfx
 Name:          xorg-driver-video-tdfx
 Version:       1.4.5
-Release:       3
+Release:       4
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-%{version}.tar.bz2
 # Source0-md5: 1b4a7815a604b3764900b520336a75ea
+Patch0:                build.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: Mesa-libGL-devel
 BuildRequires: autoconf >= 2.60
@@ -46,6 +47,7 @@ Voodoo Banshee, Voodoo3, Voodoo4 i Voodoo5.
 
 %prep
 %setup -q -n xf86-video-tdfx-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}