diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch | 364 |
1 files changed, 0 insertions, 364 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch deleted file mode 100644 index 98a946aad6..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive-1.7.99.2/error-address-work-around.patch +++ /dev/null | |||
@@ -1,364 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/dix/window.c xorg-server-1.7.99.2/dix/window.c | ||
4 | --- xorg-server-1.7.99.2.ORIG/dix/window.c 2012-01-04 13:12:40.417640130 -0700 | ||
5 | +++ xorg-server-1.7.99.2/dix/window.c 2012-01-04 12:13:20.678605493 -0700 | ||
6 | @@ -559,10 +559,10 @@ | ||
7 | box.y1 = 0; | ||
8 | box.x2 = pScreen->width; | ||
9 | box.y2 = pScreen->height; | ||
10 | - REGION_INIT(pScreen, &pWin->clipList, &box, 1); | ||
11 | - REGION_INIT(pScreen, &pWin->winSize, &box, 1); | ||
12 | - REGION_INIT(pScreen, &pWin->borderSize, &box, 1); | ||
13 | - REGION_INIT(pScreen, &pWin->borderClip, &box, 1); | ||
14 | + REGION_INIT2(pScreen, &pWin->clipList, &box, 1); | ||
15 | + REGION_INIT2(pScreen, &pWin->winSize, &box, 1); | ||
16 | + REGION_INIT2(pScreen, &pWin->borderSize, &box, 1); | ||
17 | + REGION_INIT2(pScreen, &pWin->borderClip, &box, 1); | ||
18 | |||
19 | pWin->drawable.class = InputOutput; | ||
20 | pWin->optional->visual = pScreen->rootVisual; | ||
21 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_accel.c xorg-server-1.7.99.2/exa/exa_accel.c | ||
22 | --- xorg-server-1.7.99.2.ORIG/exa/exa_accel.c 2009-12-11 11:20:48.000000000 -0700 | ||
23 | +++ xorg-server-1.7.99.2/exa/exa_accel.c 2012-01-04 12:58:11.218616328 -0700 | ||
24 | @@ -1275,7 +1275,7 @@ | ||
25 | Box.x2 = Box.x1 + w; | ||
26 | Box.y2 = Box.y1 + h; | ||
27 | |||
28 | - REGION_INIT(pScreen, &Reg, &Box, 1); | ||
29 | + REGION_INIT2(pScreen, &Reg, &Box, 1); | ||
30 | |||
31 | pixmaps[0].as_dst = FALSE; | ||
32 | pixmaps[0].as_src = TRUE; | ||
33 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa.c xorg-server-1.7.99.2/exa/exa.c | ||
34 | --- xorg-server-1.7.99.2.ORIG/exa/exa.c 2009-12-11 11:20:48.000000000 -0700 | ||
35 | +++ xorg-server-1.7.99.2/exa/exa.c 2012-01-04 12:56:30.592593427 -0700 | ||
36 | @@ -161,7 +161,7 @@ | ||
37 | if (box.x1 >= box.x2 || box.y1 >= box.y2) | ||
38 | return; | ||
39 | |||
40 | - REGION_INIT(pScreen, ®ion, &box, 1); | ||
41 | + REGION_INIT2(pScreen, ®ion, &box, 1); | ||
42 | DamageRegionAppend(&pPix->drawable, ®ion); | ||
43 | DamageRegionProcessPending(&pPix->drawable); | ||
44 | REGION_UNINIT(pScreen, ®ion); | ||
45 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_classic.c xorg-server-1.7.99.2/exa/exa_classic.c | ||
46 | --- xorg-server-1.7.99.2.ORIG/exa/exa_classic.c 2009-11-28 13:44:58.000000000 -0700 | ||
47 | +++ xorg-server-1.7.99.2/exa/exa_classic.c 2012-01-04 12:54:50.586576675 -0700 | ||
48 | @@ -131,8 +131,8 @@ | ||
49 | box.y1 = 0; | ||
50 | box.x2 = w; | ||
51 | box.y2 = h; | ||
52 | - REGION_INIT(pScreen, &pExaPixmap->validSys, &box, 0); | ||
53 | - REGION_INIT(pScreen, &pExaPixmap->validFB, &box, 0); | ||
54 | + REGION_INIT2(pScreen, &pExaPixmap->validSys, &box, 0); | ||
55 | + REGION_INIT2(pScreen, &pExaPixmap->validFB, &box, 0); | ||
56 | |||
57 | exaSetAccelBlock(pExaScr, pExaPixmap, | ||
58 | w, h, bpp); | ||
59 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_migration_classic.c xorg-server-1.7.99.2/exa/exa_migration_classic.c | ||
60 | --- xorg-server-1.7.99.2.ORIG/exa/exa_migration_classic.c 2009-11-28 13:44:58.000000000 -0700 | ||
61 | +++ xorg-server-1.7.99.2/exa/exa_migration_classic.c 2012-01-04 12:54:43.077500333 -0700 | ||
62 | @@ -177,7 +177,7 @@ | ||
63 | box.x2 = max(pValidExt->x2, pDamageExt->x2); | ||
64 | box.y2 = max(pValidExt->y2, pDamageExt->y2); | ||
65 | |||
66 | - REGION_INIT(pScreen, &closure, &box, 0); | ||
67 | + REGION_INIT2(pScreen, &closure, &box, 0); | ||
68 | REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, &closure); | ||
69 | } else | ||
70 | REGION_INTERSECT(pScreen, &CopyReg, &CopyReg, pending_damage); | ||
71 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_render.c xorg-server-1.7.99.2/exa/exa_render.c | ||
72 | --- xorg-server-1.7.99.2.ORIG/exa/exa_render.c 2009-11-28 13:44:58.000000000 -0700 | ||
73 | +++ xorg-server-1.7.99.2/exa/exa_render.c 2012-01-04 12:59:18.234297490 -0700 | ||
74 | @@ -576,7 +576,7 @@ | ||
75 | * (see use of DamagePendingRegion in exaCopyDirty) | ||
76 | */ | ||
77 | |||
78 | - REGION_INIT(pScreen, ®ion, &box, 1); | ||
79 | + REGION_INIT2(pScreen, ®ion, &box, 1); | ||
80 | |||
81 | DamageRegionAppend(pDst->pDrawable, ®ion); | ||
82 | |||
83 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/exa/exa_unaccel.c xorg-server-1.7.99.2/exa/exa_unaccel.c | ||
84 | --- xorg-server-1.7.99.2.ORIG/exa/exa_unaccel.c 2009-12-11 11:20:48.000000000 -0700 | ||
85 | +++ xorg-server-1.7.99.2/exa/exa_unaccel.c 2012-01-04 12:59:25.915375559 -0700 | ||
86 | @@ -344,7 +344,7 @@ | ||
87 | Box.x2 = Box.x1 + w; | ||
88 | Box.y2 = Box.y1 + h; | ||
89 | |||
90 | - REGION_INIT(pScreen, &Reg, &Box, 1); | ||
91 | + REGION_INIT2(pScreen, &Reg, &Box, 1); | ||
92 | |||
93 | pExaScr->prepare_access_reg(pPix, EXA_PREPARE_SRC, &Reg); | ||
94 | } else | ||
95 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/fb/fboverlay.c xorg-server-1.7.99.2/fb/fboverlay.c | ||
96 | --- xorg-server-1.7.99.2.ORIG/fb/fboverlay.c 2009-11-04 09:25:50.000000000 -0700 | ||
97 | +++ xorg-server-1.7.99.2/fb/fboverlay.c 2012-01-04 12:24:43.855400893 -0700 | ||
98 | @@ -147,7 +147,7 @@ | ||
99 | pbits)) | ||
100 | return FALSE; | ||
101 | pScrPriv->layer[i].u.run.pixmap = pPixmap; | ||
102 | - REGION_INIT(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0); | ||
103 | + REGION_INIT2(pScreen, &pScrPriv->layer[i].u.run.region, &box, 0); | ||
104 | } | ||
105 | pScreen->devPrivate = pScrPriv->layer[0].u.run.pixmap; | ||
106 | return TRUE; | ||
107 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kdrive.c xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c | ||
108 | --- xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kdrive.c 2012-01-04 13:12:40.418640141 -0700 | ||
109 | +++ xorg-server-1.7.99.2/hw/kdrive/src/kdrive.c 2012-01-04 13:05:08.771897914 -0700 | ||
110 | @@ -144,8 +144,8 @@ | ||
111 | box.y2 = pScreen->height; | ||
112 | pWin->drawable.width = pScreen->width; | ||
113 | pWin->drawable.height = pScreen->height; | ||
114 | - REGION_INIT (pScreen, &pWin->winSize, &box, 1); | ||
115 | - REGION_INIT (pScreen, &pWin->borderSize, &box, 1); | ||
116 | + REGION_INIT2 (pScreen, &pWin->winSize, &box, 1); | ||
117 | + REGION_INIT2 (pScreen, &pWin->borderSize, &box, 1); | ||
118 | REGION_RESET(pScreen, &pWin->borderClip, &box); | ||
119 | REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList); | ||
120 | } | ||
121 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kxv.c xorg-server-1.7.99.2/hw/kdrive/src/kxv.c | ||
122 | --- xorg-server-1.7.99.2.ORIG/hw/kdrive/src/kxv.c 2008-11-14 14:27:05.000000000 -0700 | ||
123 | +++ xorg-server-1.7.99.2/hw/kdrive/src/kxv.c 2012-01-04 13:07:32.625411023 -0700 | ||
124 | @@ -674,7 +674,7 @@ | ||
125 | WinBox.y2 = WinBox.y1 + portPriv->drw_h; | ||
126 | |||
127 | /* clip to the window composite clip */ | ||
128 | - REGION_INIT(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1); | ||
129 | + REGION_INIT2(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1); | ||
130 | REGION_INIT(portPriv->pDraw->pScreen, &ClipRegion, NullBox, 1); | ||
131 | REGION_INTERSECT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); | ||
132 | |||
133 | @@ -738,7 +738,7 @@ | ||
134 | WinBox.y2 = WinBox.y1 + portPriv->drw_h; | ||
135 | |||
136 | /* clip to the window composite clip */ | ||
137 | - REGION_INIT(pScreen, &WinRegion, &WinBox, 1); | ||
138 | + REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); | ||
139 | REGION_INIT(pScreen, &ClipRegion, NullBox, 1); | ||
140 | REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); | ||
141 | |||
142 | @@ -752,7 +752,7 @@ | ||
143 | VPBox.x2 = screen->width; | ||
144 | VPBox.y2 = screen->height; | ||
145 | |||
146 | - REGION_INIT(pScreen, &VPReg, &VPBox, 1); | ||
147 | + REGION_INIT2(pScreen, &VPReg, &VPBox, 1); | ||
148 | REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); | ||
149 | REGION_UNINIT(pScreen, &VPReg); | ||
150 | } | ||
151 | @@ -827,7 +827,7 @@ | ||
152 | WinBox.y2 = WinBox.y1 + portPriv->drw_h; | ||
153 | |||
154 | /* clip to the window composite clip */ | ||
155 | - REGION_INIT(pScreen, &WinRegion, &WinBox, 1); | ||
156 | + REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); | ||
157 | REGION_INIT(pScreen, &ClipRegion, NullBox, 1); | ||
158 | REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip); | ||
159 | |||
160 | @@ -841,7 +841,7 @@ | ||
161 | VPBox.x2 = screen->width; | ||
162 | VPBox.y2 = screen->height; | ||
163 | |||
164 | - REGION_INIT(pScreen, &VPReg, &VPBox, 1); | ||
165 | + REGION_INIT2(pScreen, &VPReg, &VPBox, 1); | ||
166 | REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); | ||
167 | REGION_UNINIT(pScreen, &VPReg); | ||
168 | } | ||
169 | @@ -1337,7 +1337,7 @@ | ||
170 | WinBox.x2 = WinBox.x1 + drw_w; | ||
171 | WinBox.y2 = WinBox.y1 + drw_h; | ||
172 | |||
173 | - REGION_INIT(pScreen, &WinRegion, &WinBox, 1); | ||
174 | + REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); | ||
175 | REGION_INIT(pScreen, &ClipRegion, NullBox, 1); | ||
176 | REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); | ||
177 | |||
178 | @@ -1350,7 +1350,7 @@ | ||
179 | VPBox.x2 = screen->width; | ||
180 | VPBox.y2 = screen->height; | ||
181 | |||
182 | - REGION_INIT(pScreen, &VPReg, &VPBox, 1); | ||
183 | + REGION_INIT2(pScreen, &VPReg, &VPBox, 1); | ||
184 | REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); | ||
185 | REGION_UNINIT(pScreen, &VPReg); | ||
186 | } | ||
187 | @@ -1490,7 +1490,7 @@ | ||
188 | WinBox.x2 = WinBox.x1 + drw_w; | ||
189 | WinBox.y2 = WinBox.y1 + drw_h; | ||
190 | |||
191 | - REGION_INIT(pScreen, &WinRegion, &WinBox, 1); | ||
192 | + REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); | ||
193 | REGION_INIT(pScreen, &ClipRegion, NullBox, 1); | ||
194 | REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); | ||
195 | |||
196 | @@ -1637,7 +1637,7 @@ | ||
197 | WinBox.x2 = WinBox.x1 + drw_w; | ||
198 | WinBox.y2 = WinBox.y1 + drw_h; | ||
199 | |||
200 | - REGION_INIT(pScreen, &WinRegion, &WinBox, 1); | ||
201 | + REGION_INIT2(pScreen, &WinRegion, &WinBox, 1); | ||
202 | REGION_INIT(pScreen, &ClipRegion, NullBox, 1); | ||
203 | REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip); | ||
204 | |||
205 | @@ -1650,7 +1650,7 @@ | ||
206 | VPBox.x2 = pScreen->width; | ||
207 | VPBox.y2 = pScreen->height; | ||
208 | |||
209 | - REGION_INIT(pScreen, &VPReg, &VPBox, 1); | ||
210 | + REGION_INIT2(pScreen, &VPReg, &VPBox, 1); | ||
211 | REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg); | ||
212 | REGION_UNINIT(pScreen, &VPReg); | ||
213 | } | ||
214 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/include/regionstr.h xorg-server-1.7.99.2/include/regionstr.h | ||
215 | --- xorg-server-1.7.99.2.ORIG/include/regionstr.h 2009-11-04 09:25:50.000000000 -0700 | ||
216 | +++ xorg-server-1.7.99.2/include/regionstr.h 2012-01-04 12:13:06.174461574 -0700 | ||
217 | @@ -152,6 +152,12 @@ | ||
218 | } \ | ||
219 | } | ||
220 | |||
221 | +#define REGION_INIT2(_pScreen, _pReg, _rect, _size) \ | ||
222 | +{ \ | ||
223 | + (_pReg)->extents = *(_rect); \ | ||
224 | + (_pReg)->data = (RegDataPtr)NULL; \ | ||
225 | + } | ||
226 | + | ||
227 | |||
228 | #define REGION_UNINIT(_pScreen, _pReg) \ | ||
229 | { \ | ||
230 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/micopy.c xorg-server-1.7.99.2/mi/micopy.c | ||
231 | --- xorg-server-1.7.99.2.ORIG/mi/micopy.c 2009-11-04 09:25:50.000000000 -0700 | ||
232 | +++ xorg-server-1.7.99.2/mi/micopy.c 2012-01-04 12:44:17.003144611 -0700 | ||
233 | @@ -315,7 +315,7 @@ | ||
234 | box.y1 = box_y1; | ||
235 | box.x2 = box_x2; | ||
236 | box.y2 = box_y2; | ||
237 | - REGION_INIT(pGC->pScreen, &rgnDst, &box, 1); | ||
238 | + REGION_INIT2(pGC->pScreen, &rgnDst, &box, 1); | ||
239 | } | ||
240 | |||
241 | /* Clip against complex source if needed */ | ||
242 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/miexpose.c xorg-server-1.7.99.2/mi/miexpose.c | ||
243 | --- xorg-server-1.7.99.2.ORIG/mi/miexpose.c 2009-11-04 09:25:50.000000000 -0700 | ||
244 | +++ xorg-server-1.7.99.2/mi/miexpose.c 2012-01-04 12:46:29.400478668 -0700 | ||
245 | @@ -206,7 +206,7 @@ | ||
246 | box.x2 = pSrcDrawable->width; | ||
247 | box.y2 = pSrcDrawable->height; | ||
248 | prgnSrcClip = &rgnSrcRec; | ||
249 | - REGION_INIT(pscr, prgnSrcClip, &box, 1); | ||
250 | + REGION_INIT2(pscr, prgnSrcClip, &box, 1); | ||
251 | pSrcWin = NULL; | ||
252 | } | ||
253 | |||
254 | @@ -239,11 +239,11 @@ | ||
255 | box.x2 = pDstDrawable->width; | ||
256 | box.y2 = pDstDrawable->height; | ||
257 | prgnDstClip = &rgnDstRec; | ||
258 | - REGION_INIT(pscr, prgnDstClip, &box, 1); | ||
259 | + REGION_INIT2(pscr, prgnDstClip, &box, 1); | ||
260 | } | ||
261 | |||
262 | /* drawable-relative source region */ | ||
263 | - REGION_INIT(pscr, &rgnExposed, &srcBox, 1); | ||
264 | + REGION_INIT2(pscr, &rgnExposed, &srcBox, 1); | ||
265 | |||
266 | /* now get the hidden parts of the source box*/ | ||
267 | REGION_SUBTRACT(pscr, &rgnExposed, &rgnExposed, prgnSrcClip); | ||
268 | @@ -491,7 +491,7 @@ | ||
269 | box = *REGION_EXTENTS( pWin->drawable.pScreen, exposures); | ||
270 | if (exposures == prgn) { | ||
271 | exposures = &expRec; | ||
272 | - REGION_INIT( pWin->drawable.pScreen, exposures, &box, 1); | ||
273 | + REGION_INIT2( pWin->drawable.pScreen, exposures, &box, 1); | ||
274 | REGION_RESET( pWin->drawable.pScreen, prgn, &box); | ||
275 | } else { | ||
276 | REGION_RESET( pWin->drawable.pScreen, exposures, &box); | ||
277 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/mioverlay.c xorg-server-1.7.99.2/mi/mioverlay.c | ||
278 | --- xorg-server-1.7.99.2.ORIG/mi/mioverlay.c 2009-11-04 09:25:50.000000000 -0700 | ||
279 | +++ xorg-server-1.7.99.2/mi/mioverlay.c 2012-01-04 12:47:50.114300224 -0700 | ||
280 | @@ -209,8 +209,8 @@ | ||
281 | fullBox.y1 = 0; | ||
282 | fullBox.x2 = pScreen->width; | ||
283 | fullBox.y2 = pScreen->height; | ||
284 | - REGION_INIT(pScreen, &(pTree->borderClip), &fullBox, 1); | ||
285 | - REGION_INIT(pScreen, &(pTree->clipList), &fullBox, 1); | ||
286 | + REGION_INIT2(pScreen, &(pTree->borderClip), &fullBox, 1); | ||
287 | + REGION_INIT2(pScreen, &(pTree->clipList), &fullBox, 1); | ||
288 | } | ||
289 | } else xfree(pTree); | ||
290 | } | ||
291 | @@ -1027,7 +1027,7 @@ | ||
292 | box = *REGION_EXTENTS(pScreen, exposures); | ||
293 | if (exposures == prgn) { | ||
294 | exposures = &expRec; | ||
295 | - REGION_INIT(pScreen, exposures, &box, 1); | ||
296 | + REGION_INIT2(pScreen, exposures, &box, 1); | ||
297 | REGION_RESET(pScreen, prgn, &box); | ||
298 | } else { | ||
299 | REGION_RESET(pScreen, exposures, &box); | ||
300 | @@ -1672,7 +1672,7 @@ | ||
301 | box.x1 = x1; box.x2 = x2; | ||
302 | box.y1 = y1; box.y2 = y2; | ||
303 | |||
304 | - REGION_INIT(pScreen, ®, &box, 1); | ||
305 | + REGION_INIT2(pScreen, ®, &box, 1); | ||
306 | |||
307 | REGION_INTERSECT(pScreen, ®, ®, clipList); | ||
308 | if (generateExposures) | ||
309 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/mi/miwindow.c xorg-server-1.7.99.2/mi/miwindow.c | ||
310 | --- xorg-server-1.7.99.2.ORIG/mi/miwindow.c 2009-11-04 09:25:50.000000000 -0700 | ||
311 | +++ xorg-server-1.7.99.2/mi/miwindow.c 2012-01-04 12:48:38.055787835 -0700 | ||
312 | @@ -111,7 +111,7 @@ | ||
313 | box.y2 = y2; | ||
314 | |||
315 | pScreen = pWin->drawable.pScreen; | ||
316 | - REGION_INIT(pScreen, ®, &box, 1); | ||
317 | + REGION_INIT2(pScreen, ®, &box, 1); | ||
318 | |||
319 | REGION_INTERSECT(pScreen, ®, ®, &pWin->clipList); | ||
320 | if (generateExposures) | ||
321 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/miext/damage/damage.c xorg-server-1.7.99.2/miext/damage/damage.c | ||
322 | --- xorg-server-1.7.99.2.ORIG/miext/damage/damage.c 2009-11-04 09:25:50.000000000 -0700 | ||
323 | +++ xorg-server-1.7.99.2/miext/damage/damage.c 2012-01-04 12:51:04.883281430 -0700 | ||
324 | @@ -324,7 +324,7 @@ | ||
325 | box.y1 = draw_y; | ||
326 | box.x2 = draw_x + pDamage->pDrawable->width; | ||
327 | box.y2 = draw_y + pDamage->pDrawable->height; | ||
328 | - REGION_INIT(pScreen, &pixClip, &box, 1); | ||
329 | + REGION_INIT2(pScreen, &pixClip, &box, 1); | ||
330 | REGION_INTERSECT (pScreen, pDamageRegion, pRegion, &pixClip); | ||
331 | REGION_UNINIT(pScreen, &pixClip); | ||
332 | } | ||
333 | @@ -2085,7 +2085,7 @@ | ||
334 | box.y1 = pDrawable->y; | ||
335 | box.x2 = pDrawable->x + pDrawable->width; | ||
336 | box.y2 = pDrawable->y + pDrawable->height; | ||
337 | - REGION_INIT (pDrawable->pScreen, &pixmapClip, &box, 1); | ||
338 | + REGION_INIT2 (pDrawable->pScreen, &pixmapClip, &box, 1); | ||
339 | pClip = &pixmapClip; | ||
340 | } | ||
341 | REGION_TRANSLATE (pDrawable->pScreen, &pDamage->damage, pDrawable->x, pDrawable->y); | ||
342 | diff -ur --exclude='*.lo' --exclude='config*' --exclude='Make*' --exclude='ac*' xorg-server-1.7.99.2.ORIG/Xext/xace.c xorg-server-1.7.99.2/Xext/xace.c | ||
343 | --- xorg-server-1.7.99.2.ORIG/Xext/xace.c 2009-11-04 09:25:50.000000000 -0700 | ||
344 | +++ xorg-server-1.7.99.2/Xext/xace.c 2012-01-04 12:49:36.850385965 -0700 | ||
345 | @@ -255,7 +255,7 @@ | ||
346 | imageBox.y1 = y; | ||
347 | imageBox.x2 = x + w; | ||
348 | imageBox.y2 = y + h; | ||
349 | - REGION_INIT(pScreen, &imageRegion, &imageBox, 1); | ||
350 | + REGION_INIT2(pScreen, &imageRegion, &imageBox, 1); | ||
351 | REGION_NULL(pScreen, &censorRegion); | ||
352 | |||
353 | /* censorRegion = imageRegion - visibleRegion */ | ||
354 | --- xorg-server-1.7.99.2.ORIG/mi/mibank.c 2009-11-04 09:25:50.000000000 -0700 | ||
355 | +++ xorg-server-1.7.99.2/mi/mibank.c 2012-01-04 12:37:42.251184747 -0700 | ||
356 | @@ -772,7 +772,7 @@ | ||
357 | } | ||
358 | else | ||
359 | { | ||
360 | - REGION_INIT(pScreen, &rgnDst, &fastBox, 1); | ||
361 | + REGION_INIT2(pScreen, &rgnDst, &fastBox, 1); | ||
362 | REGION_INTERSECT(pScreen, &rgnDst, &rgnDst, prgnSrcClip); | ||
363 | pBox = REGION_RECTS(&rgnDst); | ||
364 | nBox = REGION_NUM_RECTS(&rgnDst); | ||