Contents of /trunk/xf86-video-vesa/patches/xf86-video-vesa-1.3.0-no-legacy-fb.patch
Parent Directory | Revision Log
Revision 636 -
(show annotations)
(download)
Mon Jun 2 09:11:44 2008 UTC (16 years, 3 months ago) by niro
File size: 2680 byte(s)
Mon Jun 2 09:11:44 2008 UTC (16 years, 3 months ago) by niro
File size: 2680 byte(s)
-patch for alx to fix builds without lagacy-fb ({c,a,m}fb)
1 | diff -Naur xf86-video-vesa-1.3.0/src/vesa.c xf86-video-vesa-1.3.0-magellan/src/vesa.c |
2 | --- xf86-video-vesa-1.3.0/src/vesa.c 2006-11-30 22:03:07.000000000 +0100 |
3 | +++ xf86-video-vesa-1.3.0-magellan/src/vesa.c 2008-06-02 11:13:42.000000000 +0200 |
4 | @@ -157,17 +157,6 @@ |
5 | * xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about |
6 | * unresolved symbols that are not required. |
7 | */ |
8 | -#ifdef XFree86LOADER |
9 | -static const char *miscfbSymbols[] = { |
10 | - "xf1bppScreenInit", |
11 | - "xf4bppScreenInit", |
12 | -#ifdef USE_AFB |
13 | - "afbScreenInit", |
14 | -#endif |
15 | - "mfbScreenInit", |
16 | - NULL |
17 | -}; |
18 | -#endif |
19 | |
20 | static const char *fbSymbols[] = { |
21 | "fbPictureInit", |
22 | @@ -245,8 +234,7 @@ |
23 | { |
24 | Initialised = TRUE; |
25 | xf86AddDriver(&VESA, Module, 0); |
26 | - LoaderRefSymLists(miscfbSymbols, |
27 | - fbSymbols, |
28 | + LoaderRefSymLists(fbSymbols, |
29 | shadowSymbols, |
30 | vbeSymbols, |
31 | ddcSymbols, |
32 | @@ -674,23 +662,9 @@ |
33 | } |
34 | else { |
35 | switch (pScrn->bitsPerPixel) { |
36 | - case 1: |
37 | - mod = "xf1bpp"; |
38 | - reqSym = "xf1bppScreenInit"; |
39 | - break; |
40 | - case 4: |
41 | - mod = "xf4bpp"; |
42 | - reqSym = "xf4bppScreenInit"; |
43 | - break; |
44 | default: |
45 | -#ifdef USE_AFB |
46 | - mod = "afb"; |
47 | - reqSym = "afbScreenInit"; |
48 | - break; |
49 | -#else |
50 | xf86DrvMsg(pScrn->scrnIndex, X_ERROR, |
51 | "Unsupported bpp: %d", pScrn->bitsPerPixel); |
52 | -#endif |
53 | } |
54 | } |
55 | break; |
56 | @@ -860,28 +834,9 @@ |
57 | return (FALSE); |
58 | case 0x3: /* Planar */ |
59 | switch (pScrn->bitsPerPixel) { |
60 | - case 1: |
61 | - if (!xf1bppScreenInit(pScreen, pVesa->base, |
62 | - pScrn->virtualX, pScrn->virtualY, |
63 | - pScrn->xDpi, pScrn->yDpi, |
64 | - pScrn->displayWidth)) |
65 | - return (FALSE); |
66 | - break; |
67 | - case 4: |
68 | - if (!xf4bppScreenInit(pScreen, pVesa->base, |
69 | - pScrn->virtualX, pScrn->virtualY, |
70 | - pScrn->xDpi, pScrn->yDpi, |
71 | - pScrn->displayWidth)) |
72 | - return (FALSE); |
73 | - break; |
74 | default: |
75 | -#ifdef USE_AFB |
76 | - if (!afbScreenInit(pScreen, pVesa->base, |
77 | - pScrn->virtualX, pScrn->virtualY, |
78 | - pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth)) |
79 | -#endif |
80 | return (FALSE); |
81 | - break; |
82 | + break; |
83 | } |
84 | break; |
85 | case 0x4: /* Packed pixel */ |
86 | diff -Naur xf86-video-vesa-1.3.0/src/vesa.h xf86-video-vesa-1.3.0-magellan/src/vesa.h |
87 | --- xf86-video-vesa-1.3.0/src/vesa.h 2006-11-30 22:04:02.000000000 +0100 |
88 | +++ xf86-video-vesa-1.3.0-magellan/src/vesa.h 2008-06-02 11:14:10.000000000 +0200 |
89 | @@ -69,16 +69,8 @@ |
90 | #include "xf86Resources.h" |
91 | #include "xf86RAC.h" |
92 | |
93 | -#include "xf1bpp.h" |
94 | -#include "xf4bpp.h" |
95 | #include "fb.h" |
96 | |
97 | -#ifdef USE_AFB |
98 | -#include "afb.h" |
99 | -#endif |
100 | - |
101 | -#include "mfb.h" |
102 | - |
103 | #define VESA_VERSION 4000 |
104 | #define VESA_NAME "VESA" |
105 | #define VESA_DRIVER_NAME "vesa" |