1 |
commit: 304e57a630500bfe1149448bcd9dfcf2d470ec5d |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 25 20:37:42 2017 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 25 20:43:03 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304e57a6 |
7 |
|
8 |
x11-drivers/xf86-video-omapfb: Remove. |
9 |
|
10 |
Bug: https://bugs.gentoo.org/606132 |
11 |
|
12 |
x11-drivers/xf86-video-omapfb/Manifest | 2 - |
13 |
...a-large-CRTC-upper-limit-to-not-prune-lar.patch | 41 --- |
14 |
...virtual-size-when-configuring-framebuffer.patch | 32 -- |
15 |
.../files/0003-force-plain-mode.patch | 31 -- |
16 |
.../files/0004-blacklist-tv-out.patch | 33 --- |
17 |
.../files/0005-Attempt-to-fix-VRFB.patch | 325 --------------------- |
18 |
...0006-omapfb-port-to-new-xserver-video-API.patch | 272 ----------------- |
19 |
.../files/0007-always_include_xorg_server.h.patch | 48 --- |
20 |
.../xf86-video-omapfb-0.1.1-closescreen.patch | 11 - |
21 |
x11-drivers/xf86-video-omapfb/metadata.xml | 8 - |
22 |
.../xf86-video-omapfb-0.1.1.1_p1.ebuild | 34 --- |
23 |
11 files changed, 837 deletions(-) |
24 |
|
25 |
diff --git a/x11-drivers/xf86-video-omapfb/Manifest b/x11-drivers/xf86-video-omapfb/Manifest |
26 |
deleted file mode 100644 |
27 |
index b9ffcfa49a..0000000000 |
28 |
--- a/x11-drivers/xf86-video-omapfb/Manifest |
29 |
+++ /dev/null |
30 |
@@ -1,2 +0,0 @@ |
31 |
-DIST xf86-video-omapfb_0.1.1.1-1.diff.gz 3116 SHA256 c4ea91003b4244563668a78603b28918df40629ef729515ba48d1dc923ef359c SHA512 cc463421b8a86a90234cf5a6352458d708f60fe77613bcc9099531651653efd9da11640199c792a3061f65930bc39bef90ec769a673cee27dd88a606c5fa652f WHIRLPOOL 73c4ef6c0bd67f46b25c794dbfa7ed318231b68d7dc8c4cae20397fc2ecd6610beeb77dc4a49394056d21d2a5a8954c0d9fea371e7f7547eb60f698dc3d8a95f |
32 |
-DIST xf86-video-omapfb_0.1.1.1.orig.tar.gz 26835 SHA256 fe7e6e7739ecddc3b1663cbe08e7e889544a16e5e505d0dc48c79b2153208fbc SHA512 96f6ff1adc5c558e4957b32a0dee722553f6c9e4aac6f8b5ca77e58b6d7b33b910b207ffa27b6556b802ead4cacaa034cf822dccb979072171782a5a34b6f96d WHIRLPOOL 5524a3b3319de0d0de57a1dcc888c488b902357be93f685211b581b3e31c368a462c4a9ac78096b40974a9a98773220117086cd911e958c2a8444278d52744bc |
33 |
|
34 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch b/x11-drivers/xf86-video-omapfb/files/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch |
35 |
deleted file mode 100644 |
36 |
index 9fb01d438a..0000000000 |
37 |
--- a/x11-drivers/xf86-video-omapfb/files/0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch |
38 |
+++ /dev/null |
39 |
@@ -1,41 +0,0 @@ |
40 |
-From 8fb7d0f99d4afbb574b30cb4f1e66a8f89d94ad5 Mon Sep 17 00:00:00 2001 |
41 |
-From: Koen Kooi <koen@×××××××××××××××××.net> |
42 |
-Date: Wed, 26 Jan 2011 12:04:36 +0100 |
43 |
-Subject: [PATCH 1/6] Revert "Set a large CRTC upper limit to not prune larger |
44 |
- resolutions" |
45 |
- |
46 |
-Picture is garbled after switching resolutions, so revert it. |
47 |
-Virtual size too big, revert the commit 9c4d7592dcb7dc20a48a6f941d9d94bd73d34153. |
48 |
- |
49 |
-Upstream-Status: Pending |
50 |
- |
51 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
52 |
---- |
53 |
- src/omapfb-crtc.c | 8 ++++---- |
54 |
- 1 file changed, 4 insertions(+), 4 deletions(-) |
55 |
- |
56 |
-diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c |
57 |
-index 9aaa52f..cbeff35 100644 |
58 |
---- a/src/omapfb-crtc.c |
59 |
-+++ b/src/omapfb-crtc.c |
60 |
-@@ -190,13 +190,13 @@ OMAPFBCRTCInit(ScrnInfoPtr pScrn) |
61 |
- * In practise, this doesn't seem to be supported. |
62 |
- * (no way to setup the overlay offset/base address) |
63 |
- */ |
64 |
-- /* FIXME: figure out what makes sense here. A known max resolution? |
65 |
-- * framebuffer size? |
66 |
-- */ |
67 |
- xf86CrtcSetSizeRange(pScrn, |
68 |
-- 8, 8, 2048, 2048); |
69 |
-+ 8, 8, |
70 |
-+ ofb->state_info.xres_virtual, |
71 |
-+ ofb->state_info.yres_virtual); |
72 |
- |
73 |
- ofb->crtc = xf86CrtcCreate(pScrn, &OMAPFBCrtcFuncs); |
74 |
-+ |
75 |
- } |
76 |
- |
77 |
- |
78 |
--- |
79 |
-1.8.0 |
80 |
- |
81 |
|
82 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch b/x11-drivers/xf86-video-omapfb/files/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch |
83 |
deleted file mode 100644 |
84 |
index 683a989832..0000000000 |
85 |
--- a/x11-drivers/xf86-video-omapfb/files/0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch |
86 |
+++ /dev/null |
87 |
@@ -1,32 +0,0 @@ |
88 |
-From 855c333ac0d16350f895f1d1b9391e9cbb0b6db4 Mon Sep 17 00:00:00 2001 |
89 |
-From: Koen Kooi <koen@×××××××××××××××××.net> |
90 |
-Date: Wed, 26 Jan 2011 13:27:20 +0100 |
91 |
-Subject: [PATCH 2/6] Revert "Set virtual size when configuring framebuffer" |
92 |
- |
93 |
-Virtual size too big, so revert it. |
94 |
- |
95 |
-This reverts commit 2653ef07883fbd1a5e7025f9300cf89b79ba429a. |
96 |
- |
97 |
-Upstream-Status: Pending |
98 |
- |
99 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
100 |
---- |
101 |
- src/omapfb-crtc.c | 2 -- |
102 |
- 1 file changed, 2 deletions(-) |
103 |
- |
104 |
-diff --git a/src/omapfb-crtc.c b/src/omapfb-crtc.c |
105 |
-index cbeff35..9655db2 100644 |
106 |
---- a/src/omapfb-crtc.c |
107 |
-+++ b/src/omapfb-crtc.c |
108 |
-@@ -98,8 +98,6 @@ OMAPFBCrtcCommitChangeMode (xf86CrtcPtr crtc) |
109 |
- v = ofb->state_info; |
110 |
- v.xres = mode->HDisplay; |
111 |
- v.yres = mode->VDisplay; |
112 |
-- v.xres_virtual = crtc->scrn->virtualX; |
113 |
-- v.yres_virtual = crtc->scrn->virtualY; |
114 |
- v.activate = FB_ACTIVATE_NOW; |
115 |
- v.pixclock = KHZ2PICOS(mode->Clock ? mode->Clock : 56000); |
116 |
- v.left_margin = mode->HTotal - mode->HSyncEnd; |
117 |
--- |
118 |
-1.8.0 |
119 |
- |
120 |
|
121 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0003-force-plain-mode.patch b/x11-drivers/xf86-video-omapfb/files/0003-force-plain-mode.patch |
122 |
deleted file mode 100644 |
123 |
index 67ea7c1a5f..0000000000 |
124 |
--- a/x11-drivers/xf86-video-omapfb/files/0003-force-plain-mode.patch |
125 |
+++ /dev/null |
126 |
@@ -1,31 +0,0 @@ |
127 |
-From 252f44c072d3447a32127fc9afe5d0d40f3c510e Mon Sep 17 00:00:00 2001 |
128 |
-From: Koen Kooi <koen@×××××××××××××××××.net> |
129 |
-Date: Wed, 26 Jan 2011 13:20:20 +0100 |
130 |
-Subject: [PATCH 3/6] force 'plain' mode |
131 |
- |
132 |
-The new DSS mode breaks XV, so force plain mode |
133 |
- |
134 |
-Upstream-Status: Pending |
135 |
- |
136 |
-Signed-off-by: Koen Kooi <koen@×××××××××××××××××.net> |
137 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
138 |
---- |
139 |
- src/omapfb-driver.c | 2 +- |
140 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
141 |
- |
142 |
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c |
143 |
-index 018e040..48aa09c 100644 |
144 |
---- a/src/omapfb-driver.c |
145 |
-+++ b/src/omapfb-driver.c |
146 |
-@@ -326,7 +326,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) |
147 |
- OMAPFBProbeController(ofb->ctrl_name); |
148 |
- |
149 |
- /* Do we have the DSS kernel API? */ |
150 |
-- if (stat(SYSFS_DSS_DIR, &st) == 0) { |
151 |
-+ if (0) { //stat(SYSFS_DSS_DIR, &st) == 0) { |
152 |
- ofb->dss = TRUE; |
153 |
- } else { |
154 |
- ofb->dss = FALSE; |
155 |
--- |
156 |
-1.8.0 |
157 |
- |
158 |
|
159 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0004-blacklist-tv-out.patch b/x11-drivers/xf86-video-omapfb/files/0004-blacklist-tv-out.patch |
160 |
deleted file mode 100644 |
161 |
index b0ac9a44c8..0000000000 |
162 |
--- a/x11-drivers/xf86-video-omapfb/files/0004-blacklist-tv-out.patch |
163 |
+++ /dev/null |
164 |
@@ -1,33 +0,0 @@ |
165 |
-From cfa46b67f59115f6d8ef9414af60380749ff3eb3 Mon Sep 17 00:00:00 2001 |
166 |
-From: Koen Kooi <koen@×××××××××××××××××.net> |
167 |
-Date: Wed, 26 Jan 2011 13:21:12 +0100 |
168 |
-Subject: [PATCH 4/6] blacklist tv out |
169 |
- |
170 |
-The tv-out gets added last and the driver tries to reconfigure dvi to TV resolutions, which fails. so blacklist it |
171 |
- |
172 |
-Upstream-Status: Pending |
173 |
- |
174 |
-Signed-off-by: Koen Kooi <koen@×××××××××××××××××.net> |
175 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
176 |
---- |
177 |
- src/omapfb-output-dss.c | 4 ++++ |
178 |
- 1 file changed, 4 insertions(+) |
179 |
- |
180 |
-diff --git a/src/omapfb-output-dss.c b/src/omapfb-output-dss.c |
181 |
-index 6cc52de..83cb711 100644 |
182 |
---- a/src/omapfb-output-dss.c |
183 |
-+++ b/src/omapfb-output-dss.c |
184 |
-@@ -205,6 +205,10 @@ OMAPFBDSSOutputDetect (xf86OutputPtr output) |
185 |
- if(ofb->timings[idx][0] == '\0') |
186 |
- return XF86OutputStatusDisconnected; |
187 |
- |
188 |
-+ // Hack to disable the tv out |
189 |
-+ if (strncmp(output->name, "tv", 2) == 0) |
190 |
-+ return XF86OutputStatusDisconnected; |
191 |
-+ |
192 |
- return XF86OutputStatusConnected; |
193 |
- } |
194 |
- |
195 |
--- |
196 |
-1.8.0 |
197 |
- |
198 |
|
199 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0005-Attempt-to-fix-VRFB.patch b/x11-drivers/xf86-video-omapfb/files/0005-Attempt-to-fix-VRFB.patch |
200 |
deleted file mode 100644 |
201 |
index 67b284023d..0000000000 |
202 |
--- a/x11-drivers/xf86-video-omapfb/files/0005-Attempt-to-fix-VRFB.patch |
203 |
+++ /dev/null |
204 |
@@ -1,325 +0,0 @@ |
205 |
-From 8b1f697a60e35ab82fffdabfaefdb45e9a9df379 Mon Sep 17 00:00:00 2001 |
206 |
-From: Eino-Ville Talvala <talvala@××××××××.edu> |
207 |
-Date: Tue, 23 Aug 2011 18:37:01 +0200 |
208 |
-Subject: [PATCH 5/6] Attempt to fix VRFB |
209 |
- |
210 |
-Upstream-Status: Pending |
211 |
- |
212 |
-http://dominion.thruhere.net/git/cgit.cgi/xf86-video-omapfb/commit/?h=koen/fixups&id=6833fc9f795265e4943d248103fbaf3463b515d6 |
213 |
- |
214 |
-Signed-off-by: Sebastian Krzyszkowiak <dos@×××××××××.net> |
215 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
216 |
---- |
217 |
- src/image-format-conversions.c | 4 +-- |
218 |
- src/image-format-conversions.h | 2 +- |
219 |
- src/omapfb-driver.c | 28 +++++++++++++--- |
220 |
- src/omapfb-xv-blizzard.c | 1 + |
221 |
- src/omapfb-xv-generic.c | 72 +++++++++++++++++++++++++++++++++--------- |
222 |
- src/omapfb-xv.c | 3 ++ |
223 |
- 6 files changed, 88 insertions(+), 22 deletions(-) |
224 |
- |
225 |
-diff --git a/src/image-format-conversions.c b/src/image-format-conversions.c |
226 |
-index dcefa9b..d43427d 100644 |
227 |
---- a/src/image-format-conversions.c |
228 |
-+++ b/src/image-format-conversions.c |
229 |
-@@ -38,13 +38,13 @@ |
230 |
- #include "image-format-conversions.h" |
231 |
- |
232 |
- /* Basic line-based copy for packed formats */ |
233 |
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest) |
234 |
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest) |
235 |
- { |
236 |
- int i; |
237 |
- int len = w * 2; |
238 |
- for (i = 0; i < h; i++) |
239 |
- { |
240 |
-- memcpy(dest + i * len, src + i * stride, len); |
241 |
-+ memcpy(dest + i * dst_stride, src + i * src_stride, len); |
242 |
- } |
243 |
- } |
244 |
- |
245 |
-diff --git a/src/image-format-conversions.h b/src/image-format-conversions.h |
246 |
-index 584896a..ba7caf2 100644 |
247 |
---- a/src/image-format-conversions.h |
248 |
-+++ b/src/image-format-conversions.h |
249 |
-@@ -27,7 +27,7 @@ |
250 |
- #include <stdint.h> |
251 |
- |
252 |
- /* Basic line-based copy for packed formats */ |
253 |
--void packed_line_copy(int w, int h, int stride, uint8_t *src, uint8_t *dest); |
254 |
-+void packed_line_copy(int w, int h, int src_stride, int dst_stride, uint8_t *src, uint8_t *dest); |
255 |
- |
256 |
- /* Basic C implementation of YV12/I420 to UYVY conversion */ |
257 |
- void uv12_to_uyvy(int w, int h, int y_pitch, int uv_pitch, uint8_t *y_p, uint8_t *u_p, uint8_t *v_p, uint8_t *dest); |
258 |
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c |
259 |
-index 48aa09c..07989f5 100644 |
260 |
---- a/src/omapfb-driver.c |
261 |
-+++ b/src/omapfb-driver.c |
262 |
-@@ -66,6 +66,7 @@ |
263 |
- #define OMAPFB_VERSION 1000 |
264 |
- #define OMAPFB_DRIVER_NAME "OMAPFB" |
265 |
- #define OMAPFB_NAME "omapfb" |
266 |
-+#define ENFORCE_MODES |
267 |
- |
268 |
- static Bool OMAPFBProbe(DriverPtr drv, int flags); |
269 |
- static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); |
270 |
-@@ -105,11 +106,13 @@ static SymTabRec OMAPFBChipsets[] = { |
271 |
- typedef enum { |
272 |
- OPTION_ACCELMETHOD, |
273 |
- OPTION_FB, |
274 |
-+ OPTION_ROTATE, |
275 |
- } FBDevOpts; |
276 |
- |
277 |
- static const OptionInfoRec OMAPFBOptions[] = { |
278 |
- { OPTION_ACCELMETHOD, "AccelMethod", OPTV_STRING, {0}, FALSE }, |
279 |
- { OPTION_FB, "fb", OPTV_STRING, {0}, FALSE }, |
280 |
-+ { OPTION_ROTATE, "rotation", OPTV_STRING, {0}, FALSE }, |
281 |
- { -1, NULL, OPTV_NONE, {0}, FALSE } |
282 |
- }; |
283 |
- |
284 |
-@@ -286,6 +289,7 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) |
285 |
- { |
286 |
- OMAPFBPtr ofb; |
287 |
- EntityInfoPtr pEnt; |
288 |
-+ char *rotate; |
289 |
- rgb zeros = { 0, 0, 0 }; |
290 |
- struct stat st; |
291 |
- |
292 |
-@@ -379,6 +383,8 @@ OMAPFBPreInit(ScrnInfoPtr pScrn, int flags) |
293 |
- pScrn->progClock = TRUE; |
294 |
- pScrn->chipset = "omapfb"; |
295 |
- |
296 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Rotate test version 0.02\n"); |
297 |
-+ |
298 |
- /* Start with configured virtual size */ |
299 |
- pScrn->virtualX = pScrn->display->virtualX; |
300 |
- pScrn->virtualY = pScrn->display->virtualY; |
301 |
-@@ -496,12 +502,21 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
302 |
- ofb->CloseScreen = pScreen->CloseScreen; |
303 |
- pScreen->CloseScreen = OMAPFBCloseScreen; |
304 |
- |
305 |
-+ /* Enforce the default mode (this is silly I guess) */ |
306 |
-+#ifdef ENFORCE_MODES |
307 |
-+ //xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Enforcing modes\n"); |
308 |
-+ //set_mode(ofb, &ofb->default_mode); |
309 |
-+ //pScrn->displayWidth = ofb->fixed_info.line_length / |
310 |
-+ // (ofb->state_info.bits_per_pixel>>3); //ofb->state_info.xres; |
311 |
-+#endif |
312 |
-+ |
313 |
- /* Map our framebuffer memory */ |
314 |
-+ ofb->mem_info.size = ofb->fixed_info.line_length * ofb->state_info.yres; |
315 |
- ofb->fb = mmap (NULL, ofb->mem_info.size, |
316 |
- PROT_READ | PROT_WRITE, MAP_SHARED, |
317 |
- ofb->fd, 0); |
318 |
-- if (ofb->fb == NULL) { |
319 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed\n"); |
320 |
-+ if (ofb->fb == MAP_FAILED) { |
321 |
-+ xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); |
322 |
- return FALSE; |
323 |
- } |
324 |
- |
325 |
-@@ -578,8 +593,13 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
326 |
- } else if (!ofb->dss) { |
327 |
- |
328 |
- ofb->plane_info.enabled = 1; |
329 |
-- ofb->plane_info.out_width = ofb->state_info.xres; |
330 |
-- ofb->plane_info.out_height = ofb->state_info.yres; |
331 |
-+ if (ofb->state_info.rotate == 0 || ofb->state_info.rotate == 2) { |
332 |
-+ ofb->plane_info.out_width = ofb->state_info.xres; |
333 |
-+ ofb->plane_info.out_height = ofb->state_info.yres; |
334 |
-+ } else { |
335 |
-+ ofb->plane_info.out_width = ofb->state_info.yres; |
336 |
-+ ofb->plane_info.out_height = ofb->state_info.xres; |
337 |
-+ } |
338 |
- |
339 |
- if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { |
340 |
- xf86DrvMsg(scrnIndex, X_ERROR, |
341 |
-diff --git a/src/omapfb-xv-blizzard.c b/src/omapfb-xv-blizzard.c |
342 |
-index 406ffc6..b71d2aa 100644 |
343 |
---- a/src/omapfb-xv-blizzard.c |
344 |
-+++ b/src/omapfb-xv-blizzard.c |
345 |
-@@ -220,6 +220,7 @@ int OMAPFBXVPutImageBlizzard (ScrnInfoPtr pScrn, |
346 |
- packed_line_copy(src_w & ~3, |
347 |
- src_h & ~3, |
348 |
- ((src_w + 1) & ~1) * 2, |
349 |
-+ ofb->port->fixed_info.line_length, |
350 |
- (uint8_t*)buf, |
351 |
- (uint8_t*)ofb->port->fb); |
352 |
- break; |
353 |
-diff --git a/src/omapfb-xv-generic.c b/src/omapfb-xv-generic.c |
354 |
-index e6f89fe..b33f344 100644 |
355 |
---- a/src/omapfb-xv-generic.c |
356 |
-+++ b/src/omapfb-xv-generic.c |
357 |
-@@ -62,7 +62,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) |
358 |
- { |
359 |
- OMAPFBPtr ofb = OMAPFB(pScrn); |
360 |
- |
361 |
-- /* The memory size is already set in OMAPFBXVQueryImageAttributes */ |
362 |
-+ /* The memory size is already set before we get here */ |
363 |
- if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) { |
364 |
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |
365 |
- "Failed to allocate video plane memory\n"); |
366 |
-@@ -73,19 +73,20 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) |
367 |
- ofb->port->fb = mmap (NULL, ofb->port->mem_info.size, |
368 |
- PROT_READ | PROT_WRITE, MAP_SHARED, |
369 |
- ofb->port->fd, 0); |
370 |
-- if (ofb->port->fb == NULL) { |
371 |
-+ if (ofb->port->fb == MAP_FAILED) { |
372 |
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |
373 |
- "Mapping video memory failed\n"); |
374 |
- return XvBadAlloc; |
375 |
- } |
376 |
- |
377 |
- /* Update the state info */ |
378 |
-+ /* Let's not - it's bad |
379 |
- if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) |
380 |
- { |
381 |
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); |
382 |
- return XvBadAlloc; |
383 |
- } |
384 |
-- |
385 |
-+ */ |
386 |
- return Success; |
387 |
- } |
388 |
- |
389 |
-@@ -93,6 +94,7 @@ int OMAPXVAllocPlane(ScrnInfoPtr pScrn) |
390 |
- int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) |
391 |
- { |
392 |
- OMAPFBPtr ofb = OMAPFB(pScrn); |
393 |
-+ int ret; |
394 |
- |
395 |
- if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) |
396 |
- { |
397 |
-@@ -104,6 +106,31 @@ int OMAPXVSetupVideoPlane(ScrnInfoPtr pScrn) |
398 |
- xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); |
399 |
- return XvBadAlloc; |
400 |
- } |
401 |
-+ /* Changing rotation/nonstd flags can change the fixed info! */ |
402 |
-+ if (ioctl (ofb->port->fd, FBIOGET_FSCREENINFO, &ofb->port->fixed_info)) |
403 |
-+ { |
404 |
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); |
405 |
-+ return XvBadAlloc; |
406 |
-+ } |
407 |
-+ /* Correct fixed info requires recalculation of needed memory */ |
408 |
-+ ofb->port->mem_info.size = ofb->port->fixed_info.line_length * ofb->port->state_info.yres; |
409 |
-+ |
410 |
-+ /* Allocate buffer memory */ |
411 |
-+ ret = OMAPXVAllocPlane(pScrn); |
412 |
-+ if (ret != Success) |
413 |
-+ return ret; |
414 |
-+ |
415 |
-+ /* Workaround for reset of mode after memory allo */ |
416 |
-+ if (ioctl (ofb->port->fd, FBIOPUT_VSCREENINFO, &ofb->port->state_info)) |
417 |
-+ { |
418 |
-+ xf86Msg(X_ERROR, "%s: setting state info failed\n", __FUNCTION__); |
419 |
-+ return XvBadAlloc; |
420 |
-+ } |
421 |
-+ if (ioctl (ofb->port->fd, FBIOGET_VSCREENINFO, &ofb->port->state_info)) |
422 |
-+ { |
423 |
-+ xf86Msg(X_ERROR, "%s: Reading state info failed\n", __FUNCTION__); |
424 |
-+ return XvBadAlloc; |
425 |
-+ } |
426 |
- |
427 |
- if(ioctl(ofb->port->fd, OMAPFB_SETUP_PLANE, |
428 |
- &ofb->port->plane_info) != 0) { |
429 |
-@@ -124,6 +151,8 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, |
430 |
- DrawablePtr pDraw) |
431 |
- { |
432 |
- OMAPFBPtr ofb = OMAPFB(pScrn); |
433 |
-+ short drw_temp; |
434 |
-+ short rot_xres, rot_yres; |
435 |
- |
436 |
- if (!ofb->port->plane_info.enabled |
437 |
- || ofb->port->update_window.x != src_x |
438 |
-@@ -163,13 +192,6 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, |
439 |
- return Success; |
440 |
- } |
441 |
- |
442 |
-- /* If we don't have the plane running, enable it */ |
443 |
-- if (!ofb->port->plane_info.enabled) { |
444 |
-- ret = OMAPXVAllocPlane(pScrn); |
445 |
-- if (ret != Success) |
446 |
-- return ret; |
447 |
-- } |
448 |
-- |
449 |
- /* Set up the state info, xres and yres will be used for |
450 |
- * scaling to the values in the plane info struct |
451 |
- */ |
452 |
-@@ -179,12 +201,31 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, |
453 |
- ofb->port->state_info.yres_virtual = 0; |
454 |
- ofb->port->state_info.xoffset = 0; |
455 |
- ofb->port->state_info.yoffset = 0; |
456 |
-- ofb->port->state_info.rotate = 0; |
457 |
-+ //ofb->port->state_info.rotate = 0; |
458 |
- ofb->port->state_info.grayscale = 0; |
459 |
- ofb->port->state_info.activate = FB_ACTIVATE_NOW; |
460 |
- ofb->port->state_info.bits_per_pixel = 0; |
461 |
- ofb->port->state_info.nonstd = xv_to_omapfb_format(image); |
462 |
- |
463 |
-+ /* Plane info does not rotate with state_info */ |
464 |
-+ if (ofb->port->state_info.rotate == 1 || |
465 |
-+ ofb->port->state_info.rotate == 3) { |
466 |
-+ drw_temp = drw_x; |
467 |
-+ drw_x = drw_y; |
468 |
-+ drw_y = drw_temp; |
469 |
-+ |
470 |
-+ drw_temp = drw_w; |
471 |
-+ drw_w = drw_h; |
472 |
-+ drw_h = drw_temp; |
473 |
-+ |
474 |
-+ rot_xres = ofb->port->state_info.yres; |
475 |
-+ rot_yres = ofb->port->state_info.xres; |
476 |
-+ } else { |
477 |
-+ rot_xres = ofb->port->state_info.xres; |
478 |
-+ rot_yres = ofb->port->state_info.yres; |
479 |
-+ } |
480 |
-+ |
481 |
-+ |
482 |
- /* Set up the video plane info */ |
483 |
- ofb->port->plane_info.enabled = 1; |
484 |
- ofb->port->plane_info.pos_x = drw_x; |
485 |
-@@ -193,13 +234,13 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, |
486 |
- ofb->port->plane_info.out_height = drw_h & ~15; |
487 |
- |
488 |
- /* Cap output to screen size */ |
489 |
-- if (ofb->port->plane_info.out_width > ofb->state_info.xres) { |
490 |
-+ if (ofb->port->plane_info.out_width > rot_xres) { |
491 |
- ofb->port->plane_info.pos_x = 0; |
492 |
-- ofb->port->plane_info.out_width = ofb->state_info.xres; |
493 |
-+ ofb->port->plane_info.out_width = rot_xres; |
494 |
- } |
495 |
-- if (ofb->port->plane_info.out_height > ofb->state_info.yres) { |
496 |
-+ if (ofb->port->plane_info.out_height > rot_yres) { |
497 |
- ofb->port->plane_info.pos_y = 0; |
498 |
-- ofb->port->plane_info.out_height = ofb->state_info.yres; |
499 |
-+ ofb->port->plane_info.out_height = rot_yres; |
500 |
- } |
501 |
- |
502 |
- ret = OMAPXVSetupVideoPlane(pScrn); |
503 |
-@@ -223,6 +264,7 @@ int OMAPFBXVPutImageGeneric (ScrnInfoPtr pScrn, |
504 |
- packed_line_copy(src_w & ~15, |
505 |
- src_h & ~15, |
506 |
- ((src_w + 1) & ~1) * 2, |
507 |
-+ ofb->port->fixed_info.line_length, |
508 |
- (uint8_t*)buf, |
509 |
- (uint8_t*)ofb->port->fb); |
510 |
- break; |
511 |
-diff --git a/src/omapfb-xv.c b/src/omapfb-xv.c |
512 |
-index 1df651e..0fee2c6 100644 |
513 |
---- a/src/omapfb-xv.c |
514 |
-+++ b/src/omapfb-xv.c |
515 |
-@@ -169,8 +169,11 @@ static int OMAPFBXVQueryImageAttributes (ScrnInfoPtr pScrn, |
516 |
- h = *height; |
517 |
- |
518 |
- w = (w + 1) & ~1; |
519 |
-+ |
520 |
-+ /* Can't calculate these here - don't know line length |
521 |
- ofb->port->mem_info.size = w << 1; |
522 |
- ofb->port->mem_info.size *= h; |
523 |
-+ */ |
524 |
- |
525 |
- return size; |
526 |
- } |
527 |
--- |
528 |
-1.8.0 |
529 |
- |
530 |
|
531 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0006-omapfb-port-to-new-xserver-video-API.patch b/x11-drivers/xf86-video-omapfb/files/0006-omapfb-port-to-new-xserver-video-API.patch |
532 |
deleted file mode 100644 |
533 |
index d56729987c..0000000000 |
534 |
--- a/x11-drivers/xf86-video-omapfb/files/0006-omapfb-port-to-new-xserver-video-API.patch |
535 |
+++ /dev/null |
536 |
@@ -1,272 +0,0 @@ |
537 |
-From 803ecf2909949e6152f4a81b6cbb92a4430679ac Mon Sep 17 00:00:00 2001 |
538 |
-From: Martin Jansa <Martin.Jansa@×××××.com> |
539 |
-Date: Fri, 23 Nov 2012 00:31:06 +0100 |
540 |
-Subject: [PATCH 6/6] omapfb: port to new xserver video API |
541 |
- |
542 |
-Upstream-Status: Pending |
543 |
- |
544 |
-Signed-off-by: Martin Jansa <Martin.Jansa@×××××.com> |
545 |
---- |
546 |
- src/compat-api.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ |
547 |
- src/omapfb-driver.c | 41 ++++++++++++----------- |
548 |
- 2 files changed, 118 insertions(+), 19 deletions(-) |
549 |
- create mode 100644 src/compat-api.h |
550 |
- |
551 |
-diff --git a/src/compat-api.h b/src/compat-api.h |
552 |
-new file mode 100644 |
553 |
-index 0000000..b1591b1 |
554 |
---- /dev/null |
555 |
-+++ b/src/compat-api.h |
556 |
-@@ -0,0 +1,96 @@ |
557 |
-+/* |
558 |
-+ * Copyright 2012 Red Hat, Inc. |
559 |
-+ * |
560 |
-+ * Permission is hereby granted, free of charge, to any person obtaining a |
561 |
-+ * copy of this software and associated documentation files (the "Software"), |
562 |
-+ * to deal in the Software without restriction, including without limitation |
563 |
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, |
564 |
-+ * and/or sell copies of the Software, and to permit persons to whom the |
565 |
-+ * Software is furnished to do so, subject to the following conditions: |
566 |
-+ * |
567 |
-+ * The above copyright notice and this permission notice (including the next |
568 |
-+ * paragraph) shall be included in all copies or substantial portions of the |
569 |
-+ * Software. |
570 |
-+ * |
571 |
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
572 |
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
573 |
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
574 |
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
575 |
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
576 |
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
577 |
-+ * DEALINGS IN THE SOFTWARE. |
578 |
-+ * |
579 |
-+ * Author: Dave Airlie <airlied@××××××.com> |
580 |
-+ */ |
581 |
-+ |
582 |
-+/* this file provides API compat between server post 1.13 and pre it, |
583 |
-+ it should be reused inside as many drivers as possible */ |
584 |
-+#ifndef COMPAT_API_H |
585 |
-+#define COMPAT_API_H |
586 |
-+ |
587 |
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR |
588 |
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] |
589 |
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p |
590 |
-+#endif |
591 |
-+ |
592 |
-+#ifndef XF86_HAS_SCRN_CONV |
593 |
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] |
594 |
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] |
595 |
-+#endif |
596 |
-+ |
597 |
-+#ifndef XF86_SCRN_INTERFACE |
598 |
-+ |
599 |
-+#define SCRN_ARG_TYPE int |
600 |
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] |
601 |
-+ |
602 |
-+#define SCREEN_ARG_TYPE int |
603 |
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] |
604 |
-+ |
605 |
-+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv |
606 |
-+ |
607 |
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask |
608 |
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask |
609 |
-+ |
610 |
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen |
611 |
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen |
612 |
-+ |
613 |
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags |
614 |
-+ |
615 |
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags |
616 |
-+ |
617 |
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags |
618 |
-+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 |
619 |
-+ |
620 |
-+#define VT_FUNC_ARGS_DECL int arg, int flags |
621 |
-+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) |
622 |
-+ |
623 |
-+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) |
624 |
-+#else |
625 |
-+#define SCRN_ARG_TYPE ScrnInfoPtr |
626 |
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) |
627 |
-+ |
628 |
-+#define SCREEN_ARG_TYPE ScreenPtr |
629 |
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) |
630 |
-+ |
631 |
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv |
632 |
-+ |
633 |
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask |
634 |
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask |
635 |
-+ |
636 |
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen |
637 |
-+#define CLOSE_SCREEN_ARGS pScreen |
638 |
-+ |
639 |
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y |
640 |
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode |
641 |
-+ |
642 |
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg |
643 |
-+#define FREE_SCREEN_ARGS(x) (x) |
644 |
-+ |
645 |
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg |
646 |
-+#define VT_FUNC_ARGS(flags) pScrn |
647 |
-+ |
648 |
-+#define XF86_ENABLEDISABLEFB_ARG(x) (x) |
649 |
-+ |
650 |
-+#endif |
651 |
-+ |
652 |
-+#endif |
653 |
-diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c |
654 |
-index 07989f5..486ffa4 100644 |
655 |
---- a/src/omapfb-driver.c |
656 |
-+++ b/src/omapfb-driver.c |
657 |
-@@ -44,6 +44,8 @@ |
658 |
- |
659 |
- #include "exa.h" |
660 |
- |
661 |
-+#include "compat-api.h" |
662 |
-+ |
663 |
- #ifdef HAVE_XEXTPROTO_71 |
664 |
- #include <X11/extensions/dpmsconst.h> |
665 |
- #else |
666 |
-@@ -70,10 +72,10 @@ |
667 |
- |
668 |
- static Bool OMAPFBProbe(DriverPtr drv, int flags); |
669 |
- static Bool OMAPFBPreInit(ScrnInfoPtr pScrn, int flags); |
670 |
--static Bool OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv); |
671 |
--static Bool OMAPFBEnterVT(int scrnIndex, int flags); |
672 |
--static void OMAPFBLeaveVT(int scrnIndex, int flags); |
673 |
--static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); |
674 |
-+static Bool OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL); |
675 |
-+static Bool OMAPFBEnterVT(VT_FUNC_ARGS_DECL); |
676 |
-+static void OMAPFBLeaveVT(VT_FUNC_ARGS_DECL); |
677 |
-+static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL); |
678 |
- |
679 |
- static Bool |
680 |
- OMAPFBEnsureRec(ScrnInfoPtr pScrn) |
681 |
-@@ -481,7 +483,7 @@ OMAPFBXvScreenInit(ScreenPtr pScreen) |
682 |
- } |
683 |
- |
684 |
- static Bool |
685 |
--OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) |
686 |
-+OMAPFBCloseScreen(CLOSE_SCREEN_ARGS_DECL) |
687 |
- { |
688 |
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; |
689 |
- OMAPFBPtr ofb = OMAPFB(pScrn); |
690 |
-@@ -490,11 +492,11 @@ OMAPFBCloseScreen(int scrnIndex, ScreenPtr pScreen) |
691 |
- |
692 |
- pScreen->CloseScreen = ofb->CloseScreen; |
693 |
- |
694 |
-- return (*pScreen->CloseScreen)(scrnIndex, pScreen); |
695 |
-+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); |
696 |
- } |
697 |
- |
698 |
- static Bool |
699 |
--OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
700 |
-+OMAPFBScreenInit(SCREEN_INIT_ARGS_DECL) |
701 |
- { |
702 |
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; |
703 |
- OMAPFBPtr ofb = OMAPFB(pScrn); |
704 |
-@@ -516,7 +518,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
705 |
- PROT_READ | PROT_WRITE, MAP_SHARED, |
706 |
- ofb->fd, 0); |
707 |
- if (ofb->fb == MAP_FAILED) { |
708 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); |
709 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Mapping framebuffer memory failed, wanted %d bytes.\n", ofb->mem_info.size); |
710 |
- return FALSE; |
711 |
- } |
712 |
- |
713 |
-@@ -526,7 +528,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
714 |
- /* Only support TrueColor for now */ |
715 |
- if (!miSetVisualTypes(pScrn->depth, TrueColorMask, |
716 |
- pScrn->rgbBits, pScrn->defaultVisual)) { |
717 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "visual type setup failed" |
718 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "visual type setup failed" |
719 |
- " for %d bits per pixel [1]\n", |
720 |
- pScrn->bitsPerPixel); |
721 |
- return FALSE; |
722 |
-@@ -534,7 +536,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
723 |
- |
724 |
- /* Set up pixmap depth information */ |
725 |
- if (!miSetPixmapDepths()) { |
726 |
-- xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); |
727 |
-+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n"); |
728 |
- return FALSE; |
729 |
- } |
730 |
- |
731 |
-@@ -546,7 +548,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
732 |
- pScrn->virtualY, pScrn->xDpi, |
733 |
- pScrn->yDpi, pScrn->displayWidth, |
734 |
- pScrn->bitsPerPixel)) { |
735 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "fbScreenInit failed\n"); |
736 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbScreenInit failed\n"); |
737 |
- return FALSE; |
738 |
- } |
739 |
- |
740 |
-@@ -567,7 +569,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
741 |
- |
742 |
- /* Initialize XRender fallbacks */ |
743 |
- if (!fbPictureInit(pScreen, NULL, 0)) { |
744 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "fbPictureInit failed\n"); |
745 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbPictureInit failed\n"); |
746 |
- return FALSE; |
747 |
- } |
748 |
- |
749 |
-@@ -579,7 +581,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
750 |
- |
751 |
- /* Initialize default colormap */ |
752 |
- if (!miCreateDefColormap(pScreen)) { |
753 |
-- xf86DrvMsg(scrnIndex, X_ERROR, |
754 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |
755 |
- "creating default colormap failed\n"); |
756 |
- return FALSE; |
757 |
- } |
758 |
-@@ -589,7 +591,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
759 |
- /* This is non-fatal since we might be running against older |
760 |
- * kernel driver in which case we only do basic 2D stuff... |
761 |
- */ |
762 |
-- xf86DrvMsg(scrnIndex, X_ERROR, "Reading plane info failed\n"); |
763 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Reading plane info failed\n"); |
764 |
- } else if (!ofb->dss) { |
765 |
- |
766 |
- ofb->plane_info.enabled = 1; |
767 |
-@@ -602,7 +604,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
768 |
- } |
769 |
- |
770 |
- if (ioctl (ofb->fd, OMAPFB_SETUP_PLANE, &ofb->plane_info)) { |
771 |
-- xf86DrvMsg(scrnIndex, X_ERROR, |
772 |
-+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |
773 |
- "%s: Plane setup failed: %s\n", |
774 |
- __FUNCTION__, strerror(errno)); |
775 |
- return FALSE; |
776 |
-@@ -645,9 +647,10 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) |
777 |
- return TRUE; |
778 |
- } |
779 |
- |
780 |
--static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) |
781 |
-+static Bool OMAPFBSwitchMode(SWITCH_MODE_ARGS_DECL) |
782 |
- { |
783 |
-- return xf86SetSingleMode (xf86Screens[scrnIndex], mode, RR_Rotate_0); |
784 |
-+ SCRN_INFO_PTR(arg); |
785 |
-+ return xf86SetSingleMode (pScrn, mode, RR_Rotate_0); |
786 |
- } |
787 |
- |
788 |
- void |
789 |
-@@ -699,14 +702,14 @@ OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, |
790 |
- /*** Unimplemented: */ |
791 |
- |
792 |
- static Bool |
793 |
--OMAPFBEnterVT(int scrnIndex, int flags) |
794 |
-+OMAPFBEnterVT(VT_FUNC_ARGS_DECL) |
795 |
- { |
796 |
- xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); |
797 |
- return TRUE; |
798 |
- } |
799 |
- |
800 |
- static void |
801 |
--OMAPFBLeaveVT(int scrnIndex, int flags) |
802 |
-+OMAPFBLeaveVT(VT_FUNC_ARGS_DECL) |
803 |
- { |
804 |
- xf86Msg(X_NOT_IMPLEMENTED, "%s\n", __FUNCTION__); |
805 |
- } |
806 |
--- |
807 |
-1.8.0 |
808 |
- |
809 |
|
810 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch b/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch |
811 |
deleted file mode 100644 |
812 |
index dc0b9b3f41..0000000000 |
813 |
--- a/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch |
814 |
+++ /dev/null |
815 |
@@ -1,48 +0,0 @@ |
816 |
-Fix errors with glibc 2.20 |
817 |
- |
818 |
-In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, |
819 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, |
820 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, |
821 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, |
822 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, |
823 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-blizzard.c:33: |
824 |
-/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' |
825 |
- strndup(const char *str, size_t n); |
826 |
- ^ |
827 |
-In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, |
828 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, |
829 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, |
830 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, |
831 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, |
832 |
- from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-generic.c:28: |
833 |
-/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' |
834 |
- strndup(const char *str, size_t n); |
835 |
- ^ |
836 |
- |
837 |
-Singed-off-by: Khem Raj <raj.khem@×××××.com> |
838 |
- |
839 |
-Upstream-Status: Pending |
840 |
-Index: git/src/omapfb-xv-blizzard.c |
841 |
-=================================================================== |
842 |
---- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700 |
843 |
-+++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700 |
844 |
-@@ -30,6 +30,7 @@ |
845 |
- * - |
846 |
- */ |
847 |
- |
848 |
-+#include <xorg-server.h> |
849 |
- #include "xf86.h" |
850 |
- #include "xf86_OSlib.h" |
851 |
- #include "xf86xv.h" |
852 |
-Index: git/src/omapfb-xv-generic.c |
853 |
-=================================================================== |
854 |
---- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700 |
855 |
-+++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700 |
856 |
-@@ -25,6 +25,7 @@ |
857 |
- * Generic functions for the XV driver |
858 |
- */ |
859 |
- |
860 |
-+#include <xorg-server.h> |
861 |
- #include "xf86.h" |
862 |
- #include "xf86_OSlib.h" |
863 |
- #include "xf86xv.h" |
864 |
|
865 |
diff --git a/x11-drivers/xf86-video-omapfb/files/xf86-video-omapfb-0.1.1-closescreen.patch b/x11-drivers/xf86-video-omapfb/files/xf86-video-omapfb-0.1.1-closescreen.patch |
866 |
deleted file mode 100644 |
867 |
index e8a556059b..0000000000 |
868 |
--- a/x11-drivers/xf86-video-omapfb/files/xf86-video-omapfb-0.1.1-closescreen.patch |
869 |
+++ /dev/null |
870 |
@@ -1,11 +0,0 @@ |
871 |
---- a/src/omapfb-driver.c |
872 |
-+++ b/src/omapfb-driver.c |
873 |
-@@ -441,7 +441,7 @@ |
874 |
- |
875 |
- pScreen->CloseScreen = ofb->CloseScreen; |
876 |
- |
877 |
-- return (*pScreen->CloseScreen)(scrnIndex, pScreen); |
878 |
-+ return (*pScreen->CloseScreen)(pScreen); |
879 |
- } |
880 |
- |
881 |
- static Bool |
882 |
|
883 |
diff --git a/x11-drivers/xf86-video-omapfb/metadata.xml b/x11-drivers/xf86-video-omapfb/metadata.xml |
884 |
deleted file mode 100644 |
885 |
index 3101c4efc8..0000000000 |
886 |
--- a/x11-drivers/xf86-video-omapfb/metadata.xml |
887 |
+++ /dev/null |
888 |
@@ -1,8 +0,0 @@ |
889 |
-<?xml version="1.0" encoding="UTF-8"?> |
890 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
891 |
-<pkgmetadata> |
892 |
-<maintainer type="project"> |
893 |
- <email>arm@g.o</email> |
894 |
- <name>Gentoo Linux ARM Development</name> |
895 |
-</maintainer> |
896 |
-</pkgmetadata> |
897 |
|
898 |
diff --git a/x11-drivers/xf86-video-omapfb/xf86-video-omapfb-0.1.1.1_p1.ebuild b/x11-drivers/xf86-video-omapfb/xf86-video-omapfb-0.1.1.1_p1.ebuild |
899 |
deleted file mode 100644 |
900 |
index 88d1a05e88..0000000000 |
901 |
--- a/x11-drivers/xf86-video-omapfb/xf86-video-omapfb-0.1.1.1_p1.ebuild |
902 |
+++ /dev/null |
903 |
@@ -1,34 +0,0 @@ |
904 |
-# Copyright 1999-2015 Gentoo Foundation |
905 |
-# Distributed under the terms of the GNU General Public License v2 |
906 |
-# $Id$ |
907 |
- |
908 |
-EAPI="5" |
909 |
- |
910 |
-XORG_EAUTORECONF="yes" |
911 |
- |
912 |
-inherit xorg-2 |
913 |
- |
914 |
-MY_P="${P/_p*//}" |
915 |
-MY_P_PATCH="${PN}_${PV/_p/-}" |
916 |
- |
917 |
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}.orig.tar.gz |
918 |
- mirror://debian/pool/main/x/${PN}/${MY_P_PATCH}.diff.gz" |
919 |
-HOMEPAGE="https://packages.debian.org/source/sid/xf86-video-omapfb" |
920 |
- |
921 |
-DESCRIPTION="X.org driver for TI OMAP framebuffers" |
922 |
-KEYWORDS="-* arm" |
923 |
-IUSE="" |
924 |
-RDEPEND="" |
925 |
-DEPEND="${RDEPEND} |
926 |
- x11-proto/fontsproto |
927 |
- x11-proto/randrproto |
928 |
- x11-proto/renderproto |
929 |
- x11-proto/xproto" |
930 |
- |
931 |
-S="${WORKDIR}/${MY_P}" |
932 |
- |
933 |
-src_prepare() { |
934 |
- epatch "${WORKDIR}/${MY_P_PATCH}.diff" |
935 |
- epatch "${FILESDIR}"/000*.patch |
936 |
- xorg-2_src_prepare |
937 |
-} |