Contents of /trunk/vnc/patches/vnc-xorg.patch
Parent Directory | Revision Log
Revision 646 -
(show annotations)
(download)
Tue Jun 3 22:52:24 2008 UTC (16 years, 3 months ago) by niro
File size: 2859 byte(s)
Tue Jun 3 22:52:24 2008 UTC (16 years, 3 months ago) by niro
File size: 2859 byte(s)
-renamed, used wrong patch first
1 | --- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in.xorg 2005-03-04 09:09:37.000000000 +0000 |
2 | +++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in 2005-03-04 09:09:56.000000000 +0000 |
3 | @@ -8,6 +8,8 @@ |
4 | #define BuildGlxExt NO |
5 | #define XnestServer NO |
6 | #define XprtServer NO |
7 | +#define BuildXFree86ConfigTools NO |
8 | +#define BuildScanpci NO |
9 | |
10 | #ifdef SunArchitecture |
11 | #define ProjectRoot /usr/openwin |
12 | --- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc.xorg 2005-03-04 09:05:36.000000000 +0000 |
13 | +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.cc 2005-03-04 09:05:47.000000000 +0000 |
14 | @@ -413,25 +413,6 @@ |
15 | } |
16 | } |
17 | |
18 | -static void printRegion(RegionPtr reg) |
19 | -{ |
20 | - int nrects = REGION_NUM_RECTS(reg); |
21 | - |
22 | - fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects, |
23 | - (REGION_EXTENTS(pScreen,reg))->x1, |
24 | - (REGION_EXTENTS(pScreen,reg))->y1, |
25 | - (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1, |
26 | - (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1); |
27 | - |
28 | - for (int i = 0; i < nrects; i++) { |
29 | - fprintf(stderr," rect %3d,%3d %3dx%3d\n", |
30 | - REGION_RECTS(reg)[i].x1, |
31 | - REGION_RECTS(reg)[i].y1, |
32 | - REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1, |
33 | - REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1); |
34 | - } |
35 | -} |
36 | - |
37 | CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer, |
38 | CARD32 now, pointer arg) |
39 | { |
40 | --- vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile.xorg 2005-03-04 09:05:54.000000000 +0000 |
41 | +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/Imakefile 2005-03-04 09:06:19.000000000 +0000 |
42 | @@ -128,7 +128,7 @@ |
43 | LIBREGEX = RegexLibrary |
44 | |
45 | #if DoLoadableServer |
46 | - LIBCWRAPPER = os/libcwrapper.o |
47 | + LIBCWRAPPER = os/libcwrapper.o os/libos.a |
48 | #endif |
49 | |
50 | #if BuildXprint |
51 | --- vnc-4_1-unixsrc/unix/xc.patch.xorg 2005-03-04 09:07:52.000000000 +0000 |
52 | +++ vnc-4_1-unixsrc/unix/xc.patch 2005-03-04 09:08:37.000000000 +0000 |
53 | @@ -8,19 +8,19 @@ |
54 | + XCOMM |
55 | + XCOMM X VNC server |
56 | + XCOMM |
57 | -+ MFBDIR = mfb |
58 | -+ CFB8DIR = cfb |
59 | -+ CFB16DIR = cfb16 |
60 | -+ CFB24DIR = cfb24 |
61 | -+ CFB32DIR = cfb32 |
62 | -+ FBDIR = fb |
63 | ++ MFBSUBDIR = mfb |
64 | ++ CFB8SUBDIR = cfb |
65 | ++ CFB16SUBDIR = cfb16 |
66 | ++ CFB24SUBDIR = cfb24 |
67 | ++ CFB32SUBDIR = cfb32 |
68 | ++ FBSUBDIR = fb |
69 | + XVNCDDXDIR = vnc/Xvnc |
70 | + #if VncUseFb |
71 | -+ XVNCDIRS = $(STDDIRS) $(FBDIR) $(XVNCDDXDIR) $(DEPDIRS) |
72 | ++ XVNCDIRS = $(STDDIRS) $(FBSUBDIR) $(XVNCDDXDIR) $(DEPDIRS) |
73 | + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs |
74 | + #else |
75 | -+ XVNCDIRS = $(STDDIRS) $(MFBDIR) \ |
76 | -+ $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ |
77 | ++ XVNCDIRS = $(STDDIRS) $(MFBSUBDIR) \ |
78 | ++ $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) \ |
79 | + $(XVNCDDXDIR) $(DEPDIRS) |
80 | + XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) CFBLibs PostFbLibs |
81 | + #endif |