- fix building with xserver 1.14

- rel 3

diff --git a/fix-loading-the-driver-without-XAA.patch b/fix-loading-the-driver-without-XAA.patch
new file mode 100644 (file)
index 0000000..4720ff9
--- /dev/null
+++ b/fix-loading-the-driver-without-XAA.patch
@@ -0,0 +1,38 @@
+From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen <tjaalton@ubuntu.com>
+Date: Wed, 26 Sep 2012 11:01:26 +0300
+Subject: [PATCH 2/2] Fix loading the driver without XAA
+
+---
+ src/trident_dga.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/trident_dga.c b/src/trident_dga.c
+index 0263aa7..c4b5b9a 100644
+--- a/src/trident_dga.c
++++ b/src/trident_dga.c
+@@ -37,10 +37,10 @@
+ static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
+                                       int *, int *, int *);
+ static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
+-static void TRIDENT_Sync(ScrnInfoPtr);
+ static int  TRIDENT_GetViewport(ScrnInfoPtr);
+ static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
+ #ifdef HAVE_XAA_H
++static void TRIDENT_Sync(ScrnInfoPtr);
+ static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
+ static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
+ #if 0
+@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = {
+    TRIDENT_SetMode,
+    TRIDENT_SetViewport,
+    TRIDENT_GetViewport,
+-   TRIDENT_Sync,
+ #ifdef HAVE_XAA_H
++   TRIDENT_Sync,
+    TRIDENT_FillRect,
+    TRIDENT_BlitRect,
+ #if 0
+-- 
+1.8.0.2
+

diff --git a/mibstore.patch b/mibstore.patch
new file mode 100644 (file)
index 0000000..e8d43d7
--- /dev/null
+++ b/mibstore.patch
@@ -0,0 +1,33 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 08:55:01 -0400
+Subject: [PATCH 1/2] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/trident_driver.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/trident_driver.c b/src/trident_driver.c
+index dc12b76..408c870 100644
+--- a/src/trident_driver.c
++++ b/src/trident_driver.c
+@@ -56,7 +56,6 @@
+ 
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+ #include "shadow.h"
+ #include "trident.h"
+ #include "trident_regs.h"
+@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
+       TridentAccelInit(pScreen);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* Initialise cursor functions */
+-- 
+1.8.0.2
+

diff --git a/xorg-driver-video-trident.spec b/xorg-driver-video-trident.spec
index e5f157e10c18c0ff60419a086b75609b63b000cc..b7ed46004546920b60eff11dbfbe333e1581c9a0 100644 (file)
--- a/xorg-driver-video-trident.spec
+++ b/xorg-driver-video-trident.spec
@@ -2,11 +2,13 @@ Summary:      X.org video driver for Trident video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych Trident
 Name:          xorg-driver-video-trident
 Version:       1.3.6
-Release:       2
+Release:       3
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-%{version}.tar.bz2
 # Source0-md5: 86fed7e2b2876cb349f958cdd8319118
+Patch0:                mibstore.patch
+Patch1:                fix-loading-the-driver-without-XAA.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -56,6 +58,8 @@ PCI, AGP i ISA oparte na następujących układach:
 
 %prep
 %setup -q -n xf86-video-trident-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}