[xorg-x11-drv-trident] ABI rebuild

[Adam Jackson]

commit 7b5e9149654dd307ba269a9e3551a3f8c7b98edc
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 9 23:06:35 2013 -0500

    ABI rebuild

 0001-Remove-mibstore.h.patch                  |   33 +++++++++++++++++++++
 0002-Fix-loading-the-driver-without-XAA.patch |   38 +++++++++++++++++++++++++
 xorg-x11-drv-trident.spec                     |    5 +++
 3 files changed, 76 insertions(+), 0 deletions(-)
---
diff --git a/0001-Remove-mibstore.h.patch b/0001-Remove-mibstore.h.patch
new file mode 100644
index 0000000..e8d43d7
--- /dev/null
+++ b/0001-Remove-mibstore.h.patch
@@ -0,0 +1,33 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Tue, 25 Sep 2012 08:55:01 -0400
+Subject: [PATCH 1/2] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at 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/0002-Fix-loading-the-driver-without-XAA.patch b/0002-Fix-loading-the-driver-without-XAA.patch
new file mode 100644
index 0000000..4720ff9
--- /dev/null
+++ b/0002-Fix-loading-the-driver-without-XAA.patch
@@ -0,0 +1,38 @@
+From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen <tjaalton at 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/xorg-x11-drv-trident.spec b/xorg-x11-drv-trident.spec
index b9c7bf7..7b031f0 100644
--- a/xorg-x11-drv-trident.spec
+++ b/xorg-x11-drv-trident.spec
@@ -12,6 +12,9 @@ Group:      User Interface/X Hardware Support
 
 Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch0: 0001-Remove-mibstore.h.patch
+Patch1: 0002-Fix-loading-the-driver-without-XAA.patch
+
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
@@ -24,6 +27,8 @@ X.Org X11 trident video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static