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