summaryrefslogtreecommitdiff
path: root/extra/xf86-video-ast/git-fix.diff
blob: 5b2e4bc12c2bffb55fab9b7c762ec3e00e987546 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
From 358ef4a53e582a2176a163356c7754faf3192270 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 15 Aug 2012 17:22:14 +0000
Subject: Don't bother to include vbe.h

This driver no longer uses VBE, so this can go.

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
index bb99f9d..6be9a4f 100644
--- a/src/ast_2dtool.c
+++ b/src/ast_2dtool.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_accel.c b/src/ast_accel.c
index 34f9c65..a789b21 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index f967ce9..47ea09d 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 080b051..5e6a26e 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -40,7 +40,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_mode.c b/src/ast_mode.c
index 3238f39..50289f1 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_tool.c b/src/ast_tool.c
index d11f20d..c701c1e 100644
--- a/src/ast_tool.c
+++ b/src/ast_tool.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index ed8c906..42de52c 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -36,7 +36,6 @@
 #include "regionstr.h"
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "vbe.h"
 
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
--
cgit v0.9.0.2-2-gbebe
From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 25 Sep 2012 12:54:33 +0000
Subject: Remove mibstore.h

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
index 6be9a4f..684e400 100644
--- a/src/ast_2dtool.c
+++ b/src/ast_2dtool.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
diff --git a/src/ast_accel.c b/src/ast_accel.c
index a789b21..0e7e5d3 100644
--- a/src/ast_accel.c
+++ b/src/ast_accel.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
diff --git a/src/ast_cursor.c b/src/ast_cursor.c
index 47ea09d..c672564 100644
--- a/src/ast_cursor.c
+++ b/src/ast_cursor.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
diff --git a/src/ast_driver.c b/src/ast_driver.c
index 5e6a26e..43fcdbc 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -31,7 +31,6 @@
 #endif
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL)
    }
 #endif /* end of Accel_2D */
      
-   miInitializeBackingStore(pScreen);
    xf86SetBackingStore(pScreen);
    xf86SetSilkenMouse(pScreen);
 
diff --git a/src/ast_mode.c b/src/ast_mode.c
index 50289f1..2e06062 100644
--- a/src/ast_mode.c
+++ b/src/ast_mode.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
diff --git a/src/ast_tool.c b/src/ast_tool.c
index c701c1e..c2bfac6 100644
--- a/src/ast_tool.c
+++ b/src/ast_tool.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
index 42de52c..513cf7b 100644
--- a/src/ast_vgatool.c
+++ b/src/ast_vgatool.c
@@ -27,7 +27,6 @@
 #include "xf86_OSproc.h"
 #include "xf86cmap.h"
 #include "compiler.h"
-#include "mibstore.h"
 #include "vgaHW.h"
 #include "mipointer.h"
 #include "micmap.h"
--
cgit v0.9.0.2-2-gbebe